Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

inter/tha/xml/multi/page_catalog.lxml

@@ -18,6 +18,20 @@
 
 	DEBUGVAR ToppingNewShow
 
+	DEBUGVAR OpenFromPageBoard
+	If OpenFromPageBoard = 1 Then
+		Var OpenFromPageBoard = 0
+		Var langnext1 = "true"
+		Var langnext2 = "true"
+		Var langnext3 = "true"
+		Var langnext4 = "true"
+		Var langnext5 = "true"
+		Var langnext6 = "true"
+		Var langnext7 = "true"
+		Var langnext8 = "true"
+		SAVELOG "======================================= RefreshAll Languages ================================"
+	EndIf
+
 	Var NextPage = "-"
 
 	Var Seeker.thankLidFlag = 0
@@ -561,6 +575,7 @@
 	<EventClick> 
 
 		If Inst5MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 2 
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@@ -631,6 +646,7 @@
 	<EventClick> 
 
 		If Inst6MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 3 
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@@ -664,6 +680,7 @@
 	<EventClick> 
 
 		If Inst7MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 4 
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@@ -697,6 +714,7 @@
 	<EventClick> 
 
 		If Inst11MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 7
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@@ -730,6 +748,7 @@
 	<EventClick> 
 
 		If Inst10MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 8
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@@ -766,6 +785,7 @@
 	<EventClick> 
 
 		If Inst8MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 5 
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@@ -798,6 +818,7 @@
 	<Volume> SoundVolume </Volume>
 	<EventClick> 
 		If Inst8MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 5 
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@@ -858,6 +879,7 @@
 	<EventClick> 
 		
 		If Inst9MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 6
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"

inter/uae_dubai/xml/page_catalog_group_other.lxml

