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

ui feedback & bugs fixed

Browse Source
This commit is contained in:
Burak Civan
2022-06-06 10:33:03 +03:00
parent 9c2dccbf03
commit 1dd4fca8f2
10 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,33 +204,33 @@
<tr>
@stack('name_th_start')
@if (!$hideItems || (!$hideName && !$hideDescription))
<th class="item text text-semibold text-alignment-left">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
<th class="item text text-semibold text-alignment-left text-left">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
@endif
@stack('name_th_end')
@stack('quantity_th_start')
@if (!$hideQuantity)
<th class="quantity text text-semibold text-alignment-right">{{ trans($textQuantity) }}</th>
<th class="quantity text text-semibold text-alignment-right text-right">{{ trans($textQuantity) }}</th>
@endif
@stack('quantity_th_end')
@stack('price_th_start')
@if (!$hidePrice)
<th class="price text text-semibold text-alignment-right">{{ trans($textPrice) }}</th>
<th class="price text text-semibold text-alignment-right text-right">{{ trans($textPrice) }}</th>
@endif
@stack('price_th_end')
@if (!$hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<th class="discount text text-semibold text-alignment-right">{{ trans('invoices.discount') }}</th>
<th class="discount text text-semibold text-alignment-right text-right">{{ trans('invoices.discount') }}</th>
@stack('discount_td_end')
@endif
@endif
@stack('total_th_start')
@if (!$hideAmount)
<th class="total text text-semibold text-alignment-right">{{ trans($textAmount) }}</th>
<th class="total text text-semibold text-alignment-right text-right">{{ trans($textAmount) }}</th>
@endif
@stack('total_th_end')
</tr>

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

@ -189,33 +189,33 @@
<tr>
@stack('name_th_start')
@if (!$hideItems || (!$hideName && !$hideDescription))
<th class="item text text-semibold text-alignment-left text-white border-radius-first">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
<th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
@endif
@stack('name_th_end')
@stack('quantity_th_start')
@if (!$hideQuantity)
<th class="quantity text text-semibold text-alignment-right text-white">{{ trans($textQuantity) }}</th>
<th class="quantity text text-semibold text-alignment-right text-right text-white">{{ trans($textQuantity) }}</th>
@endif
@stack('quantity_th_end')
@stack('price_th_start')
@if (!$hidePrice)
<th class="price text text-semibold text-alignment-right text-white">{{ trans($textPrice) }}</th>
<th class="price text text-semibold text-alignment-right text-right text-white">{{ trans($textPrice) }}</th>
@endif
@stack('price_th_end')
@if (!$hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<th class="discount text text-semibold text-alignment-right text-white">{{ trans('invoices.discount') }}</th>
<th class="discount text text-semibold text-alignment-right text-right text-white">{{ trans('invoices.discount') }}</th>
@stack('discount_td_end')
@endif
@endif
@stack('total_th_start')
@if (!$hideAmount)
<th class="total text text-semibold text-white text-alignment-right border-radius-last">{{ trans($textAmount) }}</th>
<th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">{{ trans($textAmount) }}</th>
@endif
@stack('total_th_end')
</tr>

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

@ -1,7 +1,7 @@
<tr>
@stack('name_td_start')
@if (! $hideItems || (! $hideName && ! $hideDescription))
<td class="item text text-alignment-left">
<td class="item text text-alignment-left text-left">
@if (! $hideName)
{{ $item->name }} <br/>
@endif
@ -22,13 +22,13 @@
@stack('quantity_td_start')
@if (! $hideQuantity)
<td class="quantity text text-alignment-right">{{ $item->quantity }}</td>
<td class="quantity text text-alignment-right text-right">{{ $item->quantity }}</td>
@endif
@stack('quantity_td_end')
@stack('price_td_start')
@if (! $hidePrice)
<td class="price text text-alignment-right">@money($item->price, $document->currency_code, true)</td>
<td class="price text text-alignment-right text-right">@money($item->price, $document->currency_code, true)</td>
@endif
@stack('price_td_end')
@ -36,9 +36,9 @@
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
@if ($item->discount_type === 'percentage')
<td class="discount text text-alignment-right">{{ $item->discount }}</td>
<td class="discount text text-alignment-right text-right">{{ $item->discount }}</td>
@else
<td class="discount text text-alignment-right">@money($item->discount, $document->currency_code, true)</td>
<td class="discount text text-alignment-right text-right">@money($item->discount, $document->currency_code, true)</td>
@endif
@stack('discount_td_end')
@endif
@ -46,7 +46,7 @@
@stack('total_td_start')
@if (! $hideAmount)
<td class="total text text-alignment-right">@money($item->total, $document->currency_code, true)</td>
<td class="total text text-alignment-right text-right">@money($item->total, $document->currency_code, true)</td>
@endif
@stack('total_td_end')
</tr>

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

@ -177,33 +177,33 @@
<tr>
@stack('name_th_start')
@if (!$hideItems || (!$hideName && !$hideDescription))
<th class="item text text-semibold text-alignment-left text-white border-radius-first">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
<th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
@endif
@stack('name_th_end')
@stack('quantity_th_start')
@if (!$hideQuantity)
<th class="quantity text text-semibold text-white text-alignment-right">{{ trans($textQuantity) }}</th>
<th class="quantity text text-semibold text-white text-alignment-right text-right">{{ trans($textQuantity) }}</th>
@endif
@stack('quantity_th_end')
@stack('price_th_start')
@if (!$hidePrice)
<th class="price text text-semibold text-white text-alignment-right">{{ trans($textPrice) }}</th>
<th class="price text text-semibold text-white text-alignment-right text-right">{{ trans($textPrice) }}</th>
@endif
@stack('price_th_end')
@if (!$hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<th class="discount text text-semibold text-white text-alignment-right">{{ trans('invoices.discount') }}</th>
<th class="discount text text-semibold text-white text-alignment-right text-right">{{ trans('invoices.discount') }}</th>
@stack('discount_td_end')
@endif
@endif
@stack('total_th_start')
@if (!$hideAmount)
<th class="total text text-semibold text-white text-alignment-right border-radius-last">{{ trans($textAmount) }}</th>
<th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">{{ trans($textAmount) }}</th>
@endif
@stack('total_th_end')
</tr>