From 16eb0a45b207c1b5a9849fe3b6b39277e1f89b84 Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 26 Jul 2022 12:54:55 +0700 Subject: [PATCH] Do 1293 for door can not close --- xml/page_drinkok.xml | 7 +++++++ xml/page_payment.xml | 10 ++++++---- xml_main/startup.xml | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index d817a7ad..43b28bec 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -201,6 +201,13 @@ SAVELOG "Make next order by take-cup with close-maintenance" Var error_code_stop_now = 1221 + + If DoorCupPosition = "bottom" Then + + Else + Var error_code_stop_now = 1296 + EndIf + Open "ROOT/taobin_project/xml/page_cannotConti.xml" Else diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 1a75081e..c8abcd58 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -27,19 +27,15 @@ If SelectDrink = "12-05-02-0028" Then Var AdultFlag = 1 EndIf - If SelectDrink = "12-05-02-0029" Then Var AdultFlag = 1 EndIf - If SelectDrink = "12-05-03-0028" Then Var AdultFlag = 1 EndIf - If SelectDrink = "12-05-03-0029" Then Var AdultFlag = 1 EndIf - If SelectDrink = "12-02-01-0017" Then Var AdultFlag = 1 EndIf @@ -50,6 +46,12 @@ Var AdultFlag = 1 EndIf + If CustomerFilterEnable = "YES" Then + Var AdultFlag = 1 + + DEBUGVAR CustomerFilterType + EndIf + Var QRCODE1 = "A000000677010112" Var QRCODE2 = "010755600066301" Var QRCODE3 = "VDGN" diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 389fc339..f651ee80 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.58" - Var XMLPageVersionInt = 658 + Var XMLPageVersion = "6.59" + Var XMLPageVersionInt = 659