diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index ee56438..24ec56b 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -186,7 +186,7 @@ class AliranTunaiController extends Controller if($tebus_detail['jenistebus'] == 'S') { $totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk; - $bakiakhir = $bakiakhir + $tebus_detail['pinjaman'] + $tebus_detail['bakiupah']; + $bakiakhir = $bakiakhir + $tebus_detail['bakipjm']; }else{ $totalmasuk = $tebus_detail['bakipjm'] + $masuk; $bakiakhir = $bakiakhir + $tebus_detail['bakipjm']; diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php index c2fd086..c6e2391 100644 --- a/resources/views/khazanah/gadaian.blade.php +++ b/resources/views/khazanah/gadaian.blade.php @@ -235,6 +235,7 @@ 'norujukan': norujukan }, success:function(data){ + console.log(data); if(data == 'true'){ event.preventDefault(); return false; diff --git a/resources/views/khazanah/tebus.blade.php b/resources/views/khazanah/tebus.blade.php index d53bca7..cf3b82c 100644 --- a/resources/views/khazanah/tebus.blade.php +++ b/resources/views/khazanah/tebus.blade.php @@ -209,13 +209,14 @@ var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({ 'norujukan': norujukan }, success:function(data){ + console.log(data); if(data == 'true'){ event.preventDefault(); return false; Swal.fire({ icon: 'error', title: 'Amaran', - text: 'Gadaian Sudah Scan' + text: 'Penebusan Sudah Scan' }); }else if(data == 'false'){ $(func).attr("onSubmit","return true;");