From a02b819676d87883629b6fbbee603349ae60fc86 Mon Sep 17 00:00:00 2001 From: BTMS2 Date: Tue, 22 Oct 2024 10:35:54 +0800 Subject: [PATCH 01/10] tambah column tarikh pembayaran terakhir di arcc --- resources/views/callcenter/v2/info.blade.php | 25 +++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/resources/views/callcenter/v2/info.blade.php b/resources/views/callcenter/v2/info.blade.php index c1193f9..2b47955 100644 --- a/resources/views/callcenter/v2/info.blade.php +++ b/resources/views/callcenter/v2/info.blade.php @@ -9,7 +9,7 @@ @section('content') @include('modal.historytebus') @include('modal.wakil') -
+
@@ -175,6 +175,7 @@ Tempoh Keuntungan Lelong + Pembayaran Terakhir @@ -203,6 +204,7 @@ Tempoh Keuntungan Lelong + Pembayaran Terakhir @@ -758,6 +760,7 @@ if(gadai_detail["tagbaru"] == 0){ $('#textnavsag').addClass('text-danger'); var taglel = ''; + var lastbayar = ''; if(gadai_detail['taglel'] == 1){ if(tagarrahnbid == 1){ $.ajax({ @@ -767,6 +770,8 @@ success: function(data){ taglel = data.lelong.t_lelong; + console(taglel); + lastbayar = data.lelong.lastbayar; } }); } else { @@ -791,18 +796,20 @@ if(gadai_detail["percentpinj"] != 0) xtawarruq.row.add([ '', - '' + gadai_detail['norujukan'] + '', + '' + gadai_detail['norujukan'] + '', gadai_detail['t_gadai'], tarikh_matang, - 'RM '+ formatter.format(gadai_detail['bakihargajualan']), - 'RM '+formatter.format(gadai_detail['bakipjm']), + 'RM'+ formatter.format(gadai_detail['bakihargajualan']), + 'RM'+formatter.format(gadai_detail['bakipjm']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', gadai_detail['tempoh'], - 'RM '+ upahsemasa, + 'RM'+ upahsemasa, '
' + taglel + '
', + '
' + lastbayar + '
', ]).draw(); }else{ var taglel = ''; + var lastbayar = ''; if(gadai_detail['taglel'] == 1){ if(tagarrahnbid == 1){ $.ajax({ @@ -812,6 +819,7 @@ success: function(data){ taglel = data.lelong.t_lelong; + lastbayar = data.lelong.lastbayar; } }); } else { @@ -837,12 +845,13 @@ '' + gadai_detail['norujukan'] + '', gadai_detail['t_gadai'], tarikh_matang, - 'RM '+ formatter.format(gadai_detail['bakihargajualan']), - 'RM '+formatter.format(gadai_detail['bakipjm']), + 'RM'+ formatter.format(gadai_detail['bakihargajualan']), + 'RM'+formatter.format(gadai_detail['bakipjm']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', gadai_detail['tempoh'], - 'RM '+ formatter.format(upahsemasa['pendapatan']), + 'RM'+ formatter.format(upahsemasa['pendapatan']), '
' + taglel + '
', + '
' + lastbayar + '
', ]).draw(); } }else if(jenistebus == "sudah_tebus"){ From 04f2e5d7549fb8dbdecfc25ee7384d69ba6e77fc Mon Sep 17 00:00:00 2001 From: BTMS2 Date: Tue, 22 Oct 2024 11:45:17 +0800 Subject: [PATCH 02/10] update arcc pembayaran terakhir --- resources/views/customers/v2/info.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index 970f9c6..1fa89f6 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -1617,7 +1617,7 @@ }); } - function ubahPembiayaanSemulaErrorHandling() + async function ubahPembiayaanSemulaErrorHandling() { let selected = document.querySelector('#navtawarruqdannottawarruq input[type="radio"][name="belum"]:checked') @@ -1638,7 +1638,7 @@ return true; } - let isPS = checkPS(selected.value) + let isPS = await checkPS(selected.value) if(isPS === true){ Swal.fire({ @@ -1653,9 +1653,9 @@ return false; } - function ubahfunc(e){ + async function ubahfunc(e){ - let isError = ubahPembiayaanSemulaErrorHandling() + let isError = await ubahPembiayaanSemulaErrorHandling() if(isError){ return; } From bb3c832166c51946667b06913be8eb4ec09f32fa Mon Sep 17 00:00:00 2001 From: BTMS2 Date: Tue, 22 Oct 2024 11:52:10 +0800 Subject: [PATCH 03/10] update arcc pembayaran terakhir --- resources/views/customers/v2/info.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index 1fa89f6..970f9c6 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -1617,7 +1617,7 @@ }); } - async function ubahPembiayaanSemulaErrorHandling() + function ubahPembiayaanSemulaErrorHandling() { let selected = document.querySelector('#navtawarruqdannottawarruq input[type="radio"][name="belum"]:checked') @@ -1638,7 +1638,7 @@ return true; } - let isPS = await checkPS(selected.value) + let isPS = checkPS(selected.value) if(isPS === true){ Swal.fire({ @@ -1653,9 +1653,9 @@ return false; } - async function ubahfunc(e){ + function ubahfunc(e){ - let isError = await ubahPembiayaanSemulaErrorHandling() + let isError = ubahPembiayaanSemulaErrorHandling() if(isError){ return; } From d4aa5aadb6c8d75f459930df792aeefc12f0a597 Mon Sep 17 00:00:00 2001 From: BTMS2 Date: Tue, 22 Oct 2024 12:02:56 +0800 Subject: [PATCH 04/10] update sag lama lastpayment arcc --- resources/views/callcenter/v2/info.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/callcenter/v2/info.blade.php b/resources/views/callcenter/v2/info.blade.php index 2b47955..f846e96 100644 --- a/resources/views/callcenter/v2/info.blade.php +++ b/resources/views/callcenter/v2/info.blade.php @@ -770,7 +770,6 @@ success: function(data){ taglel = data.lelong.t_lelong; - console(taglel); lastbayar = data.lelong.lastbayar; } }); From 1b3068b14a4bb89d264e168af7616b7a4b915bdb Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 24 Oct 2024 16:25:37 +0800 Subject: [PATCH 05/10] update nota di sag --- app/Http/Controllers/PenebusanController.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 44e4de4..b31d6ab 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -339,7 +339,7 @@ class PenebusanController extends Controller $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); + array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); } foreach($arraymarhunbaru as $array1){ @@ -350,6 +350,8 @@ class PenebusanController extends Controller 'karat' => $array1['karat'], 'berat_emas' => $array1['berat'], 'harga' => $array1['harga'], + 'tag_permata' => $array1['tag_permata'], + 'berat_batu_permata' => $array1['berat_batu_permata'], 'nilai_marhun' => $array1['n_marhun'] ])->json(); } @@ -494,7 +496,7 @@ class PenebusanController extends Controller $harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga']; $nilaimarhun = (floatval($harga) * floatval($marhunloop['berat'])); - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]); + array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]); } foreach($arraymarhunbaru as $array1){ @@ -506,6 +508,8 @@ class PenebusanController extends Controller 'berat_emas' => $array1['berat'], 'harga' => $array1['harga'], 'nilai_marhun' => $array1['n_marhun'], + 'tag_permata' => $array1['tag_permata'], + 'berat_batu_permata' => $array1['berat_batu_permata'], 'jenisAT' => $request->jenisAT ])->json(); } @@ -655,7 +659,7 @@ class PenebusanController extends Controller $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); + array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); } } @@ -668,6 +672,8 @@ class PenebusanController extends Controller 'karat' => $array1['karat'], 'berat_emas' => $array1['berat'], 'harga' => $array1['harga'], + 'tag_permata' => $array1['tag_permata'], + 'berat_batu_permata' => $array1['berat_batu_permata'], 'nilai_marhun' => $array1['n_marhun'] ])->json(); From e05e77495338fd93c3c42ea7e62fa312766aee74 Mon Sep 17 00:00:00 2001 From: Nurul Ain Izazi Date: Sun, 24 Nov 2024 05:18:40 +0800 Subject: [PATCH 06/10] update latest column di interface teller,khazanah,dan cc --- resources/views/callcenter/v2/info.blade.php | 20 +++--- resources/views/customers/v2/info.blade.php | 67 ++++++++++++-------- resources/views/khazanah/v2/info.blade.php | 60 +++++++++++------- 3 files changed, 91 insertions(+), 56 deletions(-) diff --git a/resources/views/callcenter/v2/info.blade.php b/resources/views/callcenter/v2/info.blade.php index f846e96..7f4dd31 100644 --- a/resources/views/callcenter/v2/info.blade.php +++ b/resources/views/callcenter/v2/info.blade.php @@ -1,3 +1,6 @@ +Call center + + @extends('layouts.app_callcenter') + @section('content') @include('modal.historytebus') @@ -10,7 +16,7 @@
- +
+ + +
+ +
+ +
+ +
+ + + +
+ +
+ + + +
+
+
+ + +