diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 7985e15..a991158 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -515,6 +515,7 @@ class GadaianController extends Controller
// if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0];
+ $transaction_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/one/'. $id)->json();
$penebusan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json();
@@ -529,7 +530,7 @@ class GadaianController extends Controller
$khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
- return view('print.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan', 'khazanah_user'));
+ return view('print.resittebusautotawarruq',compact('transaction_tebus', 'transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan', 'khazanah_user'));
}
public function resittebus($id)
diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php
index 020eb27..aa93366 100644
--- a/resources/views/print/resitansuran_ujrah.blade.php
+++ b/resources/views/print/resitansuran_ujrah.blade.php
@@ -454,15 +454,6 @@
echo $date;
@endphp
-
-
- | |
- |
- |
- Tempoh Simpan |
- : {{ $transaction['beza_tempoh'] }} |
-
-
| |
|
@@ -572,14 +563,6 @@
@endphp
-
- | |
- |
- |
- Tempoh Simpan |
- : {{ $transaction['beza_tempoh'] }} |
-
-
| |
|
diff --git a/resources/views/print/resittebusautotawarruq.blade.php b/resources/views/print/resittebusautotawarruq.blade.php
index 8db878e..aed0a5e 100644
--- a/resources/views/print/resittebusautotawarruq.blade.php
+++ b/resources/views/print/resittebusautotawarruq.blade.php
@@ -382,11 +382,11 @@ hr.new5 {
-| Nama Wakil | : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
+ | | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
-| No K/P Wakil | : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp | | | | Masa Bayaran |
+ | | | | | Masa Bayaran |
@php
$masa_bayaran = strtotime($transaction_keuntungan['tarikh_bayaran']);
$masa = date('H:i:s', $masa_bayaran);
@@ -464,7 +464,6 @@ hr.new5 {
-
@@ -487,11 +486,11 @@ hr.new5 {
-| Nama Wakil | : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
+ | | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
-| No K/P Wakil | : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp | | | | Masa Bayaran |
+ | | | | | Masa Bayaran |
@php
$masa_bayaran = strtotime($transaction_keuntungan['tarikh_bayaran']);
$masa = date('H:i:s', $masa_bayaran);
@@ -567,6 +566,20 @@ hr.new5 {
+
+
+ | 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) }} |
+
+
| .................................................... |
diff --git a/resources/views/print/sag_ujrah_2.blade.php b/resources/views/print/sag_ujrah_2.blade.php
index 47ee7c5..934739d 100644
--- a/resources/views/print/sag_ujrah_2.blade.php
+++ b/resources/views/print/sag_ujrah_2.blade.php
@@ -742,12 +742,12 @@
MAKLUMAT PEMBIAYAAN |
- | NILAI PEMBIAYAAN |
- RM {{ number_format($gadai_detail['pinjaman'], 2) }} |
+ NILAI PEMBIAYAAN |
+ RM {{ number_format($gadai_detail['pinjaman'], 2) }} |
- | HARGA JUALAN |
- RM {{ number_format($gadai_detail['hargajualan'], 2) }} |
+ HARGA JUALAN |
+ RM {{ number_format($gadai_detail['hargajualan'], 2) }} |
@@ -776,7 +776,7 @@
| JUMLAH KEUNTUNGAN DAN UJRAH TERKUMPUL |
- |
RM {{ number_format($gadai_detail['bakiupah'], 2) }} |
- RM {{ number_format($gadai_detail['upah12'], 2) }} |
+ RM {{ number_format($gadai_detail['upah12']/2, 2) }} |
@@ -1489,12 +1489,12 @@
| MAKLUMAT PEMBIAYAAN |
- | NILAI PEMBIAYAAN |
- RM {{ number_format($gadai_detail['pinjaman'], 2) }} |
+ NILAI PEMBIAYAAN |
+ RM {{ number_format($gadai_detail['pinjaman'], 2) }} |
- | HARGA JUALAN |
- RM {{ number_format($gadai_detail['hargajualan'], 2) }} |
+ HARGA JUALAN |
+ RM {{ number_format($gadai_detail['hargajualan'], 2) }} |
@@ -1523,7 +1523,7 @@
| JUMLAH KEUNTUNGAN DAN UJRAH TERKUMPUL |
- |
RM {{ number_format($gadai_detail['bakiupah'], 2) }} |
- RM {{ number_format($gadai_detail['upah12'], 2) }} |
+ RM {{ number_format($gadai_detail['upah12']/2, 2) }} |