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

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
merve karaman
2023-07-11 13:10:10 +03:00
committed by GitHub
parent bffc926a81 49a04cd854
commit 79d1b4cb0a
94 changed files with 2053 additions and 2038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/banking/accounts/index.blade.php
View File

@ -97,7 +97,7 @@
</x-table.td>
<x-table.td class="w-6/12 sm:w-3/12" kind="amount">
<x-money :amount="$item->balance" :currency="$item->currency_code" convert />
<x-money :amount="$item->balance" :currency="$item->currency_code" />
</x-table.td>
<x-table.td kind="action">

10
resources/views/banking/accounts/show.blade.php
View File

@ -178,7 +178,7 @@
</div>
<span>
<x-money :amount="$account->opening_balance" :currency="$account->currency_code" convert />
<x-money :amount="$account->opening_balance" :currency="$account->currency_code" />
</span>
</div>
@stack('opening_balance_input_end')
@ -323,7 +323,7 @@
</x-table.td>
<x-table.td class="w-6/12 lg:w-3/12" kind="amount">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
</x-table.td>
<x-table.td kind="action">
@ -391,7 +391,7 @@
$item->name = trans('transfers.messages.delete', [
'from' => $item->expense_transaction->account->name,
'to' => $item->income_transaction->account->name,
'amount' => money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true)
'amount' => money($item->expense_transaction->amount, $item->expense_transaction->currency_code)
]);
@endphp
@ -429,10 +429,10 @@
<x-table.td class="w-6/12 sm:w-3/12" kind="amount">
<x-slot name="first">
<x-money :amount="$item->expense_transaction->amount" :currency="$item->expense_transaction->currency_code" convert />
<x-money :amount="$item->expense_transaction->amount" :currency="$item->expense_transaction->currency_code" />
</x-slot>
<x-slot name="second">
<x-money :amount="$item->income_transaction->amount" :currency="$item->income_transaction->currency_code" convert />
<x-money :amount="$item->income_transaction->amount" :currency="$item->income_transaction->currency_code" />
</x-slot>
</x-table.td>

10
resources/views/banking/reconciliations/create.blade.php
View File

@ -51,8 +51,8 @@
:currency="$currency"
/>
<x-form.group.account
form-group-class="col-span-10 lg:col-span-5 xl:col-span-2 account-input"
<x-form.group.account
form-group-class="col-span-10 lg:col-span-5 xl:col-span-2 account-input"
selected="{{ request('account_id', setting('default.account')) }}"
/>
@ -130,7 +130,7 @@
@if ($item->isIncome())
<x-table.td class="w-6/12 lg:w-2/12" hidden-mobile kind="cursor-none">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
</x-table.td>
<x-table.td class="w-6/12 lg:w-2/12" hidden-mobile kind="cursor-none">
@ -142,7 +142,7 @@
</x-table.td>
<x-table.td class="w-6/12 lg:w-2/12" hidden-mobile kind="cursor-none">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
</x-table.td>
@endif
@ -174,7 +174,7 @@
<td id="closing-balance" class="w-3/12 ltr:text-right rtl:text-left">
<span class="w-auto pl-6 text-sm">
<x-money :amount="$opening_balance" :currency="$account->currency_code" convert />
<x-money :amount="$opening_balance" :currency="$account->currency_code" />
</span>
</td>
</tr>

8
resources/views/banking/reconciliations/edit.blade.php
View File

@ -64,7 +64,7 @@
@if ($item->isIncome())
<x-table.td class="w-6/12 lg:w-2/12" hidden-mobile kind="cursor-none">
<x-money :amount="$item->amount" hidden-mobile :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" hidden-mobile :currency="$item->currency_code" />
</x-table.td>
<x-table.td class="w-6/12 lg:w-2/12" hidden-mobile kind="cursor-none">
@ -76,7 +76,7 @@
</x-table.td>
<x-table.td class="w-6/12 lg:w-2/12" hidden-mobile kind="cursor-none">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
</x-table.td>
@endif
@ -123,7 +123,7 @@
<td id="closing-balance" class="w-3/12 text-right">
<span class="w-auto pl-6 text-sm">
<x-money :amount="$opening_balance" :currency="$account->currency_code" convert />
<x-money :amount="$opening_balance" :currency="$account->currency_code" />
</span>
</td>
</tr>
@ -262,4 +262,4 @@
</x-slot>
<x-script folder="banking" file="reconciliations" />
</x-layouts.admin>
</x-layouts.admin>

2
resources/views/banking/reconciliations/index.blade.php
View File

@ -103,7 +103,7 @@
<x-table.td class="w-6/12 sm:w-3/12" kind="amount">
@if ($item->closing_balance)
<x-money :amount="$item->closing_balance" :currency="$item->account->currency_code" convert />
<x-money :amount="$item->closing_balance" :currency="$item->account->currency_code" />
@else
<x-empty-data />
@endif

2
resources/views/banking/recurring_transactions/index.blade.php
View File

@ -121,7 +121,7 @@
</x-table.td>
<x-table.td class="w-4/12 sm:w-2/12" kind="amount">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
</x-table.td>
<x-table.td kind="action">

2
resources/views/banking/transactions/index.blade.php
View File

@ -185,7 +185,7 @@
</x-table.td>
<x-table.td class="relative w-4/12 sm:w-2/12" kind="amount">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
</x-table.td>
<x-table.td kind="action">

6
resources/views/banking/transfers/index.blade.php
View File

@ -94,7 +94,7 @@
$item->name = trans('transfers.messages.delete', [
'from' => $item->expense_transaction->account->name,
'to' => $item->income_transaction->account->name,
'amount' => money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true)
'amount' => money($item->expense_transaction->amount, $item->expense_transaction->currency_code)
]);
@endphp
@ -136,10 +136,10 @@
<x-table.td class="w-4/12 sm:w-3/12" kind="amount">
<x-slot name="first">
<x-money :amount="$item->expense_transaction->amount" :currency="$item->expense_transaction->currency_code" convert />
<x-money :amount="$item->expense_transaction->amount" :currency="$item->expense_transaction->currency_code" />
</x-slot>
<x-slot name="second">
<x-money :amount="$item->income_transaction->amount" :currency="$item->income_transaction->currency_code" convert />
<x-money :amount="$item->income_transaction->amount" :currency="$item->income_transaction->currency_code" />
</x-slot>
</x-table.td>

6
resources/views/common/items/index.blade.php
View File

@ -86,7 +86,7 @@
<x-table.td class="w-6/12 sm:w-4/12">
<x-slot name="first" class="flex font-bold" override="class">
{{ $item->name }}
@if (! $item->enabled)
<x-index.disable text="{{ trans_choice('general.items', 1) }}" />
@endif
@ -117,14 +117,14 @@
<x-table.td class="w-6/12 sm:w-3/12" kind="amount">
<x-slot name="first">
@if ($item->sale_price)
<x-money :amount="$item->sale_price" :currency="default_currency()" convert />
<x-money :amount="$item->sale_price" />
@else
<x-empty-data />
@endif
</x-slot>
<x-slot name="second">
@if ($item->purchase_price)
<x-money :amount="$item->purchase_price" :currency="default_currency()" convert />
<x-money :amount="$item->purchase_price" />
@else
<x-empty-data />
@endif

4
resources/views/components/contacts/index/content.blade.php
View File

@ -221,7 +221,7 @@
@if (! $hideOpen)
<x-slot name="first">
@if ($item->open)
<x-money :amount="$item->open" :currency="default_currency()" convert />
<x-money :amount="$item->open" />
@else
<x-empty-data />
@endif
@ -233,7 +233,7 @@
@if (! $hideOverdue)
<x-slot name="second">
@if ($item->overdue)
<x-money :amount="$item->overdue" :currency="default_currency()" convert />
<x-money :amount="$item->overdue" />
@else
<x-empty-data />
@endif

6
resources/views/components/contacts/show/content.blade.php
View File

@ -184,7 +184,7 @@
id="transactions"
name="{{ trans_choice('general.transactions', 2) }}"
/>
@stack('transactions_nav_end')
</x-slot>
@ -261,7 +261,7 @@
</x-table.td>
<x-table.td class="w-4/12 lg:w-3/12" kind="amount">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
</x-table.td>
<x-table.td kind="action">
@ -359,7 +359,7 @@
</x-table.td>
<x-table.td class="w-4/12 lg:w-3/12" kind="amount">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
</x-table.td>
<x-table.td kind="action">

2
resources/views/components/documents/index/document.blade.php
View File

