diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index b5e4fa5..9c00fa7 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Auth;
use Carbon\Carbon;
use App\Http\Controllers\AliranTunaiController;
+use App\User;
class GadaianController extends Controller
{
@@ -511,7 +512,9 @@ class GadaianController extends Controller
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
- return view('print.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan'));
+ $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'));
}
public function resittebus($id)
@@ -557,10 +560,12 @@ class GadaianController extends Controller
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
+ $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
+
if($gadai['tagbaru'] == 1) {
- return view('print.resittebus_ujrah',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+ return view('print.resittebus_ujrah',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
} else {
- return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+ return view('print.resittebus',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
}
}
diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php
index 546952d..4d0af3a 100644
--- a/resources/views/print/resitansuran_ujrah.blade.php
+++ b/resources/views/print/resitansuran_ujrah.blade.php
@@ -6,9 +6,11 @@
@@ -398,19 +400,29 @@
color: black;
padding: 4px;
}
+
+ .header-style {
+ display: flex;
+ justify-content: space-between;
+ align-items: center
+ }
+
+ .header-style span {
+ font-family: Arial, Helvetica, sans-serif;
+ text-align: right;
+ background-color: #d9deda;
+ color: black;
+ padding: 2px;
+ font-size: 10px;
+ border: 1px solid black;
+ }
-
-
-
- |
-
-
-
-
- | Salinan Pelanggan |
-
-
+
@@ -444,15 +456,7 @@
- | Nama Wakil |
- : @php
- if (sizeof($wakil) != 0) {
- echo $wakil['nama'];
- } else {
- echo '';
- }
- @endphp |
- |
+ |
|
|
Tempoh Simpan |
@@ -460,47 +464,33 @@
- | No K/P Wakil |
- : @php
- if (sizeof($wakil) != 0) {
- echo $wakil['nokp'];
- } else {
- echo '';
- }
- @endphp |
- |
+ |
|
|
Masa Bayaran |
@php
- $masa_bayaran = strtotime($transaction['tarikh_bayaran']);
- $masa = date('H:i:s', $masa_bayaran);
+ $masa_bayaran = strtotime($transaction['tarikh_bayaran']);
+ $masa = date('H:i:s', $masa_bayaran);
@endphp
: {{ $masa }} |
- A
-
+ A
+
- | Baki Pembiayaan |
- : RM {{ number_format($gadai['bakipjm'], 2) }} |
- Ansuran Pembiyaan |
- : RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} |
+ Ansuran Pembiyaan |
+ : RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} |
- |
- |
- Keuntungan |
- : RM {{ number_format($transaction['onepercent'], 2) }} |
+ Keuntungan |
+ : RM {{ number_format($transaction['onepercent'], 2) }} |
- |
- |
- Ujrah |
- : RM {{ number_format($transaction['ujrah'], 2) }} |
+ Ujrah |
+ : RM {{ number_format($transaction['ujrah'], 2) }} |
|
@@ -512,19 +502,18 @@
|
- |
- |
- Jumlah Perlu Dibayar |
+ Jumlah Perlu Dibayar |
@php
- $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah'];
+ $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah'];
@endphp
: RM {{ number_format($transaction['duit_masuk'], 2) }} |
-
- Marhun: {{ $gadai['marhun'] }}
-
-
+
+
+ | Marhun: {{ $gadai['marhun'] }} |
+
+
@@ -534,32 +523,23 @@
- | Pelanggan |
+ {{ $customers_info['nama'] }} |
|
- Ar-Rahn {{ Auth::user()->name }} |
+ {{ Auth::user()->name }} |
-
-
-
-
-
- |
-
-
-
-
+
@@ -593,15 +573,7 @@
- | Nama Wakil |
- : @php
- if (sizeof($wakil) != 0) {
- echo $wakil['nama'];
- } else {
- echo '';
- }
- @endphp |
- |
+ |
|
|
Tempoh Simpan |
@@ -609,47 +581,33 @@
- | No K/P Wakil |
- : @php
- if (sizeof($wakil) != 0) {
- echo $wakil['nokp'];
- } else {
- echo '';
- }
- @endphp |
- |
+ |
|
|
Masa Bayaran |
@php
- $masa_bayaran = strtotime($transaction['tarikh_bayaran']);
- $masa = date('H:i:s', $masa_bayaran);
+ $masa_bayaran = strtotime($transaction['tarikh_bayaran']);
+ $masa = date('H:i:s', $masa_bayaran);
@endphp
: {{ $masa }} |
- A
-
+ A
+
- | Baki Pembiayaan |
- : RM {{ number_format($gadai['bakipjm'], 2) }} |
- Ansuran Pembiyaan |
- : RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} |
+ Ansuran Pembiyaan |
+ : RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} |
- |
- |
- Keuntungan |
- : RM {{ number_format($transaction['onepercent'], 2) }} |
+ Keuntungan |
+ : RM {{ number_format($transaction['onepercent'], 2) }} |
- |
- |
- Ujrah |
- : RM {{ number_format($transaction['ujrah'], 2) }} |
+ Ujrah |
+ : RM {{ number_format($transaction['ujrah'], 2) }} |
|
@@ -661,19 +619,18 @@
|
- |
- |
- Jumlah Perlu Dibayar |
+ Jumlah Perlu Dibayar |
@php
- $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah'];
+ $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah'];
@endphp
: RM {{ number_format($transaction['duit_masuk'], 2) }} |
-
- Marhun: {{ $gadai['marhun'] }}
-
-
+
+
+ | Marhun: {{ $gadai['marhun'] }} |
+
+
@@ -683,9 +640,9 @@
- | Pelanggan |
+ {{ $customers_info['nama'] }} |
|
- Ar-Rahn {{ Auth::user()->name }} |
+ {{ Auth::user()->name }} |
@@ -702,4 +659,15 @@
| : RM {{ number_format($transaction['bakipelanggan'], 2) }} |
+
+
+ | .................................................... |
+ |
+ .................................................... |
+ |
+ .................................................... |
+ |
+ .................................................... |
+
+