From b0fb1c1f9613f77f29b01cc7cb24c4714ac38d52 Mon Sep 17 00:00:00 2001 From: Pakin Date: Tue, 31 Oct 2023 16:30:47 +0700 Subject: [PATCH] add discount 50. WIP --- xml/page_board.xml | 7 ++++ xml/page_topping_select5.xml | 4 +++ xml/page_topping_select7_copy.xml | 55 +++++++++++++++++++++++++++---- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 133a5277..91ad1aae 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -925,9 +925,11 @@ ; Var XMLProfile = "y18IDCard" ; Var XMLProfile = "y18IDCardLive" ; Var XMLProfile = "SugarBreak" + Var XMLProfile = "discount50" STRCONTAIN "y18IDCardLive" XMLProfile Y18IDCARDLIVE_ENABLE STRCONTAIN "y18IDCard" XMLProfile Y18IDCARD_ENABLE STRCONTAIN "SugarBreak" XMLProfile SugarBreakEnable + STRCONTAIN "discount50" XMLProfile Discount50 If Y18IDCARDLIVE_ENABLE = "true" Then Var EnableLiveness = "true" @@ -943,9 +945,14 @@ Var NoSugarStepRight2 = "true" EndIf + If Discount50 = "true" Then + Var HalfPrice = "true" + EndIf + DEBUGVAR EnableLiveness DEBUGVAR Only18 DEBUGVAR NoSugarStepRight2 + DEBUGVAR HalfPrice Var NETCORE_LOST_COUNT_UP = 0 diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml index 63bc9034..8a9ba67c 100644 --- a/xml/page_topping_select5.xml +++ b/xml/page_topping_select5.xml @@ -56,6 +56,10 @@ Else If NoSugarStepRight2 = "true" Then Open "ROOT/taobin_project/xml/page_topping_select7_copy.xml" + Else + If HalfPrice = "true" Then + Open "ROOT/taobin_project/xml/page_topping_select7_copy.xml" + EndIf EndIf EndIf diff --git a/xml/page_topping_select7_copy.xml b/xml/page_topping_select7_copy.xml index 4950e946..793d90fd 100644 --- a/xml/page_topping_select7_copy.xml +++ b/xml/page_topping_select7_copy.xml @@ -176,7 +176,7 @@ Var PriceDrinkTmp = PriceDrink Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp Var Timeout = 0 - + ;SAVELOG PriceDrinkTmp ;- End @@ -388,8 +388,27 @@ EndIf EndIf - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_payment.xml" + If RestrictedDrink = "true" Then + DEBUGVAR RestrictedDrink + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_identity_verification.xml" + + Else + + DEBUGVAR UserSelectProductCode.Price + DEBUGVAR HalfPrice + DEBUGVAR PriceDrink + + If HalfPrice = "true" Then + + 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" + EndIf + @@ -1610,8 +1629,20 @@ Topping "Pack" ExtendDataCurr Var Seeker.ExtendDataCurr = ExtendDataCurr - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_payment.xml" + + If RestrictedDrink = "true" Then + + DEBUGVAR RestrictedDrink + + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_identity_verification.xml" + Else + + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_payment.xml" + + EndIf + EndIf @@ -4172,12 +4203,22 @@ __CMD "statement" 0 StatementCheckMenu "-" - + 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 SAVELOG "USER press next ( topping ) - new"