From 526caa4ac471d8a34491fdb8725212dd20ce727b Mon Sep 17 00:00:00 2001 From: pichet Date: Wed, 19 Apr 2023 13:27:11 +0700 Subject: [PATCH 1/2] fix rollback problem --- xml/page_drinkfail2.xml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index 9122d46d..c9c3b11f 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -15,22 +15,7 @@ DEBUGVAR Seeker.PromotionIDCurrentOrder - If Seeker.PromotionIDCurrentOrder > 1 Then - If MachineStage = "remove-cup" Then - Open "ROOT/taobin_project/xml/page_drinkfail3.xml" - Else - If NextOrder = "true" Then - Var NextOrder = "false" - - TransferVar "next" "curr" - Var Seeker = "curr" - - Open "ROOT/taobin_project/xml/page_thankyouConti.xml" - Else - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - EndIf + From 9d31d69d16e9dddf66b8e80fdb01130d51f70ccf Mon Sep 17 00:00:00 2001 From: pichet Date: Wed, 19 Apr 2023 16:06:40 +0700 Subject: [PATCH 2/2] fix paydetial --- xml/page_thankyou.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 53eed051..5504ddb7 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -273,6 +273,11 @@ Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else + Var Seeker.OrderChanel = Seeker.OrderChanel + ":" + Var Seeker.OrderChanel = Seeker.OrderChanel + Seeker.CampaignPayChanel + Var Seeker.OrderChanel = Seeker.OrderChanel + ":" + Var Seeker.OrderChanel = Seeker.OrderChanel + Seeker + If Seeker.PayWithQR = 0 Then Var ServiceAmount2 = Seeker.ServiceAmount2 Var SessionID2 = SelectSlot + ":" @@ -292,6 +297,8 @@ Var CreditReference = Seeker.CreditReferenceTmp Var VendingDiscount = Seeker.VendingDiscount Var VendingCampaign = Seeker.VendingCampaign + + Var PayDetail = "2/F:1311/0//XML|" + Seeker.OrderChanel Var PayType = "" Var Seeker.TxRef1 = TxRef1