shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into user-works

Browse Source
This commit is contained in:
Sevan Nerse 2022-06-29 10:03:17 +03:00
commit 7a7803cb68
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/auth/users/index.blade.php
View File

@ -20,7 +20,7 @@
<x-index.container>
<x-index.search
search-string="App\Models\Auth\User"
bulk-action="App\BulkActions\Auth\User"
bulk-action="App\BulkActions\Auth\Users"
/>
<x-table>

2
resources/views/banking/transfers/print_default.blade.php
View File

@ -4,6 +4,6 @@
</x-slot>
<x-slot name="content">
<x-transfers.template.default :model="$transfer" />
<x-transfers.template.ddefault :model="$transfer" />
</x-slot>
</x-layouts.print>

20
resources/views/components/transfers/template/default.blade.php
View File

@ -14,7 +14,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->name }}
{{ $transfer->expense_account->name }}
</td>
</tr>
</table>
@ -26,7 +26,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->number }}
{{ $transfer->expense_account->number }}
</td>
</tr>
</table>
@ -38,7 +38,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_name }}
{{ $transfer->expense_account->bank_name }}
</td>
</tr>
</table>
@ -50,7 +50,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_phone }}
{{ $transfer->expense_account->bank_phone }}
</td>
</tr>
</table>
@ -62,7 +62,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_address }}
{{ $transfer->expense_account->bank_address }}
</td>
</tr>
</table>
@ -86,7 +86,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->name }}
{{ $transfer->income_account->name }}
</td>
</tr>
</table>
@ -98,7 +98,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->number }}
{{ $transfer->income_account->number }}
</td>
</tr>
</table>
@ -110,7 +110,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_name }}
{{ $transfer->income_account->bank_name }}
</td>
</tr>
</table>
@ -122,7 +122,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_phone }}
{{ $transfer->income_account->bank_phone }}
</td>
</tr>
</table>
@ -134,7 +134,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_address }}
{{ $transfer->income_account->bank_address }}
</td>
</tr>
</table>

20
resources/views/components/transfers/template/second.blade.php
View File

@ -70,7 +70,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->name }}
{{ $transfer->expense_account->name }}
</td>
</tr>
</table>
@ -82,7 +82,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->number}}
{{ $transfer->expense_account->number}}
</td>
</tr>
</table>
@ -94,7 +94,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_name }}
{{ $transfer->expense_account->bank_name }}
</td>
</tr>
</table>
@ -106,7 +106,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_phone }}
{{ $transfer->expense_account->bank_phone }}
</td>
</tr>
</table>
@ -118,7 +118,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_address }}
{{ $transfer->expense_account->bank_address }}
</td>
</tr>
</table>
@ -142,7 +142,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->name }}
{{ $transfer->income_account->name }}
</td>
</tr>
</table>
@ -154,7 +154,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->number }}
{{ $transfer->income_account->number }}
</td>
</tr>
</table>
@ -166,7 +166,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_name }}
{{ $transfer->income_account->bank_name }}
</td>
</tr>
</table>
@ -178,7 +178,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_phone }}
{{ $transfer->income_account->bank_phone }}
</td>
</tr>
</table>
@ -190,7 +190,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_address }}
{{ $transfer->income_account->bank_address }}
</td>
</tr>
</table>

20
resources/views/components/transfers/template/third.blade.php
View File

@ -18,7 +18,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->name }}
{{ $transfer->expense_account->name }}
</td>
</tr>
</table>
@ -30,7 +30,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->number}}
{{ $transfer->expense_account->number}}
</td>
</tr>
</table>
@ -42,7 +42,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_name }}
{{ $transfer->expense_account->bank_name }}
</td>
</tr>
</table>
@ -54,7 +54,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_phone }}
{{ $transfer->expense_account->bank_phone }}
</td>
</tr>
</table>
@ -66,7 +66,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_address }}
{{ $transfer->expense_account->bank_address }}
</td>
</tr>
</table>
@ -92,7 +92,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->name }}
{{ $transfer->income_account->name }}
</td>
</tr>
</table>
@ -104,7 +104,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->number }}
{{ $transfer->income_account->number }}
</td>
</tr>
</table>
@ -116,7 +116,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_name }}
{{ $transfer->income_account->bank_name }}
</td>
</tr>
</table>
@ -128,7 +128,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_phone }}
{{ $transfer->income_account->bank_phone }}
</td>
</tr>
</table>
@ -140,7 +140,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_address }}
{{ $transfer->income_account->bank_address }}
</td>
</tr>
</table>