From 523fa25f9d11ee70770f561a85e45e8e1373f735 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Wed, 31 Jul 2024 11:18:51 +0700 Subject: [PATCH] THAI: Fix weird case top-up with cash --- xml/page_payment.xml | 2 + xml/page_payment_credit3-0.xml | 3 ++ xml/page_payment_credit3-TopupCash.xml | 1 + xml/page_thankyou.xml | 61 +++++++++++++++++++------- 4 files changed, 50 insertions(+), 17 deletions(-) diff --git a/xml/page_payment.xml b/xml/page_payment.xml index ca0b21e7..14a82d83 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -145,6 +145,8 @@ Var Seeker.CreditCard = 0 Var Seeker.CreditCardRef = "" + Var Seeker.UseCreditPayFullDrinkPrice = 0 + Var Seeker.IntVendingCredit = 0 Var Seeker.StoreCreditFlag = 0 diff --git a/xml/page_payment_credit3-0.xml b/xml/page_payment_credit3-0.xml index f1fdb595..9f2786d3 100644 --- a/xml/page_payment_credit3-0.xml +++ b/xml/page_payment_credit3-0.xml @@ -90,6 +90,8 @@ Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm + Var Seeker.CreditEnoughRefID = PointCrm + CoinVending OFF Var Seeker.TNumberTaobinCredit = TelephoneNumber @@ -98,6 +100,7 @@ Var Seeker.StoreCreditFlag = 1 Var SumCreditAmount = SumCreditAmount - PayAmountSubDiscount Var VendingCreditRemain = "" + SumCreditAmount + Var Seeker.UseCreditPayFullDrinkPrice = 1 If CART_COUNT >= 1 Then diff --git a/xml/page_payment_credit3-TopupCash.xml b/xml/page_payment_credit3-TopupCash.xml index 22f8ac42..228ee4ef 100644 --- a/xml/page_payment_credit3-TopupCash.xml +++ b/xml/page_payment_credit3-TopupCash.xml @@ -169,6 +169,7 @@ Var TelephoneNumber = Seeker.TNumberTaobinCredit Var PayO2 = Var Seeker.CoffeePinNumber + Var ServiceAmount2 = CoinAmount Var VendingDiscount = 0 Var VendingCampaign = 0 diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 1ddd2470..0dd2534d 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -22,6 +22,8 @@ Var GotoStoreCredit0 = 0 Var StoreCreditAmount = 0 + Var DetectCoinAmount = 0 + Var buttonRemoveCup = "Invisible" Var MachineState_Result = 0 @@ -215,24 +217,33 @@ EndIf Else + DEBUGVAR Seeker.UseCreditPayFullDrinkPrice - If Seeker.IntVendingCampaign < PayAmount Then - Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign - Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit + If Seeker.UseCreditPayFullDrinkPrice = 1 Then + If CoinAmount > 0 Then + Var StoreCreditAmount = CoinAmount + Var DetectCoinAmount = 1 + EndIf + Else + If Seeker.IntVendingCampaign < PayAmount Then + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit - If SumCoinAmount >= PayAmount Then - Var Canout = SumCoinAmount - PayAmount - If Canout > 0 Then - - ;Change Canout - ;Var ChangeFlag2 = 1 - Var GotoStoreCredit0 = 1 - Var StoreCreditAmount = Canout - + If SumCoinAmount >= PayAmount Then + Var Canout = SumCoinAmount - PayAmount + If Canout > 0 Then + + ;Change Canout + ;Var ChangeFlag2 = 1 + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + + EndIf EndIf EndIf EndIf + EndIf @@ -409,16 +420,32 @@ DEBUGVAR Seeker.CurrCreditAmount DEBUGVAR Seeker.CreditNotEnoughRefID + DEBUGVAR Seeker.CreditEnoughRefID If Seeker.CreditNotEnoughRefID = "" Then Var CurrAmount = Seeker.CurrCreditAmount - If CoinAmount > 0 Then - Var CurrAmount = CurrAmount + CoinAmount - EndIf Var CurrTelePhoneNum = Seeker.CurrCreditTelNum Var CurrPinNum = Seeker.CurrCreditPinNum - Var RefID = "" - AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID + + If DetectCoinAmount = 1 Then + Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign + + If CurrAmount >= ServiceAmountSupCampain Then + + Var creditToTopup = CurrAmount - ServiceAmountSupCampain + Var RefID = "0/" + Seeker.CreditEnoughRefID + Var Seeker.CreditReferenceTmp = RefID + + AddData 41 CurrTelePhoneNum creditToTopup CurrPinNum RefID + Else + Var RefID = "" + AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID + EndIf + Else + Var RefID = "" + AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID + EndIf + Else Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign