Fix api mobile
This commit is contained in:
@@ -75,7 +75,9 @@ class LelongMobileController extends Controller
|
||||
if (isset($activeLelong)) {
|
||||
$getKarat = LelKarat::where('lelong_id', '=' ,$activeLelong['id'])->get();
|
||||
|
||||
$updatedDateTime = $getKarat[0]['updated_at']->toDateTimeString();
|
||||
$date_convert = strtotime($getKarat[0]['updated_at']);
|
||||
$updatedDateTime = date("d-m-Y H:i", $date_convert);
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'karat' => $getKarat,
|
||||
@@ -211,7 +213,12 @@ class LelongMobileController extends Controller
|
||||
$total_berat = 0;
|
||||
foreach ($lelongBidder as $index1 => $data) {
|
||||
$fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get();
|
||||
$lelongBidder[$index1]['filemarhun'] = $fileMarhun;
|
||||
if ($fileMarhun->isNotEmpty()) {
|
||||
$lelongBidder[$index1]['filemarhun'] = $fileMarhun;
|
||||
}
|
||||
|
||||
$date_convert = strtotime($data['masa_bidaan']);
|
||||
$lelongBidder[$index1]['masa_bidaan'] = date("d-m-Y H:i", $date_convert);
|
||||
|
||||
$total_hargabida += $data['hargabida'];
|
||||
$total_berat += $data['berat'];
|
||||
@@ -222,7 +229,8 @@ class LelongMobileController extends Controller
|
||||
$groupCawangan[$index]['total_bidaan'] = number_format((float)$total_hargabida, 2, '.', '');
|
||||
$groupCawangan[$index]['lelongbid'] = $lelongBidder;
|
||||
}
|
||||
|
||||
}
|
||||
if ($groupCawangan) {
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'lelongbidder' => $groupCawangan
|
||||
@@ -433,12 +441,25 @@ class LelongMobileController extends Controller
|
||||
{
|
||||
$lelong = Lelong::where('sts_lelong', '=', 1)->first();
|
||||
if ($lelong) {
|
||||
$date_convert = strtotime($lelong->masatamat_lelong);
|
||||
$lelong->masatamat_lelong = date("H:i", $date_convert);
|
||||
|
||||
return response()->json(['success' => true, 'lelong' => $lelong]);
|
||||
} else {
|
||||
return response()->json(['success' => false,]);
|
||||
}
|
||||
}
|
||||
|
||||
public function itemInCart(Request $request)
|
||||
{
|
||||
$cart = Cart::where('user_id', $request->user_id)->count();
|
||||
if ($cart) {
|
||||
return response()->json(['success' => true, 'cart' => $cart]);
|
||||
} else {
|
||||
return response()->json(['success' => false,]);
|
||||
}
|
||||
}
|
||||
|
||||
public function searchLelongByCawangan(Request $request){
|
||||
|
||||
$currentdate = Carbon::now();
|
||||
@@ -530,10 +551,12 @@ class LelongMobileController extends Controller
|
||||
)
|
||||
->groupBy('lelongbid.kodcaw')
|
||||
->get();
|
||||
// dd($sag->toArray());
|
||||
$getTarikhLelong = Lelong::where('id', $lelong_id)->select('tarikh_lelong')->first();
|
||||
$tarikhLelong = $getTarikhLelong->tarikh_lelong;
|
||||
|
||||
$tarikhLelong = strtotime($tarikhLelong);
|
||||
$tarikhLelong = date("d-m-Y", $tarikhLelong);
|
||||
|
||||
$data = [];
|
||||
|
||||
foreach ($sag as $index1 => $kodcaw) {
|
||||
@@ -543,11 +566,14 @@ class LelongMobileController extends Controller
|
||||
->where('lelongbidder.status_bidder', 1)
|
||||
->where('lelongbid.kodcaw', $kodcaw->kodcaw)
|
||||
->select(
|
||||
'lelongbidder.id AS id',
|
||||
'lelongbid.id AS id',
|
||||
'lelongbidder.id AS bidder_id',
|
||||
'lelongbid.norujukan AS norujukan',
|
||||
'lelongbid.kodcaw AS kodcaw',
|
||||
'lelongbidder.hargabida AS total_payment',
|
||||
'lelongbid.marhun AS marhun',
|
||||
'lelongbid.hargaasas',
|
||||
'lelongbid.berat',
|
||||
'lelongbidder.status_payment')
|
||||
->get();
|
||||
|
||||
@@ -557,21 +583,33 @@ class LelongMobileController extends Controller
|
||||
$namaCawangan = $getCawangan->caw_name;
|
||||
$kodCawangan = $getCawangan->caw_code;
|
||||
|
||||
$sag = $groupBycaw;
|
||||
|
||||
|
||||
$total_hargabida = 0;
|
||||
foreach ($groupBycaw as $hargabida) {
|
||||
$totalbida = Lelongbidder::where('id', $hargabida['id'])
|
||||
$status_payment_cawangan = 1;
|
||||
foreach ($groupBycaw as $index => $hargabida) {
|
||||
$fileMarhun = FileMarhun::where('lelongbid_id', $hargabida->id)->get();
|
||||
if ($fileMarhun->isNotEmpty()) {
|
||||
$groupBycaw[$index]['filemarhun'] = $fileMarhun;
|
||||
}
|
||||
$marhun = LelongBidMarhun::where('lelongbid_id', '=', $hargabida->id)->get()->toArray();
|
||||
$groupBycaw[$index]['lelongbidmarhun'] = $marhun;
|
||||
|
||||
$totalbida = Lelongbidder::where('id', $hargabida->bidder_id)
|
||||
->select('hargabida')
|
||||
->first();
|
||||
$groupBycaw[$index]['hargabida'] = number_format($totalbida['hargabida'], 2, '.', ',');
|
||||
$total_hargabida = $total_hargabida + $totalbida['hargabida'];
|
||||
if($hargabida->status_payment == null) {
|
||||
$status_payment_cawangan = null;
|
||||
}
|
||||
}
|
||||
|
||||
$sag = $groupBycaw;
|
||||
array_push($data, [
|
||||
'kodcaw' => $kodCawangan,
|
||||
'cawangan' => $namaCawangan,
|
||||
'sag' => $sag,
|
||||
'total_hargabida' => $total_hargabida
|
||||
'total_hargabida' => number_format($total_hargabida, 2, '.', ','),
|
||||
'status_payment_cawangan' => $status_payment_cawangan
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -601,6 +639,9 @@ class LelongMobileController extends Controller
|
||||
$getTarikhLelong = Lelong::where('id', $lelong_id)->select('tarikh_lelong')->first();
|
||||
$tarikhLelong = $getTarikhLelong->tarikh_lelong;
|
||||
|
||||
$date_convert = strtotime($tarikhLelong);
|
||||
$tarikhLelong = date("d-m-Y", $date_convert);
|
||||
|
||||
$data = [];
|
||||
|
||||
foreach ($sag as $index1 => $kodcaw) {
|
||||
@@ -773,6 +814,16 @@ class LelongMobileController extends Controller
|
||||
'cawangan_lelong.masatamat_lelong',
|
||||
)
|
||||
->get();
|
||||
|
||||
foreach($lelong as $index => $data)
|
||||
{
|
||||
$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()) {
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
@@ -838,6 +889,12 @@ class LelongMobileController extends Controller
|
||||
->orderBy('lelong.tarikh_lelong', 'ASC')
|
||||
->get()->toArray();
|
||||
|
||||
foreach($lelong as $index => $data)
|
||||
{
|
||||
$date_convert = strtotime($data['tarikh_lelong']);
|
||||
$lelong[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert);
|
||||
}
|
||||
|
||||
if ($lelong) {
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
@@ -1027,11 +1084,16 @@ class LelongMobileController extends Controller
|
||||
|
||||
public function getInvoiceId(Request $request) {
|
||||
$invoice = Invoice::where('user_id', $request->user_id)->where('lelong_id', $request->lelong_id)->first();
|
||||
$lelong = Lelong::find($request->lelong_id);
|
||||
|
||||
$date_convert = strtotime($lelong->tarikh_lelong);
|
||||
$lelong->tarikh_lelong = date("d/m/Y", $date_convert);
|
||||
|
||||
if ($invoice) {
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'invoice' => $invoice,
|
||||
'lelong' => $lelong
|
||||
]);
|
||||
} else {
|
||||
return response()->json([
|
||||
@@ -1071,6 +1133,9 @@ class LelongMobileController extends Controller
|
||||
|
||||
}
|
||||
|
||||
$date_convert = strtotime($tarikhLelong->tarikh_lelong);
|
||||
$lelong[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert);
|
||||
|
||||
$lelong[$index]['jumlah'] = number_format($jumlah, 2, '.', ',');
|
||||
$lelong[$index]['status'] = $status;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user