From 310dd3598ed07dc9bde21d66f980127ed64ee3fa Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Mon, 24 Jan 2022 12:25:13 +0800
Subject: [PATCH] update get lelong details

---
 .../AuthMobile/LelongMobileController.php     | 55 +++++--------------
 1 file changed, 15 insertions(+), 40 deletions(-)

diff --git a/app/Http/Controllers/AuthMobile/LelongMobileController.php b/app/Http/Controllers/AuthMobile/LelongMobileController.php
index 993e1a61..115509fa 100644
--- a/app/Http/Controllers/AuthMobile/LelongMobileController.php
+++ b/app/Http/Controllers/AuthMobile/LelongMobileController.php
@@ -20,32 +20,6 @@ class LelongMobileController extends Controller
 
         // $arrayLelong = [];
         $lelong = Lelong::where('tarikh_lelong','=',$currentdate)->get()->toArray();
-        // $lelongbid = LelongBid::where('t_lelong', '=', $currentdate)
-        //              ->select('lelong_id',
-        //                        'id as lelongbid_id',
-        //                         'caw_id',
-        //                         'kodcaw',
-        //                         'norujukan',
-        //                         't_lelong as tarikh_lelong',
-        //                         'hargaasas',
-        //                         'hargajual',
-        //                         't_jual',
-        //                         'nopembeli',
-        //                         'jbg',
-        //                         'kadarupah',
-        //                         'upahsimpan',
-        //                         'ansuran',
-        //                         'pinjaman',
-        //                         'bakiupah',
-        //                         'cajlain',
-        //                         'cajlelong',
-        //                         'baki',
-        //                         'gst_hj',
-        //                         'gst_cl',
-        //                         'percent',
-        //                         'status_jual',
-        //                         'status_payment')
-        //              ->get();
 
         foreach($lelong as $index1=>$lel)
         {
@@ -74,20 +48,20 @@ class LelongMobileController extends Controller
                         'percent',
                         'status_jual',
                         'status_payment')
-            // ->union($lelong)
-            ->get()->toArray();
-
-            $lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
             ->get()->toArray();
 
             $lelong[$index1]['lelongbid'] = $lelongbid;
-            $lelong[$index1]['lelongbid']['lelongbidmarhun'] = $lelongbidmarhun;
-            // array_push($lelong[$index1],'lelongzz','lasdsa');
-          
- 
-     
-                    
-            // array_push($lelong[$index1],['lelong_bid' => $lelongbid[0], 'lelong_bid_marhun' => $lelongbidmarhun]);
+
+            foreach($lelongbid as $index2=>$lelbidmarhun){
+
+                // $id = lelongbid::first();
+
+                $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun['lelongbid_id'])
+                ->get()->toArray();
+
+                $lelong[$index1]['lelongbid'][$index2]['lelongbidmarhun'] = $lelongbidmarhun;
+            }
+            
         }
         
         return response()->json($lelong);
@@ -110,10 +84,11 @@ class LelongMobileController extends Controller
 
         if($feepayment != null){
 
-            $selectBid = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id')
+            $selectBid = Lelong::join('lelongbid', 'lelong.id', '=', 'lelongbid.lelong_id')
+            ->join('cart', 'lelongbid.id', '=', 'cart.lelongbid_id')
             ->where('norujukan', $request->norujukan)
-            ->select('id',
-                      't_lelong',
+            ->select('lelongbid.id as lelongbid_id',
+                      'lelongbid.t_lelong',
                       'nilaimarhun',
                       'cajlelong')
             ->get();