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

Merge branch 'faiqahzaman' of https://gitlab.com/azfararsyad/lelong into faiqahzaman

Browse Source
This commit is contained in:
faiqahzaman
2022-02-24 16:47:52 +08:00
parent 37997410d6 6f38796d12
commit 81d4a8f76d
6 changed files with 48 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ApiController.php
+3 -1
View File
@@ -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
app/Http/Controllers/AuthMobile/AuthController.php
+1
View File
@@ -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
app/Http/Controllers/Mobile/LelongMobileController.php
+1 -1
View File
@@ -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',
app/Http/Controllers/PaymentController.php
+2 -2
View File
@@ -105,7 +105,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){
@@ -118,7 +118,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;
app/Http/Controllers/PembidaController.php
+1 -1
View File
@@ -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);
resources/views/pembayaran/SAGBidItem.blade.php
+40 -71
View File
@@ -64,6 +64,7 @@
<form action="{{ route('pembayaran.paymentdenokaunter') }}" method="POST" id="formpaymentdenokaunter">
@csrf
<input type="hidden" name="user_id" value="{{ $SAGBidItem->id }}" />
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
<input type="hidden" name="eachbid" id="eachbid" value="" />
<div class="modal-content">
@@ -79,12 +80,12 @@
</div>
<div class="col" style="margin: 11px;">
<label>Amaun Sebenar</label>
<input type="text" class="form-control" id="amaundiminta" placeholder="0.00" readonly>
<input type="text" class="form-control" id="amaundiminta" value="0.00" readonly>
</div>
<div class="col" style="margin: 11px;">
<label>Amaun Kiraan</label>
<input type="text" class="form-control" name="amaunkiraan" id="amaunkiraan" placeholder="0.00" readonly>
<input type="text" class="form-control" name="amaunkiraan" id="amaunkiraan" value="0.00" readonly>
</div>
</div>
</div>
@@ -108,37 +109,37 @@
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen1" id="totalsen1" class="form-control" value="0.00" readonly /> </td>
<td>RM1</td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.05</td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly /> </td>
<td>RM5</td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen50" id="totalsen50" class="form-control" value="0.00" readonly /> </td>
<td>RM10</td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.20</td>
<td>RM0.05</td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly /> </td>
<td>RM5</td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring5" id="totalring5" class="form-control" value="0.00" readonly /> </td>
<td> RM20</td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly /> </td>
<td>RM10</td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring10" id="totalring10" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.50</td>
<td>RM0.20</td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly /> </td>
<td> RM20</td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring20" id="totalring20" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.50</td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen500" id="totalsen50" class="form-control" value="0.00" readonly /> </td>
<td>RM50</td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring50" id="totalring50" class="form-control" value="0.00" readonly /> </td>
@@ -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));
}