fix resolve conflict

This commit is contained in:
Hafifie PKB
2023-12-12 13:07:37 +08:00
7 changed files with 1717 additions and 7 deletions
+5 -1
View File
@@ -341,13 +341,17 @@ class GadaianController extends Controller
$cawangan_detail = $cawangan[0];
$kadar_ujrah = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/kadarujrah/by_group_id/', [
'kodcaw' => $cawangan_detail['kodcaw']
])->json();
$pembayaran_segera = "https://spare.arrahn.com.my/pembayaransegera";
// return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
if($gadai_detail['tagbaru'] == 1)
{
return view('print.sag_ujrah',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
return view('print.sag_ujrah_2',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu', 'kadar_ujrah'));
}else{
return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
}