From 74f6f21d4bf8fa7f604ddda771aad2cf76fcc368 Mon Sep 17 00:00:00 2001
From: amirhassan <amirhassan.hamzan@gmail.com>
Date: Wed, 31 Jan 2024 08:55:40 +0800
Subject: [PATCH] Update laporan marhun harian and scan masuk marhun for pc

---
 resources/views/khazanah/gadaian.blade.php              | 4 ++++
 resources/views/khazanah/laporan/marhunharian.blade.php | 4 ++++
 resources/views/print/laporan_marhunharian.blade.php    | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php
index 5ff2725..4a0576b 100644
--- a/resources/views/khazanah/gadaian.blade.php
+++ b/resources/views/khazanah/gadaian.blade.php
@@ -25,6 +25,8 @@
                                     <th>Karat</th>
                                     <th>Nilai Marhun</th>
                                     <th>Nota</th>
+                                    <th>Batu Permata</th>
+                                    <th>Berat Permata</th>
                                 </tr>
                             </thead>
                             <tbody id="tablemarhun">
@@ -295,6 +297,8 @@
                                 undefined, {
                                     minimumFractionDigits: 2
                                 }) + "</td><td>" + marhun_detail['nota'] +
+                                    "</td><td>" + marhun_detail['batu_permata'] +
+                                    "</td><td>" + marhun_detail['berat_batu_permata'] +
                             "</td></tr>");
                     }
                 });
diff --git a/resources/views/khazanah/laporan/marhunharian.blade.php b/resources/views/khazanah/laporan/marhunharian.blade.php
index e4925a5..84e39e9 100644
--- a/resources/views/khazanah/laporan/marhunharian.blade.php
+++ b/resources/views/khazanah/laporan/marhunharian.blade.php
@@ -45,6 +45,8 @@
                                         <th>Nama</th>
                                         <th>Marhun</th>
                                         <th>Nota</th>
+                                        <th>Batu Permata</th>
+                                        <th>Berat Permata</th>
                                         <th>Berat</th>
                                         <th>Karat</th>
                                         <th>Harga</th>
@@ -117,6 +119,8 @@
                 customers['nama'],
                 customers['marhun'],
                 customers['nota'],
+                customers['batu_permata'],
+                customers['berat_batu_permata'],
                 customers['berat'],
                 customers['karat'],
                 customers['harga'],
diff --git a/resources/views/print/laporan_marhunharian.blade.php b/resources/views/print/laporan_marhunharian.blade.php
index 00bdf87..1438271 100644
--- a/resources/views/print/laporan_marhunharian.blade.php
+++ b/resources/views/print/laporan_marhunharian.blade.php
@@ -205,6 +205,8 @@
     <th>Nama</th>
     <th>Marhun</th>
     <th>Nota</th>
+    <th>Batu Permata</th>
+    <th>Berat Permata</th>
     <th>Berat</th>
     <th>Karat</th>
     <th>Harga</th>
@@ -220,6 +222,8 @@
       <td>{{$item['nama']}}</td>
       <td>{{$item['marhun']}}</td>
       <td>{{$item['nota']}}</td>
+      <td>{{$item['batu_permata']}}</td>
+      <td>{{$item['berat_batu_permata']}}</td>
       <td>{{$item['berat']}}</td>
       <td>{{$item['karat']}}</td>
       <td>{{$item['harga']}}</td>
@@ -232,6 +236,8 @@
       <td></td>
       <td></td>
       <td></td>
+      <td></td>
+      <td></td>
       <td colspan="3"><b>{{ $totalberat }}</b></td>
       <td colspan="3"><b>{{ $totalnm }}</b></td>
     </tr>