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

inter/uae_dubai/note.txt

@@ -0,0 +1 @@
+adb push ./taobin_project/inter/uae_dubai/support_langs /sdcard/coffeevening/country/support_langs

inter/uae_dubai/xml/menu_catalog_new.lxml

@@ -41,8 +41,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_brewing3.lxml

@@ -113,6 +113,8 @@
 		Var XStraw = 274
 	EndIf
 
+	DEBUGVAR IMG_CNT
+
 	Var waitAckPay = 0
 	Var VendingTSIDTmp = ""
 	Var VendingTSIDProblem = ""
@@ -720,6 +722,10 @@
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 
+	DEBUGVAR IMG_CNT
+	DEBUGVAR LanguageObjectShow
+	DEBUGVAR LanguageShow
+	DEBUGVAR show_eng
 	
 	Var Timeout = Timeout + 1
 	

inter/uae_dubai/xml/page_catalog_group_appfast.lxml

@@ -208,8 +208,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_catalog_group_cocktail.lxml

@@ -181,8 +181,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_catalog_group_coffee.lxml

@@ -200,8 +200,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_catalog_group_forkid.lxml

@@ -209,8 +209,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_catalog_group_health.lxml

@@ -200,8 +200,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_catalog_group_milk.lxml

@@ -198,8 +198,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_catalog_group_other.lxml

@@ -199,8 +199,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_catalog_group_recommend.lxml

@@ -198,8 +198,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_catalog_group_tea.lxml

@@ -200,8 +200,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_catalog_group_whey.lxml

@@ -205,8 +205,11 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
+
+        Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
         If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+            Open brewing3ContiInter
         Else
             SAVELOG "Back"
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"

inter/uae_dubai/xml/page_topping_select6.lxml

@@ -329,9 +329,12 @@
 	
 	If Timeout > 40 Then
 		Var Timeout = 0
+
+		Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
 		If  Seeker = "next" Then 
 			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+			Open brewing3ContiInter  
 		Else
 			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 			Open "ROOT/taobin_project/xml/page_catalog.xml" 

xml/page_collect_point_1.xml

@@ -36,6 +36,12 @@
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
+	If InternationalEnable = 1 Then
+		If LanguageShow = "UAE_DUBAI" Then
+			Var IMG_CNT = CountryRootPath + "/image/page_doing/img2.png"
+		EndIf
+	EndIf
+
 	SAVELOG "collect_point1"
 	SAVELOG Seeker.TNumberTaobinCredit
 	SAVELOG TelephoneNumber

xml/page_collect_point_3.xml

@@ -739,7 +739,23 @@
 		If  CheckCoupons = 2 Then 
 
 			Var TaobinCredit =  Ext1b
-			Open "ROOT/taobin_project/xml/page_check_member2.xml" 
+
+			If InternationalEnable = 1 Then
+				Var ChackMemberPage = CountryRootPath + "xml/page_check_member2.lxml"
+
+				If CountryName = "Malaysia" Then
+					Open ChackMemberPage
+				EndIf
+
+				If CountryName = "UnitedArabEmirates Dubai" Then
+					Open ChackMemberPage
+				EndIf
+
+
+			Else
+				Open "ROOT/taobin_project/xml/page_check_member2.xml" 
+			EndIf
+
 
 		EndIf
 		 

xml/page_drinkok.xml

@@ -62,6 +62,17 @@
 		Var DirImage = "ROOT/taobin_project/image/complete/"
 	EndIf
 
+	If LanguageShow = "UAE_DUBAI" Then
+	
+		Var text_bottom = CountryRootPath + "/image/complete_en/text_bottom.png"
+
+	Else
+
+		Var text_bottom = DirImage + "text_bottom.png"
+
+	EndIf
+	DEBUGVAR text_bottom
+
 	Var VideoPlayFile = VideoPath
 	Var VideoPlayFile = VideoPlayFile + VideoFileBegin
 	Var VideoPlayFile = VideoPlayFile + "24"
@@ -612,7 +623,7 @@
 <X> 0 </X>
 <Y> 1418 </Y>
 <State> TextBottomShow </State>
-<Filename> Var( DirImage + "text_bottom.png") </Filename>
+<Filename> text_bottom </Filename>
 </Image>
 
 

xml/page_lid_straw.xml

@@ -75,6 +75,14 @@
 		Var PictureBegin = "txt_"
 		Var PictureEnd = "_en.png"
 	
+		;inter-has-alter-anim
+		If CountryName = "UnitedArabEmirates Dubai" Then
+			;check LanguageShow
+			If LanguageShow = "ENG" Then
+				Var PicturePath = "ROOT/taobin_project/image/page_doing/"
+			EndIf
+
+		EndIf
 
 	Else
 		Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
@@ -132,7 +140,14 @@
 				
 				UpdateTxRef2 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
 			EndIf
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+			If CountryName = "UnitedArabEmirates Dubai" Then
+				Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
+				Open brewing3ContiInter
+			Else
+				Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+			EndIf
+
 		Else
 			Open "ROOT/taobin_project/xml/page_get_yourchange.xml"  
 		EndIf

xml/page_payment_cash-SGP.xml

@@ -452,6 +452,15 @@
 		Var PayState6 = "Invisible"
 
 	EndIf
