Merge branch 'develop'
This commit is contained in:
commit
e8278b6af3
1 changed files with 20 additions and 5 deletions
|
|
@ -334,23 +334,38 @@ const flowAccount = {
|
||||||
discountAmount: quotation.totalDiscount,
|
discountAmount: quotation.totalDiscount,
|
||||||
|
|
||||||
subTotal:
|
subTotal:
|
||||||
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
|
quotation.payCondition === "BillSplitCustom" ||
|
||||||
|
quotation.payCondition === "BillSplit" ||
|
||||||
|
quotation.payCondition === "SplitCustom" ||
|
||||||
|
quotation.payCondition === "Split"
|
||||||
? 0
|
? 0
|
||||||
: quotation.totalPrice,
|
: quotation.totalPrice,
|
||||||
vatableAmount:
|
vatableAmount:
|
||||||
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
|
quotation.payCondition === "BillSplitCustom" ||
|
||||||
|
quotation.payCondition === "BillSplit" ||
|
||||||
|
quotation.payCondition === "SplitCustom" ||
|
||||||
|
quotation.payCondition === "Split"
|
||||||
? 0
|
? 0
|
||||||
: quotation.totalPrice - quotation.totalDiscount - quotation.vatExcluded,
|
: quotation.totalPrice - quotation.totalDiscount - quotation.vatExcluded,
|
||||||
exemptAmount:
|
exemptAmount:
|
||||||
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
|
quotation.payCondition === "BillSplitCustom" ||
|
||||||
|
quotation.payCondition === "BillSplit" ||
|
||||||
|
quotation.payCondition === "SplitCustom" ||
|
||||||
|
quotation.payCondition === "Split"
|
||||||
? 0
|
? 0
|
||||||
: quotation.vatExcluded,
|
: quotation.vatExcluded,
|
||||||
totalAfterDiscount:
|
totalAfterDiscount:
|
||||||
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
|
quotation.payCondition === "BillSplitCustom" ||
|
||||||
|
quotation.payCondition === "BillSplit" ||
|
||||||
|
quotation.payCondition === "SplitCustom" ||
|
||||||
|
quotation.payCondition === "Split"
|
||||||
? 0
|
? 0
|
||||||
: quotation.finalPrice,
|
: quotation.finalPrice,
|
||||||
vatAmount:
|
vatAmount:
|
||||||
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
|
quotation.payCondition === "BillSplitCustom" ||
|
||||||
|
quotation.payCondition === "BillSplit" ||
|
||||||
|
quotation.payCondition === "SplitCustom" ||
|
||||||
|
quotation.payCondition === "Split"
|
||||||
? 0
|
? 0
|
||||||
: quotation.vat,
|
: quotation.vat,
|
||||||
grandTotal:
|
grandTotal:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue