From cdcbb550b95d58a31010f1d118723d8fe60770c2 Mon Sep 17 00:00:00 2001 From: Pakin Date: Wed, 1 Nov 2023 10:39:31 +0700 Subject: [PATCH] change discount to init display at catalog --- xml/page_board.xml | 7 +++++-- xml/page_topping_select7_copy.xml | 32 +++++++++++++++---------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 91ad1aae..c1cf1925 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -946,7 +946,10 @@ EndIf If Discount50 = "true" Then - Var HalfPrice = "true" + ;Var HalfPrice = "true" + Var InvokeDiscountCMD = "true" + DEBUGVAR InvokeDiscountCMD + __CMD "invoke-discount-50" "-" "-" "-" EndIf DEBUGVAR EnableLiveness @@ -1064,7 +1067,7 @@ DEBUGVAR NETCORE_EVENT_CNT_X EndIf - If NETCORE_EVENT_CNT_X > 300 Then + If NETCORE_EVENT_CNT_X > 3600 Then Var stop_now = "true" Var stop_now_from_netcore_event = 1 Var MachineErrorDetailAll = "Netcore Lost" diff --git a/xml/page_topping_select7_copy.xml b/xml/page_topping_select7_copy.xml index 793d90fd..529a7f20 100644 --- a/xml/page_topping_select7_copy.xml +++ b/xml/page_topping_select7_copy.xml @@ -395,15 +395,15 @@ Else - DEBUGVAR UserSelectProductCode.Price - DEBUGVAR HalfPrice - DEBUGVAR PriceDrink + ;DEBUGVAR UserSelectProductCode.Price + ;DEBUGVAR HalfPrice + ;DEBUGVAR PriceDrink - If HalfPrice = "true" Then + ;If HalfPrice = "true" Then - Var PriceDrinkTmp = UserSelectProductCode.Price - Var PriceDrink = PriceDrinkTmp - EndIf + ; Var PriceDrinkTmp = UserSelectProductCode.Price + ; Var PriceDrink = PriceDrinkTmp + ;EndIf OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment.xml" @@ -4203,20 +4203,20 @@ __CMD "statement" 0 StatementCheckMenu "-" - If HalfPrice = "true" Then - ; Discount 50 - DEBUGVAR HalfPrice - __CMD "invoke-discount-50" UserSelectProductCode "-" "-" - - Else - Var PriceDrink = PriceDrinkTmp - EndIf + ;If HalfPrice = "true" Then + ; ; Discount 50 + ; DEBUGVAR HalfPrice + ; __CMD "invoke-discount-50" UserSelectProductCode "-" "-" + ; + ;Else + ; Var PriceDrink = PriceDrinkTmp + ;EndIf DEBUGVAR PriceDrinkTmp ;Var Seeker.PriceDrink = PriceDrinkTmp - ;Var PriceDrink = PriceDrinkTmp + Var PriceDrink = PriceDrinkTmp DEBUGVAR PriceDrink