From 8ea7a970e3a2bffb45c0d922acec4ad0af9aacf2 Mon Sep 17 00:00:00 2001
From: nishaMuhd <nurulnisha84@gmail.com>
Date: Mon, 30 Jan 2023 11:50:03 +0800
Subject: [PATCH 1/2] update function scan barcode serahan pembida

---
 app/Http/Controllers/MarhunController.php | 30 ++++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index f66a28ac..cc1ada11 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -2052,12 +2052,14 @@ class MarhunController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
 
-        $tarikhlelong_semasa = $currentdate;
+        //$tarikhlelong_semasa = $currentdate;
+        $tarikhlelong_semasa = date('Y-m-d', strtotime(now()));
 
         $lelongAll = Lelong::with('cawangan')->get();
 
 
         if($lelong){
+
         foreach ($lelong as $info) 
         {
             $lelong_id = $info['lelong_id'];
@@ -2083,21 +2085,25 @@ class MarhunController extends Controller
             ->where('cawangan.caw_code', $user->kodcaw)
             ->get()
             ->toArray();
-            array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
-        }
-
-        }
-        foreach ($arrayinfo as $lelong) {
-           
+            //array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
 
             if ($info['tarikh_lelong'] == $tarikhlelong_semasa) {
-                array_push($arraydetails0, $lelong);
-            } 
-            else
-            {
-                array_push($arraydetails1, $lelong);
+                array_push($arraydetails0, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
+            } else {
+                array_push($arraydetails1, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
             } 
+        }    
+
         }
+        // foreach ($arrayinfo as $lelong) {
+        //     if ($info['tarikh_lelong'] == $tarikhlelong_semasa) {
+        //         array_push($arraydetails0, $lelong);
+        //     } 
+        //     else
+        //     {
+        //         array_push($arraydetails1, $lelong);
+        //     } 
+        // }
         
 
 

From a76d60b0bdb6af549b78c4f6dacee8ad5d54bff3 Mon Sep 17 00:00:00 2001
From: nishaMuhd <nurulnisha84@gmail.com>
Date: Tue, 31 Jan 2023 15:03:19 +0800
Subject: [PATCH 2/2] update sorting sag dlm slip serahan

---
 app/Http/Controllers/SerahanController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php
index a5e2a47e..df8f2d75 100644
--- a/app/Http/Controllers/SerahanController.php
+++ b/app/Http/Controllers/SerahanController.php
@@ -338,6 +338,7 @@ class SerahanController extends Controller
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbid.kodcaw',$user->kodcaw)
         ->select('lelongbid.id','lelongbid.norujukan','lelongbid.hargajual')
+        ->orderBy('lelongbid.id')
         // ->where('payment.resit_id',$resit_id)
         ->get();
         // dd($SAGWin);