From 7c4778bfcaea7e3067d3e5e56d05bf479146a102 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Wed, 23 Mar 2022 14:04:59 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/MarhunController.php | 79 +++++++++++++----------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index bc5c882e..7fdc7b57 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -85,25 +85,19 @@ class MarhunController extends Controller
         //     {
                 if($request->karat != $marhun->karat)
                 {
-                    $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id)
-                    ->whereNull('disahkan_pada')
-                    ->first();
-                    if($checkdata)
-                    {
-                        //
-                    }
-                    else
-                    {
-                        $karat = new Pengesahan;
-                        $karat->lelong_id = $lelong->id;
-                        $karat->lelongbid_id = $lelongbid->id;
-                        $karat->lelongbidmarhun_id = $marhun->id;
-                        $karat->norujukan = $lelongbid->norujukan;
-                        $karat->diminta_oleh = $user->id;
-                        $karat->diminta_pada = $currentdate;
-                        $karat->status_ubah = 1;
-                        $karat->save();
-                    }
+                    // $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id)
+                    // ->whereNull('disahkan_pada')
+                    // ->first();
+                    
+                    $karat = new Pengesahan;
+                    $karat->lelong_id = $lelong->id;
+                    $karat->lelongbid_id = $lelongbid->id;
+                    $karat->lelongbidmarhun_id = $marhun->id;
+                    $karat->norujukan = $lelongbid->norujukan;
+                    $karat->diminta_oleh = $user->id;
+                    $karat->diminta_pada = $currentdate;
+                    $karat->status_ubah = 1;
+                    $karat->save();
                 }
                 $bezaberat = $marhun->berat - $request->berat_emas;
                 $bezahargaasas = $marhun->hargaasas - $request->harga_asas;
@@ -204,13 +198,14 @@ class MarhunController extends Controller
         $karat = new Pengesahan;
         $karat->lelong_id = $lelong->id;
         $karat->lelongbid_id = $lelongbid->id;
+        $karat->lelongbidmarhun_id = $lelongbidmarhun->id;
         $karat->norujukan = $lelongbid->norujukan;
         $karat->diminta_oleh = $user->id;
         $karat->diminta_pada = $currentdate;
         $karat->status_ubah = 2;
         $karat->save();
 
-        return redirect()->route('marhun.show',$lelongbid->id)
+        return redirect()->route('marhun.show',[$lelongbid->id,$lelongbid->lelong_id])
                         ->with('success','Marhun Berjaya Ditambah');
     }
         
@@ -300,7 +295,7 @@ class MarhunController extends Controller
         ->first();
 
         $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)
-        ->where('id', $pengesahan->lelongbidmarhun_id)
+        // ->where('id', $pengesahan->lelongbidmarhun_id)
         ->get()->toArray();
 
         $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
@@ -316,19 +311,37 @@ class MarhunController extends Controller
             $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun'])
             ->where('norujukan', $lelongbid->norujukan)
             ->first();
+            if($gadaimarhun)
+            {
+                $karat = $karat->where('karat', $gadaimarhun->karat)->first();
+    
+                $total = $karat->harga * $gadaimarhun->berat;
+                $hargaasas = round($total); 
+                
+                $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
+                $marhuns[$index1]['old_karat'] = $gadaimarhun->karat;
+                $marhuns[$index1]['old_berat'] = $gadaimarhun->berat;
+                $marhuns[$index1]['old_harga'] = $karat->harga;
+                $marhuns[$index1]['old_nilaimarhun'] = $total;
+                $marhuns[$index1]['old_hargaasas'] = $hargaasas;
+                $marhuns[$index1]['status_ubah'] = $status;
+            }
+            else
+            {
+                $karat = $karat->where('karat', $marhun['karat'])->first();
+    
+                $total = $karat->harga * $marhun['berat'];
+                $hargaasas = round($total); 
+                
+                $marhuns[$index1]['old_marhun'] = $marhun{'marhun'};
+                $marhuns[$index1]['old_karat'] = $marhun['karat'];
+                $marhuns[$index1]['old_berat'] = $marhun['berat'];
+                $marhuns[$index1]['old_harga'] = $karat->harga;
+                $marhuns[$index1]['old_nilaimarhun'] = $total;
+                $marhuns[$index1]['old_hargaasas'] = $hargaasas;
+                $marhuns[$index1]['status_ubah'] = $status;
+            }
 
-            $karat = $karat->where('karat', $gadaimarhun->karat)->first();
-
-            $total = $karat->harga * $gadaimarhun->berat;
-            $hargaasas = round($total); 
-            
-            $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
-            $marhuns[$index1]['old_karat'] = $gadaimarhun->karat;
-            $marhuns[$index1]['old_berat'] = $gadaimarhun->berat;
-            $marhuns[$index1]['old_harga'] = $karat->harga;
-            $marhuns[$index1]['old_nilaimarhun'] = $total;
-            $marhuns[$index1]['old_hargaasas'] = $hargaasas;
-            $marhuns[$index1]['status_ubah'] = $status;
         }
         return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan', 'id'));
     }