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-11 15:22:19 +01:00
parent 51143677c1
commit 8d87832481
3 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,12 @@ const app = new Vue({
let line_discount_amount = 0; let line_discount_amount = 0;
if (item.discount) { if (item.discount) {
line_discount_amount = item.total * (item.discount / 100); if (item.discount_type === 'percentage') {
line_discount_amount = item.total * (item.discount / 100);
} else {
line_discount_amount = item.discount;
}
item.discount_amount = line_discount_amount item.discount_amount = line_discount_amount
item_discounted_total = item.total -= line_discount_amount; item_discounted_total = item.total -= line_discount_amount;
@ -126,7 +131,11 @@ const app = new Vue({
let item_discounted_total = item.total; let item_discounted_total = item.total;
if (global_discount) { if (global_discount) {
item_discounted_total = item.total - (item.total * (global_discount / 100)); if (this.form.discount_type === 'percentage') {
item_discounted_total = item.total - (item.total * (global_discount / 100));
} else {
item_discounted_total = item.total - global_discount;
}
item_discount = global_discount; item_discount = global_discount;
} }
@ -241,7 +250,11 @@ const app = new Vue({
// Apply discount to total // Apply discount to total
if (global_discount) { if (global_discount) {
discount_total = parseFloat(sub_total + inclusive_tax_total) * (global_discount / 100); if (this.form.discount_type === 'percentage') {
discount_total = parseFloat(sub_total + inclusive_tax_total) * (global_discount / 100);
} else {
discount_total = global_discount;
}
this.totals.discount = discount_total; this.totals.discount = discount_total;
@ -389,13 +402,31 @@ const app = new Vue({
this.items[item_index].add_discount = true; this.items[item_index].add_discount = true;
}, },
onChangeDiscountType(type) {
this.form.discount_type = type;
this.onCalculateTotal();
},
onChangeLineDiscountType(item_index, type) {
this.items[item_index].discount_type = type;
this.onCalculateTotal();
},
onAddTotalDiscount() { onAddTotalDiscount() {
let discount = document.getElementById('pre-discount').value; let discount = document.getElementById('pre-discount').value;
if (discount < 0) { if (this.form.discount_type === 'percentage') {
discount = 0; if (discount < 0) {
} else if (discount > 100) { discount = 0;
discount = 100; } else if (discount > 100) {
discount = 100;
}
} else {
if (discount < 0) {
discount = 0;
} else if (discount > this.totals.sub) {
discount = this.totals.sub;
}
} }
document.getElementById('pre-discount').value = discount; document.getElementById('pre-discount').value = discount;

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

@ -76,7 +76,7 @@
@if (!$hideQuantity) @if (!$hideQuantity)
<div> <div>
@stack('quantity_input_start') @stack('quantity_input_start')
<input <input
type="number" type="number"
min="0" min="0"
class="form-control text-center p-0 input-number-disabled" class="form-control text-center p-0 input-number-disabled"
@ -161,11 +161,15 @@
</div> </div>
@stack('discount_input_start') @stack('discount_input_start')
<div class="form-group mb-0 w-100" style="display: inline-block; position: relative;"> <div class="form-group mb-0 w-100" style="display: inline-block; position: relative;">
<div class="input-group input-group-merge mb-0 select-tax"> <div class="input-group mb-0 select-tax">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text" id="input-discount"> <button class="btn btn-sm" :class="[{'btn-outline-primary' : row.discount_type !== 'percentage'}, {'btn-primary' : row.discount_type === 'percentage'}]"
<i class="fa fa-percent"></i> @click="onChangeLineDiscountType(index, 'percentage')" type="button">
</span> <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>
</div> </div>
<input type="number" <input type="number"
max="100" max="100"
@ -227,7 +231,7 @@
></akaunting-select> ></akaunting-select>
@stack('taxes_input_end') @stack('taxes_input_end')
</div> </div>
<div class="line-item-content-right"> <div class="line-item-content-right">
<div class="line-item-content-right-price long-texts text-right"> <div class="line-item-content-right-price long-texts text-right">
{{ Form::moneyGroup('tax', '', '', ['required' => 'required', 'disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'row_tax.price', 'data-item' => 'total', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00, 'text-right input-price disabled-money') }} {{ Form::moneyGroup('tax', '', '', ['required' => 'required', 'disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'row_tax.price', 'data-item' => 'total', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00, 'text-right input-price disabled-money') }}
@ -242,7 +246,7 @@
<div v-if="row.add_tax" class="line-item-area pb-3" :class="{'pt-2' : row.add_discount}"> <div v-if="row.add_tax" class="line-item-area pb-3" :class="{'pt-2' : row.add_discount}">
<div class="line-item-content"> <div class="line-item-content">
<div class="long-texts line-item-text" style="float: left; margin-top: 15px; margin-right:2px; position: absolute; left: -63px;"> <div class="long-texts line-item-text" style="float: left; margin-top: 15px; margin-right:2px; position: absolute; left: -63px;">
{{ trans_choice('general.taxes', 1) }} {{ trans_choice('general.taxes', 1) }}
</div> </div>
@stack('taxes_input_start') @stack('taxes_input_start')

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

@ -54,22 +54,27 @@
<div class="card d-none" :class="[{'show' : discount}]"> <div class="card d-none" :class="[{'show' : discount}]">
<div class="discount card-body"> <div class="discount card-body">
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-sm-6"> <div class="col-sm-8">
<div class="input-group input-group-merge"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text" id="input-discount"> <button class="btn btn-sm" :class="[{'btn-outline-primary' : form.discount_type !== 'percentage'}, {'btn-primary' : form.discount_type === 'percentage'}]"
<i class="fa fa-percent"></i> @click="onChangeDiscountType('percentage')" type="button">
</span> <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>
</div> </div>
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!} {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-4">
<div class="discount-description"> <div class="discount-description">
<strong>{{ trans('invoices.discount_desc') }}</strong> <strong>{{ trans('invoices.discount_desc') }}</strong>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="discount card-footer"> <div class="discount card-footer">
<div class="row float-right"> <div class="row float-right">