KoPKB/admin-erahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes were applied to receipt A and T for both non-ujrah and ujrah

Browse Source
This commit is contained in:
Ain Izazi
2025-11-26 15:54:26 +08:00
committed by Nur Izzati
parent 5521b6053b
commit 53038b358d
5 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/resit/resitansuran.blade.php
+8 -9
View File
@@ -440,14 +440,13 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">DiSemak </td>
<td></td>
<td colspan="3"> Cagaran Di Keluarkan</td>
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
<td colspan="3">DiSemak </td>
<td></td>
<td colspan="3"> Cagaran Di Keluarkan</td>
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn <br> <b>{{ optional(Auth::user())->name ?? '' }}</b></td>
</tr>
</table>
@@ -549,7 +548,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
<td colspan="3"> Ar-Rahn <br> <b>{{ optional(Auth::user())->name ?? '' }}</b></td>
</tr>
resources/views/resit/resitansuran_ujrah.blade.php
+4 -6
View File
@@ -546,12 +546,11 @@
<td colspan="9"></td>
<td colspan="3">Teller</td>
</tr>
<tr>
{{-- <tr>
<td colspan="3">{{ $customers_info['nama'] }}</td>
<td colspan="9"></td>
<td colspan="3">{{ Auth::user()->name }}</td>
</tr>
</tr> --}}
</table>
<hr class="new2">
</hr>
@@ -670,12 +669,11 @@
<td colspan="9"></td>
<td colspan="3">Teller</td>
</tr>
<tr>
{{-- <tr>
<td colspan="3">{{ $customers_info['nama'] }}</td>
<td colspan="9"></td>
<td colspan="3">{{ Auth::user()->name }}</td>
</tr>
</tr> --}}
</table>
<table id="inside" style="width: 45%; margin-top:20px">
<tr>
resources/views/resit/resittebus.blade.php
+2 -2
View File
@@ -473,7 +473,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
<td colspan="3">Ar-Rahn <br> <b>{{ optional(Auth::user())->name ?? '' }}</b></td>
</tr>
@@ -575,7 +575,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
<td colspan="3"> Ar-Rahn <br> <b>{{ optional(Auth::user())->name ?? '' }}</b></td>
</tr>
resources/views/resit/resittebus_ujrah.blade.php
+20 -25
View File
@@ -629,22 +629,22 @@
</tr>
<tr>
<td style="width:10px">Keuntungan</td>
<td style="width:10px">: RM {{ number_format($transaction_tebus['onepercent'], 2) }}</td>
<td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td>
</tr>
<tr>
<td style="width:10px">(-) Rebat Untung</td>
<td style="width:10px">: RM
{{ number_format(($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet']), 2) }}
{{ number_format($totalrebate['onepercent'], 2) }}
</td>
</tr>
<tr>
<td style="width:10px">Lain-Lain Caj</td>
<td style="width:10px">: RM {{ number_format($transaction_tebus['ujrah'], 2) }} </td>
<td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Rebat Lain-Lain Caj</td>
<td style="width:10px">: RM
{{ number_format(($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet']), 2) }} </td>
{{ number_format($totalrebate['ujrah'], 2) }} </td>
</tr>
<tr>
<td></td>
@@ -683,17 +683,14 @@
<td colspan="3">Khazanah</td>
</tr>
<tr>
<td colspan="3">{{ Auth::user()->name }}</td>
{{-- <tr> --}}
{{-- <td colspan="3">{{ Auth::user()->name }}</td> --}}
<td></td>
<td colspan="3">{{ sizeof($wakil) != 0 ? $wakil['nama'] : $customers_info['nama'] }}</td>
<td></td>
<td colspan="3"> {{ $khazanah_user->name }}</td>
</tr>
{{-- <td></td> --}}
{{-- <td colspan="3">{{ sizeof($wakil) != 0 ? $wakil['nama'] : $customers_info['nama'] }}</td> --}}
{{-- <td></td> --}}
{{-- <td colspan="3"> {{ $khazanah_user->name }}</td> --}} {{-- <td colspan="3">{{ $khazanah_user->name ?? '' }}</td> --}}
{{-- </tr> --}}
</table>
<hr class="new2">
@@ -859,22 +856,22 @@
</tr>
<tr>
<td style="width:10px">Keuntungan</td>
<td style="width:10px">: RM {{ number_format($transaction_tebus['onepercent'], 2) }}</td>
<td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td>
</tr>
<tr>
<td style="width:10px">(-) Rebat Untung</td>
<td style="width:10px">: RM
{{ number_format(($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet']), 2) }}
{{ number_format($totalrebate['onepercent'], 2) }}
</td>
</tr>
<tr>
<td style="width:10px">Lain-Lain Caj</td>
<td style="width:10px">: RM {{ number_format($transaction_tebus['ujrah'], 2) }} </td>
<td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Rebat Lain-Lain Caj</td>
<td style="width:10px">: RM
{{ number_format($($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet']), 2) }} </td>
{{ number_format($totalrebate['ujrah'], 2) }} </td>
</tr>
<tr>
<td></td>
@@ -914,16 +911,14 @@
<td colspan="3">Khazanah</td>
</tr>
<tr>
{{-- <tr>
<td colspan="3"> {{ Auth::user()->name }}</td>
<td></td>
<td colspan="3">{{ sizeof($wakil) != 0 ? $wakil['nama'] : $customers_info['nama'] }}</td>
<td></td>
<td colspan="3">{{ $khazanah_user->name }}</td>
</tr>
<td></td> --}}
{{-- <td colspan="3">{{ $khazanah_user->name }}</td> --}}
{{-- <td colspan="3">{{ $khazanah_user->name ?? '-' }}</td>
</tr> --}}
</table>
<table id="inside" style="width: 45%; margin-top:20px">
<tr>