Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
6ee358c7f5
5 changed files with 15010 additions and 12 deletions
14925
xml/event/double_promotion_kingdom_thai_tea_and_matcha_every_day.xml
Normal file
14925
xml/event/double_promotion_kingdom_thai_tea_and_matcha_every_day.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,28 @@
|
|||
[
|
||||
{
|
||||
"name": "kingdom_thai_tea",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_kingdom_thai_tea.xml"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "matcha_every_day",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_matcha_every_day.xml"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
@ -52,10 +52,19 @@ Else
|
|||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_pepsi_x_taobin.xml"
|
||||
EndIf
|
||||
|
||||
If MatchaEveryDayPro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_matcha_every_day.xml"
|
||||
EndIf
|
||||
Else
|
||||
If PepsiXTaobinPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_pepsi_x_taobin.xml"
|
||||
EndIf
|
||||
|
||||
If MatchaEveryDayPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If CatalogLayoutV3 = 1 Then
|
||||
|
|
|
|||
|
|
@ -111,7 +111,11 @@ If SystemDateMonthInt = 4 Then
|
|||
If SystemDateDayInt >= 7 Then
|
||||
If SystemDateDayInt <= 27 Then
|
||||
Var PepsiXTaobinPro = 1
|
||||
Else
|
||||
Var MatchaEveryDayPro = 1
|
||||
EndIf
|
||||
Else
|
||||
Var MatchaEveryDayPro = 1
|
||||
EndIf
|
||||
|
||||
Var KingdomThaiTeaPro = 1
|
||||
|
|
|
|||
|
|
@ -2029,36 +2029,68 @@
|
|||
DEBUGVAR IsSodaDisableShot2
|
||||
DEBUGVAR IsSodaDisableShot3
|
||||
If IsSodaDisableShot = "true" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
If toppingID12index2Status = "Disable" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
Else
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
EndIf
|
||||
Else
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
If toppingID12index2Status = "Enable" Then
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If IsSodaDisableShot2 = "true" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
If toppingID12index2Status = "Disable" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
Else
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
EndIf
|
||||
Else
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
If toppingID12index2Status = "Enable" Then
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If IsSodaDisableShot3 = "true" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
If toppingID12index2Status = "Disable" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
Else
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
EndIf
|
||||
Else
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
If toppingID12index2Status = "Enable" Then
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID12index2Status = "" Then
|
||||
Var CustomEnergyState[0] = "Invisible"
|
||||
Var CustomEnergyState[1] = "Invisible"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If TOPPING13 = "shot coffee" Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue