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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-11-18 10:39:18 +07:00
commit 7784bc78f7
9 changed files with 160 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

0
image/event/happy_trios/happy_trios.png → image/event/happy_trios/happy_trios_en.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 491 KiB

After

Width:  |  Height:  |  Size: 491 KiB

Before After
Before After

BIN
image/event/happy_trios/happy_trios_th.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 492 KiB

12
image/event/image_template4
View file

@ -1,6 +1,6 @@
normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios.png normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios.png normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios.png press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios.png press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios.png disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios.png disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png

12
xml/event/ignore_multi_promotion_config_happy_trios_weekday_discount_oreo11.json
View file

@ -3,12 +3,12 @@
"name": "happy_trios", "name": "happy_trios",
"template": "/event/promotion_template.inc", "template": "/event/promotion_template.inc",
"config": { "config": {
"normal_eng": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png", "normal_eng": "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png",
"normal_thai": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png", "normal_thai": "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png",
"press_eng": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png", "press_eng": "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png",
"press_thai": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png", "press_thai": "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png",
"disable_eng": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png", "disable_eng": "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png",
"disable_thai": "ROOT/taobin_project/image/event/happy_trios/happy_trios.png", "disable_thai": "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png",
"event_on_click": "ROOT/taobin_project/xml/event/happy_trios/page_catalog_group_pro_happy_trios.xml" "event_on_click": "ROOT/taobin_project/xml/event/happy_trios/page_catalog_group_pro_happy_trios.xml"
} }
}, },

12
xml/event/promotion_happy_trios.xml
View file

@ -14831,27 +14831,27 @@ LIMENADE SODA" </Value>
<Filename> <Filename>
eval( eval(
If show_eng = "true" Then If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png"
Else Else
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png"
EndIf EndIf
) )
</Filename> </Filename>
<FilenamePress> <FilenamePress>
eval( eval(
If show_eng = "true" Then If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png"
Else Else
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png"
EndIf EndIf
) )
</FilenamePress> </FilenamePress>
<FilenameDisable> <FilenameDisable>
eval( eval(
If show_eng = "true" Then If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png"
Else Else
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png"
EndIf EndIf
) )
</FilenameDisable> </FilenameDisable>

12
xml/event/triple_promotion_happy_trios_and_weekday_discount_and_oreo_11.xml
View file

@ -66,27 +66,27 @@
<Filename> <Filename>
eval( eval(
If show_eng = "true" Then If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png"
Else Else
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png"
EndIf EndIf
) )
</Filename> </Filename>
<FilenamePress> <FilenamePress>
eval( eval(
If show_eng = "true" Then If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png"
Else Else
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png"
EndIf EndIf
) )
</FilenamePress> </FilenamePress>
<FilenameDisable> <FilenameDisable>
eval( eval(
If show_eng = "true" Then If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png"
Else Else
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png"
EndIf EndIf
) )
</FilenameDisable> </FilenameDisable>

12
xml/event/triple_promotion_happy_trios_and_weekday_discount_and_oreo_11_event_on.xml
View file

@ -66,27 +66,27 @@
<Filename> <Filename>
eval( eval(
If show_eng = "true" Then If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png"
Else Else
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png"
EndIf EndIf
) )
</Filename> </Filename>
<FilenamePress> <FilenamePress>
eval( eval(
If show_eng = "true" Then If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png"
Else Else
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png"
EndIf EndIf
) )
</FilenamePress> </FilenamePress>
<FilenameDisable> <FilenameDisable>
eval( eval(
If show_eng = "true" Then If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png"
Else Else
Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios.png" Var return = "ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png"
EndIf EndIf
) )
</FilenameDisable> </FilenameDisable>

13
xml/page_payment_code.xml
View file

@ -899,6 +899,19 @@
Var ECommerce = ECommerce + DiscountDrink Var ECommerce = ECommerce + DiscountDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SessionID2 Var ECommerce = ECommerce + SessionID2
If Seeker.UseFreeSugarZeroCalTopping = 1 Then
Var ECommerce = ECommerce + ":1"
Else
Var ECommerce = ECommerce + ":0"
EndIf
If Seeker.UseFreeCollagenTopping = 1 Then
Var ECommerce = ECommerce + "1"
Else
Var ECommerce = ECommerce + "0"
EndIf
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"

7
xml/page_topping_select7.xml
View file

@ -7748,10 +7748,10 @@
If CollagenState = "Press" Then If CollagenState = "Press" Then
Var TOPPING_PRICE = TOPPING_PRICE + CollagenToppingPrice Var TOPPING_PRICE = TOPPING_PRICE + CollagenToppingPrice
Var topping3 = toppingID3index2 Var topping3 = toppingID3index2
Var DisableUsingCode = "true" Var Seeker.UseFreeCollagenTopping = 1
Else Else
Var topping3 = toppingID3index1 Var topping3 = toppingID3index1
Var DisableUsingCode = "false" Var Seeker.UseFreeCollagenTopping = 0
EndIf EndIf
@ -7759,6 +7759,9 @@
If SugarZeroCalOption = "Enable" Then If SugarZeroCalOption = "Enable" Then
If SugarZeroCalCheck = "PressForever" Then If SugarZeroCalCheck = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + SugarZeroCalPrice Var TOPPING_PRICE = TOPPING_PRICE + SugarZeroCalPrice
Var Seeker.UseFreeSugarZeroCalTopping = 1
Else
Var Seeker.UseFreeSugarZeroCalTopping = 0
EndIf EndIf
EndIf EndIf
EndIf EndIf