From cb756879490728b948ae3d981c617eb9bcf6c280 Mon Sep 17 00:00:00 2001 From: Amir Date: Thu, 23 Nov 2023 11:18:34 +0800 Subject: [PATCH 1/5] add template for both receipt --- .../views/print/resitansuran_ujrah.blade.php | 717 +++++++++++++++++ .../views/print/resittebus_ujrah.blade.php | 726 ++++++++++++++++++ 2 files changed, 1443 insertions(+) create mode 100644 resources/views/print/resitansuran_ujrah.blade.php create mode 100644 resources/views/print/resittebus_ujrah.blade.php diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php new file mode 100644 index 0000000..51fb5d9 --- /dev/null +++ b/resources/views/print/resitansuran_ujrah.blade.php @@ -0,0 +1,717 @@ + + + + + + + + + + + + + + + + + + + + +
User Image User Image
+ + + + + + + + + +
Salinan Pelanggan
RESIT BAYARAN
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Marhun: {{ $gadai['marhun'] }} No SAG: {{ $transaction['norujukan'] }}
Nama: {{ $customers_info['nama'] }} Tarikh Bayar: @php + $time = new DateTime($transaction['created_at']); + $date = $time->format('d/m/Y'); + echo $date; + @endphp
No K/P : @php + if ($customers_info['kpbaru'] == '') { + echo $customers_info['kplama']; + } else { + echo $customers_info['kpbaru']; + } + @endphp Tempoh Simpanan: {{ $gadai['tempoh'] }}
Nama Wakil : @php + if (sizeof($wakil) != 0) { + echo $wakil['nama']; + } else { + echo ''; + } + @endphp
No K/P Wakil : @php + if (sizeof($wakil) != 0) { + echo $wakil['nokp']; + } else { + echo ''; + } + @endphp
+
+ +

A

+ + + + + + + + + + + + + + + + + + + + + + + + + +
Harga Jualan/Baki: RM {{ number_format($transaction['bakiharga'] + $transaction['duit_masuk'], 2) }} + Pembiayaan/Baki: RM {{ number_format($gadai['bakipjm'] + $transaction['bayaran_pembiayaan'], 2) }} +
Bayaran Harga Jualan: RM {{ number_format($transaction['duit_masuk'], 2) }} Ansuran Pembiyaan: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }}
Baki Harga Jualan: RM {{ number_format($transaction['bakiharga'], 2) }}Baki Pembiayaan: RM {{ number_format($gadai['bakipjm'], 2) }}
Keuntungan: RM {{ number_format($transaction['bayaran_keuntungan'], 2) }}
+

* Keuntungan sebenar atas setiap baki pembiayaan akan + direbat semasa penebusan

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
.................................................... .................................................... .................................................... ....................................................
DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
{{ Auth::user()->name }}
+
+
+
+ + +
+
+ + + + + + + + + + + + + +
Salinan Pejabat
RESIT BAYARAN
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Marhun: {{ $gadai['marhun'] }} No SAG: {{ $transaction['norujukan'] }}
Nama: {{ $customers_info['nama'] }} Tarikh Bayar: @php + $time = new DateTime($transaction['created_at']); + $date = $time->format('d/m/Y'); + echo $date; + @endphp
No K/P : @php + if ($customers_info['kpbaru'] == '') { + echo $customers_info['kplama']; + } else { + echo $customers_info['kpbaru']; + } + @endphp Tempoh Simpan: {{ $gadai['tempoh'] }}
Nama Wakil : @php + if (sizeof($wakil) != 0) { + echo $wakil['nama']; + } else { + echo ''; + } + @endphp
No K/P Wakil : @php + if (sizeof($wakil) != 0) { + echo $wakil['nokp']; + } else { + echo ''; + } + @endphp
+
+ +

A

+ + + + + + + + + + + + + + + + + + + + + + + + + +
Harga Jualan/Baki: RM {{ number_format($transaction['bakiharga'] + $transaction['duit_masuk'], 2) }} + Pembiayaan/Baki: RM {{ number_format($gadai['bakipjm'] + $transaction['bayaran_pembiayaan'], 2) }} +
Bayaran Harga Jualan: RM {{ number_format($transaction['duit_masuk'], 2) }} Ansuran Pembiyaan: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }}
Baki Harga Jualan: RM {{ number_format($transaction['bakiharga'], 2) }}Baki Pembiayaan: RM {{ number_format($gadai['bakipjm'], 2) }}
Keuntungan: RM {{ number_format($transaction['bayaran_keuntungan'], 2) }}
+

