KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update pampasan module with enhanced agreement tracking and semporna processing

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BarangkesController.php
+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();
app/Http/Controllers/PampasanController.php
+133 -47
View File
@@ -6,6 +6,7 @@ use App\Cawangan;
use App\Palsu;
use App\Pampasan;
use App\Panjar;
use App\Tebus;
use Illuminate\Http\Request;
use Carbon\Carbon;
use Illuminate\Log\Logger;
@@ -13,46 +14,37 @@ use Illuminate\Support\Facades\Log;
class PampasanController extends Controller
{
public function terimaPampasan(Request $request)
{
$validated = $this->validate($request, [
'norujukan' => 'required|string',
'baucerno' => 'required|string',
'kodcaw' => 'required|string',
'jumlah_pampasan' => 'required|numeric',
'denominasi' => 'nullable|array',
'denominasi' => 'required|array',
'teller' => 'required|string',
]);
try {
$cawangan = Cawangan::on('mysql7')->where('kodcaw', $request->kodcaw)->first();
$cawangan = $this->getCawangan($request->kodcaw);
if (!$cawangan) {
return response()->json([
'success' => false,
'message' => 'Cawangan tidak dijumpai untuk kodcaw: ' . $request->kodcaw,
], 404);
return $this->errorResponse('Cawangan tidak dijumpai untuk kodcaw: ' . $request->kodcaw, 404);
}
$pampasan = Pampasan::on($cawangan['mysql'])->create([
'norujukan' => $validated['norujukan'],
'baucerno' => $validated['baucerno'],
'kodcaw' => $validated['kodcaw'],
$pampasan = Pampasan::on($cawangan['mysql'])
->where('norujukan', $validated['norujukan'])
->first();
$pampasan->update([
'jumlah_pampasan' => $validated['jumlah_pampasan'],
'denominasi' => isset($validated['denominasi']) ? json_encode($validated['denominasi']) : null,
'teller' => $validated['teller'],
]);
return response()->json([
'success' => true,
'message' => 'Pampasan berjaya dibayar.',
'data' => $pampasan,
], 201);
return $this->successResponse('Pampasan berjaya dibayar.', $pampasan, 201);
} catch (\Exception $e) {
return response()->json([
'success' => false,
'message' => 'Database error: ' . $e->getMessage(),
], 500);
return $this->errorResponse('Database error: ' . $e->getMessage(), 500);
}
}
@@ -60,7 +52,13 @@ class PampasanController extends Controller
{
$norujukan = $request->norujukan;
$cawangan = Cawangan::on('mysql7')->where('kodcaw', $request->kodcaw)->first();
$cawangan = $this->getCawangan($request->kodcaw);
if (!$cawangan) {
return $this->errorResponse('Cawangan tidak dijumpai untuk kodcaw: ' . $request->kodcaw, 404);
}
$tebus = Tebus::on($cawangan['mysql'])->where('norujukan', $norujukan)->first();
$pampasan = Pampasan::on($cawangan['mysql'])->where("norujukan", $norujukan)->first();
@@ -73,40 +71,128 @@ class PampasanController extends Controller
->where('norujukan', $norujukan)
->update(['status' => 1]);
Panjar::on($cawangan['mysql'])
->create([
'tarikh' => Carbon::now()->toDateString(),
'deskripsi' => 'BAYARAN PAMPASAN' . '(' . $pampasan->norujukan . ')',
'bayaran' => $pampasan->jumlah_pampasan,
'tag' => 1,
'kategori' => 'Belanja AM',
'id' => $pampasan->teller,
'bakiperubatan' => $request->bakiperubatan,
'nobaucer' => $pampasan->baucherno,
'nobil' => Carbon::now()->format('dmy'),
'tuntutoleh' => $pampasan->teller,
return $this->successResponse('Status Pampasan berjaya dituntut.', $pampasan, 201);
}
public function getPampasan(Request $request)
{
$cawangan_connection = Cawangan::where('kodcaw', $request->kodcaw)->first()->mysql;
$pampasan = Pampasan::on($cawangan_connection)
->when($request->filled('norujukan'), function ($query) use ($request) {
return $query->where('norujukan', $request->norujukan);
})
->get();
return $this->successResponse('Senarai pampasan', $pampasan, 201);
}
public function updateAgreementPrintedAt(Request $request)
{
$validated = $this->validate($request, [
'norujukan' => 'required|string',
'kodcaw' => 'required|string',
]);
try {
$cawangan = $this->getCawangan($validated['kodcaw']);
if (!$cawangan) {
return $this->errorResponse('Cawangan tidak dijumpai untuk kodcaw: ' . $validated['kodcaw'], 404);
}
$pampasan = Pampasan::on($cawangan['mysql'])->where('norujukan', $validated['norujukan'])->first();
if (!$pampasan) {
return $this->errorResponse('Pampasan tidak dijumpai untuk norujukan: ' . $validated['norujukan'], 404);
}
$pampasan->agreement_printed_at = Carbon::now();
$pampasan->save();
return $this->successResponse('Agreement printed timestamp berjaya dikemaskini.', $pampasan, 200);
} catch (\Exception $e) {
return $this->errorResponse('Database error: ' . $e->getMessage(), 500);
}
}
public function initiatePampasan(Request $request)
{
$validated = $this->validate($request, [
'norujukan' => 'required|string',
'kodcaw' => 'required|string',
'teller' => 'required|string',
'baucerno' => 'required|string',
]);
try {
$cawangan = $this->getCawangan($validated['kodcaw']);
if (!$cawangan) {
return $this->errorResponse('Cawangan tidak dijumpai untuk kodcaw: ' . $validated['kodcaw'], 404);
}
// Find the palsu record
$palsu = Palsu::on($cawangan['mysql'])->where('norujukan', $validated['norujukan'])->first();
if (!$palsu) {
return $this->errorResponse('Barang kes tidak dijumpai untuk norujukan: ' . $validated['norujukan'], 404);
}
// Check if pampasan already exists for this norujukan
$existingPampasan = Pampasan::on($cawangan['mysql'])->where('norujukan', $validated['norujukan'])->first();
if ($existingPampasan) {
// If pampasan exists, just update the agreement_printed_at
$existingPampasan->agreement_printed_at = Carbon::now();
$existingPampasan->save();
return $this->successResponse('Agreement printed timestamp berjaya dikemaskini untuk pampasan sedia ada.', $existingPampasan, 200);
}
// Create new pampasan record based on palsu data
$pampasan = Pampasan::on($cawangan['mysql'])->create([
'norujukan' => $palsu->norujukan,
'baucerno' => $validated['baucerno'],
'kodcaw' => $palsu->kodcaw,
'jumlah_pampasan' => $palsu->nilaimarhun,
'teller' => $validated['teller'],
'status' => 0,
'agreement_printed_at' => Carbon::now(),
]);
return response()->json([
'success' => true,
'message' => 'Status Pampasan berjaya dituntut.',
'data' => $pampasan,
], 201);
return $this->successResponse('Pampasan berjaya daftar dari rekod barang kes.', $pampasan, 201);
} catch (\Exception $e) {
return $this->errorResponse('Database error: ' . $e->getMessage(), 500);
}
}
public function getPampasan()
private function getCawangan($kodcaw)
{
$pampasan = Pampasan::on('mysql71')->get();
$cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
return response()->json([
'success' => true,
'message' => 'Status Pampasan berjaya dituntut.',
'data' => $pampasan,
], 201);
if (!$cawangan) {
return null;
}
return $cawangan;
}
public function getPampasanByNoRujukan()
private function errorResponse($message, $statusCode = 404)
{
return response()->json([
'success' => false,
'message' => $message,
], $statusCode);
}
private function successResponse($message, $data = null, $statusCode = 200)
{
return response()->json([
'success' => true,
'message' => $message,
'data' => $data,
], $statusCode);
}
}