From 296483579691bdcef74e7c192883469d1e25df8d Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Wed, 14 Dec 2022 03:14:05 +0800
Subject: [PATCH] Fix export data, send user details

---
 app/Http/Controllers/LelongController.php              | 6 +++++-
 app/Http/Controllers/Mobile/LelongMobileController.php | 3 +++
 app/Models/LelongBid.php                               | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 0a1ff060..6a24c074 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -126,7 +126,7 @@ class LelongController extends Controller
     {
         $lelongDetails = Lelong::find($request->lelong_id);
         $cawanganLelong = CawanganLelong::with('cawangan')->where('caw_id', $request->cawangan)->where('lelong_id', $request->lelong_id)->first();
-        $lelongBidMaster = LelongBid::with('payment:norujukan,status_payment_opt,remark')
+        $lelongBidMaster = LelongBid::with(['payment:norujukan,status_payment_opt,remark', 'lelongBidderMenang:lelongbid_id,user_id'])
         ->where('lelong_id', $request->lelong_id)
             ->where('status_jual', 1)
             ->where('status_payment', 1)
@@ -142,6 +142,10 @@ class LelongController extends Controller
                 $lelongBidMaster[$index]['payment_method'] =  "BAYARAN ONLINE";
                 $lelongBidMaster[$index]['teller'] =  "LELONG ONLINE";
             }
+
+            $userDetails = User::find($lelongBid->lelongBidderMenang->user_id, ['name', 'nokp', 'alamat', 'notelbimbit']);
+            $lelongBidMaster[$index]['user_details'] =  $userDetails->toArray();
+
         }
 
         $lelongbid = $lelongBidMaster->pluck('id');
diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php
index f964263f..9816ff22 100644
--- a/app/Http/Controllers/Mobile/LelongMobileController.php
+++ b/app/Http/Controllers/Mobile/LelongMobileController.php
@@ -817,11 +817,14 @@ class LelongMobileController extends Controller
 
         foreach($lelong as $index => $data)
         {
+            if($data['masamula_lelong'] != null)
+            {
             $date_convert = strtotime($data['masamula_lelong']);
             $lelong[$index]['masamula_lelong'] = date("H:i", $date_convert);
 
             $date_convert_2 = strtotime($data['masatamat_lelong']);
             $lelong[$index]['masatamat_lelong'] = date("H:i", $date_convert_2);
+            }
         }
 
         if ($lelong->isNotEmpty()) {
diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php
index af22f092..f7684318 100644
--- a/app/Models/LelongBid.php
+++ b/app/Models/LelongBid.php
@@ -86,4 +86,9 @@ class LelongBid extends Model
     {
         return $this->hasMany(ScanSemak::class, 'lelongbid_id', 'id')->whereNotNull('serahkpdpembida');
     }
+
+    public function lelongBidderMenang()
+    {
+        return $this->hasOne(LelongBidder::class, 'lelongbid_id', 'id')->where('status_bidder', 1);
+    }
 }