KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

update resit dan sag

Browse Source
This commit is contained in:
Amir
2023-12-19 15:00:04 +08:00
parent a55f2fdb71
commit 68ce1f5c25
4 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+2 -1
View File
@@ -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)
resources/views/print/resitansuran_ujrah.blade.php
-17
View File
@@ -454,15 +454,6 @@
echo $date;
@endphp</td>
</tr>
<tr>
<td colspan="7"> </td>
<td> </td>
<td> </td>
<td>Tempoh Simpan</td>
<td>: {{ $transaction['beza_tempoh'] }}</td>
</tr>
<tr>
<td colspan="7"> </td>
<td> </td>
@@ -572,14 +563,6 @@
@endphp</td>
</tr>
<tr>
<td colspan="7"> </td>
<td> </td>
<td> </td>
<td>Tempoh Simpan</td>
<td>: {{ $transaction['beza_tempoh'] }}</td>
</tr>
<tr>
<td colspan="7"> </td>
<td> </td>
resources/views/print/resittebusautotawarruq.blade.php
+18 -5
View File
@@ -382,11 +382,11 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td>
<td colspan="3"></td> <td></td> <td colspan="3"> </td> <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td>
</tr>
<tr>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td> <td></td><td> </td><td>Masa Bayaran </td>
<td colspan="3"></td> <td></td> <td colspan="3"> </td> <td></td><td> </td><td>Masa Bayaran </td>
@php
$masa_bayaran = strtotime($transaction_keuntungan['tarikh_bayaran']);
$masa = date('H:i:s', $masa_bayaran);
@@ -464,7 +464,6 @@ hr.new5 {
</tr>
</table>
<br>
<br>
<hr class="new2"></hr>
</table>
@@ -487,11 +486,11 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td>
<td colspan="3"></td> <td></td> <td colspan="3"> </td> <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td>
</tr>
<tr>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td> <td></td><td> </td><td>Masa Bayaran </td>
<td colspan="3"></td> <td></td> <td colspan="3"> </td> <td></td><td> </td><td>Masa Bayaran </td>
@php
$masa_bayaran = strtotime($transaction_keuntungan['tarikh_bayaran']);
$masa = date('H:i:s', $masa_bayaran);
@@ -567,6 +566,20 @@ hr.new5 {
</tr>
</table>
<table id="inside" style="width: 45%; margin-top:10px">
<tr>
<td>Duit Pelanggan</td>
<td>: RM {{ number_format($transaction_tebus['duitpelanggan'], 2) }}</td>
</tr>
<tr>
<td>Jumlah Perlu Dibayar</td>
<td>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</td>
</tr>
<tr>
<td>Baki</td>
<td>: RM {{ number_format($transaction_tebus['bakipelanggan'], 2) }}</td>
</tr>
</table>
<table id="semakan">
<tr style="visibility: hidden">
<td colspan="3">.................................................... </td>
resources/views/print/sag_ujrah_2.blade.php
+10 -10
View File
@@ -742,12 +742,12 @@
<th colspan="4">MAKLUMAT PEMBIAYAAN </th>
</tr>
<tr>
<td style="width: 325px">NILAI PEMBIAYAAN</td>
<td>RM {{ number_format($gadai_detail['pinjaman'], 2) }}</td>
<td style="width: 325px"><b>NILAI PEMBIAYAAN</b></td>
<td><b>RM {{ number_format($gadai_detail['pinjaman'], 2) }}</b></td>
</tr>
<tr>
<td>HARGA JUALAN</td>
<td>RM {{ number_format($gadai_detail['hargajualan'], 2) }}</td>
<td><b>HARGA JUALAN</b></td>
<td><b>RM {{ number_format($gadai_detail['hargajualan'], 2) }}</b></td>
</tr>
</table>
<table id="keuntungan" style="text-align: center">
@@ -776,7 +776,7 @@
<td class="text-left">JUMLAH KEUNTUNGAN DAN UJRAH TERKUMPUL</td>
<td>-</td>
<td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
<td>RM {{ number_format($gadai_detail['upah12'], 2) }}</td>
<td>RM {{ number_format($gadai_detail['upah12']/2, 2) }}</td>
</tr>
</table>
<table>
@@ -1489,12 +1489,12 @@
<th colspan="4">MAKLUMAT PEMBIAYAAN </th>
</tr>
<tr>
<td style="width: 325px">NILAI PEMBIAYAAN</td>
<td>RM {{ number_format($gadai_detail['pinjaman'], 2) }}</td>
<td style="width: 325px"><b>NILAI PEMBIAYAAN</b></td>
<td><b>RM {{ number_format($gadai_detail['pinjaman'], 2) }}</b></td>
</tr>
<tr>
<td>HARGA JUALAN</td>
<td>RM {{ number_format($gadai_detail['hargajualan'], 2) }}</td>
<td><b>HARGA JUALAN</b></td>
<td><b>RM {{ number_format($gadai_detail['hargajualan'], 2) }}</b></td>
</tr>
</table>
<table id="keuntungan" style="text-align: center">
@@ -1523,7 +1523,7 @@
<td class="text-left">JUMLAH KEUNTUNGAN DAN UJRAH TERKUMPUL</td>
<td>-</td>
<td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
<td>RM {{ number_format($gadai_detail['upah12'], 2) }}</td>
<td>RM {{ number_format($gadai_detail['upah12']/2, 2) }}</td>
</tr>
</table>
<table>