diff --git a/app/Helpers/Cetak.php b/app/Helpers/Cetak.php index 03c47597..0dae4835 100644 --- a/app/Helpers/Cetak.php +++ b/app/Helpers/Cetak.php @@ -360,7 +360,7 @@ public static function bon($id) $tim_id = Helper::getPropertyFromCollection(Helper::getDataPegawaiByUserId($data->user_id, $data->tanggal_permintaan), 'unit_kerja_id'); return [ - 'tim' =>Helper::getPropertyFromCollection(UnitKerja::cache()->get('all')->where('id', $tim_id)->first(), 'unit'), + 'tim' => Helper::getPropertyFromCollection(UnitKerja::cache()->get('all')->where('id', $tim_id)->first(), 'unit'), 'kegiatan' => $data->kegiatan, 'keterangan' => $data->keterangan, 'tanggal_permintaan' => Helper::terbilangTanggal($data->tanggal_permintaan), @@ -373,8 +373,6 @@ public static function bon($id) ]; } - - public static function validate($jenis, $model_id) { if ($jenis === 'kak') { @@ -434,7 +432,7 @@ public static function validate($jenis, $model_id) if ($jenis === 'bastp') { $bastp = PembelianPersediaan::where('id', $model_id)->first(); throw_if( - !in_array($bastp->status, ['berkode', 'dicetak']), + ! in_array($bastp->status, ['berkode', 'dicetak']), 'Hanya yang berstatus berkode atau dicetak yang dapat dicetak ulang.' ); throw_if( diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index c22dcabf..1946bcd1 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -223,8 +223,8 @@ public static function cekStokPersediaan($id) ->where('master_persediaan_id', $id) ->groupBy('master_persediaan_id') ->first(); - return $stok ? $stok->stok : 0; + return $stok ? $stok->stok : 0; } /** diff --git a/app/Models/BarangPersediaan.php b/app/Models/BarangPersediaan.php index 542cbc6a..c6b346eb 100644 --- a/app/Models/BarangPersediaan.php +++ b/app/Models/BarangPersediaan.php @@ -2,16 +2,13 @@ namespace App\Models; -use App\Models\PermintaanPersediaan; -use App\Models\PersediaanKeluar; -use App\Models\PersediaanMasuk; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; class BarangPersediaan extends Model { protected $fillable = [ - 'tanggal_transaksi' + 'tanggal_transaksi', ]; protected $casts = [ @@ -30,13 +27,13 @@ protected static function booted(): void if (! empty($persediaan->masterPersediaan)) { $persediaan->barang = $persediaan->masterPersediaan->barang; $persediaan->satuan = $persediaan->masterPersediaan->satuan; - } if ($persediaan->barang_persediaanable_type == 'App\Models\PembelianPersediaan' && $persediaan->isDirty()) { - if ($persediaan->isClean('master_persediaan_id')) - PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id) - ->where('status', 'diterima') - ->update(['status' => 'outdated']); + if ($persediaan->isClean('master_persediaan_id')) { + PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id) + ->where('status', 'diterima') + ->update(['status' => 'outdated']); + } PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id) ->where('status', 'berkode') ->update(['status' => 'diterima']); @@ -46,7 +43,6 @@ protected static function booted(): void PermintaanPersediaan::where('id', $persediaan->barang_persediaanable_id) ->where('status', 'dicetak') ->update(['status' => 'outdated']); - } if ($persediaan->barang_persediaanable_type == 'App\Models\PersediaanKeluar' && $persediaan->isDirty()) { $persediaan->tanggal_transaksi = PersediaanKeluar::find($persediaan->barang_persediaanable_id)->tanggal_buku; diff --git a/app/Models/IzinKeluar.php b/app/Models/IzinKeluar.php index d66b3e02..fd8c66d4 100644 --- a/app/Models/IzinKeluar.php +++ b/app/Models/IzinKeluar.php @@ -3,7 +3,6 @@ namespace App\Models; use App\Helpers\Helper; -use App\Helpers\Policy; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Support\Facades\Auth; diff --git a/app/Models/PembelianPersediaan.php b/app/Models/PembelianPersediaan.php index daf741c4..90544add 100644 --- a/app/Models/PembelianPersediaan.php +++ b/app/Models/PembelianPersediaan.php @@ -43,28 +43,26 @@ protected static function booted(): void }); static::updating(function (PembelianPersediaan $pembelian) { if ($pembelian->bast_naskah_keluar_id === null) { - $default_naskah = NaskahDefault::cache()->get('all') - ->where('jenis', 'bastp') - ->first(); - $naskahkeluar = new NaskahKeluar; - $naskahkeluar->tanggal = $pembelian->tanggal_bast; - $naskahkeluar->jenis_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'jenis_naskah_id'); - $naskahkeluar->kode_arsip_id = Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')[0]; - $naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id'); - $naskahkeluar->tujuan = 'Pengelola Barang Persediaan'; - $naskahkeluar->perihal = 'BAST '.$pembelian->rincian; - $naskahkeluar->generate = 'A'; - $naskahkeluar->save(); - $pembelian->bast_naskah_keluar_id = $naskahkeluar->id; - } else { - if ($pembelian->isDirty(['tanggal_bast'])) { - $naskahkeluar = NaskahKeluar::where('id', $pembelian->bast_naskah_keluar_id)->first(); + $default_naskah = NaskahDefault::cache()->get('all') + ->where('jenis', 'bastp') + ->first(); + $naskahkeluar = new NaskahKeluar; $naskahkeluar->tanggal = $pembelian->tanggal_bast; + $naskahkeluar->jenis_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'jenis_naskah_id'); + $naskahkeluar->kode_arsip_id = Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')[0]; + $naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id'); + $naskahkeluar->tujuan = 'Pengelola Barang Persediaan'; + $naskahkeluar->perihal = 'BAST '.$pembelian->rincian; + $naskahkeluar->generate = 'A'; $naskahkeluar->save(); + $pembelian->bast_naskah_keluar_id = $naskahkeluar->id; + } else { + if ($pembelian->isDirty(['tanggal_bast'])) { + $naskahkeluar = NaskahKeluar::where('id', $pembelian->bast_naskah_keluar_id)->first(); + $naskahkeluar->tanggal = $pembelian->tanggal_bast; + $naskahkeluar->save(); + } } - } }); - - } } diff --git a/app/Models/PermintaanPersediaan.php b/app/Models/PermintaanPersediaan.php index 6645a069..85141d82 100644 --- a/app/Models/PermintaanPersediaan.php +++ b/app/Models/PermintaanPersediaan.php @@ -43,7 +43,6 @@ protected static function booted(): void } }); - static::deleting(function (PermintaanPersediaan $permintaan) { $permintaan->daftarBarangPersediaans->each->delete(); }); diff --git a/app/Models/PersediaanKeluar.php b/app/Models/PersediaanKeluar.php index 9e69e55b..6dca245c 100644 --- a/app/Models/PersediaanKeluar.php +++ b/app/Models/PersediaanKeluar.php @@ -22,8 +22,8 @@ protected static function booted(): void static::saving(function (PersediaanKeluar $persediaan) { if ($persediaan->isDirty('tanggal_buku')) { BarangPersediaan::where('barang_persediaanable_id', $persediaan->id) - ->where('barang_persediaanable_type', 'App\Models\PersediaanKeluar') - ->update(['tanggal_transaksi' => $persediaan->tanggal_buku]); + ->where('barang_persediaanable_type', 'App\Models\PersediaanKeluar') + ->update(['tanggal_transaksi' => $persediaan->tanggal_buku]); } }); static::deleting(function (PersediaanKeluar $persediaan) { diff --git a/app/Nova/Actions/ImportBarangFromSpesifikasiKerangkaAcuan.php b/app/Nova/Actions/ImportBarangFromSpesifikasiKerangkaAcuan.php index ba191f51..a24a8730 100644 --- a/app/Nova/Actions/ImportBarangFromSpesifikasiKerangkaAcuan.php +++ b/app/Nova/Actions/ImportBarangFromSpesifikasiKerangkaAcuan.php @@ -3,16 +3,12 @@ namespace App\Nova\Actions; use App\Models\BarangPersediaan; -use App\Models\Mitra; use App\Models\SpesifikasiKerangkaAcuan; use Illuminate\Bus\Queueable; use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Carbon; use Illuminate\Support\Collection; use Laravel\Nova\Actions\Action; use Laravel\Nova\Fields\ActionFields; -use Laravel\Nova\Fields\File; -use Laravel\Nova\Fields\Heading; use Laravel\Nova\Http\Requests\NovaRequest; class ImportBarangFromSpesifikasiKerangkaAcuan extends Action @@ -33,9 +29,9 @@ public function handle(ActionFields $fields, Collection $models) BarangPersediaan::where('barang_persediaanable_id', $model->id) ->where('barang_persediaanable_type', 'App\Models\PembelianPersediaan') ->delete(); - $speks =SpesifikasiKerangkaAcuan::where('kerangka_acuan_id', $model->kerangka_acuan_id)->get(); + $speks = SpesifikasiKerangkaAcuan::where('kerangka_acuan_id', $model->kerangka_acuan_id)->get(); foreach ($speks as $spek) { - $barang = New BarangPersediaan; + $barang = new BarangPersediaan; $barang->barang = $spek->rincian; $barang->satuan = $spek->satuan; $barang->volume = $spek->volume; diff --git a/app/Nova/Actions/SetStatus.php b/app/Nova/Actions/SetStatus.php index d2be013e..6b769178 100644 --- a/app/Nova/Actions/SetStatus.php +++ b/app/Nova/Actions/SetStatus.php @@ -40,7 +40,6 @@ public function handle(ActionFields $fields, Collection $models) { $model = $models->first(); $model->query()->update([$this->statusField => $this->status]); - } /** diff --git a/app/Nova/BarangPersediaan.php b/app/Nova/BarangPersediaan.php index 4f852c6c..a003ac66 100644 --- a/app/Nova/BarangPersediaan.php +++ b/app/Nova/BarangPersediaan.php @@ -117,7 +117,6 @@ public function fields(NovaRequest $request) ->step(1) ->rules('required', 'gt:0')->min(0); } - } if ($request->viaResource == 'permintaan-persediaans') { @@ -151,8 +150,8 @@ public function fields(NovaRequest $request) ->rules('required', 'gt:0'); $fields[] = Number::make('Harga Satuan') - ->step(1) - ->rules('required', 'gt:0')->min(0); + ->step(1) + ->rules('required', 'gt:0')->min(0); } if ($request->viaResource == 'persediaan-keluars') { diff --git a/app/Nova/DaftarHonorMitra.php b/app/Nova/DaftarHonorMitra.php index d8e8406e..6a2bb9b6 100644 --- a/app/Nova/DaftarHonorMitra.php +++ b/app/Nova/DaftarHonorMitra.php @@ -6,7 +6,6 @@ use App\Helpers\Policy; use App\Nova\Actions\EditRekening; use App\Nova\Actions\ImportDaftarHonorMitra; -use App\Nova\Lenses\RekapHonorMitra; use Laravel\Nova\Fields\Currency; use Laravel\Nova\Fields\Number; use Laravel\Nova\Fields\Status; @@ -141,7 +140,6 @@ public function filters(NovaRequest $request) public function lenses(NovaRequest $request) { return [ - ]; } diff --git a/app/Nova/HonorKegiatan.php b/app/Nova/HonorKegiatan.php index 31c471e3..87a5f2e4 100644 --- a/app/Nova/HonorKegiatan.php +++ b/app/Nova/HonorKegiatan.php @@ -356,10 +356,10 @@ public function actions(NovaRequest $request) if (Policy::make()->allowedFor('all')->get()) { $actions[] = Download::make('spj', 'Unduh SPJ') - ->showInline() - ->showOnDetail() - ->exceptOnIndex() - ->confirmButtonText('Unduh'); + ->showInline() + ->showOnDetail() + ->exceptOnIndex() + ->confirmButtonText('Unduh'); $actions[] = ExportTemplateBos::make() ->showInline() diff --git a/app/Nova/MasterPersediaan.php b/app/Nova/MasterPersediaan.php index 8e31ef3d..026eb7a4 100644 --- a/app/Nova/MasterPersediaan.php +++ b/app/Nova/MasterPersediaan.php @@ -31,7 +31,7 @@ public static function label() public function subtitle() { - return $this->barang . ' (' . $this->satuan . ')'; + return $this->barang.' ('.$this->satuan.')'; } /** diff --git a/app/Nova/PembelianPersediaan.php b/app/Nova/PembelianPersediaan.php index 76dc44e4..4c6f9d17 100644 --- a/app/Nova/PembelianPersediaan.php +++ b/app/Nova/PembelianPersediaan.php @@ -4,7 +4,6 @@ use App\Helpers\Helper; use App\Helpers\Policy; -use App\Models\BarangPersediaan; use App\Nova\Actions\Download; use App\Nova\Actions\ImportBarangFromSpesifikasiKerangkaAcuan; use App\Nova\Actions\SetStatus; @@ -71,7 +70,7 @@ public function fields(NovaRequest $request) Panel::make('Keterangan Serah Terima Barang', [ Date::make('Tanggal BAST', 'tanggal_bast') ->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal)) - ->rules('nullable', 'bail', 'after_or_equal:tanggal_kak' ,'before_or_equal:today'), + ->rules('nullable', 'bail', 'after_or_equal:tanggal_kak', 'before_or_equal:today'), Select::make('Pejabat Pembuat Komitmen', 'ppk_user_id') ->rules('required') ->searchable() @@ -128,7 +127,7 @@ public function cards(NovaRequest $request) { return [ HelperPembelianPersediaan::make() - ->width('full'), + ->width('full'), ]; } @@ -191,12 +190,12 @@ public function actions(NovaRequest $request) return $this->resource instanceof Model && $this->resource->tanggal_bast !== null && $this->resource->tanggal_buku !== null && $this->resource->status === 'diterima'; }); - $actions[] = - Download::make('bastp', 'Unduh BAST') - ->showInline() - ->showOnDetail() - ->exceptOnIndex() - ->confirmButtonText('Unduh'); + $actions[] = + Download::make('bastp', 'Unduh BAST') + ->showInline() + ->showOnDetail() + ->exceptOnIndex() + ->confirmButtonText('Unduh'); } return $actions; diff --git a/app/Nova/PersediaanKeluar.php b/app/Nova/PersediaanKeluar.php index 74cd5a8b..31b43de8 100644 --- a/app/Nova/PersediaanKeluar.php +++ b/app/Nova/PersediaanKeluar.php @@ -53,13 +53,13 @@ public function fields(NovaRequest $request) ->rules('required', 'max:40'), Date::make('Tanggal Dokumen', 'tanggal_dokumen') ->sortable() - ->displayUsing(fn($tanggal) => Helper::terbilangTanggal($tanggal)) + ->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal)) ->rules('required'), Text::make('Rincian', 'rincian') ->rules('required'), Date::make('Tanggal Buku', 'tanggal_buku') ->sortable() - ->displayUsing(fn($tanggal) => Helper::terbilangTanggal($tanggal)) + ->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal)) ->rules('required', 'after_or_equal:tanggal_dokumen'), MorphMany::make('Daftar Barang Persediaan', 'daftarBarangPersediaans', 'App\Nova\BarangPersediaan'), diff --git a/app/Policies/BarangPersediaanPolicy.php b/app/Policies/BarangPersediaanPolicy.php index a01de83c..5984101f 100644 --- a/app/Policies/BarangPersediaanPolicy.php +++ b/app/Policies/BarangPersediaanPolicy.php @@ -56,7 +56,6 @@ public function create(): bool return false; }); - } /** @@ -86,8 +85,6 @@ public function update(): bool ->get(); } - - return false; }); } @@ -119,8 +116,6 @@ public function delete(): bool ->get(); } - - return false; }); } @@ -130,7 +125,7 @@ public function delete(): bool */ public function replicate(): bool { - return false; + return false; } public function runAction(): bool diff --git a/app/Providers/NovaServiceProvider.php b/app/Providers/NovaServiceProvider.php index 637b745d..ce9c6293 100644 --- a/app/Providers/NovaServiceProvider.php +++ b/app/Providers/NovaServiceProvider.php @@ -5,7 +5,6 @@ use App\Helpers\Helper; use App\Models\Pengelola; use App\Nova\BastMitra; -use App\Nova\DaftarHonorMitra; use App\Nova\Dashboards\Main; use App\Nova\Dipa; use App\Nova\HargaSatuan;