Merge branch 'develop'

This commit is contained in:
Methapon2001 2025-09-18 17:12:16 +07:00
commit e8278b6af3

View file

@ -334,23 +334,38 @@ const flowAccount = {
discountAmount: quotation.totalDiscount,
subTotal:
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
quotation.payCondition === "BillSplitCustom" ||
quotation.payCondition === "BillSplit" ||
quotation.payCondition === "SplitCustom" ||
quotation.payCondition === "Split"
? 0
: quotation.totalPrice,
vatableAmount:
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
quotation.payCondition === "BillSplitCustom" ||
quotation.payCondition === "BillSplit" ||
quotation.payCondition === "SplitCustom" ||
quotation.payCondition === "Split"
? 0
: quotation.totalPrice - quotation.totalDiscount - quotation.vatExcluded,
exemptAmount:
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
quotation.payCondition === "BillSplitCustom" ||
quotation.payCondition === "BillSplit" ||
quotation.payCondition === "SplitCustom" ||
quotation.payCondition === "Split"
? 0
: quotation.vatExcluded,
totalAfterDiscount:
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
quotation.payCondition === "BillSplitCustom" ||
quotation.payCondition === "BillSplit" ||
quotation.payCondition === "SplitCustom" ||
quotation.payCondition === "Split"
? 0
: quotation.finalPrice,
vatAmount:
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
quotation.payCondition === "BillSplitCustom" ||
quotation.payCondition === "BillSplit" ||
quotation.payCondition === "SplitCustom" ||
quotation.payCondition === "Split"
? 0
: quotation.vat,
grandTotal: