From 6053c323bd0dedca2353eef731db6af230fc76e7 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Wed, 3 Aug 2022 09:09:41 +0800
Subject: [PATCH] update pindah dan tukar tarikh

---
 app/Http/Controllers/LelongController.php             | 6 ++----
 resources/views/simulasi/senaraisimulasiall.blade.php | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index fbb7ad82..79cf3dcb 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -2001,8 +2001,7 @@ class LelongController extends Controller
         foreach($cawanganlel as $cawlel)
         {
             $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
-            $databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-            ->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
+            $databid = LelongBid::select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong')
             ->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
             
             // dd($databid->toArray());
@@ -2162,8 +2161,7 @@ class LelongController extends Controller
         foreach($cawanganlel as $cawlel)
         {
             $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
-            $databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-            ->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
+            $databid = LelongBid::select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong')
             ->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
             
             // dd($databid->toArray());
diff --git a/resources/views/simulasi/senaraisimulasiall.blade.php b/resources/views/simulasi/senaraisimulasiall.blade.php
index 70632b29..3a775b3b 100644
--- a/resources/views/simulasi/senaraisimulasiall.blade.php
+++ b/resources/views/simulasi/senaraisimulasiall.blade.php
@@ -18,8 +18,8 @@
                             <th>No</th>
                             <th>Kali Lelong</th>
                             {{-- <th>Tarikh Lelong</th> --}}
-                            <th>Fasa</th>
-                            <th align='left'>Cawangan</th>
+                            {{-- <th>Fasa</th>
+                            <th align='left'>Cawangan</th> --}}
                             {{-- <th>Harga Asas (RM)</th> --}}
                             <th class="text-center">Tindakan</th>
                         </tr>
@@ -34,7 +34,7 @@
                                {{$info['info']['tarikh_lelong'] }}
                                    
                             </td> --}}
-                            <td align = 'center'>
+                            {{-- <td align = 'center'>
                                 @foreach($info['detailsinfo'] as $info2)
                                {{$info2['fasa']}}<br>
                                 @endforeach
@@ -42,7 +42,7 @@
                             <td align = 'left'>
                             @foreach($info['detailsinfo'] as $info2)
                            {{$info2['caw_name']}}<br>
-                            @endforeach
+                            @endforeach --}}
                             {{-- </td>
                              <td>{{ $info['info']['harga_emas_asas'] }}</td> --}}
                             <td class="text-center">