Update pampasan module with enhanced agreement tracking and semporna processing

- Add agreement_printed_at timestamp to pampasan table for tracking printed agreements
- Update jenis handling for semporna v2 processing logic
- Refactor barangkes controller eager loading for improved performance
- Remove obsolete jenis migration files and consolidate schema changes
- Update related models and controllers for semporna v2 compatibility
This commit is contained in:
Afiq Hamzah
2025-09-22 13:00:08 +08:00
parent 38dd97c4f2
commit f5874b956d
10 changed files with 174 additions and 279 deletions
+6 -4
View File
@@ -38,13 +38,10 @@ class BarangkesController extends Controller
'untungonepercent',
'untungcajlain'
])
->when($request->filled('jenis'), function($query) use($request){
return $query->where('jenis', $request->jenis);
})
->when($request->filled('tarikh_mula') && $request->filled('tarikh_akhir'), function($query) use($request){
return $query->whereBetween('tarikh', [$request->tarikh_mula, $request->tarikh_akhir]);
})
->with('tebus:norujukan');
->with(['tebus:norujukan', 'gadai:norujukan,nokp']);
$palsu_array = $palsu_query->get()->toArray();
$pampasan_array = Pampasan::on($cawangan['mysql'])->where('kodcaw', $request->kodcaw)->get()->toArray();
@@ -59,8 +56,13 @@ class BarangkesController extends Controller
// Add exists_in_tebus flag based on relationship
$itemArray['gadaian_sudah_tebus'] = !is_null($item['tebus']);
// Add nokp customer from gadai relationship
$itemArray['nokp'] = $item['gadai']['nokp'];
// Remove the tebus relationship data to keep response clean
unset($itemArray['tebus']);
unset($itemArray['gadai']);
return array_merge($itemArray, $additional);
})->values()->toArray();