@ -163,7 +163,7 @@
@if (! $hideAmount)
<x-table.td class="{{ $classAmount }}" kind="amount">
@stack('amount_td_inside_start')
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
@stack('amount_td_inside_end')
</x-table.td>

6
resources/views/components/documents/index/information.blade.php
View File

@ -62,7 +62,7 @@
</div>
<span class="font-normal">
<x-money :amount="$document_item->price" :currency="$document->currency_code" convert />
<x-money :amount="$document_item->price" :currency="$document->currency_code" />
</span>
<div class="w-40 font-normal text-sm truncate">
@ -100,7 +100,7 @@
@if ($document->paid)
<span>
<x-money :amount="$document->paid" :currency="$document->currency_code" convert />
<x-money :amount="$document->paid" :currency="$document->currency_code" />
</span>
@endif
</div>
@ -111,7 +111,7 @@
</span>
<span>
<x-money :amount="$document->amount" :currency="$document->currency_code" convert />
<x-money :amount="$document->amount" :currency="$document->currency_code" />
</span>
</div>
</div>

2
resources/views/components/documents/index/recurring_templates.blade.php
View File

@ -97,7 +97,7 @@
</x-table.td>
<x-table.td class="w-4/12 sm:w-2/12" kind="amount">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
</x-table.td>
<x-table.td kind="action">

4
resources/views/components/documents/show/get-paid.blade.php
View File

@ -62,7 +62,7 @@
<span>
<x-date :date="$transaction->paid_at" />
- {!! trans('documents.transaction', [
'amount' => '<span class="font-medium">' . money($transaction->amount, $transaction->currency_code, true) . '</span>',
'amount' => '<span class="font-medium">' . money($transaction->amount, $transaction->currency_code) . '</span>',
'account' => '<span class="font-medium">' . $transaction->account->name . '</span>',
]) !!}
</span>
@ -103,7 +103,7 @@
@php
$message = trans('general.delete_confirm', [
'name' => '<strong>' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '</strong>',
'name' => '<strong>' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code) . ' - ' . $transaction->account->name . '</strong>',
'type' => strtolower(trans_choice('general.transactions', 1))
]);
@endphp

4
resources/views/components/documents/show/make-payment.blade.php
View File

@ -45,7 +45,7 @@
<span>
<x-date :date="$transaction->paid_at" />
- {!! trans('documents.transaction', [
'amount' => '<span class="font-medium">' . money($transaction->amount, $transaction->currency_code, true) . '</span>',
'amount' => '<span class="font-medium">' . money($transaction->amount, $transaction->currency_code) . '</span>',
'account' => '<span class="font-medium">' . $transaction->account->name . '</span>',
]) !!}
</span>
@ -86,7 +86,7 @@
@php
$message = trans('general.delete_confirm', [
'name' => '<strong>' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '</strong>',
'name' => '<strong>' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code) . ' - ' . $transaction->account->name . '</strong>',
'type' => strtolower(trans_choice('general.transactions', 1))
]);
@endphp

8
resources/views/components/documents/template/classic.blade.php
View File

@ -236,7 +236,7 @@
</span>
<span class="float-right spacing">
<x-money :amount="$total->amount - $document->paid" :currency="$document->currency_code" convert />
<x-money :amount="$total->amount - $document->paid" :currency="$document->currency_code" />
</span>
</p>
@endif
@ -353,7 +353,7 @@
</strong>
<span>
<x-money :amount="$total->amount" :currency="$document->currency_code" convert />
<x-money :amount="$total->amount" :currency="$document->currency_code" />
</span>
</div>
@stack($total->code . '_total_tr_end')
@ -366,7 +366,7 @@
</span>
<span>
- <x-money :amount="$document->paid" :currency="$document->currency_code" convert />
- <x-money :amount="$document->paid" :currency="$document->currency_code" />
</span>
</div>
@stack('paid_total_tr_end')
@ -379,7 +379,7 @@
</span>
<span>
<x-money :amount="$document->amount_due" :currency="$document->currency_code" convert />
<x-money :amount="$document->amount_due" :currency="$document->currency_code" />
</span>
</div>
@stack('grand_total_tr_end')

6
resources/views/components/documents/template/default.blade.php
View File

