From f0b58fc7343ea472731619f44c4178a689b1d5d4 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Thu, 16 Mar 2023 11:04:29 +0800
Subject: [PATCH] Add login using email and display AM/PM at bidrecord pembida

---
 app/Http/Controllers/AuthMobile/AuthController.php     | 5 +++--
 app/Http/Controllers/Mobile/LelongMobileController.php | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php
index d30f68c7..cc5e935c 100644
--- a/app/Http/Controllers/AuthMobile/AuthController.php
+++ b/app/Http/Controllers/AuthMobile/AuthController.php
@@ -104,7 +104,7 @@ class AuthController extends Controller
             'password' => 'required|string'
         ]);
 
-        $user = User::where('username', $fields['username'])->first();
+        $user = User::where('username', $fields['username'])->orWhere('email', $fields['username'])->first();
 
         if ($user) {
 
@@ -115,7 +115,8 @@ class AuthController extends Controller
                 if ($user->user_type != '2') {
                     return response([
                         'statusAkaun' => 6,
-                        'message' => "Akaun ini didaftar menggunakan id staff. Sila login ke https://adminbid.arrahn.com.my"
+                        'message1' => "Akaun ini didaftar menggunakan id staff.",
+                        'message2' => "Sila login menggunakan url " . env('APP_URL'),
                     ]);
                 } else {
                     if ($user->status == 'active') {
diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php
index ab168716..72ac3741 100644
--- a/app/Http/Controllers/Mobile/LelongMobileController.php
+++ b/app/Http/Controllers/Mobile/LelongMobileController.php
@@ -197,7 +197,7 @@ class LelongMobileController extends Controller
         
         if ($lelong) {
             $date_convert = strtotime($lelong->masatamat_lelong);
-            $lelong['masatamat_lelong'] = date("H:i", $date_convert);
+            $lelong['masatamat_lelong'] = date("H:i A", $date_convert);
             $groupCawangan = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
             ->where('user_id', '=', $userId)
@@ -223,7 +223,7 @@ class LelongMobileController extends Controller
                     }
 
                     $date_convert = strtotime($data['masa_bidaan']);
-                    $lelongBidder[$index1]['masa_bidaan'] = date("d-m-Y H:i", $date_convert);
+                    $lelongBidder[$index1]['masa_bidaan'] = date("H:i A", $date_convert);
 
                     $total_hargabida += $data['hargabida'];
                     $total_berat += $data['berat'];