From aba94d2d2b346ac8da97247c7850d95b8d9272d7 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <hafpkb@Hafifies-MacBook-Pro.local>
Date: Tue, 12 Dec 2023 15:37:12 +0800
Subject: [PATCH] fix hapus tebus text and customercontroller version in
 customer info

---
 app/Http/Controllers/CustomersController.php | 6 +++---
 resources/views/customers/v1/info.blade.php  | 2 +-
 resources/views/customers/v2/info.blade.php  | 2 +-
 resources/views/penebusan/v2/index.blade.php | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php
index 788df1f..ac8a6b8 100644
--- a/app/Http/Controllers/CustomersController.php
+++ b/app/Http/Controllers/CustomersController.php
@@ -96,7 +96,7 @@ class CustomersController extends Controller
         if($customer_info){
             if($blacklist){
                 $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{
                 Session::put('customer_info',$customer_info);
                 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{
             if($blacklist){
                 $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{
-                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'));
             }
         }
     }
diff --git a/resources/views/customers/v1/info.blade.php b/resources/views/customers/v1/info.blade.php
index 39c7d22..6472b7a 100644
--- a/resources/views/customers/v1/info.blade.php
+++ b/resources/views/customers/v1/info.blade.php
@@ -2168,7 +2168,7 @@
                                             if(data != "Bukan-Tebus"){
                                                 swalWithBootstrapButtons.fire(
                                                     'Hapus!',
-                                                    'Maklumat gadaian telah dihapuskan.',
+                                                    'Maklumat tebus telah dihapuskan.',
                                                     'success'
                                                 ).then(function () {
                                                     location.reload();
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php
index e92c9ca..a56a1e2 100644
--- a/resources/views/customers/v2/info.blade.php
+++ b/resources/views/customers/v2/info.blade.php
@@ -2225,7 +2225,7 @@
                                             if(data != "Bukan-Tebus"){
                                                 swalWithBootstrapButtons.fire(
                                                     'Hapus!',
-                                                    'Maklumat gadaian telah dihapuskan.',
+                                                    'Maklumat tebus telah dihapuskan.',
                                                     'success'
                                                 ).then(function () {
                                                     location.reload();
diff --git a/resources/views/penebusan/v2/index.blade.php b/resources/views/penebusan/v2/index.blade.php
index 14b677a..e5fd27b 100644
--- a/resources/views/penebusan/v2/index.blade.php
+++ b/resources/views/penebusan/v2/index.blade.php
@@ -1296,7 +1296,7 @@
             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');
                 $("#terima_transaksi").prop('disabled', false);
 
@@ -1424,7 +1424,7 @@
 
             if(isNaN(duitpelanggan)) duitpelanggan = 0;
 
-            if(duitpelanggan < bayar){
+            if(Number(duitpelanggan) < Number(bayar)){
                 Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
                 $("#terima_transaksi").prop('disabled', false);
 
@@ -2249,7 +2249,7 @@
 
             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');
                 $("#terima_transaksi").prop('disabled', false);