From da466fd8287060b4682a094ca594f489b27523e9 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 1 Mar 2021 14:41:41 +0800 Subject: [PATCH] fix skit2 tambah lelongan --- resources/views/customers/info.blade.php | 26 +++++++++---------- resources/views/lelongan/index.blade.php | 26 ++++++++++++++++--- resources/views/penebusan/index.blade.php | 8 +++--- resources/views/print/resitansuran.blade.php | 4 +-- .../views/print/resittambahpinjam.blade.php | 4 +-- resources/views/print/resittebus.blade.php | 4 +-- .../views/print/resittebusseparuh.blade.php | 4 +-- 7 files changed, 47 insertions(+), 29 deletions(-) diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 815df13..86391ed 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -350,13 +350,13 @@ Bil No Rujukan - Tarikh Gadai - Tarikh Matang - Baki Harga Jualan - Baki Pembiayaan - Margin - Tempoh + Tarikh Lelong + Tarikh Tuntut + Pembiayaan + Harga Jual + Jum Tuntut/Bayar Keuntungan + Caj Lelong @@ -468,13 +468,13 @@ tablelelong.row.add([ counter, '' + gadai_detail['norujukan'] + '', - gadai_detail['t_gadai'], - gadai_detail['t_matang1'], - '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['jbg'], - 'RM '+ formatter.format(upahsemasa) + gadai_detail['t_lelong'], + gadai_detail['trkhtuntut'], + 'RM '+ formatter.format(gadai_detail['pinjaman']), + 'RM '+formatter.format(gadai_detail['hargajual']), + 'RM '+formatter.format(gadai_detail['baki']), + 'RM '+formatter.format(gadai_detail['bakiupah']), + 'RM '+formatter.format(gadai_detail['cajlelong']) ]).draw(); } counter = counter + 1; diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index c1ea2e6..686f30d 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -85,6 +85,15 @@
+ +
+
+ TARIKH +
+
+ +
+
@@ -97,7 +106,7 @@
- HARGA JUAL + HARGA JUAL (RM)
@@ -106,7 +115,7 @@
- PEMBIAYAAN + PEMBIAYAAN (RM)
@@ -117,6 +126,15 @@
+
+
+ BATCH LELONG +
+
+ +
+
+
KEUNTUNGAN (RM) @@ -140,7 +158,7 @@ JUMLAH (RM)
- +
@@ -149,7 +167,7 @@
- +
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 474f2fa..ac56e34 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -825,7 +825,7 @@ text: 'Penebusan Berjaya', }).then(function() { window.open(urlroute, '_blank'); - window.location.replace("{{ url()->previous() }}"); + window.location.replace("{{ route('customer_info') }}"); }) } }); @@ -878,7 +878,7 @@ 'success' ).then(function() { window.open(urlroute, '_blank'); - window.location.replace("{{ url()->previous() }}"); + window.location.replace("{{ route('customer_info') }}"); }) } }); @@ -1158,7 +1158,7 @@ 'success' ) .then(function() { window.open(urlroute, '_blank'); - window.location.replace("{{ url()->previous() }}"); + window.location.replace("{{ route('customer_info') }}"); }) },error: function (request, status, error) { console.log(request.responseText); @@ -1515,7 +1515,7 @@ 'success' ).then(function() { window.open(urlroute, '_blank'); - window.location.replace("{{ url()->previous() }}"); + window.location.replace("{{ route('customer_info') }}"); }) },error: function (request, status, error) { console.log(request.responseText); diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php index 84deb83..f542897 100644 --- a/resources/views/print/resitansuran.blade.php +++ b/resources/views/print/resitansuran.blade.php @@ -409,7 +409,7 @@ hr.new5 { -No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }} +No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['tempoh'] }} @@ -502,7 +502,7 @@ hr.new5 { -No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }} +No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['tempoh'] }} diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php index 4cfd739..7aec9d4 100644 --- a/resources/views/print/resittambahpinjam.blade.php +++ b/resources/views/print/resittambahpinjam.blade.php @@ -409,7 +409,7 @@ hr.new5 { -No K/P : {{ $customers_info['kpbaru'] }} : Tempoh Simpan {{ $gadai['jbg'] }} +No K/P : {{ $customers_info['kpbaru'] }} : Tempoh Simpan {{ $gadai['tempoh'] }} @@ -505,7 +505,7 @@ hr.new5 { -No K/P : {{ $customers_info['kpbaru'] }} : Tempoh Simpan {{ $gadai['jbg'] }} +No K/P : {{ $customers_info['kpbaru'] }} : Tempoh Simpan {{ $gadai['tempoh'] }} Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php index 19b0cf5..5a9a819 100644 --- a/resources/views/print/resittebus.blade.php +++ b/resources/views/print/resittebus.blade.php @@ -410,7 +410,7 @@ hr.new5 { -No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }} +No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['tempoh'] }} @@ -509,7 +509,7 @@ hr.new5 { -No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }} +No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['tempoh'] }} diff --git a/resources/views/print/resittebusseparuh.blade.php b/resources/views/print/resittebusseparuh.blade.php index cb242ba..30659e8 100644 --- a/resources/views/print/resittebusseparuh.blade.php +++ b/resources/views/print/resittebusseparuh.blade.php @@ -410,7 +410,7 @@ hr.new5 { -No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }} +No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['tempoh'] }} @@ -511,7 +511,7 @@ hr.new5 { -No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }} +No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['tempoh'] }}