@ -324,7 +324,7 @@
</span>
<span>
<x-money :amount="$total->amount" :currency="$document->currency_code" convert />
<x-money :amount="$total->amount" :currency="$document->currency_code" />
</span>
</div>
@stack($total->code . '_total_tr_end')
@ -337,7 +337,7 @@
</span>
<span>
- <x-money :amount="$document->paid" :currency="$document->currency_code" convert />
- <x-money :amount="$document->paid" :currency="$document->currency_code" />
</span>
</div>
@stack('paid_total_tr_end')
@ -350,7 +350,7 @@
</span>
<span>
<x-money :amount="$document->amount_due" :currency="$document->currency_code" convert />
<x-money :amount="$document->amount_due" :currency="$document->currency_code" />
</span>
</div>
@stack('grand_total_tr_end')

6
resources/views/components/documents/template/line-item.blade.php
View File

@ -31,7 +31,7 @@
@stack('price_td_start')
@if (! $hidePrice)
<td class="price text text-alignment-right text-right">
<x-money :amount="$item->price" :currency="$document->currency_code" convert />
<x-money :amount="$item->price" :currency="$document->currency_code" />
</td>
@endif
@stack('price_td_end')
@ -59,7 +59,7 @@
</td>
@else
<td class="discount text text-alignment-right text-right">
<x-money :amount="$item->discount" :currency="$document->currency_code" convert />
<x-money :amount="$item->discount" :currency="$document->currency_code" />
</td>
@endif
@stack('discount_td_end')
@ -69,7 +69,7 @@
@stack('total_td_start')
@if (! $hideAmount)
<td class="total text text-alignment-right text-right">
<x-money :amount="$item->total" :currency="$document->currency_code" convert />
<x-money :amount="$item->total" :currency="$document->currency_code" />
</td>
@endif
@stack('total_td_end')

6
resources/views/components/documents/template/modern.blade.php
View File

@ -321,7 +321,7 @@
</span>
<span>
<x-money :amount="$total->amount" :currency="$document->currency_code" convert />
<x-money :amount="$total->amount" :currency="$document->currency_code" />
</span>
</div>
@stack($total->code . '_total_tr_end')
@ -334,7 +334,7 @@
</span>
<span>
- <x-money :amount="$document->paid" :currency="$document->currency_code" convert />
- <x-money :amount="$document->paid" :currency="$document->currency_code" />
</span>
</div>
@stack('paid_total_tr_end')
@ -347,7 +347,7 @@
</span>
<span>
<x-money :amount="$document->amount_due" :currency="$document->currency_code" convert />
<x-money :amount="$document->amount_due" :currency="$document->currency_code" />
</span>
</div>
@stack('grand_total_tr_end')

4
resources/views/components/reports/detail/table/footer.blade.php
View File

@ -4,8 +4,8 @@
<tr class="px-3">
<th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans_choice('general.totals', 1) }}</th>
@foreach($class->footer_totals[$table_key] as $total)
<th class="{{ $class->column_value_width }} text-right px-0">{{ $class->has_money ? money($total, default_currency(), true) : $total }}</th>
<th class="{{ $class->column_value_width }} text-right px-0">{{ $class->has_money ? money($total) : $total }}</th>
@endforeach
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">{{ $class->has_money ? money($grand_total, default_currency(), true) : $grand_total }}</th>
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">{{ $class->has_money ? money($grand_total) : $grand_total }}</th>
</tr>
</tfoot>

12
resources/views/components/reports/detail/table/row.blade.php
View File

