adv and play list

inter/sgp/animation01/play_list.tsv

@@ -859,6 +859,8 @@ Coconut Soda	52-05-02-0090	1	62	13	23						24	120	15:00	23
 Coconut Lychee Soda	52-05-02-0093	1	62	11	13	23					24	120	16:00	23
 Coconut Pepsi	52-05-02-0091	1	62	14	13	23					24	120	17:00	23
 Coconut Smoothie	52-05-03-0092	1	62	23	41						24	120	18:00	23
+Coconut Pepsi	52-05-02-0117	1	62	14	13	23					24	120	17:00	23
+Coconut Smoothie	52-05-03-0117	1	62	23	41						24	120	18:00	23
 Coconut Chocolate milk	52-03-02-0059	1	7	15	62	23					24	120	19:00	23
 Coconut Chocolate milk	52-03-03-0059	1	7	15	62	23	41				24	120	20:00	23
 Coconut Matcha latte	52-02-02-0060	1	8	9	7	62	23				24	120	21:00	23

inter/sgp/xml/page_catalog_group_other.lxml

@@ -7494,6 +7494,281 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 52-05-02-0117 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 52-05-02-0117.Button,$Sum5205020117) </State> 
+	<Button>
+	<State> $Sum5205020117 </State> 
+	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi_coconut.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi_coconut.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/sgp/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/sgp/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $52-05-02-0117.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "52-05-02-0117"
+		Var PD_CODE3 = "##-##-##-####"
+		; 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] = "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] = ""
+		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 = $52-05-02-0117.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" "52-05-02-0117"
+		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
+		Var OverlayMenuFilter = ""
+		Var OverlayMenuFilter1 = ""
+		Var OverlayMenuFilter2 = ""
+		Var OverlayMenuFilter3 = ""
+		Var OverlayMenuFilter = ""
+		
+		
+		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>Coconut Pepsi</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Coconut Pepsi</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>Coconut Syrup, Pepsi and Soda</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Coconut Syrup, Pepsi and Soda</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> $52-05-02-0117.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> $52-05-02-0117.Button </State>
+	<Value> StringFmt( $52-05-02-0117.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
+		
+			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 $Sum5205020117 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $52-05-02-0117.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> $Sum5205020117 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 3
 	; - 52-05-02-0038 52-05-03-0038 

xml/page_payment.xml

@@ -466,11 +466,14 @@
 
 	If stop_now = "true" Then
 		SAVELOG "stop_now is true"
-		If Seeker = "curr" Then
-			Open "ROOT/taobin_project/xml/page_back_to_error.xml"
-		Else
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
-		EndIf
+		;include="ROOT/taobin_project/inc/return_condition.ev"
+	EndIf
+
+	If SELLSTATUS = "DEACTIVE" Then
+		SAVELOG "DEACTIVE in page_topping_select7.xml"
+
+		;include="ROOT/taobin_project/inc/return_condition.ev"
+	
 	EndIf
 
 	If Seeker = "curr" Then

xml/page_payment_cash-SGP.xml

@@ -472,8 +472,9 @@
 
 	Var UserChoosePayment = ""
 	
-
 	DEBUGVAR SettingDisableTaobinCredit
+
+	Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
 </EventOpen>
 
 <EventActionOk>
@@ -806,7 +807,7 @@
 					Var QRCODE99 = ""
 					Var Timeout = 0
 					Var QRErrorState = "Invisible"
-					Var QR_POPUP = "/img_popup8-2.png"
+					Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
 					Var VendingCashless = "-"
 					Var LOADING_STATE = "Enable"
 					Var alphaState = "Enable"
@@ -821,7 +822,7 @@
 					Var QRCODE99 = ""
 					Var Timeout = 0
 					Var QRErrorState = "Invisible"
-					Var QR_POPUP = "/img_popup8-2.png"
+					Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
 					Var VendingCashless = "-"
 					Var LOADING_STATE = "Enable"
 					Var alphaState = "Enable"
@@ -1600,7 +1601,9 @@ If alphaState = "Invisible" Then
 
 			Var UserChoosePayment = "CreditCashless"
 
-            Var QR_POPUP = "/img_popup8.png"
+            Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
+			DEBUGVAR QR_POPUP
+			Refresh
             Var alphaState = "Enable"
             Coin CARD
         EndIf
@@ -1794,7 +1797,7 @@ EndIf
 <X> 249 </X>
 <Y> 748 </Y>
 <State> alphaState </State>
-<Filename> Var( DirImage + QR_POPUP )</Filename>
+<Filename>  QR_POPUP </Filename>
 </Image>
 
 

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "8.50"
-	Var XMLPageVersionInt = 850
+	Var XMLPageVersion = "8.51"
+	Var XMLPageVersionInt = 851
 ;Oreo
 Var OreoGuarantee = 0