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

Merge branch 'master' of https://github.com/brkcvn/akaunting into code-clean

Browse Source
This commit is contained in:
Burak Civan
2022-08-05 14:48:35 +03:00
parent bfd1f11fb9 7a07a7512a
commit d452dc097a
56 changed files with 1184 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/components/transactions/show/attachment.blade.php
View File

@ -11,7 +11,7 @@
</x-button.hover>
</span>
<div class="text-black-400 text-sm">
<div class="text-black-400 text-sm flex gap-x-1 mt-1">
{{ trans('transactions.slider.attachments') }}
</div>

2
resources/views/components/transactions/show/children.blade.php
View File

@ -8,7 +8,7 @@
</x-button.hover>
</span>
<div class="text-black-400 text-sm">
<div class="text-black-400 text-sm flex gap-x-1 mt-1">
{!! trans('transactions.slider.children', ['count' => $transaction->children()->count()]) !!}
</div>

2
resources/views/components/transactions/show/create.blade.php
View File

@ -10,7 +10,7 @@
</x-button.hover>
</span>
<div class="text-black-400 text-sm">
<div class="text-black-400 text-sm flex gap-x-1 mt-1">
@if ($transaction->isRecurringTransaction())
{!! trans('transactions.slider.create_recurring', ['user' => $transaction->owner->name, 'date' => $created_date]) !!}
@else

2
resources/views/components/transactions/show/schedule.blade.php
View File

@ -13,7 +13,7 @@
</x-button.hover>
</span>
<div class="text-black-400 text-sm">
<div class="text-black-400 text-sm flex gap-x-1 mt-1">
{!! trans('transactions.slider.schedule', ['frequency' => $frequency, 'interval' => $transaction->recurring->interval, 'date' => $started_date]) !!}
</div>

2
resources/views/components/transactions/show/transfer.blade.php
View File

@ -18,7 +18,7 @@
</span>
@if ($transfer)
<div class="text-black-400 text-sm">
<div class="text-black-400 text-sm flex gap-x-1 mt-1">
{!! trans('transactions.slider.transfer_headline', ['from_account' => $from_account, 'to_account' => $to_account]) !!}
</div>
@endif

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

@ -19,9 +19,9 @@
<td class="text" style="width: 80%; padding: 0 0 15px 0;">
@stack('company_details_start')
@if (! $hideCompanyName)
<h2 class="text-semibold text">
<span class="font-semibold text">
{{ setting('company.name') }}
</h2>
</span>
@endif
@if (! $hideCompanyAddress)
@ -368,11 +368,8 @@
<td valign="center" style="width:80%; display:block; float:right; background-color: #55588B; -webkit-print-color-adjust: exact; color:#ffffff; border-radius: 5px;">
<table>
<tr>
<td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600; color:#ffffff;">
{{ trans($textAmount) }}
</td>
<td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
<td valign="center" style="font-size: 14px; color: #ffffff; padding: 0;">
<span class="ml-2" style="font-weight: 600;">{{ trans($textAmount) }}</span>
@money($transaction->amount, $transaction->currency_code, true)
</td>
</tr>