Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions app/Helpers/Cetak.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -91,7 +91,7 @@ public static function getModifiedInnerXml($templateProcessor)
}

/**
* Format nilai KAK
* Format nilai KAK.
*
* @param string $id
* @return array
Expand Down Expand Up @@ -129,7 +129,7 @@ public static function kak($id)
}

/**
* Format nilai SPJ
* Format nilai SPJ.
*
* @param string $id
* @return array
Expand All @@ -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')),
Expand Down
19 changes: 14 additions & 5 deletions app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion app/Helpers/Policy.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 2 additions & 1 deletion app/Nova/DaftarHonor.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,10 @@ public function actions(NovaRequest $request)
{
$actions = [];
if (Policy::make()->allowedFor('koordinator')->get()) {
$actions []=
$actions [] =
EditRekening::make()->standalone();
}

return $actions;
}

Expand Down
11 changes: 6 additions & 5 deletions app/Nova/HonorSurvei.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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;

}
}
3 changes: 2 additions & 1 deletion app/Nova/KerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
3 changes: 2 additions & 1 deletion app/Nova/KodeArsip.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,10 @@ public function actions(NovaRequest $request)
{
$actions = [];
if (Policy::make()->allowedFor('admin')->get()) {
$actions []=
$actions [] =
ImportKodeArsip::make()->standalone();
}

return $actions;
}
}
3 changes: 2 additions & 1 deletion app/Nova/MataAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,10 @@ public function actions(NovaRequest $request)
{
$actions = [];
if (Policy::make()->allowedFor('admin')->get()) {
$actions []=
$actions [] =
ImportMataAnggaran::make()->standalone();
}

return $actions;
}
}
3 changes: 2 additions & 1 deletion app/Nova/Mitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@ public function actions(NovaRequest $request)
{
$actions = [];
if (Policy::make()->allowedFor('admin')->get()) {
$actions []=
$actions [] =
ImportMitra::make()->standalone();
}

return $actions;
}
}