From 9a6cdba39af0c89d62ec36db553c7af160d38684 Mon Sep 17 00:00:00 2001 From: amirhassan Date: Tue, 20 Feb 2024 15:21:37 +0800 Subject: [PATCH] Add info batu permata if exist when tuntut baki --- app/Http/Controllers/LelongController.php | 28 +++++++++- resources/views/lelongan/index.blade.php | 31 +++++++++++ .../views/print/resit_tuntutbaki.blade.php | 51 +++++++++++++++++++ 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 548d66a..fe48372 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -25,6 +25,18 @@ class LelongController extends Controller $customerdetail = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $noic)->json(); $nama = $customerdetail['nama']; + $marhuns = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $norujukan)->json(); + + $batuPermataExist = false; + + foreach($marhuns[0] as $marhun) + { + if($marhun['batu_permata'] != null) + { + $batuPermataExist = true; + } + } + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/lelong/cawangan/'. $auth_user['cawangan'] . '/' . $norujukan)->json(); if(sizeof($lelong) > 0) @@ -34,7 +46,7 @@ class LelongController extends Controller $gadai = $gadaidetail[0]; - return view('lelongan.index',compact('cawangan_info','api_url','gadai','nama','lelong')); + return view('lelongan.index',compact('cawangan_info','api_url','gadai','nama','lelong', 'marhuns', 'batuPermataExist')); } public function lelong(){ @@ -65,7 +77,19 @@ class LelongController extends Controller if(sizeof($wakil) != 0) $wakil = $wakil[0]; - return view('print.resit_tuntutbaki', compact('cawangan_detail','api_url','lelong','wakil')); + $marhuns = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $norujukan)->json(); + + $batuPermataExist = false; + + foreach($marhuns[0] as $marhun) + { + if($marhun['batu_permata'] != null) + { + $batuPermataExist = true; + } + } + + return view('print.resit_tuntutbaki', compact('cawangan_detail','api_url','lelong','wakil', 'marhuns', 'batuPermataExist')); } diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index aa5b71f..a66a410 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -81,6 +81,37 @@ +
+
+
*Surat ini direkod mengandungi batu permata. Sila serahkan batu permata kepada pelanggan semasa membuat tuntutan.
+ + + + + + + + + + + + + + @foreach ($marhuns[0] as $marhun) + + + + + + + + + + @endforeach + +
BilMarhunKaratBerat(g)NotaBatu PermataBerat Permata(g)
{{ $loop->iteration }}{{ $marhun['marhun'] }}{{ $marhun['karat'] }}{{ $marhun['berat'] }}{{ $marhun['nota'] }}{{ $marhun['batu_permata'] }}{{ $marhun['berat_batu_permata'] }}
+
+
diff --git a/resources/views/print/resit_tuntutbaki.blade.php b/resources/views/print/resit_tuntutbaki.blade.php index 40ffc24..81da10a 100644 --- a/resources/views/print/resit_tuntutbaki.blade.php +++ b/resources/views/print/resit_tuntutbaki.blade.php @@ -147,6 +147,27 @@ padding:4px; color:black; } + +.main-table { + border-collapse: collapse; + width: 100%; +} + +.main-table td, +.main-table th { + border: 1px solid #ddd; + padding: 2px; + font-size: 9px; +} + +.main-table th { + padding-top: 12px; + padding-bottom: 12px; + text-align: center; + background-color: #d0d2d063; + color: black; + padding: 5px; +} @@ -265,6 +286,36 @@ RM {{ number_format($lelong['jumlah'],2) }} + + Jumlah Bayaran + RM {{ number_format($lelong['jumlah'],2) }} + + + + + + + + + + + + + + @foreach($marhuns[0] as $marhun) + + + + + + + + + + @endforeach +
BilMarhunKaratBerat(g)NotaBatu PermataBerat Permata(g)
{{ $loop->iteration }}{{ $marhun['marhun'] }}{{ $marhun['karat'] }}{{ $marhun['berat'] }}{{ $marhun['nota'] }}{{ $marhun['batu_permata'] }}{{ $marhun['berat_batu_permata'] }}
+ +
*Sila semak batu permata.