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
111 changes: 55 additions & 56 deletions app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -810,67 +810,66 @@ public static function makeStMitraAndPegawai($honor_kegiatan_id, $tanggal)
->toArray();
}

public static function makeCollectionForExportOnSheet($honor_kegiatan_id, $tanggal, $sheet_no = 1, $awal ='', $akhir = '')
public static function makeCollectionForExportOnSheet($honor_kegiatan_id, $tanggal, $sheet_no = 1, $awal = '', $akhir = '')
{
// TODO: ada OB selain bulanan harus diisi bulan awal dan akhir
if ($sheet_no === 1) {
return self::makeBaseListMitraAndPegawai($honor_kegiatan_id, $tanggal)
->reject(function ($item) {
return $item['netto'] == 0;
})
->flatten()
->transform(function ($item, $index) use ($awal, $akhir){
$item['NIP Lama'] = $item['nip_lama'];
$item['TanggalAwal'] = '';
$item['TanggalAkhir'] = '';
$item['BulanMulai'] = $awal;
$item['BulanSelesai'] = $akhir;
$item['Volume'] = $item['volume'];
$item['HargaSatuan'] = $item['harga_satuan'];
$item['PersentasePajak'] = $item['persen_pajak'];
$item['Pajak'] = '';
unset($item['nip_lama']);
unset($item['volume']);
unset($item['harga_satuan']);
unset($item['persen_pajak']);
unset($item['bruto']);
unset($item['nama']);
unset($item['nip']);
unset($item['jabatan']);
unset($item['rekening']);
unset($item['golongan']);
unset($item['bruto']);
unset($item['pajak']);
unset($item['netto']);

return $item;
});
->reject(function ($item) {
return $item['netto'] == 0;
})
->flatten()
->transform(function ($item, $index) use ($awal, $akhir) {
$item['NIP Lama'] = $item['nip_lama'];
$item['TanggalAwal'] = '';
$item['TanggalAkhir'] = '';
$item['BulanMulai'] = $awal;
$item['BulanSelesai'] = $akhir;
$item['Volume'] = $item['volume'];
$item['HargaSatuan'] = $item['harga_satuan'];
$item['PersentasePajak'] = $item['persen_pajak'];
$item['Pajak'] = '';
unset($item['nip_lama']);
unset($item['volume']);
unset($item['harga_satuan']);
unset($item['persen_pajak']);
unset($item['bruto']);
unset($item['nama']);
unset($item['nip']);
unset($item['jabatan']);
unset($item['rekening']);
unset($item['golongan']);
unset($item['bruto']);
unset($item['pajak']);
unset($item['netto']);

return $item;
});
} else {
return self::makeBaseListMitra($honor_kegiatan_id)
->reject(function ($item) {
return $item['netto'] == 0;
})
->flatten()
->transform(function ($item, $index) {
$item['nip'] = $item['nip_lama'];
$item['nama'] = $item['nama'];
unset($item['nip_lama']);
unset($item['volume']);
unset($item['harga_satuan']);
unset($item['persen_pajak']);
unset($item['bruto']);
unset($item['jabatan']);
unset($item['rekening']);
unset($item['golongan']);
unset($item['bruto']);
unset($item['pajak']);
unset($item['netto']);

return $item;
});
}
else {
return self::makeBaseListMitra($honor_kegiatan_id)
->reject(function ($item) {
return $item['netto'] == 0;
})
->flatten()
->transform(function ($item, $index) {
$item['nip'] = $item['nip_lama'];
$item['nama'] = $item['nama'];
unset($item['nip_lama']);
unset($item['volume']);
unset($item['harga_satuan']);
unset($item['persen_pajak']);
unset($item['bruto']);
unset($item['jabatan']);
unset($item['rekening']);
unset($item['golongan']);
unset($item['bruto']);
unset($item['pajak']);
unset($item['netto']);

return $item;
});
}
}
}

/**
* Make Surat Keterangan (SK) for both Mitra and Pegawai.
Expand Down
4 changes: 2 additions & 2 deletions app/Models/DaftarHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ protected static function booted(): void
HonorKegiatan::find($honor->honor_kegiatan_id)->update(['status' => 'dibuat']);
}
if ($honor->volume_realisasi != $honor->volume_target) {
$honor->status_realisasi = $honor->volume_realisasi < $honor->volume_target
? 'Selesai Tidak Sesuai Target'
$honor->status_realisasi = $honor->volume_realisasi < $honor->volume_target
? 'Selesai Tidak Sesuai Target'
: 'Selesai Melebihi Target';
} else {
$honor->status_realisasi = 'Selesai Sesuai Target';
Expand Down
2 changes: 1 addition & 1 deletion app/Models/DaftarHonorPegawai.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protected static function booted(): void
if ($honor->isDirty()) {
HonorKegiatan::find($honor->honor_kegiatan_id)->update(['status' => 'dibuat']);
}
if (!$honor->volume) {
if (! $honor->volume) {
$honor->harga_satuan = null;
$honor->persen_pajak = null;
}
Expand Down
3 changes: 1 addition & 2 deletions app/Nova/Actions/ExportTemplateBos.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function handle(ActionFields $fields, Collection $models)
$sheetCollection = Helper::makeCollectionForExportOnSheet($model->id, $model->tangal_spj, 1);
if (in_array($satuan, ['OB', 'BULAN', '0B'])) {
$sheetCollection = Helper::makeCollectionForExportOnSheet($model->id, $model->tangal_spj, 1, $fields->awal, $fields->akhir);
}
}
$filename = $fields->filename.'.xlsx';
$sheets = new SheetCollection([
'Template' => $sheetCollection,
Expand All @@ -57,7 +57,6 @@ public function handle(ActionFields $fields, Collection $models)
*/
public function fields(NovaRequest $request)
{

return [
Select::make('Bulan Awal', 'awal')
->options(Helper::$bulan)
Expand Down
3 changes: 0 additions & 3 deletions app/Nova/DaftarHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

use App\Helpers\Helper;
use App\Helpers\Policy;
use App\Models\HonorKegiatan;
use App\Nova\Actions\EditRekening;
use App\Nova\Actions\EditTarget;
use App\Nova\Actions\ImportDaftarHonorMitra;
use App\Nova\Lenses\RekapHonorMitra;
use Laravel\Nova\Fields\Currency;
Expand Down Expand Up @@ -183,5 +181,4 @@ public static function redirectAfterUpdate(NovaRequest $request, $resource)
{
return '/resources/honor-kegiatans/'.$request->viaResourceId.'#Daftar%20Honor=daftar-honor-mitra';
}

}
17 changes: 7 additions & 10 deletions app/Nova/DaftarHonorPegawai.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

class DaftarHonorPegawai extends Resource
{

public static $displayInNavigation = false;

/**
Expand Down Expand Up @@ -45,6 +44,7 @@ class DaftarHonorPegawai extends Resource
public function fields(NovaRequest $request)
{
$user = Helper::getPegawaiByUserId($this->user_id);

return [
Select::make('Nama Pegawai', 'user_id')
->rules('required')
Expand All @@ -59,18 +59,17 @@ public function fields(NovaRequest $request)
->exceptOnForms(),
Number::make('Jumlah', 'volume')
->step(0.01)
->rules('nullable','bail','gt:0')
->rules('nullable', 'bail', 'gt:0')
->help('Kosongkan jika pegawai tidak diberi honor'),
Currency::make('Harga Satuan', 'harga_satuan')
->currency('IDR')
->locale('id')
->hide()
->dependsOn(['volume'], function (Number $field, NovaRequest $request, FormData $formData) {
if ($formData->volume <> null) {
->dependsOn(['volume'], function (Number $field, NovaRequest $request, FormData $formData) {
if ($formData->volume != null) {
$field->show();
$field->rules('required','gt:0');
$field->rules('required', 'gt:0');
}

})
->step(1),
Currency::make('Bruto', fn () => $this->volume * $this->harga_satuan)
Expand All @@ -80,14 +79,12 @@ public function fields(NovaRequest $request)
Number::make('Persentase Pajak (%)', 'persen_pajak')
->hide()
->step(0.01)
->dependsOn(['volume','user_id'], function (Number $field, NovaRequest $request, FormData $formData) {
if ($formData->volume <> null) {
->dependsOn(['volume', 'user_id'], function (Number $field, NovaRequest $request, FormData $formData) {
if ($formData->volume != null) {
$field->show();
$field->rules('required');
$field->setvalue(Helper::$pajakgolongan[Helper::getPropertyFromCollection(Helper::getDataPegawaiByUserId($formData->user_id, Helper::getPropertyFromCollection(HonorKegiatan::where('id', $request->viaResourceId)->first(), 'tanggal_spj')), 'golongan') ?? 'I/a']);

}

})->onlyOnForms(),
Currency::make('Pajak', fn () => round($this->volume * $this->harga_satuan * $this->persen_pajak / 100, 0, PHP_ROUND_HALF_UP))
->currency('IDR')
Expand Down
5 changes: 2 additions & 3 deletions app/Nova/HonorKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use App\Nova\Actions\Download;
use App\Nova\Actions\ExportTemplateBos;
use App\Nova\Metrics\HelperHonorKegiatan;
use DigitalCreative\NovaWelcomeCard\WelcomeCard;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Carbon;
use Laravel\Nova\Fields\BelongsTo;
Expand Down Expand Up @@ -317,8 +316,8 @@ public function fields(NovaRequest $request)
public function cards(NovaRequest $request)
{
return [
HelperHonorKegiatan::make()
->width('full'),
HelperHonorKegiatan::make()
->width('full'),
];
}

Expand Down
1 change: 0 additions & 1 deletion app/Nova/Lenses/RekapHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public static function query(LensRequest $request, $query)
->orderBy('jenis_kontrak_id', 'asc')
->orderBy('bulan', 'desc')
->orderBy('nilai_kontrak', 'desc'));

}

/**
Expand Down
1 change: 1 addition & 0 deletions app/Nova/Metrics/HelperHonorKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public function name()
{
return 'Tata Cara Penggunaan Import dan Upload Menggunakan FIle BOS';
}

/**
* Calculate the value of the metric.
*
Expand Down
11 changes: 5 additions & 6 deletions app/Nova/Metrics/JumlahMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ public function calculate(NovaRequest $request)
$query = DB::table('daftar_honor_mitras')
->select(DB::raw('bulan, COUNT(DISTINCT mitra_id) as mitra_count'))
->join(
'honor_kegiatans',
'honor_kegiatans.id',
'=',
'daftar_honor_mitras.honor_kegiatan_id'
'honor_kegiatans',
'honor_kegiatans.id',
'=',
'daftar_honor_mitras.honor_kegiatan_id'
)
->where('jenis_honor', 'Kontrak Mitra Bulanan')
->where('tahun', session('year'))
->when(! empty($filtered_jenis), function ($query) use ($filtered_jenis) {
return $query->where('jenis_kontrak_id', $filtered_jenis);
return $query->where('jenis_kontrak_id', $filtered_jenis);
})
->groupBy('bulan')
->get();
Expand All @@ -57,7 +57,6 @@ public function calculate(NovaRequest $request)
->suffix('Mitra')
->withoutSuffixInflection();
}

}

/**
Expand Down
1 change: 0 additions & 1 deletion app/Nova/Metrics/KesesuaianSbml.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ public function calculate(NovaRequest $request)
}

return ['Tidak Ada Data' => 0];

});

return $this
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function fields(NovaRequest $request)
return [
Avatar::make('Avatar')->disableDownload()->disk('avatars')->prunable(),
Panel::make('Akun', [
Text::make('Username','email')
Text::make('Username', 'email')
->sortable()
->rules('required', 'regex:/^[0-9A-Za-z.\-_]+$/u', 'max:254')
->creationRules('unique:users,email')
Expand Down