KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add login using email and display AM/PM at bidrecord pembida

Browse Source
This commit is contained in:
Amir
2023-03-16 11:04:29 +08:00
parent 50d6cdc331
commit f0b58fc734
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AuthMobile/AuthController.php
+3 -2
View File
@@ -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') {
app/Http/Controllers/Mobile/LelongMobileController.php
+2 -2
View File
@@ -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'];