From 251062d56ca7b9bc79fd547f689f204d3d96f8af Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Thu, 22 Dec 2022 10:12:46 +0800
Subject: [PATCH] Fix minor api

---
 .../Mobile/LelongMobileController.php         | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php
index 390d78cd..78a54fa5 100644
--- a/app/Http/Controllers/Mobile/LelongMobileController.php
+++ b/app/Http/Controllers/Mobile/LelongMobileController.php
@@ -73,8 +73,8 @@ class LelongMobileController extends Controller
 
         $activeLelong = Lelong::where('sts_lelong', '=', 1)->first();
         if (isset($activeLelong)) {
-            $getKarat = LelKarat::where('lelong_id', '=' ,$activeLelong['id'])->get();
-            
+            $getKarat = LelKarat::where('lelong_id', '=' ,$activeLelong['id'])->whereNotIn('karat', ['18.0Kp', '14.0Kp'])->get();
+
             $date_convert = strtotime($getKarat[0]['updated_at']);
             $updatedDateTime = date("d-m-Y H:i", $date_convert);
 
@@ -190,7 +190,10 @@ class LelongMobileController extends Controller
     {
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateString();
-        $lelong = Lelong::where('tarikh_lelong', '=', $currentdate)->select('id')->first();
+        $lelong = Lelong::where('tarikh_lelong', '=', $currentdate)->select('id', 'masatamat_lelong')->first();
+
+        $date_convert = strtotime($lelong->masatamat_lelong);
+        $lelong['masatamat_lelong'] = date("H:i", $date_convert);
 
         if ($lelong) {
             $groupCawangan = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -230,10 +233,11 @@ class LelongMobileController extends Controller
                 $groupCawangan[$index]['lelongbid'] = $lelongBidder;
             }
         }
-        if ($groupCawangan) {
+        if ($lelong && $groupCawangan) {
             return response()->json([
                 'success' => true,
-                'lelongbidder' => $groupCawangan
+                'lelongbidder' => $groupCawangan,
+                'lelong' => $lelong,
             ], 201);
         } else {
             return response()->json([
@@ -862,6 +866,9 @@ class LelongMobileController extends Controller
             $date_convert_2 = strtotime($data['masatamat_lelong']);
             $lelong[$index]['masatamat_lelong'] = date("H:i", $date_convert_2);
             }
+
+            $lelong[$index]['caw_name'] = trim($data['caw_name'], "AR-RAHN ");
+
         }
 
         if ($lelong->isNotEmpty()) {
@@ -933,6 +940,8 @@ class LelongMobileController extends Controller
         {
             $date_convert = strtotime($data['tarikh_lelong']);
             $lelong[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert);
+
+            $lelong[$index]['caw_name'] = trim($data['caw_name'], "AR-RAHN ");
         }
 
         if ($lelong) {