SGP: checkpoint 3, fix bug season pass & lang

inter/sgp/menu/lang.tsv

@@ -1,14 +1,13 @@
 TextID	Note	English	Thai
 
-		Font=Montserrat,Type=Bold,Size=48,Color=0x0025FF,Align=Center	Font=Kanit,Type=Light,Size=48,Color=0xEE8C62,Align=Center
+		Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center	Font=Kanit,Type=Light,Size=48,Color=0xEE8C62,Align=Center
 000001	Page catalog head	Welcome	ยินดีต้อนรับ
-		Font=Montserrat,Type=Bold,Size=64,Color=0x0025FF,Align=Center	Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center
+		Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center	Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center
 000002		Please Select Drink Type	กรุณาเลือกประเภทเครื่องดื่ม
 
-	Page catalog body
+
-		Font=Kanit,Type=Medium,Size=32,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
+		Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
-		Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
+000003	Page catalog body	Best Sellers	เมนูแนะนำ
-000003		Best Sellers	เมนูแนะนำ
 000004		Vending\nMachine	ตู้สินค้า
 000005		Coffee	กาแฟ
 000006		Tea	ชา
@@ -24,8 +23,8 @@ TextID	Note	English	Thai
 000013		UNAVAILABLE	หมด
 
 
-		Font=Montserrat,Type=Regular,Size=20,Color=0x0025FF,Align=Center-All	Font=Montserrat,Type=Regular,Size=24,Color=0x746253,Align=Center-All
+		Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All	Font=Montserrat,Type=Regular,Size=24,Color=0x746253,Align=Center-All
-		Font=Montserrat,Type=Bold,Size=20,Color=0x0025FF,Align=Center-All	Font=Montserrat,Type=Bold,Size=24,Color=0x746253,Align=Center-All
+		Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All	Font=Montserrat,Type=Bold,Size=24,Color=0x746253,Align=Center-All
 000014		our specialty	เมนูแนะนำ
 000015		Coffee	กาแฟ
 000016		Tea	ชา
@@ -43,7 +42,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
- 		Not sweet	ไม่หวาน
+000040		Not sweet	ไม่หวาน
 000041		Little	หวานจุบจิบ
 000042		Less	หวานน้อย
 000043		Perfect	หวานพอดี
@@ -77,8 +76,8 @@ TextID	Note	English	Thai
 000061		=+ SUGAR 2 g (8 cal)	=+ น้ำตาล 2 g (8 cal)
 000062		=+ SUGAR 5 g (19 cal)	=+ น้ำตาล 5 g (19 cal)
 000063		=+ SUGAR 7 g (26 cal)	=+ น้ำตาล 7 g (26 cal)
-	Text 
+
-		Font=Kanit,Type=Medium,Size=36,Color=0x0025FF
+		Font=Kanit,Type=Medium,Size=36,Color=0xDE794E
 000064		Extra topping	เพิ่มส่วนผสมพิเศษ
 000065		Sweetness level	ระดับความหวาน
 000066		Straw and Lid	หลอด และ ฝา
@@ -86,33 +85,31 @@ TextID	Note	English	Thai
 000103		Vegan substitution	นมทางเลือก
 
 	Text 
-		Font=Kanit,Type=Regular,Size=36,Color=0x0025FF
+		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F
 000070		I want a straw	รับหลอด
 000071		I want a lid	รับฝา
-	Text 
+
-		Font=Opun,Type=Medium,Size=10,Color=0x8092FF
+		Font=Opun,Type=Medium,Size=10,Color=0xDE794E
 000072		Ice will be ready at	น้ำแข็งจะพร้อมเวลา 
-	Text 
+
 		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
 		Font=Kanit,Type=Regular,Size=36,Color=0x746253
 000073		Pay now	ซื้อเลย
-	Text 
+		Font=Kanit,Type=Regular,Size=36,Color=0x746253
-		Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF
 		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
 000074		Cancel	ยกเลิก
-	Text 
+		Font=Kanit,Type=Light,Size=36,Color=0xFF0000
-		Font=Kanit,Type=Light,Size=36,Color=0x0025FF
 000075		Please choose drink type	โปรดเลือกประเภทเครื่องดื่ม
 
