From 5a3054d098accda9ab350aa9f924b337187bb2f8 Mon Sep 17 00:00:00 2001 From: miggaze Date: Thu, 9 Dec 2021 15:15:11 +0700 Subject: [PATCH 1/2] Multi Credit --- xml/page_board.xml | 3 +++ xml/page_brewing3.xml | 24 ++++++++++++++---------- xml/page_payment_cash.xml | 28 +++++++++++++++++++++++++--- xml/page_payment_cashMore.xml | 31 +++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 13 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 23c707cf..41daa79f 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -14,6 +14,9 @@ DEBUGVAR SoundVolume + + Var PauseOrder = "false" + DEBUGVAR web_ref DEBUGVAR web_payment DEBUGVAR web_telnum diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index d3670fac..47dff9e9 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -534,7 +534,7 @@ Var PayDetail = PayDetail + NOBONUS - Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" If GetFreeFromError = 1 Then Var CodeChannel = 1 @@ -963,15 +963,19 @@ - + + +; diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 41b23206..fdf38230 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -534,7 +534,11 @@ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc ;Var Timeout = 0 EndIf - Open "ROOT/taobin_project/xml/page_catalog.xml" + If PauseOrder = "false" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + Open "ROOT/taobin_project/xml/page_brewing3.xml" + EndIf EndIf @@ -579,9 +583,23 @@ Var CancelFlag = 1 Var CancelCounter = 0 If CoinAmount = 0 Then + + If IntVendingCredit > 0 Then + Var BmiYear = IntVendingCredit + Var GetScore = "useCredit" + AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore + Var IntVendingCredit = 0 + EndIf + + + If IntVendingCampaign = 0 Then VendingQR OFF - Open "ROOT/taobin_project/xml/page_catalog.xml" + If PauseOrder = "false" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + Open "ROOT/taobin_project/xml/page_brewing3.xml" + EndIf EndIf EndIf @@ -648,7 +666,11 @@ ;EndIf Var ActionOKCase = 1 If IntVendingCampaign = 0 Then - Open "ROOT/taobin_project/xml/page_catalog.xml" + If PauseOrder = "false" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + Open "ROOT/taobin_project/xml/page_brewing3.xml" + EndIf EndIf EndIf EndIf diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index 0bae281c..c9c0105d 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -568,6 +568,13 @@ Var CancelFlag = 1 Var CancelCounter = 0 If CoinAmount = 0 Then + If IntVendingCredit > 0 Then + Var BmiYear = IntVendingCredit + Var GetScore = "useCredit" + AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore + Var IntVendingCredit = 0 + EndIf + If IntVendingCampaign = 0 Then VendingQR OFF @@ -1037,6 +1044,12 @@ If CoinInFlag = 0 Then VendingQR OFF + If IntVendingCredit > 0 Then + Var BmiYear = IntVendingCredit + Var GetScore = "useCredit" + AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore + Var IntVendingCredit = 0 + EndIf Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf @@ -1360,6 +1373,12 @@ cart1_en "ROOT/taobin_project/image/page_payment/iconX.png" + If IntVendingCredit > 0 Then + Var BmiYear = IntVendingCredit + Var GetScore = "useCredit" + AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore + Var IntVendingCredit = 0 + EndIf Cart "DeleteMenuID" 1 @@ -1399,6 +1418,12 @@ cart2_en "ROOT/taobin_project/image/page_payment/iconX.png" + If IntVendingCredit > 0 Then + Var BmiYear = IntVendingCredit + Var GetScore = "useCredit" + AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore + Var IntVendingCredit = 0 + EndIf Cart "DeleteMenuID" 2 @@ -1438,6 +1463,12 @@ cart3_en "ROOT/taobin_project/image/page_payment/iconX.png" + If IntVendingCredit > 0 Then + Var BmiYear = IntVendingCredit + Var GetScore = "useCredit" + AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore + Var IntVendingCredit = 0 + EndIf Cart "DeleteMenuID" 3 From 0479282586527f47f0f2821824b32af59e613c53 Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 9 Dec 2021 15:24:23 +0700 Subject: [PATCH 2/2] Release --- xml/page_catalog.xml | 1 + xml/page_thankyou.xml | 6 ++++-- xml/page_thankyouMore.xml | 6 +++++- xml_main/startup.xml | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 2e5967f2..0ad86ac2 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -13,6 +13,7 @@ Var web_readyOK = "false" Var web_telnumOK = "" + Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/" If CocktailShow = "true" Then Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index ae81df3e..9e78ccbb 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -35,15 +35,18 @@ Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var BottomText = PicturePath + "text_bottom_eng.png" Else Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var BottomText = PicturePath + "text_bottom_thai2.png" EndIf DEBUGVAR StarwState DEBUGVAR LidState - + DEBUGVAR BottomText + If StarwState = "Press" Then Machine StrawWithDelay LED LedDoorLid Blink 255 255 255 255 @@ -59,7 +62,6 @@ DEBUGVAR StoreCreditFlag - 1000 diff --git a/xml/page_thankyouMore.xml b/xml/page_thankyouMore.xml index e6eec5d7..050b9b28 100644 --- a/xml/page_thankyouMore.xml +++ b/xml/page_thankyouMore.xml @@ -30,15 +30,19 @@ Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - + Var BottomText = PicturePath + "text_bottom_eng.png" + Else Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var BottomText = PicturePath + "text_bottom_thai2.png" EndIf DEBUGVAR StarwState DEBUGVAR LidState + DEBUGVAR BottomText + If StarwState = "Press" Then Machine StrawWithDelay diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 87260906..77274c2a 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.83" - Var XMLPageVersionInt = 583 + Var XMLPageVersion = "5.84" + Var XMLPageVersionInt = 584