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 form-elements

Browse Source
This commit is contained in:
Burak Civan
2022-06-28 16:46:57 +03:00
parent 668300ddb8 239b4d6276
commit 2e6aaa8f10
54 changed files with 12529 additions and 980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/components/documents/form/line-item.blade.php
View File

@ -190,18 +190,18 @@
@if (! $hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
<div class="text-left border-0 p-0 mr-16" v-if="!row.add_discount">
<button type="button" class="text-xs text-purple" @click="onAddLineDiscount(index)">
<span class="border-b border-transparent transition-all hover:border-purple">
<x-link.hover color="to-purple">
{{ trans('general.title.add', ['type' => trans('invoices.discount')]) }}
</span>
</x-link.hover>
</button>
</div>
@endif
<div class="text-right border-0 p-0 pr-4">
<button type="button" class="text-xs text-purple" @click="onAddTax(index)">
<span class="border-b border-transparent transition-all hover:border-purple">
<x-link.hover color="to-purple">
{{ trans('general.title.add', ['type' => trans_choice('general.taxes', 1)]) }}
</span>
</x-link.hover>
</button>
</div>
</div>

6
resources/views/components/documents/form/totals.blade.php
View File

@ -79,10 +79,10 @@
<td class="border-t-0 py-0"></td>
<td class="text-right border-t-0 border-r-0 border-b-0 align-middle py-0 pr-0">
<div v-if="show_discount_text">
<span class="border-b border-transparent transition-all text-sm text-purple cursor-pointer hover:border-purple" v-if="!totals.discount_text" @click="onAddDiscount()">
<div v-if="show_discount_text" v-if="!totals.discount_text" @click="onAddDiscount()">
<x-link.hover color="to-purple">
{{ trans('invoices.add_discount') }}
</span>
</x-link.hover>
</div>
<span v-if="totals.discount_text" v-html="totals.discount_text"></span>