diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 16dd910..ff94002 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -410,7 +410,7 @@ class GadaianController extends Controller $totaltransaction = 0; $transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/one/'. $id)->json(); - + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $id)->json(); @@ -430,9 +430,9 @@ class GadaianController extends Controller $wakil = $wakil[0]; if($gadai['tagbaru'] == 1) { - return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil')); + return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil','cawangan_info')); } else { - return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil')); + return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil','cawangan_info')); // return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran')); } } @@ -536,6 +536,8 @@ class GadaianController extends Controller $customers_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $transaction_keuntungan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json(); // if(sizeof($customers_info) != 0) // $customers_info = $customers_info[0]; @@ -555,7 +557,7 @@ class GadaianController extends Controller $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first(); - return view('print.resittebusautotawarruq',compact('transaction_tebus', 'transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan', 'khazanah_user')); + return view('print.resittebusautotawarruq',compact('transaction_tebus', 'transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan', 'khazanah_user','cawangan_info')); } public function resittebus($id) @@ -701,6 +703,9 @@ class GadaianController extends Controller $customers_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + // if(sizeof($customers_info) != 0) // $customers_info = $customers_info[0]; @@ -728,7 +733,7 @@ class GadaianController extends Controller $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first(); $totalrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/totalrebate',['norujukan'=>$id])->json(); - return view('print.resit.tambah_pinjaman',compact('totalrebate','khazanah_user','totalBayaranAnsuran','transaction_tebus','gadai','customers_info','penebusan','wakil')); + return view('print.resit.tambah_pinjaman',compact('totalrebate','khazanah_user','totalBayaranAnsuran','transaction_tebus','gadai','customers_info','penebusan','wakil','cawangan_info')); } public function history(Request $request) diff --git a/config/redeemoption.php b/config/redeemoption.php index 6467b1e..717c6fb 100644 --- a/config/redeemoption.php +++ b/config/redeemoption.php @@ -5,5 +5,6 @@ return [ 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1), // 'enable_specific_block' => env('ENABLE_BLOCK',0), 'cawangan_block' => explode(',', env('CAWANGAN_BLOCK', '1STOP,010915,010219,011013,011412,010621,010620,010617,010618')), + 'ansuran_block' => explode(',', env('ANSURAN_BLOCK', '')), ]; ?> diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index cfdcc62..777e5ed 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -8,7 +8,15 @@ - SISTEM AR-RAHN + + @if (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan') + v2 Putatan Lama + @elseif (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2') + v2 Putatan Baru + @else + SISTEM AR-RAHN + @endif + @@ -114,6 +122,10 @@ border-bottom:none; } + .text-gold { + color: gold !important; + } + @@ -131,21 +143,49 @@ @endphp
-