+
- Základ DPH {{ tax.rate }}%
+ Discount
- {{ formatNumber(tax.total) }}
+ - {{ formatNumber(invoice.discount_rate) }} {{ invoice.discount_type === 'percent' ? '%' : ''}}
+
+
+
+
+
+
+ Základ DPH {{ tax.rate }}%
+
+
+ {{ formatNumber(tax.total) }}
+
@@ -362,13 +379,32 @@
})
} else {
bag.find(bagItem => {
- if (bagItem.rate === item.tax_rate)
+
+ // Count total tax rate for percentage
+ if (bagItem.rate === item.tax_rate) {
bagItem.total += (item.price * item.amount)
+ }
})
}
}
})
+ // Count discount
+ if (this.isDiscount) {
+ bag.forEach(bagItem => {
+
+ if (this.invoice.discount_type === 'percent') {
+ bagItem.total -= bagItem.total * (this.invoice.discount_rate / 100)
+ }
+
+ if (this.invoice.discount_type === 'value') {
+ let percentage_of_discount = this.invoice.discount_rate / (this.total + this.invoice.discount_rate)
+
+ bagItem.total -= bagItem.total * percentage_of_discount
+ }
+ })
+ }
+
return bag
},
taxSummary() {
@@ -387,14 +423,33 @@
} else {
- bag.find(bagItem => {
- if (bagItem.rate === item.tax_rate)
+ bag.map(bagItem => {
+
+ // Count total tax rate for percentage
+ if (bagItem.rate === item.tax_rate) {
bagItem.total += (item.price * item.amount) * (item.tax_rate / 100)
+ }
})
}
}
})
+ // Count discount
+ if (this.isDiscount) {
+ bag.forEach(bagItem => {
+
+ if (this.invoice.discount_type === 'percent') {
+ bagItem.total -= bagItem.total * (this.invoice.discount_rate / 100)
+ }
+
+ if (this.invoice.discount_type === 'value') {
+ let percentage_of_discount = this.invoice.discount_rate / (this.total + this.invoice.discount_rate)
+
+ bagItem.total -= bagItem.total * percentage_of_discount
+ }
+ })
+ }
+
return bag
},
total() {
@@ -405,6 +460,7 @@
let total_without_tax = (item.price * item.amount)
+ // Count tax
if (item.tax_rate) {
total_without_tax += total_without_tax * (item.tax_rate / 100)
}
@@ -413,6 +469,18 @@
}
})
+ // Count discount
+ if (this.isDiscount) {
+
+ if (this.invoice.discount_type === 'percent') {
+ total -= total * (this.invoice.discount_rate / 100)
+ }
+
+ if (this.invoice.discount_type === 'value') {
+ total -= this.invoice.discount_rate
+ }
+ }
+
return total
}
},
@@ -428,7 +496,7 @@
return {
isLoading: true,
isError: false,
- isDiscount: false,
+ isDiscount: true,
isVatPayer: false,
clients: [],
latestInvoiceNumber: undefined,
@@ -472,13 +540,20 @@
{
id: 1,
description: 'Item 1',
- amount: 1,
+ amount: 2,
tax_rate: 20,
price: 200,
- }
+ },
+ {
+ id: 2,
+ description: 'Item 2',
+ amount: 1,
+ tax_rate: 10,
+ price: 100,
+ },
],
- discount_type: 'percent',
- discount_rate: '10',
+ discount_type: 'value',
+ discount_rate: 10,
client: '0354bab9-1b23-4d17-aa5f-fd8e9aaaf0a2',
client_avatar: '',
client_name: 'VueFileManager Inc.',
@@ -628,24 +703,17 @@
@import '@assets/vuefilemanager/_forms';
#page-content {
- max-width: 1190px;
+ max-width: 1100px;
}
- .order {
- display: flex;
+ .content-page {
+ display: grid;
+ grid-template-columns: 2fr 1fr;
margin-bottom: 30px;
+ gap: 50px;
- .steps {
- flex: 0 0 65%;
- padding-right: 30px;
-
- .form {
- max-width: 100%;
- }
- }
-
- .summary {
- flex: 0 0 34%;
+ .form {
+ max-width: 100%;
}
}
@@ -719,6 +787,7 @@
span {
@include font-size(14);
+ font-weight: 600;
}
}
}