From d3b9cdf79e6aba469388d6c8ff39742f0d4858d7 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sun, 8 Sep 2024 01:39:33 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Helpers/Cetak.php | 18 +++++++++--------- app/Helpers/Helper.php | 19 ++++++++++++++----- app/Helpers/Policy.php | 2 +- app/Nova/DaftarHonor.php | 3 ++- app/Nova/HonorSurvei.php | 11 ++++++----- app/Nova/KerangkaAcuan.php | 3 ++- app/Nova/KodeArsip.php | 3 ++- app/Nova/MataAnggaran.php | 3 ++- app/Nova/Mitra.php | 3 ++- 9 files changed, 40 insertions(+), 25 deletions(-) diff --git a/app/Helpers/Cetak.php b/app/Helpers/Cetak.php index 5d693b36..47e251de 100644 --- a/app/Helpers/Cetak.php +++ b/app/Helpers/Cetak.php @@ -57,7 +57,7 @@ public static function getTemplate($jenis, $id) unset($data['anggaran'], $data['spesifikasi']); } if ($jenis === 'spj') { - $templateProcessor->cloneRowAndSetValues('spj_no', Helper::formatSpj(DaftarHonor::where('honor_survei_id', $id)->get(['nama As spj_nama', 'satuan AS spj_satuan','jumlah AS spj_jumlah', 'bruto AS spj_bruto', 'pajak AS spj_pajak','netto AS spj_netto','rekening AS spj_rekening']))); + $templateProcessor->cloneRowAndSetValues('spj_no', Helper::formatSpj(DaftarHonor::where('honor_survei_id', $id)->get(['nama As spj_nama', 'satuan AS spj_satuan', 'jumlah AS spj_jumlah', 'bruto AS spj_bruto', 'pajak AS spj_pajak', 'netto AS spj_netto', 'rekening AS spj_rekening']))); } $templateProcessor->setValues($data); @@ -91,7 +91,7 @@ public static function getModifiedInnerXml($templateProcessor) } /** - * Format nilai KAK + * Format nilai KAK. * * @param string $id * @return array @@ -129,7 +129,7 @@ public static function kak($id) } /** - * Format nilai SPJ + * Format nilai SPJ. * * @param string $id * @return array @@ -144,12 +144,12 @@ public static function spj($id) 'detail' => $data->detail, 'bulan' => Helper::terbilangBulan($data->bulan), 'mak' => $data->mak, - 'kegiatan' => Helper::getDetailAnggaran($data->mak ,'kegiatan'), - 'kro' => Helper::getDetailAnggaran($data->mak ,'kro'), - 'ro' => Helper::getDetailAnggaran($data->mak ,'ro'), - 'komponen' => Helper::getDetailAnggaran($data->mak ,'komponen'), - 'sub' => Helper::getDetailAnggaran($data->mak ,'sub'), - 'akun' => Helper::getDetailAnggaran($data->mak ,'akun'), + 'kegiatan' => Helper::getDetailAnggaran($data->mak, 'kegiatan'), + 'kro' => Helper::getDetailAnggaran($data->mak, 'kro'), + 'ro' => Helper::getDetailAnggaran($data->mak, 'ro'), + 'komponen' => Helper::getDetailAnggaran($data->mak, 'komponen'), + 'sub' => Helper::getDetailAnggaran($data->mak, 'sub'), + 'akun' => Helper::getDetailAnggaran($data->mak, 'akun'), 'satuan' => $data->satuan, 'total_bruto' => Helper::formatUang(DaftarHonor::where('honor_survei_id', $id)->sum('bruto')), 'total_pajak' => Helper::formatUang(DaftarHonor::where('honor_survei_id', $id)->sum('pajak')), diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 43c81642..e3ca627f 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -753,17 +753,26 @@ public static function formatAnggaran($anggaran) */ public static function formatSpj($spesifikasi) { - $spek= json_decode($spesifikasi,true); + $spek = json_decode($spesifikasi, true); $speks = collect($spek); $speks->transform(function ($item, $index) { $item['spj_no'] = $index + 1; - if (isset($item['spj_satuan'])) $item['spj_satuan'] = self::formatUang($item['spj_satuan']); - if (isset($item['spj_bruto'])) $item['spj_bruto'] = self::formatUang($item['spj_bruto']); - if (isset($item['spj_pajak'])) $item['spj_pajak'] = self::formatUang($item['spj_pajak']); - if (isset($item['spj_netto'])) $item['spj_netto'] = self::formatUang($item['spj_netto']); + if (isset($item['spj_satuan'])) { + $item['spj_satuan'] = self::formatUang($item['spj_satuan']); + } + if (isset($item['spj_bruto'])) { + $item['spj_bruto'] = self::formatUang($item['spj_bruto']); + } + if (isset($item['spj_pajak'])) { + $item['spj_pajak'] = self::formatUang($item['spj_pajak']); + } + if (isset($item['spj_netto'])) { + $item['spj_netto'] = self::formatUang($item['spj_netto']); + } return $item; })->toArray(); + return $speks; } diff --git a/app/Helpers/Policy.php b/app/Helpers/Policy.php index 07d5aa8b..f3979177 100644 --- a/app/Helpers/Policy.php +++ b/app/Helpers/Policy.php @@ -70,7 +70,7 @@ public function orEqual($expr1, $expr2, $strict = true) public function orNotEqual($expr1, $expr2, $strict = true) { - $this->allowed = $this->allowed ?? false || $strict ? $expr1 !== $expr2 : $expr1 != $expr2; + $this->allowed = $this->allowed ?? false || $strict ? $expr1 !== $expr2 : $expr1 != $expr2; return $this; } diff --git a/app/Nova/DaftarHonor.php b/app/Nova/DaftarHonor.php index c447a3e2..7e9e3bf4 100644 --- a/app/Nova/DaftarHonor.php +++ b/app/Nova/DaftarHonor.php @@ -115,9 +115,10 @@ public function actions(NovaRequest $request) { $actions = []; if (Policy::make()->allowedFor('koordinator')->get()) { - $actions []= + $actions [] = EditRekening::make()->standalone(); } + return $actions; } diff --git a/app/Nova/HonorSurvei.php b/app/Nova/HonorSurvei.php index 95dd5b61..27f0cdbb 100644 --- a/app/Nova/HonorSurvei.php +++ b/app/Nova/HonorSurvei.php @@ -262,17 +262,18 @@ public function actions(NovaRequest $request) { $actions = []; if (Policy::make()->allowedFor('koordinator')->get()) { - $actions[]= + $actions[] = ImportDaftarHonor::make()->onlyOnDetail()->confirmButtonText('Import') ->canSee(function ($request) { if ($request instanceof ActionRequest) { return true; } + return $this->resource instanceof Model && $this->resource->bulan !== null; }); - } + } if (Policy::make()->allowedFor('koordinator,ppk,bendahara,ppspm')->get()) { - $actions[]= + $actions[] = Download::make('spj', 'Unduh SPJ') ->showInline() ->showOnDetail() @@ -282,11 +283,11 @@ public function actions(NovaRequest $request) if ($request instanceof ActionRequest) { return true; } + return $this->resource instanceof Model && $this->resource->bulan !== null; }); - } + } return $actions; - } } diff --git a/app/Nova/KerangkaAcuan.php b/app/Nova/KerangkaAcuan.php index 13f2c5fa..0a732387 100644 --- a/app/Nova/KerangkaAcuan.php +++ b/app/Nova/KerangkaAcuan.php @@ -135,13 +135,14 @@ public function actions(NovaRequest $request) { $actions = []; if (Policy::make()->allowedFor('all')->get()) { - $actions[]= + $actions[] = Download::make('kak', 'Unduh KAK') ->showInline() ->showOnDetail() ->exceptOnIndex() ->withoutConfirmation(); } + return $actions; } diff --git a/app/Nova/KodeArsip.php b/app/Nova/KodeArsip.php index dc764f8a..708bd90e 100644 --- a/app/Nova/KodeArsip.php +++ b/app/Nova/KodeArsip.php @@ -104,9 +104,10 @@ public function actions(NovaRequest $request) { $actions = []; if (Policy::make()->allowedFor('admin')->get()) { - $actions []= + $actions [] = ImportKodeArsip::make()->standalone(); } + return $actions; } } diff --git a/app/Nova/MataAnggaran.php b/app/Nova/MataAnggaran.php index cefc594b..3dc1bc3a 100644 --- a/app/Nova/MataAnggaran.php +++ b/app/Nova/MataAnggaran.php @@ -99,9 +99,10 @@ public function actions(NovaRequest $request) { $actions = []; if (Policy::make()->allowedFor('admin')->get()) { - $actions []= + $actions [] = ImportMataAnggaran::make()->standalone(); } + return $actions; } } diff --git a/app/Nova/Mitra.php b/app/Nova/Mitra.php index 99a4f45e..3bb20c88 100644 --- a/app/Nova/Mitra.php +++ b/app/Nova/Mitra.php @@ -106,9 +106,10 @@ public function actions(NovaRequest $request) { $actions = []; if (Policy::make()->allowedFor('admin')->get()) { - $actions []= + $actions [] = ImportMitra::make()->standalone(); } + return $actions; } }