Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

animation01/play_list.tsv

@@ -1050,8 +1050,8 @@ PEPSI COCONUT SMOOTHIE	12-05-03-0091	1	23	62	14	41
 
 ไมโลร้อน	12-03-01-0048	1	51	17	16						24	120	18:00	23
 ไมโลเย็น	12-03-02-0048	1	51	17	23						24	120	19:00	23
-ไมโลเย็น	12-03-03-0048	1	51	17	23	41					24	120	20:00	23
+ไมโลปั่น	12-03-03-0048	1	51	17	23	41					24	120	20:00	23
-
+ไมโลปั่น	12-03-03-0049	1	51	17	23	41					24	120	20:00	23
 
 7UP ENERGY PLUM LIME SODA	12-05-02-0096	1	18	12	33	23	13				24	120	19:00	23
 7UP PLUM LIME SODA	12-05-02-0097	1	18	33	23	13					24	120	20:00	23

inter/aus/xml/page_show_error.lxml

@@ -372,30 +372,36 @@
 <State> show_error_normal </State>
 <X> 69 </X>
 <Y> 642 </Y>
-<Filename> Var(DirImage + "/img_error_aus.png") </Filename>
-</Image>
-
-
-<Image>
-<State> show_error_sp1 </State>
-<X> 0 </X>
-<Y> 897 </Y>
 <Filename> Var(DirImage + "/img1.png") </Filename>
 </Image>
 
 <Image>
 <State> show_error_sp1 </State>
-<X> 0 </X>
+<X> 69 </X>
-<Y> 694 </Y>
+<Y> 642 </Y>
-<Filename> Var(DirImage + "/text1.png") </Filename>
+<Filename> Var(DirImage + "/img_error_aus.png") </Filename>
 </Image>
 
-<Image>
+;<Image>
-<State> show_error_sp1 </State>
+;<State> show_error_sp1 </State>
-<X> 127 </X>
+;<X> 0 </X>
-<Y> 1685 </Y>
+;<Y> 897 </Y>
-<Filename> Var(DirImage + "/text2.png") </Filename>
+;<Filename> Var(DirImage + "/img1.png") </Filename>
-</Image>
+;</Image>
+;
+;<Image>
+;<State> show_error_sp1 </State>
+;<X> 0 </X>
+;<Y> 694 </Y>
+;<Filename> Var(DirImage + "/text1.png") </Filename>
+;</Image>
+;
+;<Image>
+;<State> show_error_sp1 </State>
+;<X> 127 </X>
+;<Y> 1685 </Y>
+;<Filename> Var(DirImage + "/text2.png") </Filename>
+;</Image>
 
 <Button>
 <X> 0 </X>

inter/sgp/xml/page_catalog_group_milk.lxml

@@ -4726,7 +4726,7 @@
 		Var PD_CODE3 = "52-03-03-0049"
 		; begin lang 
 		Var aliasName[0] = "MILO SMOOTHIE \nVOLCANO"
-		Var aliasDesc[0] = "Milo, Sugar, milk, Oreo"
+		Var aliasDesc[0] = "Milo, Sugar, milk"
 		Var aliasName[1] = "โอวัลตินปั่นภูเขาไฟ"
 		Var aliasDesc[1] = "โอวัลติน น้ำตาล และ นม"
 		Var aliasName[2] = "-"
@@ -4767,7 +4767,7 @@
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Milo, Sugar, milk, Oreo"
+		Var DescLang[2][0] = "Milo, Sugar, milk"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
@@ -4850,9 +4850,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Milo, Sugar, milk, Oreo</LanguageSlot1>
+		<LanguageSlot1>Milo, Sugar, milk</LanguageSlot1>
 		<LanguageSlot2>โอวัลติน น้ำตาล และ นม</LanguageSlot2>
-		<LanguageSlot3>Milo, Sugar, milk, Oreo</LanguageSlot3>
+		<LanguageSlot3>Milo, Sugar, milk</LanguageSlot3>
 		<LanguageSlot4>โอวัลติน น้ำตาล และ นม</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โอวัลติน น้ำตาล และ นม</LanguageSlot6>

inter/sgp/xml/page_catalog_group_recommend.lxml

@@ -11203,7 +11203,7 @@
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Milo, Sugar, milk, Oreo"
+		Var DescLang[2][0] = "Milo, Sugar, milk"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"

xml/page_board.xml

@@ -698,6 +698,8 @@
 
 	;inter-page-board
 	If CountryName = "Australia" Then
+
+		Var SettingVideoBrewingUseCommon = 1
 		
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
 		

xml/page_catalog2.xml

@@ -109,8 +109,9 @@
 	EndIf
 
 	If SELLSTATUS = "DEACTIVE" Then
-	
+		SAVELOG "DEACTIVE in catalog2.xml"
-	;include="ROOT/taobin_project/inc/return_condition_when_deative.ev"
+
+	;include="ROOT/taobin_project/inc/return_condition.ev"
 	
 	EndIf
 

xml/page_get_yourchange.xml

@@ -80,7 +80,7 @@
 				DEBUGVAR PayDetail
 				DEBUGVAR PayDetail2
 
-				UpdateTxRef2 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail, PayDetail2
+				UpdateTxRef2 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
 			EndIf
 
 

xml/page_payment.xml

@@ -458,6 +458,8 @@
 
 	Var CoundDownStillOnPage = 240
 
+	__CMD "CLEAR_TIME_BLINK_DISPLAY" 0 "-" "-"
+
 </EventOpen>
 <Timeout> 900 </Timeout>
 <EventTimeout> 

xml/page_payment_cash.xml

@@ -2547,6 +2547,9 @@
 				EndIf
 
 				If  Seeker.IntVendingCredit > 0 Then
+					If Seeker.IntVendingCampaign > 0 Then
+						Var ECommerceQR =	ECommerceQR + ":"
+					EndIf
 					Var ECommerceQR =	ECommerceQR + "CRD"
 					Var ECommerceQR =	ECommerceQR + ":"
 					Var ECommerceQR =	ECommerceQR + Seeker.TNumberTaobinCredit

xml/page_topping_select7.xml

@@ -509,6 +509,15 @@
 	DEBUGVAR MenuReady
 	DEBUGVAR CupRemain
 
+	If SELLSTATUS = "DEACTIVE" Then
+		SAVELOG "DEACTIVE in page_topping_select7.xml"
+
+	;include="ROOT/taobin_project/inc/return_condition.ev"
+	
+	EndIf
+
+
+
 	If SelectDrinkType = 1 Then
 		
 

xml_main/startup.xml

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