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
8 changes: 4 additions & 4 deletions app/Helpers/Cetak.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ public static function getTemplate(string $jenis, $id, $template_id, $tanggal, $
unset($data['daftar_barang']);
$pembelian = PembelianPersediaan::where('id', $id);
$pembelian->update(['status' => 'dicetak']);
BarangPersediaan::where('barang_persediaanable_id', $id)->where('barang_persediaanable_type', 'App\Models\PembelianPersediaan')->update(['tanggal_transaksi' => $pembelian->first()->tanggal_buku]);
BarangPersediaan::where('barang_persediaanable_id', $id)->where('barang_persediaanable_type', \App\Models\PembelianPersediaan::class)->update(['tanggal_transaksi' => $pembelian->first()->tanggal_buku]);
}
if ($jenis === 'bon') {
$templateProcessor->cloneRowAndSetValues('no', Helper::formatBarangPersediaan($data['daftar_barang']));
unset($data['daftar_barang']);
$permintaan = PermintaanPersediaan::where('id', $id);
$permintaan->update(['status' => 'dicetak']);
BarangPersediaan::where('barang_persediaanable_id', $id)->where('barang_persediaanable_type', 'App\Models\PermintaanPersediaan')->update(['tanggal_transaksi' => $permintaan->first()->tanggal_persetujuan]);
BarangPersediaan::where('barang_persediaanable_id', $id)->where('barang_persediaanable_type', \App\Models\PermintaanPersediaan::class)->update(['tanggal_transaksi' => $permintaan->first()->tanggal_persetujuan]);
}
if ($jenis === 'sk') {
$templateProcessor->cloneRowAndSetValues('sk_no', $data['daftar_petugas']);
Expand Down Expand Up @@ -678,7 +678,7 @@ public static function bastp($id)
'bmn' => Helper::getPropertyFromCollection($bmn, 'name'),
'bmn_ttd' => Helper::namaTanpaGelar(Helper::getPropertyFromCollection($bmn, 'name')),
'nipbmn' => Helper::getPropertyFromCollection($bmn, 'nip'),
'daftar_barang' => BarangPersediaan::where('barang_persediaanable_id', $id)->where('barang_persediaanable_type', 'App\Models\PembelianPersediaan')->get()->toArray(),
'daftar_barang' => BarangPersediaan::where('barang_persediaanable_id', $id)->where('barang_persediaanable_type', \App\Models\PembelianPersediaan::class)->get()->toArray(),
];
}

Expand Down Expand Up @@ -707,7 +707,7 @@ public static function bon($id)
'nip' => Helper::getPropertyFromCollection($pembuat, 'nip'),
'bmn' => Helper::upperNamaTanpaGelar(Helper::getPropertyFromCollection($bmn, 'name')),
'nipbmn' => Helper::getPropertyFromCollection($bmn, 'nip'),
'daftar_barang' => BarangPersediaan::where('barang_persediaanable_id', $id)->where('barang_persediaanable_type', 'App\Models\PermintaanPersediaan')->get()->toArray(),
'daftar_barang' => BarangPersediaan::where('barang_persediaanable_id', $id)->where('barang_persediaanable_type', \App\Models\PermintaanPersediaan::class)->get()->toArray(),
];
}

Expand Down
32 changes: 16 additions & 16 deletions app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -1125,47 +1125,47 @@ public static function formatDaftarPersediaan($id, $spek)

// Mengambil nomor dokumen berdasarkan tipe barang persediaan
$item['nomor_dokumen'] = match (get_class($item->barangPersediaanable)) {
"App\Models\PembelianPersediaan" => $item->barangPersediaanable
\App\Models\PembelianPersediaan::class => $item->barangPersediaanable
->bastNaskahKeluar->nomor,
"App\Models\PermintaanPersediaan" => $item->barangPersediaanable
\App\Models\PermintaanPersediaan::class => $item->barangPersediaanable
->naskahKeluar->nomor,
"App\Models\PersediaanMasuk" => $item->barangPersediaanable
\App\Models\PersediaanMasuk::class => $item->barangPersediaanable
->naskahMasuk->nomor,
"App\Models\PersediaanKeluar" => $item->barangPersediaanable
\App\Models\PersediaanKeluar::class => $item->barangPersediaanable
->naskahKeluar->nomor,
};