@ -14,9 +14,9 @@
@endif
@foreach($rows as $row)
<td class="{{ $class->column_value_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs">{{ $class->has_money ? money($row, default_currency(), true) : $row }}</td>
<td class="{{ $class->column_value_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs">{{ $class->has_money ? money($row) : $row }}</td>
@endforeach
<td class="{{ $class->column_name_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs uppercase">{{ $class->has_money ? money($row_total, default_currency(), true) : $row }}</td>
<td class="{{ $class->column_name_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs uppercase">{{ $class->has_money ? money($row_total) : $row }}</td>
</tr>
@endif
@endif
@ -57,9 +57,9 @@
</div>
</td>
@foreach($parent_row_values as $row)
<td class="{{ $class->column_value_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs">{{ $class->has_money ? money($row, default_currency(), true) : $row }}</td>
<td class="{{ $class->column_value_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs">{{ $class->has_money ? money($row) : $row }}</td>
@endforeach
<td class="{{ $class->column_name_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs uppercase">{{ $class->has_money ? money($row_total, default_currency(), true) : $row }}</td>
<td class="{{ $class->column_name_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs uppercase">{{ $class->has_money ? money($row_total) : $row }}</td>
</tr>
@endif
@ -69,9 +69,9 @@
<tr class="hover:bg-gray-100 border-b collapse-sub collapse-sub-report" data-collapse="child-{{ $id }}">
<td class="{{ $class->column_name_width }} py-2 text-left text-black-400" style="padding-left: {{ ($tree_level + 1) * 20 }}px;" title="{{ $class->row_names[$table_key][$id] }}">{{ $class->row_names[$table_key][$id] }}</td>
@foreach($rows as $row)
<td class="{{ $class->column_value_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs">{{ $class->has_money ? money($row, default_currency(), true) : $row }}</td>
<td class="{{ $class->column_value_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs">{{ $class->has_money ? money($row) : $row }}</td>
@endforeach
<td class="{{ $class->column_name_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs uppercase">{{ $class->has_money ? money($row_total, default_currency(), true) : $row }}</td>
<td class="{{ $class->column_name_width }} py-2 ltr:text-right rtl:text-left text-alignment-right text-black-400 text-xs uppercase">{{ $class->has_money ? money($row_total) : $row }}</td>
</tr>
@endif

4
resources/views/components/reports/summary/table/body.blade.php
View File

@ -1,12 +1,12 @@
<div>
<div
<div
@class([
'd-flex align-items-center justify-content-between rp-border-bottom-1 text' => $is_print,
'flex items-center justify-between text-xl text-black-400 border-b pb-2' => !$is_print
])
>
<h2>{{ $table_name }}</h2>
<span>{{ $class->has_money ? money($grand_total, default_currency(), true) : $grand_total }}</span>
<span>{{ $class->has_money ? money($grand_total) : $grand_total }}</span>
</div>
@if (!empty($class->row_values[$table_key]))
<ul

6
resources/views/components/reports/summary/table/row.blade.php
View File

@ -28,7 +28,7 @@
@endif
<span>{{ $class->row_names[$table_key][$id] }}</span>
</div>
<span>{{ $class->has_money ? money($row_total, default_currency(), true) : $row_total }}</span>
<span>{{ $class->has_money ? money($row_total) : $row_total }}</span>
</div>
</li>
@endif
@ -73,7 +73,7 @@
@endif
@endif
</div>
<span>{{ $class->has_money ? money($row_total, default_currency(), true) : $row_total }}</span>
<span>{{ $class->has_money ? money($row_total) : $row_total }}</span>
</div>
</li>
@endif
@ -91,7 +91,7 @@
<div style="display:flex; align-items: center; padding-left: {{ ($tree_level + 1) * 20 }}px;">
<span>{{ $class->row_names[$table_key][$id] }}</span>
</div>
<span>{{ $class->has_money ? money($row_total, default_currency(), true) : $row_total }}</span>
<span>{{ $class->has_money ? money($row_total) : $row_total }}</span>
</div>
</li>
@endif

6
resources/views/components/transactions/template/default.blade.php
View File

@ -354,12 +354,12 @@
<td class="price text-alignment-right text-right" style="color:#424242; font-size:12px; padding-right:0;">
@if (! $hideRelatedDocumentAmount)
<x-money :amount="$transaction->document->amount" :currency="$transaction->document->currency_code" convert /> <br />
<x-money :amount="$transaction->document->amount" :currency="$transaction->document->currency_code" /> <br />
@endif
@if (! $hideRelatedAmount)
<span style="color: #6E6E6E">
<x-money :amount="$transaction->amount" :currency="$transaction->currency_code" convert />
<x-money :amount="$transaction->amount" :currency="$transaction->currency_code" />
</span>
@endif
</td>
@ -379,7 +379,7 @@
<span class="ml-2 font-semibold">
{{ trans($textAmount) }}
</span>
<x-money :amount="$transaction->amount" :currency="$transaction->currency_code" convert />
<x-money :amount="$transaction->amount" :currency="$transaction->currency_code" />
</td>
</tr>
</table>

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

@ -253,7 +253,7 @@
</table>
@stack('details_end')
<table style="text-align: right; margin-top:55px;">
<tr>
<td valign="center" style="width:80%; display:block; float:right; background-color: #55588B; -webkit-print-color-adjust: exact; color:#ffffff; border-radius: 5px;">
@ -264,7 +264,7 @@
{{ trans('general.amount') }}
</span>
<x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
<x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" />
</td>
</tr>
</table>

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

@ -259,7 +259,7 @@
{{ trans('general.amount') }}
</span>
<x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
<x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" />
</td>
</tr>
</table>

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

@ -273,7 +273,7 @@
{{ trans('general.amount') }}
</span>
<x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
<x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" />
</td>
</tr>
</table>

2
resources/views/components/widgets/last_payment.blade.php
View File

@ -9,7 +9,7 @@
</span>
<span class="text-xl text-black my-3">
<x-money :amount="$payment->amount" :currency="$payment->currency_code" convert />
<x-money :amount="$payment->amount" :currency="$payment->currency_code" />
</span>
@else
<span class="text-xs">

4
resources/views/components/widgets/outstanding_balance.blade.php
View File

@ -10,9 +10,9 @@
<div class="flex flex-col items-start my-3">
<span class="text-xl text-black">
<x-money :amount="$contact->overdue" :currency="$contact->currency_code" convert />
<x-money :amount="$contact->overdue" :currency="$contact->currency_code" />
</span>
<x-link href="{{ route('portal.invoices.index') }}" class="px-2 py-1 my-3 rounded-lg text-xs leading-6 bg-green text-white hover:bg-green-700 disabled:bg-green-100" override="class">
{{ trans('bills.make_payment') }}
</x-link>

4
resources/views/components/widgets/payment_history.blade.php
View File

@ -7,9 +7,9 @@
@foreach ($payments as $item)
<span class="text-xs mb-3">
@if (! $item->document)
{{ trans('portal.payment_history.description', ['date' => company_date($item->created_at), 'amount' => money($item->amount, $item->currency_code, true)]) }}
{{ trans('portal.payment_history.description', ['date' => company_date($item->created_at), 'amount' => money($item->amount, $item->currency_code)]) }}
@else
{{ trans('portal.payment_history.invoice_description', ['date' => company_date($item->created_at), 'amount' => money($item->amount, $item->currency_code, true), 'invoice_nember' => $item->document->document_number]) }}
{{ trans('portal.payment_history.invoice_description', ['date' => company_date($item->created_at), 'amount' => money($item->amount, $item->currency_code), 'invoice_nember' => $item->document->document_number]) }}
@endif
</span>
@endforeach

2
resources/views/portal/invoices/index.blade.php
View File

@ -137,7 +137,7 @@
<x-table.td class="w-6/12 sm:w-2/12" kind="amount">
@stack('amount_td_inside_start')
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
@stack('amount_td_inside_end')
</x-table.td>

2
resources/views/portal/invoices/preview.blade.php
View File

@ -111,7 +111,7 @@
<x-date :date="$transaction->paid_at" />
</x-link>
- {!! trans('documents.transaction', [
'amount' => '<span class="font-medium">' . money($transaction->amount, $transaction->currency_code, true) . '</span>',
'amount' => '<span class="font-medium">' . money($transaction->amount, $transaction->currency_code) . '</span>',
'account' => '<span class="font-medium">' . $transaction->account->name . '</span>',
]) !!}
</span>

2
resources/views/portal/invoices/show.blade.php
View File

@ -109,7 +109,7 @@
<x-date :date="$transaction->paid_at" />
</x-link>
- {!! trans('documents.transaction', [
'amount' => '<span class="font-medium">' . money($transaction->amount, $transaction->currency_code, true) . '</span>',
'amount' => '<span class="font-medium">' . money($transaction->amount, $transaction->currency_code) . '</span>',
'account' => '<span class="font-medium">' . $transaction->account->name . '</span>',
]) !!}
</span>

2
resources/views/portal/invoices/signed.blade.php
View File

@ -118,7 +118,7 @@
<x-date :date="$transaction->paid_at" />
</x-link>
- {!! trans('documents.transaction', [
'amount' => '<span class="font-medium">' . money($transaction->amount, $transaction->currency_code, true) . '</span>',
'amount' => '<span class="font-medium">' . money($transaction->amount, $transaction->currency_code) . '</span>',
'account' => '<span class="font-medium">' . $transaction->account->name . '</span>',
]) !!}
</span>

