From e099452885e0bc2d500421e590e47cb0d1989bca Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Fri, 27 Oct 2023 12:34:39 +0700 Subject: [PATCH] update promotion code for 15THB pro --- xml/menu_new_layout_gen.py | 11 +++-------- xml/page_catalog_group_pro_15THB.xml | 27 ++++++++++++++------------- xml/page_payment.xml | 5 ++++- xml/page_topping_select7.xml | 18 ++++++++++++++++++ 4 files changed, 39 insertions(+), 22 deletions(-) diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index e1bf14c5..14917eaf 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -180,14 +180,9 @@ out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n') - if fixed_price > 0: - out_xml( '\t\tVar PriceD1 = '+ (('$' + spl[4] + '.Price') if spl[4] == '-' else str(fixed_price)) + '\r\n') - out_xml( '\t\tVar PriceD2 = '+ (('$' + spl[5] + '.Price') if spl[5] == '-' else str(fixed_price)) + '\r\n') - out_xml( '\t\tVar PriceD3 = '+ (('$' + spl[6] + '.Price') if spl[6] == '-' else str(fixed_price)) + '\r\n') - else: - out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price\r\n') - out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price\r\n') - out_xml( '\t\tVar PriceD3 = $' + spl[6] + '.Price\r\n') + out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price\r\n') + out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price\r\n') + out_xml( '\t\tVar PriceD3 = $' + spl[6] + '.Price\r\n') out_xml( '\t\tVar PD_CODE1 = "' + pd_code_1 + '"\r\n') out_xml( '\t\tVar PD_CODE2 = "' + pd_code_2 + '"\r\n') diff --git a/xml/page_catalog_group_pro_15THB.xml b/xml/page_catalog_group_pro_15THB.xml index 3e94490d..5c917166 100644 --- a/xml/page_catalog_group_pro_15THB.xml +++ b/xml/page_catalog_group_pro_15THB.xml @@ -119,6 +119,7 @@ Var Menu1Selected = "PressForever" Var OreoBigButtonEnable = "Enable" + Var From15THBPro = 0 If $12-01-01-0001.Button = "Invisible" Then Var esp102101001Enable = "Invisible" @@ -571,7 +572,7 @@ Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "15THB/bn_iced_lime.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price - Var PriceD2 = 15 + Var PriceD2 = $12-05-02-0001.Price Var PriceD3 = $-.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "12-05-02-0001" @@ -820,7 +821,7 @@ Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "15THB/bn_sala.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price - Var PriceD2 = 15 + Var PriceD2 = $12-05-02-0002.Price Var PriceD3 = $-.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "12-05-02-0002" @@ -1070,7 +1071,7 @@ Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "15THB/bn_iced_pepsi.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price - Var PriceD2 = 15 + Var PriceD2 = $12-05-02-0007.Price Var PriceD3 = $-.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "12-05-02-0007" @@ -1319,7 +1320,7 @@ Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "15THB/bn_iced_energy_drink.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price - Var PriceD2 = 15 + Var PriceD2 = $12-05-02-0034.Price Var PriceD3 = $-.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "12-05-02-0034" @@ -1569,7 +1570,7 @@ Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "15THB/bn_iced_energy_drink_soda.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price - Var PriceD2 = 15 + Var PriceD2 = $12-05-02-0035.Price Var PriceD3 = $-.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "12-05-02-0035" @@ -1818,8 +1819,8 @@ DRINK SODA" Var DrinkDescription = "Matcha & Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "15THB/bn_hot_matcha_tea.png" Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = 15 - Var PriceD2 = 15 + Var PriceD1 = $12-02-01-0027.Price + Var PriceD2 = $12-02-02-0027.Price Var PriceD3 = $-.Price Var PD_CODE1 = "12-02-01-0027" Var PD_CODE2 = "12-02-02-0027" @@ -2071,8 +2072,8 @@ DRINK SODA" Var DrinkDescription = "Jasmine Tea ,Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "15THB/bn_hot_jasmine_tea.png" Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = 15 - Var PriceD2 = 15 + Var PriceD1 = $12-02-01-0045.Price + Var PriceD2 = $12-02-02-0045.Price Var PriceD3 = $-.Price Var PD_CODE1 = "12-02-01-0045" Var PD_CODE2 = "12-02-02-0045" @@ -2324,8 +2325,8 @@ DRINK SODA" Var DrinkDescription = "Jasmine Tea, Limenade, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "15THB/bn_jasmine_lime_tea.png" Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = 15 - Var PriceD2 = 15 + Var PriceD1 = $12-02-01-0048.Price + Var PriceD2 = $12-02-02-0049.Price Var PriceD3 = $-.Price Var PD_CODE1 = "12-02-01-0048" Var PD_CODE2 = "12-02-02-0049" @@ -2577,8 +2578,8 @@ DRINK SODA" Var DrinkDescription = "Thai Tea & Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "15THB/bn_hot_black_thai_tea.png" Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = 15 - Var PriceD2 = 15 + Var PriceD1 = $12-02-01-0047.Price + Var PriceD2 = $12-02-02-0047.Price Var PriceD3 = $-.Price Var PD_CODE1 = "12-02-01-0047" Var PD_CODE2 = "12-02-02-0047" diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 19c469cd..5fc144d5 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -273,11 +273,14 @@ EndIf If From15THBPro = 1 Then + Var PriceDrink = OriginalPrice + Var PriceDiff = OriginalPrice - 15 Var Seeker.VendingCode = "FIX15" - Var Seeker.IntVendingCampaign = PriceDrink + Var Seeker.IntVendingCampaign = PriceDiff Var Seeker.FreeVendingCampaign = 0 Var Seeker.CodeChannel = 1 Var Seeker.CodeNumber = IDNum + Var Seeker.VendingCampaignRI3 = 15 EndIf If ChildrenFree = 1 Then diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 2964034f..8d345317 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -263,6 +263,21 @@ DEBUGVAR PriceD2 DEBUGVAR PriceD3 + If From15THBPro = 1 Then + If PriceD1 > 0 Then + Var OriginalPriceD1 = PriceD1 + Var PriceD1 = 15 + EndIf + If PriceD2 > 0 Then + Var OriginalPriceD2 = PriceD2 + Var PriceD2 = 15 + EndIf + If PriceD3 > 0 Then + Var OriginalPriceD3 = PriceD3 + Var PriceD3 = 15 + EndIf + EndIf + If hot_button_state = "Disable2" Then Var text_price_d1 = "" Else @@ -4126,6 +4141,7 @@ If hot_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD1 + Var OriginalPrice = OriginalPriceD1 Var UserSelectProductCode = PD_CODE1 If showShotEnable = "Disable" Then @@ -4152,6 +4168,7 @@ If cold_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD2 + Var OriginalPrice = OriginalPriceD2 Var UserSelectProductCode = PD_CODE2 If showShotEnable = "Disable" Then @@ -4178,6 +4195,7 @@ If blend_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD3 + Var OriginalPrice = OriginalPriceD3 Var UserSelectProductCode = PD_CODE3 If showShotEnable = "Invisible" Then