diff --git a/app/Http/Controllers/BayaranController.php b/app/Http/Controllers/BayaranController.php index 198ba4b..e7d5c86 100644 --- a/app/Http/Controllers/BayaranController.php +++ b/app/Http/Controllers/BayaranController.php @@ -201,26 +201,31 @@ class BayaranController extends Controller $current = Carbon::now(); $current = new Carbon(); - $date = $current->toDateTimeString(); + $date = $current->toDateTimeString(); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $payment_details['kodcaw'])->json(); + $cawangan = Http::get(config('api.url') . '/api/cawangan/detail/'. $payment_details['kodcaw'])->json(); + $cawangan_detail = $cawangan[0]; + $nama_cawangan = $cawangan_info['details_caw']; $gadai_details = Http::get(config('api.url') .'/api/gadai/norujukan/'.$payment_details['norujukan'])->json(); - - if($gadai_details[0][0]['hargajualan'] > 0) - { - $baki_harga_jualan_sebelum = $gadai_details[0][0]['bakihargajualan'] + $payment_details['total_payment']; - $baki_harga_jualan_semasa = $gadai_details[0][0]['bakihargajualan']; + $gadai = $gadai_details[0][0]; + // if($gadai_details[0][0]['hargajualan'] > 0) + // { + // $baki_harga_jualan_sebelum = $gadai_details[0][0]['bakihargajualan'] + $payment_details['total_payment']; + // $baki_harga_jualan_semasa = $gadai_details[0][0]['bakihargajualan']; - return view('pembayaran.resit.resit_baru',compact('customer_details','payment_details','date','baki_harga_jualan_sebelum','baki_harga_jualan_semasa')); - }else{ + return view('pembayaran.resit.resitportal',compact('customer_details','payment_details','cawangan_detail','nama_cawangan','gadai')); + // }else{ - $gadai_details = $gadai_details[0][0]; + // $gadai_details = $gadai_details[0][0]; - $koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $payment_details['kodcaw'] . '/' . $payment_details['norujukan'])->json(); + // $koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $payment_details['kodcaw'] . '/' . $payment_details['norujukan'])->json(); - $jbg = $gadai_details['jbg']; + // $jbg = $gadai_details['jbg']; - return view('pembayaran.resit.resit_baru_sebelum',compact('customer_details','payment_details','date','koskeuntungan','jbg')); - } + // return view('pembayaran.resit.resit_baru_sebelum',compact('customer_details','payment_details','date','koskeuntungan','jbg')); + // } } diff --git a/public/argon/img/brand/arrahnlogo.png b/public/argon/img/brand/arrahnlogo.png new file mode 100644 index 0000000..529603a Binary files /dev/null and b/public/argon/img/brand/arrahnlogo.png differ diff --git a/public/argon/img/brand/nama.png b/public/argon/img/brand/nama.png new file mode 100644 index 0000000..470f005 Binary files /dev/null and b/public/argon/img/brand/nama.png differ diff --git a/resources/views/pembayaran/resit/resitportal.blade.php b/resources/views/pembayaran/resit/resitportal.blade.php new file mode 100644 index 0000000..7470f0c --- /dev/null +++ b/resources/views/pembayaran/resit/resitportal.blade.php @@ -0,0 +1,152 @@ + + + + + + {{ config('app.name') }} | Pembayaran Berjaya + + + + + + {{-- --}} + + + + + {{-- --}} + {{-- --}} + + + + + + +
+
+
+
+
+
+
+
+
+
+ Logo Ar Rahn + Logo Ar Rahn +
+
+
Pelanggan yang dihargai,
+
Terima kasih kerana menggunakan perkhidmatan kami.
+
+
+
+
+
Status Bayaran
+
Berjaya
+
+
+
+
+
+
ID Transaksi
+
{{ $payment_details['reference_no'] }}
+
+
+
+
+
+
No. Surat Akuan Gadai
+
{{ $payment_details['norujukan'] }}
+
+
+
+
+
+
Nama Pelanggan
+
{{ $payment_details['customer_name'] }}
+
+
+
+
+
+
Tarikh Transaksi
+ @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $payment_details['tarikh'] ); + $formattedweddingdate = $myDateTime->format('d/m/Y'); + @endphp +
{{ $formattedweddingdate . ' ' . $payment_details['masa']}}
+
+
+
+
+
+
Jumlah Bayaran
+
RM {{ number_format($payment_details['total_payment'],2) }}
+
+ @if($gadai['hargajualan'] == 0) +
+
+
+
+
Tarikh Lanjutan
+
31/12/2021
+
+ @endif +
+
+
+
Sebarang pembayaran akan dikemaskini selepas 1 Jam sebaik pembayaran dilakukan
+
Nota: Resit ini adalah cetakan komputer dan tandatangan tidak diperlukan.
+
+
+
+
+
+ {{ $cawangan_detail['namacaw'] }} +
+
+ {{ $cawangan_detail['alamat1'] . ' ' . $cawangan_detail['alamat2']}} +
+
+
+
+
+
+
+
+
+
+ Kembali Muka Hadapan + +
+
+
+
+
+
+ + + diff --git a/resources/views/penyata/summaryupah.blade.php b/resources/views/penyata/summaryupah.blade.php index 330476f..d7b61f7 100644 --- a/resources/views/penyata/summaryupah.blade.php +++ b/resources/views/penyata/summaryupah.blade.php @@ -220,9 +220,9 @@ TRANSAKSI PELANGGAN UPAH (RM) - JUMLAH (RM) + {{-- JUMLAH (RM) --}} - @foreach($gadai as $index1=>$gad) + {{-- @foreach($gadai as $index1=>$gad) PERMULAAN PEMBIAYAAN PADA @php @@ -235,7 +235,7 @@ - {{ number_format($gad['pinjaman'],2) }} - @endforeach + @endforeach --}} @foreach($upah as $index=>$upahan) @@ -248,13 +248,13 @@ @endphp : {{ $upahan['upahDibayar'] }} - {{ number_format($gad['pinjaman'],2) }} + {{-- {{ number_format($gad['pinjaman'],2) }} --}} @endforeach PEMBIAYAAN KESELURUHAN : - {{ number_format($gad['pinjaman'],2) }} + {{ number_format($gad['pinjaman'],2) }}