From ea54e26f973f9435a6f54308f8cc463835235543 Mon Sep 17 00:00:00 2001 From: amirhassan Date: Sun, 17 Mar 2024 09:17:11 +0800 Subject: [PATCH] Update feature tuntut baki lelong read tag permata --- app/Http/Controllers/LelongController.php | 4 ++-- resources/views/lelongan/index.blade.php | 4 +--- resources/views/print/resit_tuntutbaki.blade.php | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index fe48372..82f4b40 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -31,7 +31,7 @@ class LelongController extends Controller foreach($marhuns[0] as $marhun) { - if($marhun['batu_permata'] != null) + if($marhun['tag_permata'] == 1) { $batuPermataExist = true; } @@ -83,7 +83,7 @@ class LelongController extends Controller foreach($marhuns[0] as $marhun) { - if($marhun['batu_permata'] != null) + if($marhun['tag_permata'] == 1) { $batuPermataExist = true; } diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index a66a410..0e953b0 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -92,7 +92,6 @@ Karat Berat(g) Nota - Batu Permata Berat Permata(g) @@ -103,8 +102,7 @@ {{ $marhun['marhun'] }} {{ $marhun['karat'] }} {{ $marhun['berat'] }} - {{ $marhun['nota'] }} - {{ $marhun['batu_permata'] }} + {{ $marhun['tag_permata'] == 1 ? '(PMT) ' : '' }}{{ $marhun['nota'] }} {{ $marhun['berat_batu_permata'] }} @endforeach diff --git a/resources/views/print/resit_tuntutbaki.blade.php b/resources/views/print/resit_tuntutbaki.blade.php index 81da10a..c44db96 100644 --- a/resources/views/print/resit_tuntutbaki.blade.php +++ b/resources/views/print/resit_tuntutbaki.blade.php @@ -299,7 +299,6 @@ Karat Berat(g) Nota - Batu Permata Berat Permata(g) @foreach($marhuns[0] as $marhun) @@ -308,9 +307,8 @@ {{ $marhun['marhun'] }} {{ $marhun['karat'] }} {{ $marhun['berat'] }} - {{ $marhun['nota'] }} - {{ $marhun['batu_permata'] }} - {{ $marhun['berat_batu_permata'] }} + {{ $marhun['tag_permata'] == 1 ? '(PMT) ' : '' }}{{ $marhun['nota'] }} + {{ $marhun['tag_permata'] == 1 ? $marhun['berat_batu_permata'] : '-' }} @endforeach