-	Text 
+
-		Font=Kanit,Type=Regular,Size=28,Color=0x0025FF,PressColor=0xFFFFFF
+		Font=Kanit,Type=Regular,Size=28,Color=0x513C2F
-		Font=Kanit,Type=Medium,Size=28,Color=0xFFFFFF
+		Font=Kanit,Type=Medium,Size=28,Color=0x513C2F
-		Font=Kanit,Type=Regular,Size=28,Color=0xA6B2FF
+		Font=Kanit,Type=Regular,Size=28,Color=0x9D9D9D
-		Font=Kanit,Type=Regular,Size=28,Color=0x8092FF
+		Font=Kanit,Type=Regular,Size=28,Color=0xCFCFCF
 000081		Hot	ร้อน
 000082		Iced	เย็น
 000083		Blend	ปั่น
-		Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,PressColor=0xFFFFFF
+		Font=Kanit,Type=Regular,Size=24,Color=0x513C2F
 000084		Normal	ปกติ
 
 
@@ -120,7 +117,7 @@ TextID	Note	English	Thai
 
 
 	Left of check box
-		Font=Kanit,Type=Light,Size=29,Color=0xA6B2FF,Align=end-center-vertical,LineHeight=30
+		Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30
 000090		Out of straw	หลอดหมด
 000091		Out of lid	ฝาหมด
 000092		Only smoothie\n avalible	สำหรับเมนูปั่น
@@ -128,7 +125,7 @@ TextID	Note	English	Thai
 
 
 	Text topping extra
-		Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,LineHeight=46
+		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
 000100		1 Shot of Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15]	เอสเพรสโซ่ 1 ช็อต\n[ใช้เวลาชงนานขึ้น 1 นาที###Font=KanitLight,Size=15]
 000101		Add extra Oreo crunchy	เพิ่มท็อปปิ้งโอริโอภูเขาไฟ
 000102		1 Shot of Single Origin Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15]	เอสเพรสโซ Single Origin 1 ช็อต\n[ใช้เวลาชงนานขึ้น 1 นาที###Font=KanitLight,Size=15]

inter/sgp/xml/page_catalog_group_coffee.lxml

@@ -14574,15 +14574,11 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 390 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
 	</Image>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<State> $52-21-01-0005.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
@@ -14601,8 +14597,6 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> $52-31-02-0002.Button </State>
@@ -14621,8 +14615,6 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
 	<State> $52-31-03-0002.Button </State>
@@ -15168,15 +15160,11 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 390 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
 	</Image>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<State> $52-21-01-0006.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
@@ -15195,8 +15183,6 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> $52-21-02-0003.Button </State>
@@ -15215,8 +15201,6 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
 	<State> $52-21-03-0003.Button </State>
@@ -15762,15 +15746,11 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 390 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
 	</Image>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<State> $52-21-01-0007.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
@@ -15789,8 +15769,6 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> $52-21-02-0004.Button </State>
@@ -15809,8 +15787,6 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
 	<State> $52-21-03-0004.Button </State>

inter/sgp/xml/page_catalog_group_milk.lxml

@@ -3496,15 +3496,11 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 390 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
 	</Image>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<State> "Invisible" </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
@@ -3523,8 +3519,6 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> "Invisible" </State>
@@ -3543,8 +3537,6 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
 	<State> $52-03-03-0009.Button </State>
@@ -9231,15 +9223,11 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 390 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
 	</Image>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<State> "Invisible" </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
@@ -9258,8 +9246,6 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> "Invisible" </State>
@@ -9278,8 +9264,6 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
 	<State> $52-03-03-0027.Button </State>

inter/sgp/xml/page_catalog_group_whey.lxml

@@ -1418,15 +1418,11 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 390 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
 	</Image>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<State> "Invisible" </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
@@ -1445,8 +1441,6 @@
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> $52-04-02-0002.Button </State>
@@ -1465,8 +1459,6 @@
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Width> 134 </Width>
-	<Height> 44 </Height>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
 	<State> "Invisible" </State>

xml/page_board.xml

@@ -880,9 +880,6 @@
 
 		; Singapore disable point
 		Var SettingIgnoreCollectPoint = 1
-		If BoxID = 210604 Then
-			Var SettingIgnoreCollectPoint = 0
-		EndIf
 		
 		READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev
 		STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg