diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 4cff9052..843d3507 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -182,7 +182,7 @@ class ApiController extends Controller // dd($response2->toArray()); $resit = new Resit; $resit->user_id = $request->user_id; - $resit->lelongbid_id = null; + $resit->lelong_id = $request->lelong_id; $resit->reference_no = $reference_no; $resit->billplz_id = $billcode['id']; $resit->resit_type = 1; @@ -220,6 +220,7 @@ class ApiController extends Controller $payment = new Payment; $payment->user_id = $resit->user_id; + $payment->lelong_id = $resit->lelong_id; $payment->total_payment = $resit->total_payment; $payment->resit_id = $resit->id; $payment->status_payment_opt = 2; //bayar secara online 2 @@ -274,6 +275,7 @@ class ApiController extends Controller $payment = new Payment; $payment->user_id = $resit->user_id; + $payment->lelong_id = $resit->lelong_id; $payment->total_payment = $resit->total_payment; $payment->resit_id = $resit->id; $payment->status_payment_opt = 2; //bayar secara online 2 diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php index 4ef4bced..6d4ae5ab 100644 --- a/app/Http/Controllers/AuthMobile/AuthController.php +++ b/app/Http/Controllers/AuthMobile/AuthController.php @@ -50,6 +50,7 @@ class AuthController extends Controller $user->notelbimbit = $fields['notelbimbit']; $user->register_agree = $fields['register_agree']; $user->t_daftar = $currentdate; + $user->status = 'inprogress'; $user->user_type = 2; //type 2 = pembida diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index ae0c8efc..937886ac 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -72,7 +72,7 @@ class LelongMobileController extends Controller ->first(); $carts = Cart::join('lelongbid', 'carts.lelongbid_id', '=', 'lelongbid.id') - join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') + ->join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') ->where('lelong.sts_lelong','=',1) ->where('carts.user_id', $user->id) ->select('lelongbid.id as lelongbid_id', diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index fbdbc725..17e1dc01 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -108,7 +108,7 @@ class PaymentController extends Controller // } - return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid')); + return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id')); } public function paymentdenokaunter(Request $request){ @@ -121,7 +121,7 @@ class PaymentController extends Controller $bid_id = explode(",", $request->eachbid); - $resit = Resit::where('lelong_id', $lelong_id) + $resit = Resit::where('lelong_id', $request->lelong_id) ->first(); $total_hargabida = 0; diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index b846638b..591f16e5 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -34,7 +34,7 @@ class PembidaController extends Controller // $alluser = User::all(); $alluser = User::doesntHave('roles') ->where('user_type','=',2) - ->where('status', '!=', 'rejected') + ->where('status', '=', 'inprogress') ->get(); // dd($alluser); diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 8445cc62..6792a501 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -64,6 +64,7 @@
@csrf +
@@ -79,12 +80,12 @@
- +
- +
@@ -108,37 +109,37 @@ RM1 - - - - - RM0.05 - - - RM5 - - - - - RM0.10 - - - RM10 - RM0.20 + RM0.05 + + + RM5 - RM20 + + + RM0.10 + + + RM10 - RM0.50 + RM0.20 + + + RM20 + + + RM0.50 + + RM50 @@ -187,19 +188,13 @@ $('#denominasiHQModal').modal('show'); var total_sum = parseFloat($('#total').val()); $('#amaundiminta').val(parseFloat(total_sum).toFixed(2)); + $('#amaunkiraan').val(parseFloat(0).toFixed(2)); } function sum(val, e){ //e = get all data - if(arraylelongbid.length != 0) - { - $("#btnterima").prop("disabled", false); - } - else - { - $("#btnterima").prop("disabled", true); - } - + console.log(arraylelongbid.length); + let bid_id = $(e).data('bid_id'); - console.log(bid_id); + // console.log(bid_id); if(e.checked==true) //checkbox { arraylelongbid.push(bid_id); @@ -209,37 +204,27 @@ } else{ var index = arraylelongbid.findIndex(function(item) {return item == bid_id}); - console.log(index); + // console.log(index); arraylelongbid.splice(index, 1); var total_sum = parseFloat($('#total').val()); total_sum = total_sum - parseFloat(val); $('#total').val(parseFloat(total_sum).toFixed(2)); } - console.log(arraylelongbid); + // console.log(arraylelongbid); + if(arraylelongbid.length != 0) + { + $("#btnterima").prop("disabled", false); + } + else + { + $("#btnterima").prop("disabled", true); + } } function totalamount(idwang,bilangan) { var amount = 0; - switch (idwang) { - case 'bundle1': - amount += (bilangan * 100); - break; - case 'bundle20': - amount += (bilangan * 1000); - break; - case 'bundle5': - amount += (bilangan * 500); - break; - case 'bundle50': - amount += (bilangan * 5000); - break; - case 'bundle10': - amount += (bilangan * 1000); - break; - case 'bundle100': - amount += (bilangan * 5000); - break; + switch (idwang) { case 'sen1': amount += (bilangan * 0.01); break; @@ -247,8 +232,8 @@ amount += (bilangan * 0.05); break; case 'sen10': - amount += (bilangan * 0.10); - break; + amount += (bilangan * 0.10); + break; case 'sen20': amount += (bilangan * 0.20); break; @@ -306,22 +291,6 @@ amount += arr[1]; }); - // if(id === 'serahan') - // { - // var deno = $(datakeyin).data('deno'); - - // if(valkey > deno) - // { - // $.alert({ - // title: 'Alert!', - // content: 'Simple alert!', - // }); - - // return false; - // } - - // } - if(amount > validate) { $.alert({ @@ -332,7 +301,7 @@ else { - $('#amaunkiraan').val(amount); + $('#amaunkiraan').val(parseFloat(amount).toFixed(2)); }