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

Refactor total and line discount calculation according to new design

Browse Source
This commit is contained in:
Burak Çakırel
2021-01-03 23:46:19 +03:00
parent 76cb9076a2
commit a832142dcd
4 changed files with 55 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@
<a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary" @click="closePayment">
{{ trans('general.cancel') }}
</a>
{!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success']) !!}
{!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddTotalDiscount', 'class' => 'btn btn-success']) !!}
</div>
</div>
</div>
@ -133,7 +133,7 @@
<tr id="tr-currency-conversion" class="d-none" :class="[{'d-table-row': (('{{ setting('default.currency') }}' != form.currency_code) && totals.total)}]">
<td class="border-top-0 pb-0"></td>
<td class="text-right border-top-0 border-right-0 align-middle pb-0" colspan="2">
<akaunting-currency-conversion
<akaunting-currency-conversion
currency-conversion-text="{{ trans('currencies.conversion') }}"
:price="(totals.total / form.currency_rate).toFixed(2)"
currecy-code="{{ setting('default.currency') }}"
@ -147,4 +147,4 @@
</table>
</div>
</div>
</div>
</div>