* Keuntungan sebenar atas setiap baki pembiayaan akan + direbat semasa penebusan

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
.................................................... .................................................... .................................................... ....................................................
DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
{{ Auth::user()->name }}
+
+ diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php new file mode 100644 index 0000000..ee39860 --- /dev/null +++ b/resources/views/print/resittebus_ujrah.blade.php @@ -0,0 +1,726 @@ + + + + + + + + + + + + + + + + + + + + + +
User Image User Image
+ + + + + + + + + + +
Salinan Pelanggan
RESIT BAYARAN
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Marhun: {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
Nama: {{ $customers_info['nama'] }} Tarikh Bayar: @php + $time = new DateTime($penebusan['t_tebus']); + $date = $time->format('d/m/Y'); + echo $date; + @endphp
No K/P : @php + if ($customers_info['kpbaru'] == '') { + echo $customers_info['kplama']; + } else { + echo $customers_info['kpbaru']; + } + @endphp Tempoh Simpan: {{ $gadai['tempoh'] }}
Nama Wakil : @php + if (sizeof($wakil) != 0) { + echo $wakil['nama']; + } else { + echo ''; + } + @endphp
No K/P Wakil : @php + if (sizeof($wakil) != 0) { + echo $wakil['nokp']; + } else { + echo ''; + } + @endphp
+
+ +

T

+ + + + + + + + + + + + + + + + + + + + + + +
Harga Jualan: RM {{ number_format($gadai['hargajualan'], 2) }}
(-) Jumlah Ansuran Telah Dibayar: RM {{ number_format($totalBayaranAnsuran, 2) }}
Baki Harga Jualan: RM {{ number_format($gadai['bakihargajualan'], 2) }}
(-) Ibra' (Rebat): RM {{ number_format($penebusan['rebate'], 2) }}
Tebus Keseluruhan: RM {{ number_format($gadai['bakihargajualan'] - $penebusan['rebate'], 2) }} +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
.................................................... .................................................... .................................................... ....................................................
DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
{{ Auth::user()->name }}
+
+
+
+ + +
+
+ + + + + + + + + + + + + +
Salinan Pejabat
RESIT BAYARAN
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Marhun: {{ $gadai['marhun'] }} + + No SAG: {{ $gadai['norujukan'] }}
Nama: {{ $customers_info['nama'] }} + + Tarikh Bayar: @php + $time = new DateTime($penebusan['t_tebus']); + $date = $time->format('d/m/Y'); + echo $date; + @endphp
No K/P : @php + if ($customers_info['kpbaru'] == '') { + echo $customers_info['kplama']; + } else { + echo $customers_info['kpbaru']; + } + @endphp + + Tempoh Simpan: {{ $gadai['tempoh'] }}
Nama Wakil : @php + if (sizeof($wakil) != 0) { + echo $wakil['nama']; + } else { + echo ''; + } + @endphp + +
No K/P Wakil : @php + if (sizeof($wakil) != 0) { + echo $wakil['nokp']; + } else { + echo ''; + } + @endphp +
+
+ +

T

+ + + + + + + + + + + + + + + + + + + + + + +
Harga Jualan: RM {{ number_format($gadai['hargajualan'], 2) }}
(-) Jumlah Ansuran Telah Dibayar: RM {{ number_format($totalBayaranAnsuran, 2) }}
Baki Harga Jualan: RM {{ number_format($gadai['bakihargajualan'], 2) }}
(-) Ibra' (Rebat): RM {{ number_format($penebusan['rebate'], 2) }}
Tebus Keseluruhan: RM {{ number_format($gadai['bakihargajualan'] - $penebusan['rebate'], 2) }} +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
.................................................... .................................................... .................................................... ....................................................
DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
{{ Auth::user()->name }}
+
+ From 2b81c5dd087dec3a890d7d368f42073b5317c736 Mon Sep 17 00:00:00 2001 From: Amir Date: Thu, 23 Nov 2023 13:39:26 +0800 Subject: [PATCH 2/5] Update resit ansuran --- app/Http/Controllers/GadaianController.php | 3 +- .../views/print/resitansuran_ujrah.blade.php | 220 ++++++++---------- 2 files changed, 97 insertions(+), 126 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 17d965c..c3ea243 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -385,7 +385,8 @@ class GadaianController extends Controller if(sizeof($wakil) != 0) $wakil = $wakil[0]; - return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil')); + // return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil')); + return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil')); } public function resitbelumansurans($id) diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php index 51fb5d9..64ba248 100644 --- a/resources/views/print/resitansuran_ujrah.blade.php +++ b/resources/views/print/resitansuran_ujrah.blade.php @@ -422,28 +422,14 @@ - - + + - - - - - - - - - - - - + + @@ -472,8 +462,8 @@ - - + + @@ -488,8 +478,8 @@ - - + +
Marhun: {{ $gadai['marhun'] }} Nama: {{ $customers_info['nama'] }} No SAG : {{ $transaction['norujukan'] }}
Nama: {{ $customers_info['nama'] }} Tarikh Bayar: @php - $time = new DateTime($transaction['created_at']); - $date = $time->format('d/m/Y'); - echo $date; - @endphp
No K/P : @php @@ -456,8 +442,12 @@ Tempoh Simpanan: {{ $gadai['tempoh'] }} Tarikh Bayar: @php + $time = new DateTime($transaction['created_at']); + $date = $time->format('d/m/Y'); + echo $date; + @endphp
Tempoh Simpan: {{ $gadai['tempoh'] }}
Masa Bayaran: --:--:--

