pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2025-03-25 17:21:35 +07:00
commit 6ee358c7f5
5 changed files with 15010 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14925
xml/event/double_promotion_kingdom_thai_tea_and_matcha_every_day.xml Normal file
View file

File diff suppressed because it is too large Load diff

28
xml/event/ignore_multi_promotion_config_kingdom_thai_tea_matcha_every_day.json Normal file
View file

@ -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"
}
}
]

9
xml/event/script_common_for_open_promotion_xml.ev
View file

@ -52,10 +52,19 @@ Else
Var PromotionState2 = "Enable" Var PromotionState2 = "Enable"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_pepsi_x_taobin.xml" Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_pepsi_x_taobin.xml"
EndIf 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 Else
If PepsiXTaobinPro = 1 Then If PepsiXTaobinPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_pepsi_x_taobin.xml" Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_pepsi_x_taobin.xml"
EndIf EndIf
If MatchaEveryDayPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
EndIf
EndIf EndIf
If CatalogLayoutV3 = 1 Then If CatalogLayoutV3 = 1 Then

4
xml/event/tricker.ev
View file

@ -111,7 +111,11 @@ If SystemDateMonthInt = 4 Then
If SystemDateDayInt >= 7 Then If SystemDateDayInt >= 7 Then
If SystemDateDayInt <= 27 Then If SystemDateDayInt <= 27 Then
Var PepsiXTaobinPro = 1 Var PepsiXTaobinPro = 1
Else
Var MatchaEveryDayPro = 1
EndIf EndIf
Else
Var MatchaEveryDayPro = 1
EndIf EndIf
Var KingdomThaiTeaPro = 1 Var KingdomThaiTeaPro = 1

56
xml/page_topping_select8.xml
View file

@ -2029,36 +2029,68 @@
DEBUGVAR IsSodaDisableShot2 DEBUGVAR IsSodaDisableShot2
DEBUGVAR IsSodaDisableShot3 DEBUGVAR IsSodaDisableShot3
If IsSodaDisableShot = "true" Then If IsSodaDisableShot = "true" Then
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
If cold_button_state = "PressForever" Then If cold_button_state = "PressForever" Then
Var CustomEnergyState[0] = "Disable" If toppingID12index2Status = "Disable" Then
Var CustomEnergyState[1] = "Disable" Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
Else
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
EndIf
Else Else
Var CustomEnergyState[0] = "Enable" If toppingID12index2Status = "Enable" Then
Var CustomEnergyState[1] = "Enable" Var CustomEnergyState[0] = "Enable"
Var CustomEnergyState[1] = "Enable"
EndIf
EndIf EndIf
EndIf EndIf
If IsSodaDisableShot2 = "true" Then If IsSodaDisableShot2 = "true" Then
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
If cold_button_state = "PressForever" Then If cold_button_state = "PressForever" Then
Var CustomEnergyState[0] = "Disable" If toppingID12index2Status = "Disable" Then
Var CustomEnergyState[1] = "Disable" Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
Else
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
EndIf
Else Else
Var CustomEnergyState[0] = "Enable" If toppingID12index2Status = "Enable" Then
Var CustomEnergyState[1] = "Enable" Var CustomEnergyState[0] = "Enable"
Var CustomEnergyState[1] = "Enable"
EndIf
EndIf EndIf
EndIf EndIf
If IsSodaDisableShot3 = "true" Then If IsSodaDisableShot3 = "true" Then
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
If cold_button_state = "PressForever" Then If cold_button_state = "PressForever" Then
Var CustomEnergyState[0] = "Disable" If toppingID12index2Status = "Disable" Then
Var CustomEnergyState[1] = "Disable" Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
Else
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
EndIf
Else Else
Var CustomEnergyState[0] = "Enable" If toppingID12index2Status = "Enable" Then
Var CustomEnergyState[1] = "Enable" Var CustomEnergyState[0] = "Enable"
Var CustomEnergyState[1] = "Enable"
EndIf
EndIf EndIf
EndIf EndIf
If toppingID12index2Status = "" Then
Var CustomEnergyState[0] = "Invisible"
Var CustomEnergyState[1] = "Invisible"
EndIf
EndIf EndIf
If TOPPING13 = "shot coffee" Then If TOPPING13 = "shot coffee" Then