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

xml/page_board.xml

@@ -2229,7 +2229,7 @@ PRICE "Reset" "-"
                 Var refresh_str = "-RefreshProf"
                 STRCONTAIN refresh_str XMLProfile HasRefreshProf
                 If HasRefreshProf = "true" Then
-                    RebootWithCause "RefreshProf_ProMelon"
+
                 EndIf
 
     		EndIf

xml/page_drinkfail2.xml

@@ -38,6 +38,10 @@
 		Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail_gbr.lxml"
 	EndIf
 
+	If CountryName = "Malaysia" Then
+		Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
+	EndIf
+
 
 	If TelephoneNumberProblem = "" Then
 

xml/page_drinkfail5.xml

@@ -16,6 +16,16 @@
 
     Var MachineErrorDetailAll = MachineErrorDetailEng
 
+	DEBUGVAR Seeker.CreditCard
+	Var SorryUnexpectedTxt11 = DirImage + "/text11.png"
+	Var SorryFullState = "Enable"
+	If Seeker.CreditCard = 1 Then
+		DEBUGVAR "Fail5::CreditCard"
+		Var SorryUnexpectedTxt11 = DirImage + "/text11_if_credit.png"
+		Var Timeout = 21
+		Var SorryFullState = "Invisible"
+	EndIf
+	DEBUGVAR SorryUnexpectedTxt11
 
 
 	DEBUGVAR TelephoneNumberProblem
@@ -94,20 +104,22 @@
 
 
 <Image>
-<X> 43 </X>
+<X> 0 </X>
 <Y> 428 </Y>
-<Filename> Var( DirImage + "/text11.png" ) </Filename>
+<Filename> SorryUnexpectedTxt11 </Filename>
 </Image>
 
 <Image>
 <X> 429 </X>
 <Y> 1351 </Y>
+<State> SorryFullState </State>
 <Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
 </Image>
 
 <Image>
 <X> 190 </X>
 <Y> 1598 </Y>
+<State> SorryFullState </State>
 <Filename> Var( DirImage + "/text13.png" ) </Filename>
 </Image>
 

xml/page_lid_straw.xml

@@ -216,7 +216,7 @@
 			EndIf
 
 			If CountryName = "UnitedArabEmirates Dubai" Then
-				Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+				Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
 
 				Open brewing3ContiInter
 			Else
@@ -264,7 +264,7 @@
 					If New_Payment = 1 Then
 						TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
 					EndIf
-					
+
 					Open "ROOT/taobin_project/xml/page_brewing3.xml"
 				Else
 					Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
@@ -302,11 +302,11 @@
 		Var LidState = "Invisible"
 	EndIf
 
-	
+
 
 	DEBUGVAR CountryName
 	DEBUGVAR InternationalEnable
-	
+
 	Var UserPressButton = "false"
 
 	SAVELOG "page_lid_straw.xml"