Merge branch 'develop'
This commit is contained in:
commit
6ea672a2cb
1 changed files with 1 additions and 3 deletions
|
|
@ -186,8 +186,6 @@ const flowAccountAPI = {
|
||||||
data.paymentDate = `${year}-${String(month).padStart(2, "0")}-${String(date).padStart(2, "0")}`;
|
data.paymentDate = `${year}-${String(month).padStart(2, "0")}-${String(date).padStart(2, "0")}`;
|
||||||
} */
|
} */
|
||||||
|
|
||||||
console.log(JSON.stringify(data, null, 2));
|
|
||||||
|
|
||||||
const res = await fetch(
|
const res = await fetch(
|
||||||
api + "/upgrade/receipts/inline" + (withPayment ? "/with-payment" : ""),
|
api + "/upgrade/receipts/inline" + (withPayment ? "/with-payment" : ""),
|
||||||
{
|
{
|
||||||
|
|
@ -338,7 +336,7 @@ const flowAccount = {
|
||||||
subTotal:
|
subTotal:
|
||||||
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
|
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
|
||||||
? 0
|
? 0
|
||||||
: quotation.totalPrice,
|
: quotation.totalPrice - quotation.totalDiscount - quotation.vatExcluded,
|
||||||
totalAfterDiscount:
|
totalAfterDiscount:
|
||||||
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
|
quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
|
||||||
? 0
|
? 0
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue