SGP+WTC: fix get your change not blue theme

inter/sgp/menu/lang.tsv

@@ -146,8 +146,8 @@ TextID	Note	English	Thai
 
 
 	Page brewing
+		Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30
 		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center,LineHeight=30
-		Font=Kanit,Type=Regular,Size=36,Color=0xDE794E,Align=Centerr,LineHeight=30
 000400		Notify us about lid problem	แจ้งเตือนฝาติด
 000401		Notify us about straw problem	แจ้งเตือนหลอดติด
 
@@ -851,9 +851,9 @@ TextID	Note	English	Thai
 800771		Type number.	ใส่ตัวเลข
 800772
 800773		Exhaust Fan Test	ทดสอบพัดลมดูดอากาศ
-800774
+800774			ตรวจสอบลูกเบี้ยว
-800775
+800775		Cam powder test pass	ทดสอบผ่าน
-800776
+800776		Cam powder test fail	ทดสอบไม่ผ่าน
 810000
 810001		Start	เริ่มทำงาน
 810002		Stop	หยุดทำงาน
@@ -957,8 +957,8 @@ TextID	Note	English	Thai
 810150		Volume	ปริมาณ
 810151		Water Tank	ถังน้ำดี
 810152		Day	วันที่
-810153
+810153		Weight	น้ำหนัก
-810154
+810154		calibrate	calibrate
 810155
 810156
 810157

inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml

@@ -0,0 +1,207 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> BackgroundColor </Background>
+;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	
+	Var Timeout = 0 
+	Var LangButtonEnable = "Enable"
+
+	If CountryName = "Singapore" Then
+		Var LangButtonEnable = "Invisible"
+	EndIf
+
+	If CountryName = "HongKong" Then
+		Var LangButtonEnable = "Invisible"
+	EndIf
+		
+	DEBUGVAR LangButtonEnable
+
+	If show_eng = "true" Then 
+		
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+		If CountryName = "Singapore" Then
+			Var show_btp = ""
+			Var show_btn = ""
+
+		EndIf
+
+	
+
+		Var DirImage = "ROOT/taobin_project/image/page_thankyou_en"
+	Else
+		
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+		If CountryName = "Singapore" Then
+			Var show_btp = ""
+			Var show_btn = ""
+
+		EndIf
+	
+
+		Var DirImage = "ROOT/taobin_project/image/page_thankyou"
+	EndIf
+
+	If show_eng = "true" Then 
+			PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Dont_forget_your_changes_below.mp3"
+	Else
+			PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Dont_forget_your_changes_below.mp3"
+	EndIf
+
+	Var imgGetChange = "/imgGetChange.png"
+	
+	;inter-image
+    If CountryName = "Malaysia" Then
+		Var imgGetChange = "/imgGetChange-MYR.png"
+	EndIf
+
+	;inter-image
+	If CountryName = "Indonesia" Then
+		Var imgGetChange = "/imgGetChange-IDR.png"
+	EndIf 
+
+	;inter-image
+	If CountryName = "Singapore" Then
+		Var imgGetChange = "/imgGetChange-SGP.png"
+	EndIf
+
+	;inter-image
+	If CountryName = "HongKong" Then
+		Var imgGetChange = "/imgGetChange-HKG.png"
+	EndIf
+
+	;inter-image
+	If CountryName = "UnitedArabEmirates Dubai" Then
+		Var imgGetChange = "/imgGetChange-UAE_DUBAI.png"
+	EndIf
+
+	;INT StoreCreditAmount
+	Var StoreCreditAmountStr !assigned StringFmt( StoreCreditAmount, DisplayFormat, PreScaleConvertShow )
+
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+	Var Timeout = Timeout + 1 
+
+    If Timeout >= 2 Then 
+
+        If ChangeStatus = "payout-end" Then 
+            Var Timeout = 30
+        EndIf
+
+        If Seeker = "curr" Then
+            Var Timeout = 30
+        EndIf 
+
+        If Timeout >= 30 Then
+
+         	If Seeker.PayWithQR = 0 Then
+				DEBUGVAR TxRef1
+				Var PayDetail2 = ToppingDetail
+				DEBUGVAR PayDetail
+				DEBUGVAR PayDetail2
+
+				UpdateTxRef2 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
+			EndIf
+
+			If InternationalEnable = 1 Then
+				Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
+				Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
+
+				If Seeker = "next" Then
+					;CoinBack
+				    Open Brew3ConInter 
+				Else
+				    Open Brew3Inter 
+				EndIf
+			Else
+
+				If New_Payment = 1 Then
+					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
+				EndIf
+
+				If Seeker = "next" Then
+					;CoinBack
+				    Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+				Else
+				    Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+				EndIf
+
+				
+			EndIf	
+
+			;If New_Payment = 1 Then
+			;	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
+			;EndIf
+
+            ;If Seeker = "next" Then
+                ;CoinBack
+            ;    Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            ;Else
+            ;    Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+            ;EndIf
+
+        EndIf
+
+    EndIf
+
+  
+
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+
+<Button>
+<X> 990 </X>
+<Y> 416 </Y>
+<State> LangButtonEnable </State>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+</EventClick>
+</Button>
+
+
+<Image>
+<X> 70 </X>
+<Y> 932 </Y>
+<Filename> Var( DirImage + imgGetChange ) </Filename>
+</Image>
+
+
+<Text>
+<X> 0 </X>
+<Y> 1123 </Y>
+<Size> 144 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> PopupBodyTextColor </Color>
+<Value> StoreCreditAmountStr </Value>
+</Text>
+
+</Popup>

xml/page_lid_straw.xml

@@ -150,7 +150,16 @@
 			EndIf
 
 		Else
-			Open "ROOT/taobin_project/xml/page_get_yourchange.xml"  
+
+			If UsePepsiTheme = 1 Then
+				If CountryName = "Singapore" Then
+					Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
+				EndIf
+			Else
+				Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
+			EndIf
+
+			
 		EndIf
 	Else
 
@@ -180,7 +189,13 @@
 				Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 			EndIf	
 		Else
-			Open "ROOT/taobin_project/xml/page_get_yourchange.xml"  
+			If UsePepsiTheme = 1 Then
+				If CountryName = "Singapore" Then
+					Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
+				EndIf
+			Else
+				Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
+			EndIf
 		EndIf
 	EndIf