2
resources/views/portal/payments/index.blade.php
View File

@ -49,7 +49,7 @@
</x-table.td>
<x-table.td class="w-3/12" kind="amount">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
<x-money :amount="$item->amount" :currency="$item->currency_code" />
</x-table.td>
</x-table.tr>
@endforeach

2
resources/views/portal/payments/preview.blade.php
View File

@ -46,7 +46,7 @@
</div>
<span class="text-sm">
{{ trans('portal.payment_detail.description', ['date' => date($payment->paid_at), 'amount' => money($payment->amount, $payment->currency_code, true)]) }}
{{ trans('portal.payment_detail.description', ['date' => date($payment->paid_at), 'amount' => money($payment->amount, $payment->currency_code)]) }}
</span>
</div>
@endif

2
resources/views/portal/payments/show.blade.php
View File

@ -44,7 +44,7 @@
</div>
<span class="text-sm">
{{ trans('portal.payment_detail.description', ['date' => date($payment->paid_at), 'amount' => money($payment->amount, $payment->currency_code, true)]) }}
{{ trans('portal.payment_detail.description', ['date' => date($payment->paid_at), 'amount' => money($payment->amount, $payment->currency_code)]) }}
</span>
</div>
@endif

4
resources/views/portal/payments/signed.blade.php
View File

@ -17,7 +17,7 @@
</x-link>
@stack('button_print_end')
@stack('button_dashboard_start')
@if (! user())
<x-link href="{{ route('portal.dashboard') }}" class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-lg text-sm font-medium leading-6">
@ -54,7 +54,7 @@
</div>
<span class="text-sm">
{{ trans('portal.payment_detail.description', ['date' => date($payment->paid_at), 'amount' => money($payment->amount, $payment->currency_code, true)]) }}
{{ trans('portal.payment_detail.description', ['date' => date($payment->paid_at), 'amount' => money($payment->amount, $payment->currency_code)]) }}
</span>
</div>
@endif

4
resources/views/reports/profit_loss/content/footer.blade.php
View File

@ -8,12 +8,12 @@
@foreach($class->net_profit as $profit)
<td class="{{ $class->column_value_width }} ltr:text-right rtl:text-left text-black-400 font-medium text-xs print-alignment">
<x-money :amount="$profit" :currency="default_currency()" convert />
<x-money :amount="$profit" />
</td>
@endforeach
<td class="{{ $class->column_name_width }} ltr:text-right rtl:text-left text-black-400 font-medium text-xs print-alignment">
<x-money :amount="array_sum($class->net_profit)" :currency="default_currency()" convert />
<x-money :amount="array_sum($class->net_profit)" />
</td>
</tr>
</tbody>

4
resources/views/reports/profit_loss/table/footer.blade.php
View File

@ -8,12 +8,12 @@
@foreach($class->footer_totals[$table_key] as $total)
<td class="{{ $class->column_value_width }} py-4 ltr:text-right rtl:text-left text-black-400 font-medium text-xs print-alignment">
<x-money :amount="$total" :currency="default_currency()" convert />
<x-money :amount="$total" />
</td>
@endforeach
<td class="{{ $class->column_name_width }} py-4 ltr:text-right rtl:text-left text-black-400 font-medium text-xs print-alignment">
<x-money :amount="$grand_total" :currency="default_currency()" convert />
<x-money :amount="$grand_total" />
</td>
</tr>
</tfoot>

4
resources/views/reports/tax_summary/table/footer.blade.php
View File

@ -8,12 +8,12 @@
@foreach($class->footer_totals[$table_key] as $total)
<td class="{{ $class->column_value_width }} py-4 ltr:text-right rtl:text-left text-black-400 font-medium text-xs print-alignment">
<x-money :amount="$total" :currency="default_currency()" convert />
<x-money :amount="$total" />
</td>
@endforeach
<td class="{{ $class->column_name_width }} py-4 ltr:text-right rtl:text-left text-black-400 font-medium text-xs print-alignment">
<x-money :amount="$grand_total" :currency="default_currency()" convert />
<x-money :amount="$grand_total" />
</td>
</tr>
</tfoot>