+
+	;Disable taobin credit
+
+	Var TopRowY = 1276
+	Var BotRowY = 1499
+
+	If DisableTaobinCredit = "true" Then
+		Var PayState4 = "Invisible"
+	EndIf
 </EventOpen>
 
 <EventActionOk>
@@ -1504,7 +1513,13 @@ EndIf
 ; cash Singapore
 <Button>
 <X> 439 </X>
-<Y> 1499 </Y>
+<Y> eval(
+	If DisableTaobinCredit = "true" Then
+		Var return = TopRowY
+	Else
+		Var return = BotRowY
+	EndIf
+) </Y>
 <State> PayState1</State>
 <Filename>  FilenameShowbuttonCashBN </Filename>
 <FilenamePress> FilenameShowbuttonCashBP </FilenamePress>

xml/page_payment_cash-UAE.xml

@@ -233,8 +233,8 @@
 				Var FilenameShowbuttonCashBN = CountryRootPath + "/image/page_payment_cash/bn_cash.png"
 				Var FilenameShowbuttonCashBP = CountryRootPath + "/image/page_payment_cash/bp_cash.png"
 			Else
-				Var FilenameShowbuttonCashBN = CountryRootPath + "/image/page_payment_en/page_payment_cash/bn_cash.png"
+				Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
-				Var FilenameShowbuttonCashBP = CountryRootPath + "/image/page_payment_en/page_payment_cash/bp_cash.png"
+				Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
 			EndIf
 		Else
 			Var FilenameShowbuttonCashBN = CountryRootPath + "/image/page_payment_cash/bn_cash.png"
@@ -352,6 +352,9 @@
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
+	If LanguageShow = "UAE_DUBAI" Then
+		Var DirImage = CountryRootPath + "/image/page_payment_cash/"
+	EndIf
 	
 	Var EnoughChange = "yes"
 
@@ -401,7 +404,11 @@
 	
 
 	Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png"
-	Var pay_with_chanel_text = CountryRootPath + "image/page_payment_cash/text_1.png"
+	If LanguageShow = "UAE_DUBAI" Then
+		Var pay_with_chanel_text = CountryRootPath + "image/page_payment_cash/text_1.png"
+	Else
+		Var pay_with_chanel_text = DirImage + "/text_1.png"
+	EndIf
 	
 
 	;If DisableUsingCode = "true" Then
@@ -874,7 +881,9 @@
 			Open "ROOT/taobin_project/xml/page_catalog.xml"  
 		Else
 			
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+			Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+			DEBUGVAR brewing3ContiInter
+			Open brewing3ContiInter
 		EndIf
 	EndIf
 
@@ -957,8 +966,9 @@
 						If Seeker = "curr" Then
 							Open "ROOT/taobin_project/xml/page_catalog.xml"  
 						Else
-							
+							Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
-							Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+
+							Open brewing3ContiInter
 						EndIf
 					EndIf
 				EndIf
@@ -1029,8 +1039,9 @@
 							If Seeker = "curr" Then
 								Open "ROOT/taobin_project/xml/page_catalog.xml"  
 							Else
-								
+								Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
-								Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+
+								Open brewing3ContiInter
 							EndIf
 					EndIf
 				Else
@@ -1419,9 +1430,9 @@
 <Y>  1276</Y>
 <State> PayState2</State>
 ;inter-image
-<Filename> Var( CountryRootPath + "image/page_payment_cash/bn_pay_with_code.png") </Filename>
+<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
-<FilenamePress> Var( CountryRootPath + "image/page_payment_cash/bp_pay_with_code.png") </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
-<FilenameDisable> Var( CountryRootPath + "image/page_payment_cash/bd_pay_with_code.png") </FilenameDisable>
+<FilenameDisable> Var( DirImage + "/bd_pay_with_code.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -1445,9 +1456,9 @@
 <Y> 1276 </Y>
 <State> PayState5 </State>
 ;inter-image
-<Filename> Var( CountryRootPath + "image/page_payment_cash/bn_credit_card_and_qr.png") </Filename>
+<Filename> Var( DirImage + "/bn_credit_card_and_qr.png") </Filename>
-<FilenamePress> Var( CountryRootPath + "image/page_payment_cash/bp_credit_card_and_qr.png") </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_credit_card_and_qr.png") </FilenamePress>
-<FilenameDisable> Var( CountryRootPath + "image/page_payment_cash/bd_credit_card_and_qr.png") </FilenameDisable> 
+<FilenameDisable> Var( DirImage + "/bd_credit_card_and_qr.png") </FilenameDisable> 
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -1513,7 +1524,7 @@ EndIf
 </EventClick>
 </Button>
 
-; cash Singapore
+; cash Dubai
 <Button>
 <X> 439 </X>
 <Y> eval(
@@ -1707,7 +1718,14 @@ EndIf
 <X> 182 </X>
 <Y> 748 </Y>
 <State> alphaState2 </State>
-<Filename> Var( DirImage2 + "/img_popup11-UAE_DUBAI.png" )</Filename>
+;inter-image
+<Filename> eval(
+	If LanguageShow = "UAE_DUBAI" Then
+		Var return = CountryRootPath + "/image/page_payment_cash/img_popup11-UAE_DUBAI.png"
+	Else
+		Var return = CountryRootPath + "/image/page_payment_cash/img_popup11-UAE_DUBAI_en.png"
+	EndIf
+) </Filename>
 </Image>