diff --git a/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml b/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml
index f3a851c0..ddd47313 100644
--- a/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml
+++ b/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml
@@ -47,6 +47,26 @@
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
+
+ If UsePepsiTheme = 1 Then
+ Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+ DEBUGVAR DirImage2
+
+ Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+ DEBUGVAR DirImageAlter
+
+
+ Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage = DirImage + "/image/page3_en/"
+ DEBUGVAR DirImage
+
+ Var ice_tab_text = "Ice will be ready at "
+
+
+
+ EndIf
If ICE_PROCESS_STATUS = 2 Then
@@ -158,6 +178,24 @@
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ If UsePepsiTheme = 1 Then
+ Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+
+
+ Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+
+ Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage = DirImage + "/image/page3_en/"
+
+ Var ice_tab_text = "Ice will be ready at "
+
+
+
+ EndIf
+
Else
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
@@ -357,7 +395,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
CARAMEL LATTE
คาราเมลลาเต้
@@ -373,7 +411,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Espresso, Milk,\nCaramel Syrup
กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล
@@ -405,8 +443,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0007.Button
StringFmt( $52-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -425,8 +463,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-02-0004.Button
StringFmt( $52-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -445,8 +483,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-03-0004.Button
StringFmt( $52-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -503,7 +541,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -680,7 +718,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
OREO SMOOTHIE
โอริโอ้ปั่นภูเขาไฟ
@@ -715,7 +753,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Milk, Sugar, Oreo, Ice
นม น้ำตาล โอริโอ้ \n
@@ -747,8 +785,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -767,8 +805,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -787,8 +825,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-03-03-0009.Button
StringFmt( $52-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -841,7 +879,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1036,7 +1074,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
MATCHA LATTE
มัทฉะลาเต้
@@ -1052,7 +1090,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Green Tea, Milk, Sugar, Ice
ชาเชียว นม
@@ -1082,8 +1120,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-01-0026.Button
StringFmt( $52-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1100,8 +1138,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-02-0026.Button
StringFmt( $52-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1118,8 +1156,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-03-0026.Button
StringFmt( $52-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1176,7 +1214,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1365,7 +1403,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
PEPSI YUZU
เป๊ปซี่ยูซุ
@@ -1381,7 +1419,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Pepsi, Yuzu Syrup& Ice
เป๊ปซี่ น้ำเชื่อมยูซุ โซดา
@@ -1409,8 +1447,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1427,8 +1465,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0076.Button
StringFmt( $52-05-02-0076.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1445,8 +1483,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1499,7 +1537,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1668,7 +1706,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
LATTE
ลาเต้
@@ -1684,7 +1722,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Espresso, Milk,\n milk
กาแฟ นม และ นม
@@ -1712,8 +1750,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0004.Button
StringFmt( $52-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1730,8 +1768,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-02-0002.Button
StringFmt( $52-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1748,8 +1786,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-03-0002.Button
StringFmt( $52-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1806,7 +1844,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1975,7 +2013,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
THAI MILK TEA
ชานมไทย
@@ -1991,7 +2029,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Thai tea, Sugar, milk
ชาไทย และ นม
@@ -2019,8 +2057,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-01-0039.Button
StringFmt( $52-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2037,8 +2075,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-02-0039.Button
StringFmt( $52-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2055,8 +2093,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-03-0039.Button
StringFmt( $52-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2113,7 +2151,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -2273,7 +2311,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
PLUM \nLIMENADE SODA
บ๊วยมะนาวโซดา
@@ -2289,7 +2327,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Ume Syrup, Limenade, Soda
น้ำเชื่อมบ๊วย มะนาว โซดา \n
@@ -2317,8 +2355,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2335,8 +2373,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0025.Button
StringFmt( $52-05-02-0025.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2353,8 +2391,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-03-0025.Button
StringFmt( $52-05-03-0025.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2407,7 +2445,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
diff --git a/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml b/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml
index b9fbb42f..751d2956 100644
--- a/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml
+++ b/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml
@@ -47,6 +47,26 @@
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
+
+ If UsePepsiTheme = 1 Then
+ Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+ DEBUGVAR DirImage2
+
+ Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+ DEBUGVAR DirImageAlter
+
+
+ Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage = DirImage + "/image/page3_en/"
+ DEBUGVAR DirImage
+
+ Var ice_tab_text = "Ice will be ready at "
+
+
+
+ EndIf
If ICE_PROCESS_STATUS = 2 Then
@@ -158,6 +178,24 @@
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ If UsePepsiTheme = 1 Then
+ Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+
+
+ Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+
+ Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage = DirImage + "/image/page3_en/"
+
+ Var ice_tab_text = "Ice will be ready at "
+
+
+
+ EndIf
+
Else
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
@@ -357,7 +395,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
MOCHA
มอคค่า
@@ -373,7 +411,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Espresso, Cocoa, Milk, Sugar
กาแฟ นม โกโก้ และ น้ำตาล
@@ -405,8 +443,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0006.Button
StringFmt( $52-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -425,8 +463,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-02-0003.Button
StringFmt( $52-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -445,8 +483,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-03-0003.Button
StringFmt( $52-21-03-0003.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -503,7 +541,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -680,7 +718,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
MILO SMOOTHIE
โอวัลตินปั่นภูเขาไฟ
@@ -747,8 +785,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -767,8 +805,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -787,8 +825,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-03-03-0049.Button
StringFmt( $52-03-03-0049.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -841,7 +879,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1036,7 +1074,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
THAI MILK TEA
ชานมไทย
@@ -1052,7 +1090,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Thai tea, Sugar, milk
ชาไทย และ นม
@@ -1082,8 +1120,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-01-0039.Button
StringFmt( $52-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1100,8 +1138,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-02-0039.Button
StringFmt( $52-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1118,8 +1156,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-03-0039.Button
StringFmt( $52-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1176,7 +1214,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1365,7 +1403,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
YUZU SODA
ยูซุโซดา
@@ -1381,7 +1419,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Yuzu Syrup, Soda, Ice
น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง
@@ -1409,8 +1447,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1427,8 +1465,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0045.Button
StringFmt( $52-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1445,8 +1483,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1499,7 +1537,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1668,7 +1706,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
CAPPUCCINO
คาปูชิโน่
@@ -1684,7 +1722,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Espresso, Milk, Foamed milk
กาแฟ นม และ ฟองนม
@@ -1712,8 +1750,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0005.Button
StringFmt( $52-21-01-0005.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1730,8 +1768,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-31-02-0002.Button
StringFmt( $52-31-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1748,8 +1786,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-31-03-0002.Button
StringFmt( $52-31-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1806,7 +1844,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1975,7 +2013,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
MATCHA LATTE
มัทฉะลาเต้
@@ -1991,7 +2029,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Matcha, Milk
ชาเขียวมัทฉะ และ นมอุ่น
@@ -2037,8 +2075,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-02-0026.Button
StringFmt( $52-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2055,8 +2093,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-03-0026.Button
StringFmt( $52-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2113,7 +2151,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -2273,7 +2311,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
PEPSI PLUM
เป๊ปซี่บ๊วย
@@ -2289,7 +2327,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Pepsi, Ume Syrup & Ice
เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา
@@ -2317,8 +2355,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2335,8 +2373,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0074.Button
StringFmt( $52-05-02-0074.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2353,8 +2391,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-03-0074.Button
StringFmt( $52-05-03-0074.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2407,7 +2445,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
diff --git a/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml b/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
index 213101c1..8ce5bd61 100644
--- a/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
+++ b/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
@@ -47,6 +47,26 @@
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
+
+ If UsePepsiTheme = 1 Then
+ Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+ DEBUGVAR DirImage2
+
+ Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+ DEBUGVAR DirImageAlter
+
+
+ Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage = DirImage + "/image/page3_en/"
+ DEBUGVAR DirImage
+
+ Var ice_tab_text = "Ice will be ready at "
+
+
+
+ EndIf
If ICE_PROCESS_STATUS = 2 Then
@@ -158,6 +178,24 @@
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ If UsePepsiTheme = 1 Then
+ Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+
+
+ Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+
+ Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage = DirImage + "/image/page3_en/"
+
+ Var ice_tab_text = "Ice will be ready at "
+
+
+
+ EndIf
+
Else
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
@@ -357,7 +395,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
CAPPUCCINO
คาปูชิโน่
@@ -373,7 +411,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Espresso, Milk, Foamed milk
กาแฟ นม และ ฟองนม
@@ -405,8 +443,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0005.Button
StringFmt( $52-21-01-0005.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -425,8 +463,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-31-02-0002.Button
StringFmt( $52-31-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -445,8 +483,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-31-03-0002.Button
StringFmt( $52-31-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -503,7 +541,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -680,7 +718,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
CHOCOLATE SHAKE
โกโก้โปรตีน
@@ -696,7 +734,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Whey protein,\nCocoa, & Milk
เวย์โปรตีน โกโก้ นม
@@ -728,8 +766,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -748,8 +786,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-04-02-0002.Button
StringFmt( $52-04-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -768,8 +806,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -822,7 +860,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -999,7 +1037,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
STRAWBERRY MILK
สตอเบอร์รี่ปั่น
@@ -1034,7 +1072,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Strawberry Syrup, Milk,\nSugar, Oreo
น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล \n Oreo
@@ -1066,8 +1104,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1086,8 +1124,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1106,8 +1144,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-03-03-0027.Button
StringFmt( $52-03-03-0027.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1160,7 +1198,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1349,7 +1387,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
COCONUT PEPSI
@@ -1365,7 +1403,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Coconut Syrup, Pepsi and Soda
@@ -1393,8 +1431,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1411,8 +1449,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0117.Button
StringFmt( $52-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1429,8 +1467,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1483,7 +1521,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1643,7 +1681,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
AMERICANO
กาแฟดำ(อเมริกาโน)
@@ -1659,7 +1697,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Espresso, Water
กาแฟ และน้ำ
@@ -1687,8 +1725,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0003.Button
StringFmt( $52-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1705,8 +1743,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-02-0001.Button
StringFmt( $52-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1723,8 +1761,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1781,7 +1819,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1950,7 +1988,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
THAI MILK TEA
ชานมไทย
@@ -1966,7 +2004,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Thai tea, Sugar, milk
ชาไทย และ นม
@@ -1994,8 +2032,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-01-0039.Button
StringFmt( $52-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2012,8 +2050,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-02-0039.Button
StringFmt( $52-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2030,8 +2068,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-03-0039.Button
StringFmt( $52-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2088,7 +2126,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -2248,7 +2286,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor2
LYCHEE SODA
น้ำลิ้นจี่โซดา
@@ -2264,7 +2302,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor2
Lychee Syrup, Soda & Ice
น้ำเชื่อมลิ้นจี่ โซดา
@@ -2292,8 +2330,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2310,8 +2348,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0033.Button
StringFmt( $52-05-02-0033.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2328,8 +2366,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-03-0033.Button
StringFmt( $52-05-03-0033.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2382,7 +2420,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 1df14272..8a5aaa27 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -759,7 +759,7 @@
DEBUGVAR MaterialAvailable
STRCONTAIN "511215" MaterialAvailable SugarZeroCalEnable
- Var cups_sold_text = "CUPS SOLD"
+ Var cups_sold_text = "Cups Sold Worldwide"
Var MinPhoneNumber = 10
Var MaxPhoneNumber = 10