// Mengambil uraian berdasarkan tipe barang persediaan
$item['uraian'] = match (get_class($item->barangPersediaanable)) {
"App\Models\PembelianPersediaan" => $item->barangPersediaanable
\App\Models\PembelianPersediaan::class => $item->barangPersediaanable
->rincian,
"App\Models\PermintaanPersediaan" => 'Permintaan Persediaan oleh '.
\App\Models\PermintaanPersediaan::class => 'Permintaan Persediaan oleh '.
$item->barangPersediaanable->user->name.
' untuk '.
$item->barangPersediaanable->kegiatan,
"App\Models\PersediaanMasuk" => $item->barangPersediaanable->rincian,
"App\Models\PersediaanKeluar" => $item->barangPersediaanable->rincian
\App\Models\PersediaanMasuk::class => $item->barangPersediaanable->rincian,
\App\Models\PersediaanKeluar::class => $item->barangPersediaanable->rincian
};

// Menghitung volume masuk dan keluar
$item['masuk'] = match (get_class($item->barangPersediaanable)) {
"App\Models\PembelianPersediaan" => $item->volume,
"App\Models\PersediaanMasuk" => $item->volume,
\App\Models\PembelianPersediaan::class => $item->volume,
\App\Models\PersediaanMasuk::class => $item->volume,
default => '-'
};

$item['keluar'] = match (get_class($item->barangPersediaanable)) {
"App\Models\PermintaanPersediaan" => $item->volume,
"App\Models\PersediaanKeluar" => $item->volume,
\App\Models\PermintaanPersediaan::class => $item->volume,
\App\Models\PersediaanKeluar::class => $item->volume,
default => '-'
};

// Menghitung sisa stok
$item['sisa'] = match (get_class($item->barangPersediaanable)) {
"App\Models\PembelianPersediaan", "App\Models\PersediaanMasuk" => $stok +
\App\Models\PembelianPersediaan::class, \App\Models\PersediaanMasuk::class => $stok +
$item['volume'],
"App\Models\PermintaanPersediaan",
"App\Models\PersediaanKeluar" => $stok - $item['volume']
\App\Models\PermintaanPersediaan::class,
\App\Models\PersediaanKeluar::class => $stok - $item['volume']
};

// Memperbarui stok
Expand Down Expand Up @@ -1878,7 +1878,7 @@ public static function sendReminder($reminder, $method = 'auto')
'{judul}' => $hari > 0 ? '[Reminder Deadline (H-'.$hari.')]' : '[Reminder Deadline]',
'{tanggal}' => Helper::terbilangTanggal($kegiatan->awal),
'{kegiatan}' => $kegiatan->kegiatan,
'{pj}' => $kegiatan->daftar_kegiatanable_type == 'App\Models\UnitKerja' ? UnitKerja::find($kegiatan->daftar_kegiatanable_id)->unit : User::find($kegiatan->daftar_kegiatanable_id)->name,
'{pj}' => $kegiatan->daftar_kegiatanable_type == \App\Models\UnitKerja::class ? UnitKerja::find($kegiatan->daftar_kegiatanable_id)->unit : User::find($kegiatan->daftar_kegiatanable_id)->name,
]);
$response = Fonnte::make()->sendWhatsAppMessage($kegiatan->wa_group_id, $pesan);
$reminder->status = $response['data']['process'] ?? 'Gagal';
Expand Down
12 changes: 6 additions & 6 deletions app/Models/BarangPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected static function booted(): void
$persediaan->satuan = $persediaan->masterPersediaan->satuan;
}

