diff --git a/inter/sgp/menu/lang.tsv b/inter/sgp/menu/lang.tsv
index 751976c1..9fc9739c 100644
--- a/inter/sgp/menu/lang.tsv
+++ b/inter/sgp/menu/lang.tsv
@@ -43,7 +43,7 @@ TextID Note English Thai
Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0xCFCFCF,Align=Center
-000040 Not sweet ไม่หวาน
+ Not sweet ไม่หวาน
000041 Little หวานจุบจิบ
000042 Less หวานน้อย
000043 Perfect หวานพอดี
@@ -97,7 +97,7 @@ TextID Note English Thai
Font=Kanit,Type=Regular,Size=36,Color=0x746253
000073 Pay now ซื้อเลย
Text
- Font=Kanit,Type=Regular,Size=36,Color=0x0025FF
+ Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF
Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
000074 Cancel ยกเลิก
Text
@@ -105,14 +105,14 @@ TextID Note English Thai
000075 Please choose drink type โปรดเลือกประเภทเครื่องดื่ม
Text
- Font=Kanit,Type=Regular,Size=28,Color=0x0025FF
+ Font=Kanit,Type=Regular,Size=28,Color=0x0025FF,PressColor=0xFFFFFF
Font=Kanit,Type=Medium,Size=28,Color=0xFFFFFF
Font=Kanit,Type=Regular,Size=28,Color=0xA6B2FF
Font=Kanit,Type=Regular,Size=28,Color=0x8092FF
000081 Hot ร้อน
000082 Iced เย็น
000083 Blend ปั่น
- Font=Kanit,Type=Regular,Size=24,Color=0x025FF
+ Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,PressColor=0xFFFFFF
000084 Normal ปกติ
diff --git a/inter/sgp/xml/page_collect_point_1.lxml b/inter/sgp/xml/page_collect_point_1.lxml
index d43d8007..6247594d 100644
--- a/inter/sgp/xml/page_collect_point_1.lxml
+++ b/inter/sgp/xml/page_collect_point_1.lxml
@@ -499,6 +499,8 @@
Var ShowCountDownBrewing = CountDownBrewing
+ DEBUGVAR DebugBypassCollectPt2
+
; percent
If ShowCountDownAsPercent = 1 Then
Var XPercent = InitCNT - ShowCountDownBrewing
@@ -1188,7 +1190,12 @@
EndIf
+
+ Var DebugBypassCollectPt2 = 1
+ DEBUGVAR DebugBypassCollectPt2
+
+
\ No newline at end of file
diff --git a/inter/sgp/xml/page_collect_point_2.lxml b/inter/sgp/xml/page_collect_point_2.lxml
index 7310a674..e64ce595 100644
--- a/inter/sgp/xml/page_collect_point_2.lxml
+++ b/inter/sgp/xml/page_collect_point_2.lxml
@@ -36,6 +36,18 @@
DEBUGVAR PayOfflineMode
+ If DebugBypassCollectPt2 = 1 Then
+ Var Seeker.TaobinErrorNetwork = 1
+ Var Seeker.PointTaobinStr = ParamCP
+ Var TelephoneNumber = TelephoneNumberX
+ Var Seeker.TNumberTaobinMember= TelephoneNumber
+
+ ; reset
+ Var DebugBypassCollectPt2 = 0
+
+ Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml"
+ EndIf
+
If PayOfflineMode = 1 Then
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
@@ -55,6 +67,13 @@
Var ShowCountdown = "Invisible"
Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
+
+ If UsePepsiTheme = 1 Then
+ ;Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ ;Var DirImage = DirImage + "/image/collectiing_en"
+
+ Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_eng.png"
+ EndIf
EndIf
@@ -391,7 +410,7 @@
153
88
RobotoBold
- 0x513C2F
+ HeadlineColor
XPercent
diff --git a/inter/sgp/xml/page_collect_point_error.lxml b/inter/sgp/xml/page_collect_point_error.lxml
index 05be6c3e..8aaf0aaf 100644
--- a/inter/sgp/xml/page_collect_point_error.lxml
+++ b/inter/sgp/xml/page_collect_point_error.lxml
@@ -14,6 +14,7 @@
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/display_get_free_en/"
+ Var DirImageStatic = "ROOT/taobin_project/image/display_get_free_en/"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
@@ -22,6 +23,16 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
EndIf
+
+ Var AlphaBg = "ROOT/taobin_project/image/collectiing/alpha.png"
+ If UsePepsiTheme = 1 Then
+ Var AlphaBg = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/alpha.png"
+ ;Var NumImgDir = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/"
+
+ Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+ Var DirImage = DirImage + "/image/display_get_free_en/"
+ EndIf
+
1000
@@ -54,7 +65,7 @@
0
380
- "ROOT/taobin_project/image/collectiing/alpha.png"
+ AlphaBg
@@ -65,7 +76,7 @@
158
665
- Var( DirImage + "/img_popup4.png" )
+ Var( DirImageStatic + "/img_popup4.png" )
diff --git a/inter/whatthecup/sgp/image/collect_point1_en/text_edit.png b/inter/whatthecup/sgp/image/collect_point1_en/text_edit.png
new file mode 100644
index 00000000..36cafc85
Binary files /dev/null and b/inter/whatthecup/sgp/image/collect_point1_en/text_edit.png differ
diff --git a/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml b/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml
index f6c2a0c0..a9a3c8be 100644
--- a/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml
+++ b/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml
@@ -1681,13 +1681,13 @@
-;
-; 43
-; 8
-; 60
-; 42
-; 000081
-;
+
+ 43
+ 8
+ 60
+ 42
+ 000081
+
@@ -1740,13 +1740,13 @@
Var OverlayMenuFilter = OverlayMenuFilter2_Value
-;
-; 40
-; 8
-; 60
-; 42
-; 000082
-;
+
+ 40
+ 8
+ 60
+ 42
+ 000082
+
@@ -1854,54 +1854,18 @@
Var OverlayMenuFilter = OverlayMenuFilter3_Value
-;
-; 26
-; 8
-; 75
-; 42
-; 000083
-;
+
+ 26
+ 8
+ 75
+ 42
+ 000083
+
-; type
-
-;
-; 460
-; 80
-; KanitRegularTTF
-; 28
-; text_hot_color
-; "Hot"
-;
-
-;
-; 630
-; 80
-; KanitRegularTTF
-; 28
-; text_cold_color
-; eval(
-; If normal_button_state = "Enable" Then
-; Var return = "Normal"
-; Else
-; Var return = "Iced"
-; EndIf
-;)
-;
-
-;
-; 822
-; 80
-; KanitRegularTTF
-; 28
-; text_blender_color
-; "Blend"
-;
-
-; price
- 520
+ 510
85
KanitRegularTTF
23
@@ -1910,7 +1874,7 @@
- 700
+ 690
85
KanitRegularTTF
23
@@ -1922,7 +1886,7 @@
; x for blend rng.
- 882
+ text_show_blend_x
85
KanitRegularTTF
23
@@ -3383,13 +3347,13 @@
EndIf
-;
-; 53
-; 16
-; 120
-; 42
-; 000074
-;
+
+ 53
+ 16
+ 120
+ 42
+ 000074
+
@@ -3708,11 +3672,11 @@
-;
-; 64
-; 19
-; 000073
-;
+
+ 64
+ 19
+ 000073
+