From 1b3068b14a4bb89d264e168af7616b7a4b915bdb Mon Sep 17 00:00:00 2001
From: unknown <ain55645@gmail.com>
Date: Thu, 24 Oct 2024 16:25:37 +0800
Subject: [PATCH] update nota di sag

---
 app/Http/Controllers/PenebusanController.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php
index 44e4de4..b31d6ab 100644
--- a/app/Http/Controllers/PenebusanController.php
+++ b/app/Http/Controllers/PenebusanController.php
@@ -339,7 +339,7 @@ class PenebusanController extends Controller
 
             $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
 
-            array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
+            array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
         }
 
         foreach($arraymarhunbaru as $array1){
@@ -350,6 +350,8 @@ class PenebusanController extends Controller
                 'karat' => $array1['karat'],
                 'berat_emas' => $array1['berat'],
                 'harga' => $array1['harga'],
+                'tag_permata' => $array1['tag_permata'],
+                'berat_batu_permata' => $array1['berat_batu_permata'],
                 'nilai_marhun' => $array1['n_marhun']
             ])->json();
         }
@@ -494,7 +496,7 @@ class PenebusanController extends Controller
            $harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga'];
            $nilaimarhun = (floatval($harga) * floatval($marhunloop['berat']));
 
-           array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]);
+           array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]);
        }
 
        foreach($arraymarhunbaru as $array1){
@@ -506,6 +508,8 @@ class PenebusanController extends Controller
                'berat_emas' => $array1['berat'],
                'harga' => $array1['harga'],
                'nilai_marhun' => $array1['n_marhun'],
+               'tag_permata' => $array1['tag_permata'],
+               'berat_batu_permata' => $array1['berat_batu_permata'],
                'jenisAT' => $request->jenisAT
            ])->json();
        }
@@ -655,7 +659,7 @@ class PenebusanController extends Controller
 
                 $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
 
-                array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
+                array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
             }
        }
 
@@ -668,6 +672,8 @@ class PenebusanController extends Controller
                 'karat' => $array1['karat'],
                 'berat_emas' => $array1['berat'],
                 'harga' => $array1['harga'],
+                'tag_permata' => $array1['tag_permata'],
+                'berat_batu_permata' => $array1['berat_batu_permata'],
                 'nilai_marhun' => $array1['n_marhun']
             ])->json();