From 34eb1b96638e62ee41de3bfd22f59ff7dfd346cc Mon Sep 17 00:00:00 2001 From: miggaze Date: Fri, 3 Nov 2023 14:45:33 +0700 Subject: [PATCH] ... --- xml/page_payment_cash.xml | 13 ++++++++++++- xml/page_payment_credit2.xml | 16 +++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 9a454eaa..9f3ca026 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -226,6 +226,12 @@ Var PayState4 = "Disable" Var PayState5 = "Enable" Var PayState6 = "Disable" + + If From15THBPro = 1 Then + Var PayState4 = "Enable" + EndIf + + EndIf Var PayState3 = "Enable" @@ -234,7 +240,7 @@ Var PayState3 = "Enable" Var PayState5 = "Disable" Var PayState6 = "Disable" - Var PayState4 = "Disable" + ;Var PayState4 = "Disable" EndIf @@ -255,6 +261,11 @@ Var PayState4 = "Disable" Var PayState5 = "Disable" Var PayState6 = "Disable" + + If From15THBPro = 1 Then + Var PayState4 = "Disable" + EndIf + EndIf diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index ea69c493..91996ffc 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -10,6 +10,8 @@ ; On open + Var PayAmountSubDiscount = PayAmount - Seeker.IntVendingCampaign + Var useCreditAmount = 0; Var useCreditTemp = 0; @@ -66,10 +68,10 @@ Var SumCreditAmount = CoffeeCredit - If SumCreditAmount >= PayAmount Then + If SumCreditAmount >= PayAmountSubDiscount Then If ReqAdddata22 = 0 Then - Var useCreditAmount = PayAmount + Var useCreditAmount = PayAmountSubDiscount Var BmiYear = useCreditAmount Var GetScore = "useCredit" AddData 22 TelephoneNumber BmiYear PointCrm GetScore @@ -173,7 +175,7 @@ Var Seeker.StoreCreditFlag = 1 - Var SumCreditAmount = SumCreditAmount - PayAmount + Var SumCreditAmount = SumCreditAmount - PayAmountSubDiscount Var VendingCreditRemain = "" + SumCreditAmount @@ -938,7 +940,7 @@ Var SumCreditAmount = CoffeeCredit - If SumCreditAmount >= PayAmount Then + If SumCreditAmount >= PayAmountSubDiscount Then If ReqAdddata22 = 0 Then @@ -949,7 +951,7 @@ EndIf EndIf - Var useCreditAmount = PayAmount + Var useCreditAmount = PayAmountSubDiscount Var BmiYear = useCreditAmount Var GetScore = "useCredit" AddData 22 TelephoneNumber BmiYear PointCrm GetScore @@ -963,10 +965,10 @@ If TelephoneNumber = Curr.CurrCreditTelNum Then Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount - If SumCreditAmount >= PayAmount Then + If SumCreditAmount >= PayAmountSubDiscount Then If ReqAdddata22 = 0 Then - Var useCreditTemp = PayAmount - CoffeeCredit + Var useCreditTemp = PayAmountSubDiscount - CoffeeCredit Var useCreditAmount = CoffeeCredit Var BmiYear = useCreditAmount