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

fix hapus tebus text and customercontroller version in customer info

Browse Source
This commit is contained in:
Hafifie PKB
2023-12-12 15:37:12 +08:00
parent 1a851feaec
commit aba94d2d2b
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomersController.php
+3 -3
View File
@@ -96,7 +96,7 @@ class CustomersController extends Controller
if($customer_info){ if($customer_info){
if($blacklist){ if($blacklist){
$blacklist_search = true; $blacklist_search = true;
return view('customers.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype')); return view('customers.' . $cawangan_info['version'] .'.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype'));
}else{ }else{
Session::put('customer_info',$customer_info); Session::put('customer_info',$customer_info);
return redirect()->route('customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); return redirect()->route('customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]);
@@ -104,9 +104,9 @@ class CustomersController extends Controller
}else{ }else{
if($blacklist){ if($blacklist){
$blacklist_search = true; $blacklist_search = true;
return view('customers.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype')); return view('customers.' . $cawangan_info['version'] . '.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype'));
}else{ }else{
return view('customers.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype')); return view('customers.' . $cawangan_info['version'] . '.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype'));
} }
} }
} }
resources/views/customers/v1/info.blade.php
+1 -1
View File
@@ -2168,7 +2168,7 @@
if(data != "Bukan-Tebus"){ if(data != "Bukan-Tebus"){
swalWithBootstrapButtons.fire( swalWithBootstrapButtons.fire(
'Hapus!', 'Hapus!',
'Maklumat gadaian telah dihapuskan.', 'Maklumat tebus telah dihapuskan.',
'success' 'success'
).then(function () { ).then(function () {
location.reload(); location.reload();
resources/views/customers/v2/info.blade.php
+1 -1
View File
@@ -2225,7 +2225,7 @@
if(data != "Bukan-Tebus"){ if(data != "Bukan-Tebus"){
swalWithBootstrapButtons.fire( swalWithBootstrapButtons.fire(
'Hapus!', 'Hapus!',
'Maklumat gadaian telah dihapuskan.', 'Maklumat tebus telah dihapuskan.',
'success' 'success'
).then(function () { ).then(function () {
location.reload(); location.reload();
resources/views/penebusan/v2/index.blade.php
+3 -3
View File
@@ -1296,7 +1296,7 @@
var bakipelanggan = $('#bakiPelanggan').val().replace(/[^0-9.-]+/g,""); var bakipelanggan = $('#bakiPelanggan').val().replace(/[^0-9.-]+/g,"");
if(duitpelanggan < bakipinjaman){ if(Number(duitpelanggan) < Number(bakipinjaman)){
Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error'); Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
$("#terima_transaksi").prop('disabled', false); $("#terima_transaksi").prop('disabled', false);
@@ -1424,7 +1424,7 @@
if(isNaN(duitpelanggan)) duitpelanggan = 0; if(isNaN(duitpelanggan)) duitpelanggan = 0;
if(duitpelanggan < bayar){ if(Number(duitpelanggan) < Number(bayar)){
Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error'); Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
$("#terima_transaksi").prop('disabled', false); $("#terima_transaksi").prop('disabled', false);
@@ -2249,7 +2249,7 @@
var duitpelanggan = parseFloat($('#duitPelanggan').val().replace(/[^0-9.-]+/g,"")); var duitpelanggan = parseFloat($('#duitPelanggan').val().replace(/[^0-9.-]+/g,""));
if(duitpelanggan < parseFloat($('#perludibayarAT').val())){ if(Number(duitpelanggan) < parseFloat($('#perludibayarAT').val())){
Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error'); Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
$("#terima_transaksi").prop('disabled', false); $("#terima_transaksi").prop('disabled', false);