@@ -497,61 +487,56 @@

A

- - - - - - - - - - - - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
Harga Jualan/Baki: RM {{ number_format($transaction['bakiharga'] + $transaction['duit_masuk'], 2) }} - Pembiayaan/Baki: RM {{ number_format($gadai['bakipjm'] + $transaction['bayaran_pembiayaan'], 2) }} -
Bayaran Harga Jualan: RM {{ number_format($transaction['duit_masuk'], 2) }} Ansuran Pembiyaan: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }}
Baki Harga Jualan: RM {{ number_format($transaction['bakiharga'], 2) }} Baki Pembiayaan : RM {{ number_format($gadai['bakipjm'], 2) }} Ansuran Pembiyaan: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }}
Keuntungan: RM {{ number_format($transaction['bayaran_keuntungan'], 2) }} Untung: RM XX.XX
Ujrah: RM XX.XX
Jumlah Perlu Dibayar: RM XX.XX
-

* Keuntungan sebenar atas setiap baki pembiayaan akan - direbat semasa penebusan

+

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

+

- - - - - - - - - - + - - - - - - + + - -
.................................................... .................................................... .................................................... ....................................................
DiSemak Cagaran Di KeluarkanCagaran Diterima Pelanggan Ar-Rahn
{{ Auth::user()->name }}

@@ -580,28 +565,14 @@ - - + + - - - - - - - - - - - - + + @@ -630,8 +605,8 @@ - - + + @@ -646,8 +621,8 @@ - - + +
Marhun: {{ $gadai['marhun'] }} Nama: {{ $customers_info['nama'] }} No SAG : {{ $transaction['norujukan'] }}
Nama: {{ $customers_info['nama'] }} Tarikh Bayar: @php - $time = new DateTime($transaction['created_at']); - $date = $time->format('d/m/Y'); - echo $date; - @endphp
No K/P : @php @@ -614,8 +585,12 @@ Tempoh Simpan: {{ $gadai['tempoh'] }} Tarikh Bayar: @php + $time = new DateTime($transaction['created_at']); + $date = $time->format('d/m/Y'); + echo $date; + @endphp
Tempoh Simpan: {{ $gadai['tempoh'] }}
Masa Bayaran: --:--:--

@@ -655,63 +630,58 @@

A

- - - - - - - - - - - - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
Harga Jualan/Baki: RM {{ number_format($transaction['bakiharga'] + $transaction['duit_masuk'], 2) }} - Pembiayaan/Baki: RM {{ number_format($gadai['bakipjm'] + $transaction['bayaran_pembiayaan'], 2) }} -
Bayaran Harga Jualan: RM {{ number_format($transaction['duit_masuk'], 2) }} Ansuran Pembiyaan: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }}
Baki Harga Jualan: RM {{ number_format($transaction['bakiharga'], 2) }} Baki Pembiayaan : RM {{ number_format($gadai['bakipjm'], 2) }} Ansuran Pembiyaan: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }}
Keuntungan: RM {{ number_format($transaction['bayaran_keuntungan'], 2) }} Untung: RM XX.XX
Ujrah: RM XX.XX
Jumlah Perlu Dibayar: RM XX.XX
-

* Keuntungan sebenar atas setiap baki pembiayaan akan - direbat semasa penebusan

- +

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

+

- - - - - - - - - - + - - - - - - + + - -
.................................................... .................................................... .................................................... ....................................................
DiSemak Cagaran Di KeluarkanCagaran Diterima Pelanggan Ar-Rahn
{{ Auth::user()->name }}

+
From 4a49f35e48442ed329205f15167718c79cb03003 Mon Sep 17 00:00:00 2001 From: Amir Date: Mon, 27 Nov 2023 08:52:34 +0800 Subject: [PATCH 3/5] update resit tebus ujrah --- app/Http/Controllers/GadaianController.php | 3 +- .../views/print/resittebus_ujrah.blade.php | 174 ++++++++---------- 2 files changed, 78 insertions(+), 99 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index c3ea243..a8490af 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -542,7 +542,8 @@ class GadaianController extends Controller if(sizeof($wakil) != 0) $wakil = $wakil[0]; - return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran')); + // return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran')); + return view('print.resittebus_ujrah',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran')); } public function resitbelumtebus($id) diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php index ee39860..e338cd4 100644 --- a/resources/views/print/resittebus_ujrah.blade.php +++ b/resources/views/print/resittebus_ujrah.blade.php @@ -434,29 +434,15 @@ - - - - - - - - - - - + + - - - + + @@ -485,8 +475,8 @@ - - + + @@ -501,8 +491,8 @@ - - + +
Marhun: {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php - $time = new DateTime($penebusan['t_tebus']); - $date = $time->format('d/m/Y'); - echo $date; - @endphpNo SAG: {{ $gadai['norujukan'] }}
No K/P : @php @@ -469,8 +455,12 @@ Tempoh Simpan: {{ $gadai['tempoh'] }} Tarikh Bayar: @php + $time = new DateTime($penebusan['t_tebus']); + $date = $time->format('d/m/Y'); + echo $date; + @endphp
Tempoh Simpan: {{ $gadai['tempoh'] }}
Masa Bayaran: --:--:--

@@ -511,34 +501,43 @@ - + - + - + - + - - + + + + + + + + + + + + + + +
Harga JualanBaki Pembiayaan : RM {{ number_format($gadai['hargajualan'], 2) }}
(-) Jumlah Ansuran Telah DibayarUntung : RM {{ number_format($totalBayaranAnsuran, 2) }}
Baki Harga Jualan(-) Rebat Untung : RM {{ number_format($gadai['bakihargajualan'], 2) }}
(-) Ibra' (Rebat)Ujrah : RM {{ number_format($penebusan['rebate'], 2) }}
Tebus Keseluruhan: RM {{ number_format($gadai['bakihargajualan'] - $penebusan['rebate'], 2) }} - (-) Rebat Ujrah: RM {{ number_format($gadai['bakihargajualan'] - $penebusan['rebate'], 2) }}
Jumlah Perlu Dibayar: RM XX.XX
-
- - - - - +

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

@@ -546,16 +545,11 @@ - - - - - - + @@ -565,8 +559,6 @@

- -

@@ -587,31 +579,15 @@
.................................................... .................................................... .................................................... ....................................................
DiSemak Cagaran Di Keluarkan Cagaran Diterima Pelanggan Ar-Rahn
{{ Auth::user()->name }}
- - - - - - - - - - - + + - - + - - + + - - - - + + + - - - + @endphp + + +
Marhun: {{ $gadai['marhun'] }} - - No SAG: {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} - + Tarikh Bayar: @php - $time = new DateTime($penebusan['t_tebus']); - $date = $time->format('d/m/Y'); - echo $date; - @endphp No SAG: {{ $gadai['norujukan'] }}
No K/P : @php @@ -620,17 +596,18 @@ } else { echo $customers_info['kpbaru']; } - @endphp - + @endphp Tempoh Simpan: {{ $gadai['tempoh'] }} Tarikh Bayar: @php + $time = new DateTime($penebusan['t_tebus']); + $date = $time->format('d/m/Y'); + echo $date; + @endphp
Nama Wakil : @php @@ -640,15 +617,13 @@ echo ''; } @endphp - - Tempoh Simpan: {{ $gadai['tempoh'] }}
No K/P Wakil : @php @@ -657,12 +632,12 @@ } else { echo ''; } - @endphp - Masa Bayaran: --:--:--

