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

Adding discount as an amount #kbcqjv

Browse Source
This commit is contained in:
Burak Çakırel
2021-08-15 17:20:39 +01:00
parent 538e116fb2
commit e8720c6a8a
6 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/assets/js/views/common/documents.js vendored
View File

@ -70,7 +70,7 @@ const app = new Vue({
},
mounted() {
this.form.discount_type = 'percentage';
this.form.discount_type = 'normal';
if ((document.getElementById('items') != null) && (document.getElementById('items').rows)) {
this.colspan = document.getElementById("items").rows[0].cells.length - 1;
@ -118,7 +118,7 @@ const app = new Vue({
let line_discount_amount = 0;
if (item.discount) {
if (item.discount_type === 'percentage') {
if (item.discount_type === 'normal') {
if (item.discount > 100) {
item.discount = 100;
}
@ -249,7 +249,7 @@ const app = new Vue({
// Apply discount to total
if (global_discount) {
if (this.form.discount_type === 'percentage') {
if (this.form.discount_type === 'normal') {
discount_total = parseFloat(sub_total + inclusive_tax_total) * (global_discount / 100);
} else {
discount_total = global_discount;
@ -398,7 +398,7 @@ const app = new Vue({
},
onAddLineDiscount(item_index) {
this.items[item_index].discount_type = 'percentage';
this.items[item_index].discount_type = 'normal';
this.items[item_index].add_discount = true;
},
@ -415,7 +415,7 @@ const app = new Vue({
onAddTotalDiscount() {
let discount = document.getElementById('pre-discount').value;
if (this.form.discount_type === 'percentage') {
if (this.form.discount_type === 'normal') {
if (discount < 0) {
discount = 0;
} else if (discount > 100) {
@ -649,6 +649,7 @@ const app = new Vue({
price: (item.price).toFixed(2),
tax_ids: item.tax_ids,
discount: item.discount_rate,
discount_type: item.discount_type,
total: (item.total).toFixed(2)
});
@ -686,6 +687,7 @@ const app = new Vue({
tax_ids: item_taxes,
add_discount: (item.discount_rate) ? true : false,
discount: item.discount_rate,
discount_type: item.discount_type,
total: (item.total).toFixed(2),
// @todo
// invoice_item_checkbox_sample: [],

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

@ -163,12 +163,12 @@
<div class="form-group mb-0 w-100" style="display: inline-block; position: relative;">
<div class="input-group mb-0 select-tax">
<div class="input-group-prepend">
<button class="btn btn-sm" :class="[{'btn-outline-primary' : row.discount_type !== 'percentage'}, {'btn-primary' : row.discount_type === 'percentage'}]"
@click="onChangeLineDiscountType(index, 'percentage')" type="button">
<button class="btn btn-sm" :class="[{'btn-outline-primary' : row.discount_type !== 'normal'}, {'btn-primary' : row.discount_type === 'normal'}]"
@click="onChangeLineDiscountType(index, 'normal')" type="button">
<i class="fa fa-percent fa-sm"></i>
</button>
<button class="btn btn-sm" :class="[{'btn-outline-primary' : row.discount_type !== 'amount'}, {'btn-primary' : row.discount_type === 'amount'}]"
@click="onChangeLineDiscountType(index, 'amount')" type="button">{{ $currency->symbol }}
<button class="btn btn-sm" :class="[{'btn-outline-primary' : row.discount_type !== 'fixed'}, {'btn-primary' : row.discount_type === 'fixed'}]"
@click="onChangeLineDiscountType(index, 'fixed')" type="button">{{ $currency->symbol }}
</button>
</div>
<input type="number"

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

@ -57,12 +57,12 @@
<div class="col-sm-8">
<div class="input-group">
<div class="input-group-prepend">
<button class="btn btn-sm" :class="[{'btn-outline-primary' : form.discount_type !== 'percentage'}, {'btn-primary' : form.discount_type === 'percentage'}]"
@click="onChangeDiscountType('percentage')" type="button">
<button class="btn btn-sm" :class="[{'btn-outline-primary' : form.discount_type !== 'normal'}, {'btn-primary' : form.discount_type === 'normal'}]"
@click="onChangeDiscountType('normal')" type="button">
<i class="fa fa-percent fa-sm"></i>
</button>
<button class="btn btn-sm" :class="[{'btn-outline-primary' : form.discount_type !== 'amount'}, {'btn-primary' : form.discount_type === 'amount'}]"
@click="onChangeDiscountType('amount')" type="button">{{ $currency->symbol }}
<button class="btn btn-sm" :class="[{'btn-outline-primary' : form.discount_type !== 'fixed'}, {'btn-primary' : form.discount_type === 'fixed'}]"
@click="onChangeDiscountType('fixed')" type="button">{{ $currency->symbol }}
</button>
</div>
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}

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

@ -33,7 +33,11 @@
@if (!$hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<td class="discount">{{ $item->discount }}</td>
@if ($item->discount_type === 'normal')
<td class="discount">{{ $item->discount }}</td>
@else
<td class="discount">@money($item->discount, $document->currency_code, true)</td>
@endif
@stack('discount_td_end')
@endif
@endif