From ca6d7c9a26896c0620c4ce16c739a88eae430013 Mon Sep 17 00:00:00 2001 From: Amir Date: Mon, 4 Dec 2023 09:40:04 +0800 Subject: [PATCH 1/2] Update content for resit tebus & ansuran --- .../views/print/resitansuran_ujrah.blade.php | 48 ++++++++------- .../views/print/resittebus_ujrah.blade.php | 61 +++++++++---------- 2 files changed, 56 insertions(+), 53 deletions(-) diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php index 9129dea..546952d 100644 --- a/resources/views/print/resitansuran_ujrah.blade.php +++ b/resources/views/print/resitansuran_ujrah.blade.php @@ -6,10 +6,10 @@ @@ -404,19 +404,12 @@ User Image - User Image - - - - -
Salinan Pelanggan
RESIT BAYARAN

@@ -463,7 +456,7 @@ - + @@ -528,7 +521,7 @@
Tempoh Simpan: {{ $gadai['tempoh'] }}: {{ $transaction['beza_tempoh'] }}
: RM {{ number_format($transaction['duit_masuk'], 2) }}
-

+

Marhun: {{ $gadai['marhun'] }}


@@ -555,17 +548,16 @@
+ + +
User Image
- - - - -
Salinan Pejabat
RESIT BAYARAN

@@ -613,7 +605,7 @@ Tempoh Simpan - : {{ $gadai['tempoh'] }} + : {{ $transaction['beza_tempoh'] }} @@ -678,7 +670,7 @@ : RM {{ number_format($transaction['duit_masuk'], 2) }} -

+

Marhun: {{ $gadai['marhun'] }}


@@ -696,6 +688,18 @@ Ar-Rahn
{{ Auth::user()->name }} -
-
+ + + + + + + + + + + + + +
Duit Pelanggan: RM {{ number_format($transaction['duitpelanggan'], 2) }}
Jumlah Perlu Dibayar: RM {{ number_format($transaction['duit_masuk'], 2) }}
Baki: RM {{ number_format($transaction['bakipelanggan'], 2) }}
diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php index f3d4338..16627ae 100644 --- a/resources/views/print/resittebus_ujrah.blade.php +++ b/resources/views/print/resittebus_ujrah.blade.php @@ -7,8 +7,10 @@ @@ -413,20 +415,12 @@ User Image - User Image - - - - - -
Salinan Pelanggan
RESIT BAYARAN
@@ -476,7 +470,7 @@ Tempoh Simpan - : {{ $gadai['tempoh'] }} + : {{ $transaction_tebus['beza_tempoh'] }} @@ -493,8 +487,8 @@ Masa Bayaran @php - $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']); - $masa = date('H:i:s', $masa_bayaran); + $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']); + $masa = date('H:i:s', $masa_bayaran); @endphp : {{ $masa }} @@ -533,15 +527,11 @@ - @php - $jumlah_perlu_dibayar = $penebusan['bakipjm'] + $penebusan['onepercent'] - $transaction_tebus['onepercent_rebet'] + $penebusan['ujrah'] - $transaction_tebus['ujrah_rebet']; - @endphp Jumlah Perlu Dibayar : RM {{ number_format($transaction_tebus['duit_masuk'], 2) }} - -

+

Marhun: {{ $gadai['marhun'] }}

@@ -565,20 +555,18 @@

-
-
+ + +
User Image
- - - -
Salinan Pejabat
RESIT BAYARAN
@@ -627,7 +615,7 @@ Tempoh Simpan - : {{ $gadai['tempoh'] }} + : {{ $transaction_tebus['beza_tempoh'] }} @@ -644,8 +632,8 @@ Masa Bayaran @php - $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']); - $masa = date('H:i:s', $masa_bayaran); + $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']); + $masa = date('H:i:s', $masa_bayaran); @endphp : {{ $masa }} @@ -685,15 +673,12 @@ - @php - $jumlah_perlu_dibayar = $penebusan['bakipjm'] + $penebusan['onepercent'] - $transaction_tebus['onepercent_rebet'] + $penebusan['ujrah'] - $transaction_tebus['ujrah_rebet']; - @endphp Jumlah Perlu Dibayar : RM {{ number_format($transaction_tebus['duit_masuk'], 2) }} -

+

Marhun: {{ $gadai['marhun'] }}

@@ -714,4 +699,18 @@
+ + + + + + + + + + + + + +
Duit Pelanggan: RM {{ number_format($transaction_tebus['duitpelanggan'], 2) }}
Jumlah Perlu Dibayar: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}
Baki: RM {{ number_format($transaction_tebus['bakipelanggan'], 2) }}
From 9aa14e17ff2db1b566e896927cee10a2716a2167 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Mon, 4 Dec 2023 09:44:06 +0800 Subject: [PATCH 2/2] fix penebusan layout dan resit tebus tukar rebate --- resources/views/penebusan/index.blade.php | 2 +- resources/views/print/resittebus_ujrah.blade.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index dbb18b7..3fd89ba 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -1248,7 +1248,7 @@ var nowakil = nw; var duitpelanggan = $('#duitPelanggan').val().replace(/[^0-9.-]+/g,""); var bakipelanggan = $('#bakiPelanggan').val().replace(/[^0-9.-]+/g,""); - + console.log('test'); $.ajax({ method:'get', datatype: 'json', diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php index 16627ae..193f727 100644 --- a/resources/views/print/resittebus_ujrah.blade.php +++ b/resources/views/print/resittebus_ujrah.blade.php @@ -499,7 +499,7 @@ - + @@ -507,7 +507,7 @@ - + @@ -515,7 +515,7 @@ - + @@ -645,7 +645,7 @@
Baki Pembiayaan: RM {{ number_format($penebusan['bakipjm'], 2) }} : RM {{ number_format($gadai['bakipjm'], 2) }}
Keuntungan
(-) Rebat Untung: RM {{ number_format($transaction_tebus['onepercent_rebet'], 2) }} : RM {{ number_format(($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet']), 2) }}
Ujrah
(-) Rebat Ujrah: RM {{ number_format($transaction_tebus['ujrah_rebet'], 2) }} : RM {{ number_format(($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet']), 2) }}
- + @@ -653,7 +653,7 @@ - + @@ -661,7 +661,7 @@ - +
Baki Pembiayaan: RM {{ number_format($penebusan['bakipjm'], 2) }} : RM {{ number_format($gadai['bakipjm'], 2) }}
Keuntungan
(-) Rebat Untung: RM {{ number_format($transaction_tebus['onepercent_rebet'], 2) }} : RM {{ number_format(($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet']), 2) }}
Ujrah
(-) Rebat Ujrah: RM {{ number_format($transaction_tebus['ujrah_rebet'], 2) }} : RM {{ number_format(($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet']), 2) }}