Skip to content

Commit f8d57f8

Browse files
Merge pull request #82 from laravelwebdev/analysis-Dyr6yk
Apply fixes from StyleCI
2 parents 877f628 + 15c969c commit f8d57f8

17 files changed

+48
-73
lines changed

app/Helpers/Cetak.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public static function bon($id)
360360
$tim_id = Helper::getPropertyFromCollection(Helper::getDataPegawaiByUserId($data->user_id, $data->tanggal_permintaan), 'unit_kerja_id');
361361

362362
return [
363-
'tim' =>Helper::getPropertyFromCollection(UnitKerja::cache()->get('all')->where('id', $tim_id)->first(), 'unit'),
363+
'tim' => Helper::getPropertyFromCollection(UnitKerja::cache()->get('all')->where('id', $tim_id)->first(), 'unit'),
364364
'kegiatan' => $data->kegiatan,
365365
'keterangan' => $data->keterangan,
366366
'tanggal_permintaan' => Helper::terbilangTanggal($data->tanggal_permintaan),
@@ -373,8 +373,6 @@ public static function bon($id)
373373
];
374374
}
375375

376-
377-
378376
public static function validate($jenis, $model_id)
379377
{
380378
if ($jenis === 'kak') {
@@ -434,7 +432,7 @@ public static function validate($jenis, $model_id)
434432
if ($jenis === 'bastp') {
435433
$bastp = PembelianPersediaan::where('id', $model_id)->first();
436434
throw_if(
437-
!in_array($bastp->status, ['berkode', 'dicetak']),
435+
! in_array($bastp->status, ['berkode', 'dicetak']),
438436
'Hanya yang berstatus berkode atau dicetak yang dapat dicetak ulang.'
439437
);
440438
throw_if(

app/Helpers/Helper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ public static function cekStokPersediaan($id)
223223
->where('master_persediaan_id', $id)
224224
->groupBy('master_persediaan_id')
225225
->first();
226-
return $stok ? $stok->stok : 0;
227226

227+
return $stok ? $stok->stok : 0;
228228
}
229229

230230
/**

app/Models/BarangPersediaan.php

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace App\Models;
44

5-
use App\Models\PermintaanPersediaan;
6-
use App\Models\PersediaanKeluar;
7-
use App\Models\PersediaanMasuk;
85
use Illuminate\Database\Eloquent\Model;
96
use Illuminate\Database\Eloquent\Relations\BelongsTo;
107

118
class BarangPersediaan extends Model
129
{
1310
protected $fillable = [
14-
'tanggal_transaksi'
11+
'tanggal_transaksi',
1512
];
1613

1714
protected $casts = [
@@ -30,13 +27,13 @@ protected static function booted(): void
3027
if (! empty($persediaan->masterPersediaan)) {
3128
$persediaan->barang = $persediaan->masterPersediaan->barang;
3229
$persediaan->satuan = $persediaan->masterPersediaan->satuan;
33-
3430
}
3531
if ($persediaan->barang_persediaanable_type == 'App\Models\PembelianPersediaan' && $persediaan->isDirty()) {
36-
if ($persediaan->isClean('master_persediaan_id'))
37-
PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id)
38-
->where('status', 'diterima')
39-
->update(['status' => 'outdated']);
32+
if ($persediaan->isClean('master_persediaan_id')) {
33+
PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id)
34+
->where('status', 'diterima')
35+
->update(['status' => 'outdated']);
36+
}
4037
PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id)
4138
->where('status', 'berkode')
4239
->update(['status' => 'diterima']);
@@ -46,7 +43,6 @@ protected static function booted(): void
4643
PermintaanPersediaan::where('id', $persediaan->barang_persediaanable_id)
4744
->where('status', 'dicetak')
4845
->update(['status' => 'outdated']);
49-
5046
}
5147
if ($persediaan->barang_persediaanable_type == 'App\Models\PersediaanKeluar' && $persediaan->isDirty()) {
5248
$persediaan->tanggal_transaksi = PersediaanKeluar::find($persediaan->barang_persediaanable_id)->tanggal_buku;

app/Models/IzinKeluar.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace App\Models;
44

55
use App\Helpers\Helper;
6-
use App\Helpers\Policy;
76
use Illuminate\Database\Eloquent\Model;
87
use Illuminate\Database\Eloquent\Relations\BelongsTo;
98
use Illuminate\Support\Facades\Auth;

app/Models/PembelianPersediaan.php

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,26 @@ protected static function booted(): void
4343
});
4444
static::updating(function (PembelianPersediaan $pembelian) {
4545
if ($pembelian->bast_naskah_keluar_id === null) {
46-
$default_naskah = NaskahDefault::cache()->get('all')
47-
->where('jenis', 'bastp')
48-
->first();
49-
$naskahkeluar = new NaskahKeluar;
50-
$naskahkeluar->tanggal = $pembelian->tanggal_bast;
51-
$naskahkeluar->jenis_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'jenis_naskah_id');
52-
$naskahkeluar->kode_arsip_id = Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')[0];
53-
$naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id');
54-
$naskahkeluar->tujuan = 'Pengelola Barang Persediaan';
55-
$naskahkeluar->perihal = 'BAST '.$pembelian->rincian;
56-
$naskahkeluar->generate = 'A';
57-
$naskahkeluar->save();
58-
$pembelian->bast_naskah_keluar_id = $naskahkeluar->id;
59-
} else {
60-
if ($pembelian->isDirty(['tanggal_bast'])) {
61-
$naskahkeluar = NaskahKeluar::where('id', $pembelian->bast_naskah_keluar_id)->first();
46+
$default_naskah = NaskahDefault::cache()->get('all')
47+
->where('jenis', 'bastp')
48+
->first();
49+
$naskahkeluar = new NaskahKeluar;
6250
$naskahkeluar->tanggal = $pembelian->tanggal_bast;
51+
$naskahkeluar->jenis_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'jenis_naskah_id');
52+
$naskahkeluar->kode_arsip_id = Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')[0];
53+
$naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id');
54+
$naskahkeluar->tujuan = 'Pengelola Barang Persediaan';
55+
$naskahkeluar->perihal = 'BAST '.$pembelian->rincian;
56+
$naskahkeluar->generate = 'A';
6357
$naskahkeluar->save();
58+
$pembelian->bast_naskah_keluar_id = $naskahkeluar->id;
59+
} else {
60+
if ($pembelian->isDirty(['tanggal_bast'])) {
61+
$naskahkeluar = NaskahKeluar::where('id', $pembelian->bast_naskah_keluar_id)->first();
62+
$naskahkeluar->tanggal = $pembelian->tanggal_bast;
63+
$naskahkeluar->save();
64+
}
6465
}
65-
}
6666
});
67-
68-
6967
}
7068
}

app/Models/PermintaanPersediaan.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ protected static function booted(): void
4343
}
4444
});
4545

46-
4746
static::deleting(function (PermintaanPersediaan $permintaan) {
4847
$permintaan->daftarBarangPersediaans->each->delete();
4948
});

app/Models/PersediaanKeluar.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ protected static function booted(): void
2222
static::saving(function (PersediaanKeluar $persediaan) {
2323
if ($persediaan->isDirty('tanggal_buku')) {
2424
BarangPersediaan::where('barang_persediaanable_id', $persediaan->id)
25-
->where('barang_persediaanable_type', 'App\Models\PersediaanKeluar')
26-
->update(['tanggal_transaksi' => $persediaan->tanggal_buku]);
25+
->where('barang_persediaanable_type', 'App\Models\PersediaanKeluar')
26+
->update(['tanggal_transaksi' => $persediaan->tanggal_buku]);
2727
}
2828
});
2929
static::deleting(function (PersediaanKeluar $persediaan) {

app/Nova/Actions/ImportBarangFromSpesifikasiKerangkaAcuan.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33
namespace App\Nova\Actions;
44

55
use App\Models\BarangPersediaan;
6-
use App\Models\Mitra;
76
use App\Models\SpesifikasiKerangkaAcuan;
87
use Illuminate\Bus\Queueable;
98
use Illuminate\Queue\InteractsWithQueue;
10-
use Illuminate\Support\Carbon;
119
use Illuminate\Support\Collection;
1210
use Laravel\Nova\Actions\Action;
1311
use Laravel\Nova\Fields\ActionFields;
14-
use Laravel\Nova\Fields\File;
15-
use Laravel\Nova\Fields\Heading;
1612
use Laravel\Nova\Http\Requests\NovaRequest;
1713

1814
class ImportBarangFromSpesifikasiKerangkaAcuan extends Action
@@ -33,9 +29,9 @@ public function handle(ActionFields $fields, Collection $models)
3329
BarangPersediaan::where('barang_persediaanable_id', $model->id)
3430
->where('barang_persediaanable_type', 'App\Models\PembelianPersediaan')
3531
->delete();
36-
$speks =SpesifikasiKerangkaAcuan::where('kerangka_acuan_id', $model->kerangka_acuan_id)->get();
32+
$speks = SpesifikasiKerangkaAcuan::where('kerangka_acuan_id', $model->kerangka_acuan_id)->get();
3733
foreach ($speks as $spek) {
38-
$barang = New BarangPersediaan;
34+
$barang = new BarangPersediaan;
3935
$barang->barang = $spek->rincian;
4036
$barang->satuan = $spek->satuan;
4137
$barang->volume = $spek->volume;

app/Nova/Actions/SetStatus.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public function handle(ActionFields $fields, Collection $models)
4040
{
4141
$model = $models->first();
4242
$model->query()->update([$this->statusField => $this->status]);
43-
4443
}
4544

4645
/**

app/Nova/BarangPersediaan.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ public function fields(NovaRequest $request)
117117
->step(1)
118118
->rules('required', 'gt:0')->min(0);
119119
}
120-
121120
}
122121

123122
if ($request->viaResource == 'permintaan-persediaans') {
@@ -151,8 +150,8 @@ public function fields(NovaRequest $request)
151150
->rules('required', 'gt:0');
152151
$fields[] =
153152
Number::make('Harga Satuan')
154-
->step(1)
155-
->rules('required', 'gt:0')->min(0);
153+
->step(1)
154+
->rules('required', 'gt:0')->min(0);
156155
}
157156

158157
if ($request->viaResource == 'persediaan-keluars') {

0 commit comments

Comments
 (0)