@@ -10962,276 +10962,6 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; ==================> Len = 3
-	; - 53-05-02-0114 53-05-03-0114 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 53-05-02-0114.Button,53-05-03-0114.Button,$Sum53050201145305030114) </State> 
-	<Button>
-	<State> $Sum53050201145305030114 </State> 
-	<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_iced_pepsi_coconut.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_iced_pepsi_coconut.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_iced_pepsi_coconut.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/uae_dubai/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $53-05-02-0114.Price
-		Var PriceD3 = $53-05-03-0114.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "53-05-02-0114"
-		Var PD_CODE3 = "53-05-03-0114"
-		; begin lang 
-		Var aliasName[0] = "COCONUT PEPSI "
-		Var aliasDesc[0] = "Coconut Syrup, Pepsi and Soda"
-		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] = "Iced COCONUT PEPSI "
-		Var NameLang[1][1] = "بيبسي مع جوز الهند مثلج"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
-		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Coconut Syrup, Pepsi and Soda"
-		Var DescLang[1][1] = "شراب جوز الهند ، بيبسي ، صودا"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
-		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "COCONUT PEPSI  SMOOTHIE"
-		Var NameLang[2][1] = "بيبسي مع جوز الهند سموذي"
-		Var NameLang[2][2] = ""
-		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
-		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Coconut Syrup, Pepsi and Soda"
-		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 = $53-05-02-0114.Button
-		Var PD_STAGE_3 = $53-05-03-0114.Button
-		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" "53-05-02-0114"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "53-05-03-0114"
-			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> HeadlineColor </Color>
-	<LanguageGroup>
-		<LanguageSlot1>COCONUT PEPSI </LanguageSlot1>
-		<LanguageSlot2>بيبسي مع جوز الهند</LanguageSlot2>
-		<LanguageSlot3>COCONUT PEPSI </LanguageSlot3>
-		<LanguageSlot4>بيبسي مع جوز الهند</LanguageSlot4>
-		<LanguageSlot5>COCONUT PEPSI </LanguageSlot5>
-		<LanguageSlot6>بيبسي مع جوز الهند</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>222</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> BodyTextColor </Color>
-	<LanguageGroup>
-		<LanguageSlot1>Coconut Syrup, Pepsi and Soda</LanguageSlot1>
-		<LanguageSlot2>شراب جوز الهند، بيبسي وصودا</LanguageSlot2>
-		<LanguageSlot3>Coconut Syrup, Pepsi and Soda</LanguageSlot3>
-		<LanguageSlot4>شراب جوز الهند، بيبسي وصودا</LanguageSlot4>
-		<LanguageSlot5>Coconut Syrup, Pepsi and Soda</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> WTCBlueColor </Color>
-	<ColorDisable> WTCWhiteColor </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> $53-05-02-0114.Button </State>
-	</Image>
-	<Text>
-	<X> 113 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> WTCBlueColor </Color>
-	<ColorDisable> WTCWhiteColor </ColorDisable>
-	<State> $53-05-02-0114.Button </State>
-	<Value> StringFmt( $53-05-02-0114.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> $53-05-03-0114.Button </State>
-	</Image>
-	<Text>
-	<X> TextPriceMenuBlendX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
-	<Color> WTCBlueColor </Color>
-	<ColorDisable> WTCWhiteColor </ColorDisable>
-	<State> $53-05-03-0114.Button </State>
-	<Value> StringFmt(  $53-05-03-0114.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			Var ice_tab_process_show = "Invisible"
-		
-		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 $Sum53050201145305030114 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $53-05-02-0114.TAG tag2_is_disable
-				STRCONTAIN "ERR" $53-05-03-0114.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> WTCMediumBlueColor </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> $Sum53050201145305030114 </State> 
-	<Language>
-		<ID> 000013 </ID> 
-	</Language>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; ==================> Len = 3
 	; - 53-05-02-0093 - 

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

@@ -433,11 +433,6 @@
 	Machine DoorClose
 
 
-	If ShoppyPayEnable = "true" Then
-	Else
-		Var PayState5 = "Disable"
-		Var PayState6 = "Disable"
-	EndIf
 
 
 	If web_readyOK = "true" Then

inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml

@@ -497,14 +497,6 @@
 
 	Machine DoorClose
 
-
-	If ShoppyPayEnable = "true" Then
-	Else
-		Var PayState5 = "Disable"
-		Var PayState6 = "Disable"
-	EndIf
-
-
 	If web_readyOK = "true" Then
 
 		Var web_readyOK = "false"
@@ -548,6 +540,7 @@
 	EndIf
 
 	DEBUGVAR DirImage2
+	DEBUGVAR PayState5
 
 	Var CancelContinue = 0
 
@@ -874,6 +867,11 @@
 
 <Timeout> 1000 </Timeout>
 <EventTimeout>
+	DEBUGVAR PayState5
+	DEBUGVAR CoinAmount
+	DEBUGVAR SELLONLINE
+
+
 	If ReadyForBrew = "false" Then
 		SAVELOG "Back to main1"
 		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
@@ -913,17 +911,11 @@
 
 	  If RoadShow = "true" Then
 	  Else
-			Var PayState3 = "Disable"
+	  	If PayState3 = "Enable" Then
 			Var PayState3 = "Disable"
 		EndIf
-		If PayState5 = "Enable" Then
-		Var PayState3 = "Disable"
-		EndIf
 		If PayState5 = "Enable" Then
 		  	Var PayState5 = "Disable"
-		  	Var PayState5 = "Disable"
-	  	EndIf
-	  	Var PayState5 = "Disable"
 	  	EndIf
 	  EndIf
 

xml/page_payment_cash-HKG.xml

@@ -458,12 +458,6 @@
 	Machine DoorClose
 
 
-	If ShoppyPayEnable = "true" Then
-	Else
-		Var PayState5 = "Disable"
-		Var PayState6 = "Disable"
-	EndIf
-
 
 	If web_readyOK = "true" Then
 

xml/page_payment_cash-MYR.xml

@@ -441,12 +441,6 @@
 	Machine DoorClose
 
 
-	If ShoppyPayEnable = "true" Then
-	Else
-		Var PayState5 = "Disable"
-		Var PayState6 = "Disable"
-	EndIf
-
 
 	If web_readyOK = "true" Then
 

xml/page_payment_code.xml

@@ -1121,14 +1121,7 @@
 ;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
 ;</Image>
 
-<Video>
+;include="ROOT/taobin_project/inc/video.inc"
-<X> 0 </X>
-<Y> 0 </Y>
-<Width> 1080</Width>
-<Height> 380 </Height>
-<Loop> "true" </Loop>
-<Filename> video_menu_0 </Filename>
-</Video>