DO cocoa

animation01/play_list.tsv

@@ -1102,3 +1102,5 @@ Iced Mocha	12-21-02-0064	1	2	3	4	5	15	7	59	23	24	167	2:47	23
 12-03-01-0068	โกโก้ตัวสูตินรีร้อน	1	15	26							24	120	2:00	23
 12-03-02-0068	โกโก้ตัวสูตินรีเย็น	1	15	26	23						24	120	2:00	23
 12-03-02-0069	โกโก้ตัวแม่ลูกอ่อน	1	15	17	23						24	120	2:00	23
+12-03-02-0070	โกโก้ตัวแม่ลูกอ่อน	1	15	17	23						24	120	2:00	23
+12-03-02-0071	โกโก้ตัวแม่ลูกอ่อน	1	15	17	23						24	120	2:00	23

inter/aus/xml/open_page_catalog.ev

@@ -1,7 +1,7 @@
 If WinterWarmersCatalogFlag = 1 Then
     Var catalogFile = CountryRootPath + "/xml/page_catalog_winter_warmers.lxml"
 Else
-    Var catalogFile = CountryRootPath + "/xml/page_catalog_westfield.lxml"
+    Var catalogFile = CountryRootPath + "/xml/page_catalog.lxml"
 EndIf
 
 

inter/aus/xml/page_catalog.lxml

@@ -42,6 +42,8 @@
 	Var GetPayInfoFlag = 0
 	Var countDownRetrun = 300
 
+    Var OpenRouteManTest = 0
+
 	CoinVending OFF
 
 	
@@ -712,6 +714,34 @@
 </EventClick>
 </Button>
 
+
+
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 1820 </Y>
+<Width> 100 </Width>
+<Height> 100 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var ClickCountMainTe = ClickCountMainTe + 1
+	
+	DEBUGVAR ClickCountMainTe
+
+	If ClickCountMainTe = 2 Then 
+		Var OpenRouteManTest = 1
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        Var ClickCountMainTe = 0
+ 	EndIf
+</EventClick>
+</Image>
+
+
+
+
 <EventUnitTest1>
 	Var StrawGetMoreState = "Invisible"
 	Var bg_lidProblem_ST = "Invisible"

inter/aus/xml/page_catalog_cocktail.lxml

@@ -681,6 +681,25 @@
 </EventWebApp>
 
 
+<Image>
+<X> 0 </X>
+<Y> 1820 </Y>
+<Width> 100 </Width>
+<Height> 100 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var ClickCountMainTe = ClickCountMainTe + 1
+	
+	DEBUGVAR ClickCountMainTe
+
+	If ClickCountMainTe = 2 Then 
+		Var OpenRouteManTest = 1
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        Var ClickCountMainTe = 0
+ 	EndIf
+</EventClick>
+</Image>
 
 
 <Button>

inter/aus/xml/page_catalog_group_menu_test.lxml