if ($persediaan->barang_persediaanable_type == 'App\Models\PembelianPersediaan' && $persediaan->isDirty()) {
if ($persediaan->barang_persediaanable_type == \App\Models\PembelianPersediaan::class && $persediaan->isDirty()) {
if ($persediaan->isClean('master_persediaan_id')) {
PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id)
->where('status', 'diterima')
Expand All @@ -49,25 +49,25 @@ protected static function booted(): void
->update(['status' => 'diterima']);
}

if ($persediaan->barang_persediaanable_type == 'App\Models\PermintaanPersediaan' && $persediaan->isDirty()) {
if ($persediaan->barang_persediaanable_type == \App\Models\PermintaanPersediaan::class && $persediaan->isDirty()) {
PermintaanPersediaan::where('id', $persediaan->barang_persediaanable_id)
->where('status', 'dicetak')
->update(['status' => 'outdated']);
}
if ($persediaan->barang_persediaanable_type == 'App\Models\PersediaanKeluar' && $persediaan->isDirty()) {
if ($persediaan->barang_persediaanable_type == \App\Models\PersediaanKeluar::class && $persediaan->isDirty()) {
$persediaan->tanggal_transaksi = PersediaanKeluar::find($persediaan->barang_persediaanable_id)->tanggal_buku;
}

if ($persediaan->barang_persediaanable_type == 'App\Models\PersediaanMasuk' && $persediaan->isDirty()) {
if ($persediaan->barang_persediaanable_type == \App\Models\PersediaanMasuk::class && $persediaan->isDirty()) {
$persediaan->tanggal_transaksi = PersediaanMasuk::find($persediaan->barang_persediaanable_id)->tanggal_buku;
}
});
static::deleting(function (BarangPersediaan $persediaan) {
if ($persediaan->barang_persediaanable_type == 'App\Models\PembelianPersediaan') {
if ($persediaan->barang_persediaanable_type == \App\Models\PembelianPersediaan::class) {
PembelianPersediaan::where('id', $persediaan->barang_persediaanable_id)
->update(['status' => 'outdated']);
}
if ($persediaan->barang_persediaanable_type == 'App\Models\PermintaanPersediaan') {
if ($persediaan->barang_persediaanable_type == \App\Models\PermintaanPersediaan::class) {
PermintaanPersediaan::where('id', $persediaan->barang_persediaanable_id)
->update(['status' => 'outdated']);
}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/PersediaanKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ 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')
->where('barang_persediaanable_type', \App\Models\PersediaanKeluar::class)
->update(['tanggal_transaksi' => $persediaan->tanggal_buku]);
}
});
Expand Down
2 changes: 1 addition & 1 deletion app/Models/PersediaanMasuk.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected static function booted(): void
static::saving(function (PersediaanMasuk $persediaan) {
if ($persediaan->isDirty('tanggal_buku')) {
BarangPersediaan::where('barang_persediaanable_id', $persediaan->id)
->where('barang_persediaanable_type', 'App\Models\PersediaanMasuk')
->where('barang_persediaanable_type', \App\Models\PersediaanMasuk::class)
->update(['tanggal_transaksi' => $persediaan->tanggal_buku]);
}
});
Expand Down
4 changes: 2 additions & 2 deletions app/Nova/Actions/ImportBarangFromSpesifikasiKerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function handle(ActionFields $fields, Collection $models)
{
$model = $models->first();
BarangPersediaan::where('barang_persediaanable_id', $model->id)
->where('barang_persediaanable_type', 'App\Models\PembelianPersediaan')
->where('barang_persediaanable_type', \App\Models\PembelianPersediaan::class)
->delete();
$speks = SpesifikasiKerangkaAcuan::where('kerangka_acuan_id', $model->kerangka_acuan_id)->get();
foreach ($speks as $spek) {
Expand All @@ -38,7 +38,7 @@ public function handle(ActionFields $fields, Collection $models)
$barang->harga_satuan = $spek->harga_satuan;
$barang->total_harga = $spek->total_harga;
$barang->barang_persediaanable_id = $model->id;
$barang->barang_persediaanable_type = 'App\Models\PembelianPersediaan';
$barang->barang_persediaanable_type = \App\Models\PembelianPersediaan::class;
$barang->save();
}

Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Actions/ImportMasterPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function handle(ActionFields $fields, Collection $models)
$persediaan->tanggal_transaksi = session('year') - 1 .'-12-31';
$persediaan->master_persediaan_id = $masterPersediaanId;
$persediaan->barang_persediaanable_id = $id_persediaan_masuk;
$persediaan->barang_persediaanable_type = 'App\Models\PersediaanMasuk';
$persediaan->barang_persediaanable_type = \App\Models\PersediaanMasuk::class;
$persediaan->save();
}
});
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Lenses/FormRencanaAksi.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class FormRencanaAksi extends Lens
*/
public static function query(LensRequest $request, Builder $query): Builder|Paginator
{
$triwulan = Helper::parseFilter($request->query->get('filters'), 'App\\Nova\\Filters\\TriwulanFilter', '1') ?: (string) now()->quarter;
$triwulan = Helper::parseFilter($request->query->get('filters'), \App\Nova\Filters\TriwulanFilter::class, '1') ?: (string) now()->quarter;
$model = Helper::modelQuery($query, $triwulan);

return $request->withOrdering($request->withFilters(
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Lenses/RealisasiAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function name()
public static function query(LensRequest $request, $query)
{
$dipa_id = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(), 'id');
$filtered_bulan = Helper::parseFilter($request->query->get('filters'), 'App\\Nova\\Filters\\BulanFilter', (int) date('m'));
$filtered_bulan = Helper::parseFilter($request->query->get('filters'), \App\Nova\Filters\BulanFilter::class, (int) date('m'));

return $request->withOrdering($request->withFilters(
$query->fromSub(fn ($query) => $query->from('realisasi_anggarans')->selectRaw(
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Lenses/RekapHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function name()
*/
public static function query(LensRequest $request, $query)
{
$filtered_bulan = Helper::parseFilter($request->query->get('filters'), 'App\\Nova\\Filters\\BulanFilter', date('m'));
$filtered_bulan = Helper::parseFilter($request->query->get('filters'), \App\Nova\Filters\BulanFilter::class, date('m'));
$filtered_kegiatan = Helper::parseFilter($request->query->get('filters'), 'Select:jenis_kontrak_id', null);

return $request->withoutTableOrderPrefix()->withOrdering(
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Lenses/RencanaPenarikanDana.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function name()
public static function query(LensRequest $request, $query)
{
$dipa_id = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(), 'id');
$filtered_bulan = Helper::parseFilter($request->query->get('filters'), 'App\\Nova\\Filters\\BulanFilter', (int) date('m'));
$filtered_bulan = Helper::parseFilter($request->query->get('filters'), \App\Nova\Filters\BulanFilter::class, (int) date('m'));

return $request->withOrdering($request->withFilters(
$query->fromSub(fn ($query) => $query->from('realisasi_anggarans')->selectRaw(
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Metrics/JumlahKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function name()
public function calculate(NovaRequest $request)
{
$filtered_jenis = Helper::parseFilter($request->query->get('filter'), 'Select:jenis_kontrak_id');
$filtered_bulan = Helper::parseFilter($request->query->get('filter'), 'App\\Nova\\Filters\\BulanFilter', (int) date('m'));
$filtered_bulan = Helper::parseFilter($request->query->get('filter'), \App\Nova\Filters\BulanFilter::class, (int) date('m'));
$bulan_ini = DB::table('daftar_honor_mitras')
->select('honor_kegiatans.id')
->join('honor_kegiatans', 'honor_kegiatans.id', '=', 'daftar_honor_mitras.honor_kegiatan_id')
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Metrics/JumlahMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function name()
public function calculate(NovaRequest $request)
{
$filtered_jenis = Helper::parseFilter($request->query->get('filter'), 'Select:jenis_kontrak_id');
$filtered_bulan = Helper::parseFilter($request->query->get('filter'), 'App\\Nova\\Filters\\BulanFilter', (int) date('m'));
$filtered_bulan = Helper::parseFilter($request->query->get('filter'), \App\Nova\Filters\BulanFilter::class, (int) date('m'));
$arr = [];
$query = DB::table('daftar_honor_mitras')
->select(DB::raw('bulan, COUNT(DISTINCT mitra_id) as mitra_count'))
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Metrics/KesesuaianSbml.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function name()
public function calculate(NovaRequest $request)
{
$filtered_jenis = Helper::parseFilter($request->query->get('filter'), 'Select:jenis_kontrak_id');
$filtered_bulan = Helper::parseFilter($request->query->get('filter'), 'App\\Nova\\Filters\\BulanFilter', (int) date('m'));
$filtered_bulan = Helper::parseFilter($request->query->get('filter'), \App\Nova\Filters\BulanFilter::class, (int) date('m'));
$arr = DB::query()
->selectRaw(
'sum(if(valid_sbml=1,1,0)) as sesuai, sum(if(valid_sbml=0,1,0)) as tidak, count(valid_sbml) as total'
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Metrics/MetricKeberadaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function nullStrict(bool $value)
public function calculate(NovaRequest $request): PartitionResult
{
if (is_null($this->model)) {
$triwulan = Helper::parseFilter($request->query->get('filter'), 'App\\Nova\\Filters\\TriwulanFilter', '1') ?: (string) now()->quarter;
$triwulan = Helper::parseFilter($request->query->get('filter'), \App\Nova\Filters\TriwulanFilter::class, '1') ?: (string) now()->quarter;
$this->model = Helper::modelQuery(PerjanjianKinerja::query(), $triwulan);
}
$table = $this->model->newQuery();
Expand Down
4 changes: 2 additions & 2 deletions app/Nova/Metrics/SerapanAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public function name()
public function calculate(NovaRequest $request)
{
$dipa_id = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(), 'id');
$filtered_ro = Helper::parseFilter($request->query->get('filter'), 'App\\Nova\\Filters\\RoFilter');
$filtered_bulan = Helper::parseFilter($request->query->get('filter'), 'App\\Nova\\Filters\\BulanFilter');
$filtered_ro = Helper::parseFilter($request->query->get('filter'), \App\Nova\Filters\RoFilter::class);
$filtered_bulan = Helper::parseFilter($request->query->get('filter'), \App\Nova\Filters\BulanFilter::class);

return $this->program
? $this->sum($request, RealisasiAnggaran::class, function ($query) use ($dipa_id, $filtered_bulan) {
Expand Down
2 changes: 1 addition & 1 deletion app/Providers/CalendarDataProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ protected function customizeEvent(Event $event): Event
$event->notes('Mulai: '.RapatInternal::find($event->model()->rapat_internal_id)->mulai);
}
if ($event->model()->jenis == 'Kegiatan' || $event->model()->jenis == 'Deadline') {
$pj = $event->model()->daftar_kegiatanable_type == 'App\Models\UnitKerja' ? UnitKerja::find($event->model()->daftar_kegiatanable_id)->unit : User::find($event->model()->daftar_kegiatanable_id)->name;
$pj = $event->model()->daftar_kegiatanable_type == \App\Models\UnitKerja::class ? UnitKerja::find($event->model()->daftar_kegiatanable_id)->unit : User::find($event->model()->daftar_kegiatanable_id)->name;
$event->notes('PJ: '.$pj);
if ($event->model()->jenis == 'Kegiatan') {
$event->addBadges('🏢');
Expand Down