Bug fixes were applied to receipt A and T for both non-ujrah and ujrah

This commit is contained in:
Ain Izazi
2025-11-26 15:54:26 +08:00
parent abc5416e9b
commit 3f60ac89d9
5 changed files with 43 additions and 48 deletions
+9 -6
View File
@@ -23,8 +23,6 @@ class ResitController extends Controller
$transaction = Http::get(config('api.url') . '/api/transaction/id/'. $id)->json();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
if(sizeof($transaction) != 0)
$transaction = $transaction[0];
@@ -35,13 +33,15 @@ class ResitController extends Controller
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/' . $gadai['kodcaw'])->json();
$wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $transaction['nowakil'])->json();
if($gadai['tagbaru'] == 1){
return view('resit.resitansuran_ujrah',compact('transaction','gadai','customers_info'));
return view('resit.resitansuran_ujrah',compact('transaction','gadai','customers_info','cawangan_info','wakil'));
}else{
return view('resit.resitansuran',compact('transaction','gadai','customers_info'));
return view('resit.resitansuran',compact('transaction','gadai','customers_info','cawangan_info','wakil'));
}
}
@@ -136,6 +136,8 @@ class ResitController extends Controller
$transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
$transaction_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/one/'. $id)->json();
foreach($transaction as $trans)
{
$totaltransaction += $trans['duit_masuk'];
@@ -152,6 +154,7 @@ class ResitController extends Controller
$totalBayaranAnsuran = Http::get(config('api.url') . '/api/transaction/norujukan/total/ansuran',['norujukan'=>$id])->json();
$totalrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/totalrebate',['norujukan'=>$id])->json();
$surat_wakil = [];
if(sizeof($wakil) != 0) {
$wakil = $wakil[0];
@@ -163,10 +166,10 @@ class ResitController extends Controller
$khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
if($gadai['tagbaru'] == 1){
return view('resit.resittebus_ujrah',compact('surat_wakil','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
return view('resit.resittebus_ujrah',compact('transaction','transaction_tebus','totalrebate','khazanah_user','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
}else{
return view('resit.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
return view('resit.resittebus',compact('transaction','transaction_tebus','totalrebate','khazanah_user','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
}
}