From e16db6782395ba50881d4c4a9b09c21e5b7f4a01 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Thu, 8 Dec 2022 16:08:58 +0800
Subject: [PATCH] senarai lelong all

---
 app/Http/Controllers/LelongController.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 5730f920..cd2cba70 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -3856,11 +3856,17 @@ class LelongController extends Controller
         foreach($cawanganlel as $cawlel)
         {
             $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
-            $databid = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id')
+            // $databid = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id')
+
+            $databid = LelongBid::   join('cawangan_lelong', function ($join) {
+                $join->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id')
+                     ->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id');
+            })
             ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun',
-            'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah')
+            'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah','cawangan_lelong.kali')
             ->where('cawangan_lelong.caw_id','=', $cawlel->caw_id)
             ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id)
+            ->where('cawangan_lelong.kali','=',$kali)
             ->get();
             // ->toArray();
             // dd($databid);