diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index afc24a6..a917b00 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -507,11 +507,13 @@ class GadaianController extends Controller
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
+ $totalBayaranAnsuran = Http::get(config('api.url') . '/api/transaction/norujukan/total/ansuran',['norujukan'=>$id])->json();
+
// dd($wakil);
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
- return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction'));
+ 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/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php
index 6bda936..009632c 100644
--- a/resources/views/print/resitansuran.blade.php
+++ b/resources/views/print/resitansuran.blade.php
@@ -142,15 +142,6 @@ hr.new5 {
color: white;
}
-
-
-
-
-
-
-
-
-
#salinan {
font-family: Arial, Helvetica, sans-serif;
border-collapse:collapse;
@@ -390,7 +381,7 @@ hr.new5 {
-| No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpanan | : {{ $gadai['tempoh'] }} |
@@ -404,23 +395,31 @@ hr.new5 {
A
-
-
-
-| Tarikh Bayaran | | : @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp |
-
-
-| Harga Jualan | | : RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} |
-
-
-| (-) Bayaran Pelanggan | | : RM {{ number_format($transaction['duit_masuk'],2) }} |
-
-
-| Baki Harga Jualan | | : RM {{ number_format($transaction['bakiharga'],2) }} |
-
-
-
+
+ | Harga/Baki Harga Jualan |
+ : RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} |
+ Pembiayaan/Baki Pembiayaan |
+ : 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) }} |
+
@@ -501,21 +500,30 @@ hr.new5 {
-
-
-| Tarikh Bayaran | | : @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp |
-
-
-| Harga Jualan | | : RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} |
-
-
-| (-) Bayaran Pelanggan | | : RM {{ number_format($transaction['duit_masuk'],2) }} |
-
-
-| Baki Harga Jualan | | : RM {{ number_format($transaction['bakiharga'],2) }} |
-
-
-
+
+ | Harga/Baki Harga Jualan |
+ : RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} |
+ Pembiayaan/Baki Pembiayaan |
+ : 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) }} |
+
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index 6b2e8cf..9030924 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -427,27 +427,26 @@ hr.new5 {
T
-
-
-| Tarikh Bayaran | | : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp |
-
-
-| Harga Jualan | | : RM {{ number_format(($gadai['hargajualan']),2) }} |
-
-
-| (-) Bayaran Pelanggan | | : RM {{ number_format($totaltransaction,2) }} |
-
-
-| Baki Harga Jualan | | : RM {{ number_format($gadai['bakihargajualan'],2) }} |
-
-
- | (-) Rebate | | : RM {{ number_format($penebusan['rebate'],2) }} |
+
+ | Harga Jualan |
+ : RM {{ number_format(($gadai['hargajualan']),2) }} |
-
- | Tebus Keseluruhan | | : RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),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) }} |
-
-
@@ -530,26 +529,26 @@ hr.new5 {
T
-
-
-| Tarikh Bayaran | | : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp |
-
-
-| Harga Jualan | | : RM {{ number_format(($gadai['hargajualan']),2) }} |
-
-
-| (-) Bayaran Pelanggan | | : RM {{ number_format($totaltransaction,2) }} |
-
-
-| Baki Harga Jualan | | : RM {{ number_format($gadai['bakihargajualan'],2) }} |
-
-
- | (-) Rebate | | : RM {{ number_format($penebusan['rebate'],2) }} |
+
+ | Harga Jualan |
+ : RM {{ number_format(($gadai['hargajualan']),2) }} |
-
- | Tebus Keseluruhan | | : RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),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) }} |
-