@@ -0,0 +1,316 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"    
+
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
+</EventOpen>
+
+
+;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
+
+
+<FrameScroll> 
+<X> 10 </X>
+<Y> 497 </Y>
+<Width> 1080 </Width>
+<ScrollHeight> "auto" </ScrollHeight>
+<Scroll> "Vertical" </Scroll>
+<Column> 4 </Column>
+<Script>
+	 Var block_index_override = 0
+	 Var block_index_move = 0
+</Script>
+;dummy_layout.inc
+	; ==================> Len = 1
+	; 51-99-99-9999
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-99-99-9999.Button,$Sum5199999999) </State> 
+	<Button>
+	<State> $Sum5199999999 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_milk.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_milk.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_milk.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_milk.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $51-99-99-9999.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "51-99-99-9999"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "Test Drink"
+		Var aliasDesc[0] = "Just drop cup"
+		Var aliasName[1] = "นม"
+		Var aliasDesc[1] = "นม"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = ""
+		Var aliasDesc[4] = ""
+		Var aliasName[5] = ""
+		Var aliasDesc[5] = ""
+		Var NameLang[0][0] = ""
+		Var NameLang[0][1] = ""
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = ""
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = ""
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = "Test Drink"
+		Var NameLang[1][1] = "นมเย็น"
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Just drop cup"
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = ""
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = ""
+		Var DescLang[2][1] = ""
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = ""
+		Var DescLang[2][5] = ""
+		; end lang 
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $51-99-99-9999.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "51-99-99-9999"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Test Drink</LanguageSlot1>
+		<LanguageSlot2>นม</LanguageSlot2>
+		<LanguageSlot3>Test Drink</LanguageSlot3>
+		<LanguageSlot4>นม</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>นม</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Milk</LanguageSlot1>
+		<LanguageSlot2>นม</LanguageSlot2>
+		<LanguageSlot3>Milk</LanguageSlot3>
+		<LanguageSlot4>นม</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>นม</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $51-99-99-9999.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $51-99-99-9999.Button </State>
+	<Value> StringFmt( $51-99-99-9999.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum5199999999 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum5199999999 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $51-99-99-9999.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5199999999 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+</FrameScroll>
+
+<EventUnitTest4>
+    RefreshAll
+</EventUnitTest4>
+
+
+</Popup>

inter/aus/xml/page_catalog_winter_warmers.lxml

@@ -693,6 +693,26 @@
 
 
 
+<Image>
+<X> 0 </X>
+<Y> 1820 </Y>
+<Width> 100 </Width>
+<Height> 100 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var ClickCountMainTe = ClickCountMainTe + 1
+	
+	DEBUGVAR ClickCountMainTe
+
+	If ClickCountMainTe = 2 Then 
+		Var OpenRouteManTest = 1
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        Var ClickCountMainTe = 0
+ 	EndIf
+</EventClick>
+</Image>
+
 
 <Button>
 <X> 780 </X>

inter/aus/xml/page_drinkfail_aus.lxml

@@ -0,0 +1,646 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xEFEDEA" </Background>
+<Volume> SoundVolume </Volume>
+;<Refresh> "Partial" </Refresh>
+<EventOpen>
+	; On open
+
+	Var Seeker.TNumberTaobinMember = ""
+
+	
+	DEBUGVAR TelephoneNumberProblem
+	DEBUGVAR Seeker.PromotionIDCurrentOrder
+
+	If TelephoneNumberProblem = "" Then
+
+	Else
+		Var NumberFailed = "true"
+		CHECKNUMBERFAIL TelephoneNumberProblem NumberFailed
+
+		DEBUGVAR NumberFailed
+		DEBUGVAR ERROR_PAY_TIMEOUT
+		DEBUGVAR ERROR_BREW_CAUSE_ENG
+		DEBUGVAR ERROR_BREW_CAUSE_THAI
+
+
+		If FailedCount > 0 Then 
+			Var ERROR_PAY_TIMEOUT = "false"
+			DEBUGVAR FailedCount
+			DEBUGVAR ERROR_PAY_TIMEOUT
+		EndIf
+
+		If  NextOrder = "true" Then
+			Var ERROR_PAY_TIMEOUT = "false"
+			DEBUGVAR FailedCount
+			DEBUGVAR ERROR_PAY_TIMEOUT
+		EndIf
+
+
+		If ERROR_PAY_TIMEOUT = "true" Then
+			
+			If NumberFailed = "false" Then
+
+				If show_eng = "true" Then 
+					Var TextErrorShow = ERROR_BREW_CAUSE_ENG
+				Else
+					If show_japan = "true" Then 
+						Var TextErrorShow = ERROR_BREW_CAUSE_JAPAN
+					Else
+						Var TextErrorShow = ERROR_BREW_CAUSE_THAI
+					EndIf
+				EndIf
+
+
+				Open "ROOT/taobin_project/xml/page_drinkfail4.xml" 
+
+			EndIf
+
+			
+			Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
+		Else
+			Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
+		EndIf
+		
+		
+	EndIf
+
+
+	
+	
+	
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/collectiing/"
+	EndIf
+
+	
+	Var Timeout = 0
+
+	
+	StopLongPlay
+
+
+	
+
+   
+
+    Var MachineErrorDetailAll = MachineErrorDetail + " / "
+	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
+
+	
+
+
+	If show_eng = "true" Then 
+		Var textRefundChannelX = "textRefundChannel1.png"
+		Var xRefundChannelX = 249
+
+		If Seeker.PayWithQR = 0 Then 
+
+			If Seeker.StoreCreditFlag = 1 Then
+				Var textRefundChannelX = "textRefundChannel2.png"
+				Var xRefundChannelX = 249
+			EndIf
+
+			If Seeker.CodeChannel = 1 Then
+				Var textRefundChannelX = "textRefundChannel3.png"
+				Var xRefundChannelX = 60
+			EndIf
+
+		Else
+			Var textRefundChannelX = "textRefundChannel3.png"
+			Var xRefundChannelX = 60
+		EndIf
+
+		Var textRefundChannelX = "textRefundChannel3.png"
+		Var xRefundChannelX = 60
+
+	Else
+		Var textRefundChannelX = "textRefundChannel1.png"
+		Var xRefundChannelX = 204
+
+		If Seeker.PayWithQR = 0 Then 
+
+			If Seeker.StoreCreditFlag = 1 Then
+				Var textRefundChannelX = "textRefundChannel2.png"
+				Var xRefundChannelX = 256
+			EndIf
+
+			If Seeker.CodeChannel = 1 Then
+				Var textRefundChannelX = "textRefundChannel3.png"
+				Var xRefundChannelX = 162
+			EndIf
+
+		Else
+			Var textRefundChannelX = "textRefundChannel3.png"
+			Var xRefundChannelX = 162
+		EndIf
+
+		Var textRefundChannelX = "textRefundChannel3.png"
+		Var xRefundChannelX = 162
+	EndIf
+
+	Var text22 = "/text22.png"
+
+	DEBUGVAR CountryName
+	DEBUGVAR MaxPhoneNumber
+	
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+	SAVELOG MachineStage
+
+    Var Timeout = Timeout + 1
+
+	If Timeout > 15 Then
+
+        If MachineStage = "remove-cup" Then
+			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+		Else
+			If  NextOrder = "true" Then
+				Var NextOrder = "false"
+
+				TransferVar "next" "curr"
+				Var Seeker = "curr"
+							
+				Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+			Else
+				Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+			EndIf
+		EndIf
+	EndIf
+
+	
+
+	TimerReset
+
+</EventTimeout> 
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+
+
+
+
+<Button>
+<X> 333 </X>
+<Y> 1281 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_1.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "1"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1281 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_2.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_2.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "2"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1281 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_3.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_3.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "3"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 333 </X>
+<Y> 1395 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_4.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_4.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "4"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1395 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_5.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_5.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "5"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1395 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_6.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_6.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "6"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 333 </X>
+<Y> 1507 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_7.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_7.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "7"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1507 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_8.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_8.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "8"
+    Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1507 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_9.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_9.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "9"
+	 Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1620 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_0.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_0.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "0"
+	 Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 620 </X>
+<Y> 1620 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_back-1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_back-1.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Trim TelephoneNumberProblem  -1
+	
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen < 10 Then 
+		Var Tel_Confirm_State = "Invisible"
+	EndIf
+	
+	If TelNumLen = 0 Then 
+		Var ShowTextNumber = "Enable"
+	EndIf
+
+	TimerReset
+	Refresh
+	
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 44 </X>
+<Y> 1783 </Y>
+<Filename> Var( DirImage + "/bn_back2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_back2.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+
+	
+
+			
+	If MachineStage = "remove-cup" Then
+		Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+	Else
+		
+		If  NextOrder = "true" Then
+			Var NextOrder = "false"
+
+			TransferVar "next" "curr"
+			Var Seeker = "curr"
+						
+			Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+		Else
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+		EndIf
+	EndIf
+
+
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 750 </X>
+<Y> 1783 </Y>
+<Refresh> "Enable" </Refresh>
+<State> Tel_Confirm_State </State>
+<Filename> Var( DirImage + "/bn_confirm.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_confirm.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bp_confirm.png" )</FilenameDisable>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	StrLen TelephoneNumberProblem TelNumLen
+	If TelNumLen >= MinPhoneNumber Then  
+
+		If MachineStage = "remove-cup" Then
+			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+		Else
+			If  NextOrder = "true" Then
+				Var NextOrder = "false"
+
+				TransferVar "next" "curr"
+				Var Seeker = "curr"
+						
+				Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+			Else
+				Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+			EndIf
+		EndIf
+
+	EndIf
+
+	
+
+</EventClick>
+</Button>
+
+;<Image>
+;<X> xRefundChannelX </X>
+;<Y> 960 </Y>
+;<Filename> Var( DirImage + textRefundChannelX ) </Filename>
+;</Image>
+
+<Image>
+<X> 47 </X>
+<Y> 408 </Y>
+<Filename> Var( DirImage + text22 ) </Filename>
+</Image>
+
+;<Image>
+;<X> 410 </X>
+;<Y> 524 </Y>
+;<Filename> Var( DirImage + "/Businessman_sorry.png" ) </Filename>
+;</Image>
+
+
+
+<Image>
+<X> 262 </X>
+<Y> 1119 </Y>
+<Filename> Var( DirImage + "/img5.png" ) </Filename>
+</Image>
+
+<Image>
+<X> 400 </X>
+<Y> 1160 </Y>
+<State> ShowTextNumber </State>
+;<Refresh> "Enable" </Refresh>
+<Filename> Var( DirImage + "/text15.png" )</Filename>
+</Image>
+
+<Image>
+<X> 293 </X>
+<Y> 1140 </Y>
+<State> ShowTextNumber </State>
+;<Refresh> "Enable" </Refresh>
+<Filename> Var( DirImage + "/Group.png" )</Filename>
+</Image>
+
+<Text>
+<X> 0 </X>
+<Y> 1140 </Y>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Size> 62 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+
+<Value> TelephoneNumberProblem </Value>
+<Format> Telnum-mask-1 </Format>
+</Text>
+
+
+
+
+<Text>
+<X> 5 </X>
+<Y> 1868 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xDE794E </Color>
+<Value> MachineErrorDetailAll </Value>
+</Text>
+
+
+
+
+</Popup>

inter/aus/xml/route_man_test.lxml

@@ -0,0 +1,61 @@
+<Page>
+<Width> 1080 </Width>
+<Height> 1312 </Height>
+<Volume> SoundVolume </Volume>
+<Background> "0xeae6e1" </Background>
+<EventOpen>
+    Var OpenRouteManTest = 0
+    Var Timeout = 0
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    Var Timeout = Timeout + 1
+    DEBUGVAR Timeout
+
+    If Timeout > 15 Then
+        Open "ROOT/taobin_project/xml/page_board.xml"
+	EndIf
+
+	TimerReset
+</EventTimeout>
+
+
+
+<Image>
+<X> 290 </X>
+<Y> 800 </Y>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick>
+	TopView "show"
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+    OpenInst 2 "ROOT/taobin_project/inter/aus/xml/page_catalog_group_menu_test.lxml"
+</EventClick>
+</Image>
+
+<Text>
+<X> 290 </X>
+<Y> 800 </Y>
+<Width> 500 </Width>
+<Height> 75 </Height>
+<Size> 30 </Size>
+<Font> fontType1 </Font>
+<Color> 0x000000 </Color>
+<Align> center-vertical-horizontal </Align>
+<Value> "Test Buy Drink" </Value>
+</Text>
+
+
+<Button>
+<X> 431 </X>
+<Y> 1100 </Y>
+<Filename> "ROOT/taobin_project/image//bp_cancel.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/bp_cancel.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Open "ROOT/taobin_project/xml/page_board.xml"
+</EventClick>
+</Button>
+
+</Page>

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	หวานพอดี

inter/sgp/xml/page_brewing3.lxml

@@ -2,9 +2,14 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+
+	If UsePepsiTheme = 1 Then
+		Open "ROOT/taobin_project/inter/sgp/xml/page_brewing3_blue.lxml"
+	EndIf
+
 	Var SendNotiPaySuccess = 2
 
 	Var GetMoreStrawCount = 2
@@ -27,6 +32,12 @@
 
 	Var DirImageDoing = CountryRootPath + "/image/page_doing"
 
+	If UsePepsiTheme = 1 Then
+		Var DirImageDoing = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing"
+	EndIf
+
+	DEBUGVAR BackgroundColor
+
 	Var SelectDrink = Seeker.selected_a_drink
 	Var ExtendData = Seeker.ExtendData
 
@@ -56,7 +67,6 @@
 		Var IMG_CNT = DirImageDoing + "/img2_eng.png"
 
 		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
-
 		Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw_en.png"
 		Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw_en.png"
 
@@ -73,6 +83,19 @@
 		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
 		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
 
+		DEBUGVAR bnGetMoreStrawFileName
+		DEBUGVAR bnStrawProblemReport
+		DEBUGVAR bnLidProblemReport
+		DEBUGVAR bn_get_lid_image
+
+		;If UsePepsiTheme = 1 Then
+		;	Var brew_txt2 = "ROOT/taobin_project/inter/whatthecup/sgp/video/brewing_txt_adv3_en.png"
+		;	Var brew_txt1 = "ROOT/taobin_project/inter/whatthecup/sgp/video/brewing_txt_adv1_en.png"
+		;EndIf
+
+		DEBUGVAR EnableGetMoreStrawFileName
+		DEBUGVAR GetLidButtonState
+
 		Var XStraw = 274
 	Else
 		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
@@ -232,6 +255,11 @@
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+
+		If UsePepsiTheme = 1 Then
+			Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment"
+			Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en"
+		EndIf
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2"
@@ -436,6 +464,10 @@
 		Var ShowCountdown = "Invisible"
 
 		Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_percent_eng.png"
+		EndIf
 	EndIf
 
 	If XPercent = 0 Then
@@ -1585,7 +1617,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> BodyTextColor </Color>
 <Value> XPercent </Value>
 </Text>
 

inter/sgp/xml/page_collect_point_1.lxml

@@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 ;<Refresh> "Partial" </Refresh>
 <EventOpen>
@@ -40,6 +40,13 @@
 		;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+			Var DirImage = DirImage + "/image/collect_point1_en"
+
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_eng.png"
+		EndIf
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collect_point1"
 		;Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
@@ -425,6 +432,11 @@
 		Var ShowCountdown = "Invisible"
 
 		Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_percent_eng.png"
+
+		EndIf
 	EndIf
 
 	If XPercent = 0 Then
@@ -433,6 +445,51 @@
 		Var XPercent = 0
 	EndIf
 
+	Var AlphaBg = "ROOT/taobin_project/image/collectiing/alpha.png"
+	Var NumImgDir = "ROOT/taobin_project/image/collectiing/"
+
+	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/"
+	EndIf
+
+	Var bn_NumPad1 = NumImgDir + "bn_1.png"
+	Var bp_NumPad1 = NumImgDir + "bp_1.png"
+
+	Var bn_NumPad2 = NumImgDir + "bn_2.png"
+	Var bp_NumPad2 = NumImgDir + "bp_2.png"
+
+	Var bn_NumPad3 = NumImgDir + "bn_3.png"
+	Var bp_NumPad3 = NumImgDir + "bp_3.png"
+
+	Var bn_NumPad4 = NumImgDir + "bn_4.png"
+	Var bp_NumPad4 = NumImgDir + "bp_4.png"
+
+	Var bn_NumPad5 = NumImgDir + "bn_5.png"
+	Var bp_NumPad5 = NumImgDir + "bp_5.png"
+
+	Var bn_NumPad6 = NumImgDir + "bn_6.png"
+	Var bp_NumPad6 = NumImgDir + "bp_6.png"
+
+	Var bn_NumPad7 = NumImgDir + "bn_7.png"
+	Var bp_NumPad7 = NumImgDir + "bp_7.png"
+
+	Var bn_NumPad8 = NumImgDir + "bn_8.png"
+	Var bp_NumPad8 = NumImgDir + "bp_8.png"
+
+	Var bn_NumPad9 = NumImgDir + "bn_9.png"
+	Var bp_NumPad9 = NumImgDir + "bp_9.png"
+
+	Var bn_NumPad0 = NumImgDir + "bn_0.png"
+	Var bp_NumPad0 = NumImgDir + "bp_0.png"
+
+	Var bn_NumPadBack = NumImgDir + "bn_back-1.png"
+	Var bp_NumPadBack = NumImgDir + "bp_back-1.png"
+
+	Var TextEditImg = DirImage + "/text_edit.png"
+
+	DEBUGVAR TextEditImg
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -509,7 +566,7 @@
 <Image>
 <X> 0 </X>
 <Y> 380 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+<Filename> AlphaBg </Filename>
 </Image>
 
 
@@ -524,8 +581,8 @@
 <Button>
 <X> 333 </X>
 <Y> 1086 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_1.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
+<Filename> bn_NumPad1 </Filename>
+<FilenamePress> bp_NumPad1 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -554,8 +611,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1086 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
+<Filename> bn_NumPad2 </Filename>
+<FilenamePress> bp_NumPad2 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -579,8 +636,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1086 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_3.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
+<Filename> bn_NumPad3 </Filename>
+<FilenamePress> bp_NumPad3 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -604,8 +661,8 @@
 <Button>
 <X> 333 </X>
 <Y> 1230 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_4.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
+<Filename> bn_NumPad4 </Filename>
+<FilenamePress> bp_NumPad4 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -629,8 +686,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1230 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_5.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
+<Filename> bn_NumPad5 </Filename>
+<FilenamePress> bp_NumPad5 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -654,8 +711,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1230 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_6.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
+<Filename> bn_NumPad6 </Filename>
+<FilenamePress> bp_NumPad6 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -679,8 +736,8 @@
 <Button>
 <X> 333 </X>
 <Y> 1373 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_7.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
+<Filename> bn_NumPad7 </Filename>
+<FilenamePress> bp_NumPad7 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -704,8 +761,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1373 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_8.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
+<Filename> bn_NumPad8 </Filename>
+<FilenamePress> bp_NumPad8 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -729,8 +786,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1373 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_9.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
+<Filename> bn_NumPad9 </Filename>
+<FilenamePress> bp_NumPad9 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -755,8 +812,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1517 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_0.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
+<Filename> bn_NumPad0 </Filename>
+<FilenamePress> bp_NumPad0 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -780,8 +837,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1517 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_back-1.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
+<Filename> bn_NumPadBack </Filename>
+<FilenamePress> bp_NumPadBack </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -813,7 +870,7 @@
 <Align> Center </Align>
 <Size> 62 </Size>
 <Font> RobotoBlack </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> TelephoneNumber </Value>
 <Format> Telnum-mask-3 </Format>
 </Text>
@@ -1023,14 +1080,14 @@
 <Image>
 <X> 217 </X>
 <Y> 866 </Y>
-<Filename> "ROOT/taobin_project/image/collect_point1/img3.png" </Filename>
+<Filename> Var( DirImage + "/img3.png") </Filename>
 </Image>
 
 <Image>
 <X> 157 </X>
 <Y> 868 </Y>
 <State> ShowTextNumber </State>
-<Filename> Var( DirImage + "/text_edit.png") </Filename>
+<Filename> TextEditImg </Filename>
 </Image>
 
 
@@ -1104,7 +1161,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> XPercent </Value>
 </Text>
 

inter/sgp/xml/page_member_prompt.lxml

@@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
 
@@ -22,12 +22,20 @@
 
     ; img
     Var ImgDir = CountryRootPath + "/image/page_member/"
+    Var ImgDirStatic = CountryRootPath + "/image/page_member/"
+
+    If UsePepsiTheme = 1 Then
+        Var ImgDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var ImgDir = ImgDir + "/image/page_member/"
+    EndIf
+
+
     Var PromptDialogImg = ImgDir + "ask_member_dialog.png"
     Var YesButton = ImgDir + "bn_yes.png"
     Var NoButton = ImgDir + "bn_no.png"
     Var YesPressButton = ImgDir + "bp_yes.png"
     Var NoPressButton = ImgDir + "bp_no.png"
-    Var QRImg = ImgDir + "qr_regis.png"
+    Var QRImg = ImgDirStatic + "qr_regis.png"
     
     Var UseSGPCollectFlag = 0
 
@@ -35,6 +43,7 @@
     DEBUGVAR ChangeFlag2
 
     Var IMG_CNT = ImgDir + "img2_sp_eng.png"
+    DEBUGVAR IMG_CNT
 
 </EventOpen>
 
@@ -123,7 +132,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> RemainingInThisPage </Value>
 </Text>
 
@@ -136,7 +145,7 @@
 <Width> 1080 </Width>
 <Font> KanitRegularTTF </Font>
 <State> DisplayQR </State>
-<Color> 0xDE794E </Color>
+<Color> HeadlineColor </Color>
 <Value> "Please scan QR to register" </Value>
 </Text>