Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project
This commit is contained in:
commit
d963b995be
58 changed files with 13023 additions and 26 deletions
|
|
@ -1 +1 @@
|
|||
/event/promotion_Tamatian.xml
|
||||
/event/promotion_15THB.xml
|
||||
9981
xml/event/promotion_15THB.xml
Normal file
9981
xml/event/promotion_15THB.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1 +1 @@
|
|||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_melon.xml"
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_15THB.xml"
|
||||
|
|
|
|||
|
|
@ -13,28 +13,41 @@ Else
|
|||
; zone promote
|
||||
If OpenFromPageBoard = 1 Then
|
||||
|
||||
If PepweenEnable = 1 Then
|
||||
If pro15THBEnable = 1 Then
|
||||
Var BigButtonEnable = "Enable"
|
||||
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_pepween.xml"
|
||||
Var OpenFromPageBoard = 0
|
||||
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_15THB.xml"
|
||||
Var OpenFromPageBoard = 0
|
||||
|
||||
Else
|
||||
OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
|
||||
If PepweenEnable = 1 Then
|
||||
Var BigButtonEnable = "Enable"
|
||||
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_pepween.xml"
|
||||
Var OpenFromPageBoard = 0
|
||||
|
||||
Else
|
||||
OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If PepweenEnable = 1 Then
|
||||
If pro15THBEnable = 1 Then
|
||||
|
||||
; Temporary debug
|
||||
Var BigButtonEnable = "Enable"
|
||||
Open "ROOT/taobin_project/xml/event/promotion_pepween.xml"
|
||||
Open "ROOT/taobin_project/xml/event/promotion_15THB.xml"
|
||||
|
||||
Else
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
If PepweenEnable = 1 Then
|
||||
Var BigButtonEnable = "Enable"
|
||||
Open "ROOT/taobin_project/xml/event/promotion_pepween.xml"
|
||||
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
Var OpenFromPageBoard = 0
|
||||
|
|
|
|||
|
|
@ -45,6 +45,10 @@ Var MayDayRunEnable = 0
|
|||
Var MilkChoiceVeganEnable = 0
|
||||
|
||||
|
||||
; Enable pro 15 THB, November 1 - 30
|
||||
Var pro15THBEnable = 0
|
||||
Var From15THBPro = 0
|
||||
|
||||
|
||||
If SystemDateMonthInt = 10 Then
|
||||
|
||||
|
|
@ -63,7 +67,7 @@ EndIf
|
|||
|
||||
If SystemDateMonthInt = 11 Then
|
||||
Var PepweenEnable = 0
|
||||
|
||||
Var pro15THBEnable = 1
|
||||
If SystemDateDayInt = 1 Then
|
||||
If SystemTimeHourInt < 5 Then
|
||||
Var PepweenEnable = 1
|
||||
|
|
@ -78,6 +82,7 @@ EndIf
|
|||
If BoxID = 173149 Then
|
||||
Var PepweenEnable = 1
|
||||
Var MilkChoiceVeganEnable = 1
|
||||
Var pro15THBEnable = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 176757 Then
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
else:
|
||||
touch_less_gen = False
|
||||
|
||||
if current_file_name == "page_catalog_group_pro_15THB.skt":
|
||||
fixed_price = 15
|
||||
else:
|
||||
fixed_price = 0
|
||||
|
||||
print ("######################################################################################################")
|
||||
idx_of_eng = 2
|
||||
out_xml('<FrameScroll> \r\n')
|
||||
|
|
@ -248,6 +253,9 @@
|
|||
out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n')
|
||||
out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n')
|
||||
out_xml( '\t\tVar SelectDrinkType = 0\r\n')
|
||||
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t\tVar From15THBPro = 1 \r\n')
|
||||
|
||||
|
||||
out_xml( '\t\t\r\n')
|
||||
|
|
@ -369,9 +377,15 @@
|
|||
if "free" in param:
|
||||
out_xml( '\t<Value> "Free" </Value>\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> StringFmt( $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> StringFmt( 15 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> StringFmt( $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> "฿15" </Value>\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
|
||||
out_xml( '\t</Text>\r\n')
|
||||
|
||||
ice_tab_ice_show = True
|
||||
|
|
@ -414,9 +428,15 @@
|
|||
if "free" in param:
|
||||
out_xml( '\t<Value> "Free" </Value>\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> StringFmt( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> StringFmt( 15 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> StringFmt( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> "฿15" </Value>\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
|
||||
out_xml( '\t</Text>\r\n')
|
||||
|
||||
ice_tab_blend_show = True
|
||||
|
|
@ -461,9 +481,15 @@
|
|||
if "free" in param:
|
||||
out_xml( '\t<Value> "Free" </Value>\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> StringFmt( $' + spl[6] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> StringFmt( 15 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> StringFmt( $' + spl[6] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> "฿15" </Value>\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
|
||||
out_xml( '\t</Text>\r\n')
|
||||
|
||||
out_xml( '\t<Image>\r\n')
|
||||
|
|
|
|||
84
xml/page_catalog_group_pro_15THB.skt
Normal file
84
xml/page_catalog_group_pro_15THB.skt
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
<?hurr
|
||||
#include=menu_head.py
|
||||
?>
|
||||
|
||||
<Popup>
|
||||
<Cache> "Enable" </Cache>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1920 </Height>
|
||||
;<Background> "0xeae6e1" </Background>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
; On open
|
||||
<?hurr
|
||||
#include=menu_catalog_default_init.xml
|
||||
?>
|
||||
|
||||
Var Menu1Selected = "PressForever"
|
||||
|
||||
Var OreoBigButtonEnable = "Enable"
|
||||
Var From15THBPro = 0
|
||||
|
||||
If $12-01-01-0001.Button = "Invisible" Then
|
||||
Var esp102101001Enable = "Invisible"
|
||||
Var esp122101001Enable = "Enable"
|
||||
|
||||
Else
|
||||
Var esp102101001Enable = "Enable"
|
||||
Var esp122101001Enable = "Invisible"
|
||||
|
||||
EndIf
|
||||
|
||||
SAVELOG PreviseXMLFileName2
|
||||
|
||||
Var Timeout = 0
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
||||
Var text_unavailable = "UNAVAILABLE###size=16"
|
||||
Else
|
||||
Var text_unavailable = "หมด###size=32"
|
||||
|
||||
EndIf
|
||||
|
||||
<?hurr
|
||||
#include=menu_catalog_new_menu.xml
|
||||
?>
|
||||
|
||||
</EventOpen>
|
||||
|
||||
|
||||
<?hurr
|
||||
#include=menu_catalog_new.py
|
||||
?>
|
||||
|
||||
|
||||
<?hurr
|
||||
#include=menu_new_layout_gen_v2.py
|
||||
?>
|
||||
<?hurr
|
||||
#include=menu_new_layout_gen.py
|
||||
?>
|
||||
|
||||
<Button>
|
||||
<X> 780 </X>
|
||||
<Y> 500 </Y>
|
||||
<State> buttonRemoveCup </State>
|
||||
;<Color> "0x00BDFF" </Color>
|
||||
<Interval> 500 </Interval>
|
||||
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
|
||||
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
|
||||
<EventClick>
|
||||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
|
||||
;BigLogoLayout
|
||||
|
||||
</Popup>
|
||||
|
||||
|
||||
2849
xml/page_catalog_group_pro_15THB.xml
Normal file
2849
xml/page_catalog_group_pro_15THB.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -272,6 +272,17 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If From15THBPro = 1 Then
|
||||
Var PriceDrink = OriginalPrice
|
||||
Var PriceDiff = OriginalPrice - 15
|
||||
Var Seeker.VendingCode = "FIX15"
|
||||
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
|
||||
|
||||
Var RemainAmountStr = "Free###size=150"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -4133,6 +4148,7 @@
|
|||
|
||||
If hot_button_state = "PressForever" Then
|
||||
Var PriceDrinkNoTop = PriceD1
|
||||
Var OriginalPrice = OriginalPriceD1
|
||||
Var UserSelectProductCode = PD_CODE1
|
||||
|
||||
If showShotEnable = "Disable" Then
|
||||
|
|
@ -4159,6 +4175,7 @@
|
|||
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var PriceDrinkNoTop = PriceD2
|
||||
Var OriginalPrice = OriginalPriceD2
|
||||
Var UserSelectProductCode = PD_CODE2
|
||||
|
||||
If showShotEnable = "Disable" Then
|
||||
|
|
@ -4185,6 +4202,7 @@
|
|||
|
||||
If blend_button_state = "PressForever" Then
|
||||
Var PriceDrinkNoTop = PriceD3
|
||||
Var OriginalPrice = OriginalPriceD3
|
||||
Var UserSelectProductCode = PD_CODE3
|
||||
|
||||
If showShotEnable = "Invisible" Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue