chamomind/jws-frontend
chamomind/jws-frontend
6
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix: vat not calculated

Browse source
This commit is contained in:
Methapon2001 2025-01-23 11:08:28 +07:00
parent 35fbedd74f
commit c34feaa421
3 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/05_quotation/ProductItem.vue
View file

@ -57,12 +57,10 @@ const currentBtnOpen = ref<{ title: string; opened: boolean[] }[]>([
]); ]);
function calcPrice(c: (typeof rows.value)[number]) { function calcPrice(c: (typeof rows.value)[number]) {
console.log(c);
const originalPrice = c.pricePerUnit; const originalPrice = c.pricePerUnit;
const finalPriceWithVat = precisionRound( const finalPriceWithVat = precisionRound(
originalPrice + originalPrice + originalPrice * (config.value?.vat || 0.07),
(c.product.vatIncluded || c.vat !== 0
? 0
: originalPrice * (config.value?.vat || 0.07)),
); );
const finalPriceNoVat = finalPriceWithVat / (1 + (config.value?.vat || 0.07)); const finalPriceNoVat = finalPriceWithVat / (1 + (config.value?.vat || 0.07));

5
src/pages/05_quotation/QuotationForm.vue
View file

@ -244,10 +244,7 @@ function getPrice(
const originalPrice = c.pricePerUnit; const originalPrice = c.pricePerUnit;
const finalPriceWithVat = precisionRound( const finalPriceWithVat = precisionRound(
originalPrice + originalPrice * (1 + (config.value?.vat || 0.07)),
(c.product.vatIncluded
? 0
: originalPrice * (config.value?.vat || 0.07)),
); );
const finalPriceNoVat = const finalPriceNoVat =
finalPriceWithVat / (1 + (config.value?.vat || 0.07)); finalPriceWithVat / (1 + (config.value?.vat || 0.07));

10
src/pages/05_quotation/preview/ViewForm.vue
View file

@ -231,10 +231,7 @@ onMounted(async () => {
(v) => { (v) => {
const originalPrice = v.pricePerUnit; const originalPrice = v.pricePerUnit;
const finalPriceWithVat = precisionRound( const finalPriceWithVat = precisionRound(
originalPrice + originalPrice * (1 + (config.value?.vat || 0.07)),
(v.product.vatIncluded || v.vat !== 0
? 0
: originalPrice * (config.value?.vat || 0.07)),
); );
const finalPriceNoVat = const finalPriceNoVat =
finalPriceWithVat / (1 + (config.value?.vat || 0.07)); finalPriceWithVat / (1 + (config.value?.vat || 0.07));
@ -265,10 +262,7 @@ onMounted(async () => {
(a, c) => { (a, c) => {
const originalPrice = c.pricePerUnit; const originalPrice = c.pricePerUnit;
const finalPriceWithVat = precisionRound( const finalPriceWithVat = precisionRound(
originalPrice + originalPrice * (1 + (config.value?.vat || 0.07)),
(c.product.vatIncluded || c.vat !== 0
? 0
: originalPrice * (config.value?.vat || 0.07)),
); );
const finalPriceNoVat = const finalPriceNoVat =
finalPriceWithVat / (1 + (config.value?.vat || 0.07)); finalPriceWithVat / (1 + (config.value?.vat || 0.07));