@@ -671,34 +646,43 @@ - + - + - + - + - - + + + + + + + + + + + + + + +
Harga JualanBaki Pembiayaan : RM {{ number_format($gadai['hargajualan'], 2) }}
(-) Jumlah Ansuran Telah DibayarUntung : RM {{ number_format($totalBayaranAnsuran, 2) }}
Baki Harga Jualan(-) Rebat Untung : RM {{ number_format($gadai['bakihargajualan'], 2) }}
(-) Ibra' (Rebat)Ujrah : RM {{ number_format($penebusan['rebate'], 2) }}
Tebus Keseluruhan: RM {{ number_format($gadai['bakihargajualan'] - $penebusan['rebate'], 2) }} - (-) Rebat Ujrah: RM {{ number_format($gadai['bakihargajualan'] - $penebusan['rebate'], 2) }}
Jumlah Perlu Dibayar: RM XX.XX
-
- - - - - +

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

@@ -706,21 +690,15 @@ - - - - - - +
.................................................... .................................................... .................................................... ....................................................
DiSemak Cagaran Di Keluarkan Cagaran Diterima Pelanggan Ar-Rahn
{{ Auth::user()->name }}
-
From 9ec9215b97805cbf7e74b6de996c967f5b28254a Mon Sep 17 00:00:00 2001 From: Amir Date: Sun, 3 Dec 2023 11:10:04 +0800 Subject: [PATCH 4/5] Append data to resit tebus --- app/Http/Controllers/GadaianController.php | 9 +++- .../views/print/resittebus_ujrah.blade.php | 47 ++++++++++++------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 01164f8..3f96867 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -515,6 +515,8 @@ class GadaianController extends Controller $transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/'. $id)->json(); + $transaction_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/one/'. $id)->json(); + foreach($transaction as $trans) { $totaltransaction += $trans['duit_masuk']; @@ -543,8 +545,11 @@ class GadaianController extends Controller if(sizeof($wakil) != 0) $wakil = $wakil[0]; - // return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran')); - return view('print.resittebus_ujrah',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran')); + if($gadai['tagbaru'] == 1) { + return view('print.resittebus_ujrah',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran')); + } else { + return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran')); + } } public function resitbelumtebus($id) diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php index e338cd4..d8e756a 100644 --- a/resources/views/print/resittebus_ujrah.blade.php +++ b/resources/views/print/resittebus_ujrah.blade.php @@ -492,33 +492,36 @@ Masa Bayaran - : --:--:-- + @php + $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']); + $masa = date('H:i:s', $masa_bayaran); + @endphp + : {{ $masa }}

T

- - + - - + + - + - + - + @@ -530,8 +533,11 @@ + @php + $jumlah_perlu_dibayar = $penebusan['bakipjm'] + $penebusan['onepercent'] - $transaction_tebus['onepercent_rebet'] + $penebusan['ujrah'] - $transaction_tebus['ujrah_rebet']; + @endphp - +
Baki Pembiayaan: RM {{ number_format($gadai['hargajualan'], 2) }} : RM {{ number_format($penebusan['bakipjm'], 2) }}
Untung: RM {{ number_format($totalBayaranAnsuran, 2) }}Keuntungan: RM {{ number_format($penebusan['onepercent'], 2) }}
(-) Rebat Untung: RM {{ number_format($gadai['bakihargajualan'], 2) }} : RM {{ number_format($transaction_tebus['onepercent_rebet'], 2) }}
Ujrah: RM {{ number_format($penebusan['rebate'], 2) }} : RM {{ number_format($penebusan['ujrah'], 2) }}
(-) Rebat Ujrah: RM {{ number_format($gadai['bakihargajualan'] - $penebusan['rebate'], 2) }}: RM {{ number_format($transaction_tebus['ujrah_rebet'], 2) }}
Jumlah Perlu Dibayar: RM XX.XX: RM {{ number_format($jumlah_perlu_dibayar, 2) }}
@@ -637,7 +643,11 @@ Masa Bayaran - : --:--:-- + @php + $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']); + $masa = date('H:i:s', $masa_bayaran); + @endphp + : {{ $masa }}
@@ -647,23 +657,23 @@ - + - - + + - + - + - + @@ -675,8 +685,11 @@ + @php + $jumlah_perlu_dibayar = $penebusan['bakipjm'] + $penebusan['onepercent'] - $transaction_tebus['onepercent_rebet'] + $penebusan['ujrah'] - $transaction_tebus['ujrah_rebet']; + @endphp - +
Baki Pembiayaan: RM {{ number_format($gadai['hargajualan'], 2) }} : RM {{ number_format($penebusan['bakipjm'], 2) }}
Untung: RM {{ number_format($totalBayaranAnsuran, 2) }}Keuntungan: RM {{ number_format($penebusan['onepercent'], 2) }}
(-) Rebat Untung: RM {{ number_format($gadai['bakihargajualan'], 2) }} : RM {{ number_format($transaction_tebus['onepercent_rebet'], 2) }}
Ujrah: RM {{ number_format($penebusan['rebate'], 2) }} : RM {{ number_format($penebusan['ujrah'], 2) }}
(-) Rebat Ujrah: RM {{ number_format($gadai['bakihargajualan'] - $penebusan['rebate'], 2) }}: RM {{ number_format($transaction_tebus['ujrah_rebet'], 2) }}
Jumlah Perlu Dibayar: RM XX.XX: RM {{ number_format($jumlah_perlu_dibayar, 2) }}
From 710db76b07b34208d55c757662f515fa5d9e3f76 Mon Sep 17 00:00:00 2001 From: Amir Date: Sun, 3 Dec 2023 11:24:11 +0800 Subject: [PATCH 5/5] Apppend data transaksi_keuntungan to resit ansuran --- app/Http/Controllers/GadaianController.php | 7 ++-- .../views/print/resitansuran_ujrah.blade.php | 34 +++++++++++++------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 3f96867..511ad55 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -386,8 +386,11 @@ class GadaianController extends Controller if(sizeof($wakil) != 0) $wakil = $wakil[0]; - // return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil')); - return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil')); + if($gadai['tagbaru'] == 1) { + return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil')); + } else { + return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran')); + } } public function resitbelumansurans($id) diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php index 64ba248..45d19e9 100644 --- a/resources/views/print/resitansuran_ujrah.blade.php +++ b/resources/views/print/resitansuran_ujrah.blade.php @@ -479,7 +479,11 @@ Masa Bayaran - : --:--:-- + @php + $masa_bayaran = strtotime($transaction['tarikh_bayaran']); + $masa = date('H:i:s', $masa_bayaran); + @endphp + : {{ $masa }}
@@ -496,14 +500,14 @@ - Untung - : RM XX.XX + Keuntungan + : RM {{ number_format($transaction['bayaran_keuntungan'], 2) }} Ujrah - : RM XX.XX + : RM {{ number_format($transaction['ujrah'], 2) }} @@ -518,7 +522,10 @@ Jumlah Perlu Dibayar - : RM XX.XX + @php + $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah']; + @endphp + : RM {{ number_format($jumlah_perlu_dibayar, 2) }}

@@ -622,7 +629,11 @@ Masa Bayaran - : --:--:-- + @php + $masa_bayaran = strtotime($transaction['tarikh_bayaran']); + $masa = date('H:i:s', $masa_bayaran); + @endphp + : {{ $masa }}
@@ -639,14 +650,14 @@ - Untung - : RM XX.XX + Keuntungan + : RM {{ number_format($transaction['bayaran_keuntungan'], 2) }} Ujrah - : RM XX.XX + : RM {{ number_format($transaction['ujrah'], 2) }} @@ -661,7 +672,10 @@ Jumlah Perlu Dibayar - : RM XX.XX + @php + $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah']; + @endphp + : RM {{ number_format($jumlah_perlu_dibayar, 2) }}