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

xml/page_NewBrewing3.xml

@@ -258,6 +258,13 @@
 		Var EnableTopupCreditBetweenBrew = "Invisible"
 	EndIf
 
+	If ModeFreeEnable = 1 Then
+		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+	EndIf
+
+
 	If SELLSTATUS = "DEACTIVE" Then
 		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
@@ -501,7 +508,11 @@
 
 
 	EndIf
-
+	
+	__CMD "SetErrorCodeHandleByXML" 1028 "-" "-"
+	__CMD "SetErrorCodeHandleByXML" 1029 "-" "-"
+	__CMD "SetErrorCodeHandleByXML" 1030 "-" "-"
+	__CMD "SetErrorCodeHandleByXML" 1031 "-" "-"
 
 </EventOpen>
 <EventLanguageOnChange>

xml/page_NewBrewing3Conti.xml

@@ -676,6 +676,8 @@
 	
 
 
+	;include="ROOT/taobin_project/inc/timeout_lid_and_straw_step.inc"
+
 	
 
 	Refresh
@@ -986,4 +988,7 @@
 </Text>
 </Button>
 
+;include="ROOT/taobin_project/inc/button_request_lid_and_straw.inc"
+
+
 </Popup>

xml/page_NewCannotConti.xml

@@ -354,6 +354,35 @@
 				Var PayO2 = Seeker.CoffeePinNumber
 			EndIf
 
+			; Reject by app close order
+			; XML must send pay detail by myself.
+			SAVELOG " Cannot conti with new payment"
+			
+			If NextOrderStatus = "Disable" Then
+				Var PayDetail="1/F:1221/0/"
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
+			Else
+				DEBUGVAR error_code_stop_now
+
+				If error_code_stop_now > 0 Then
+					Var PayDetail = "1/F:" + error_code_stop_now
+					Var PayDetail = PayDetail + "/0/"
+					Var PayDetail = PayDetail + "/XML|"
+					Var PayDetail = PayDetail +  Seeker.OrderChanel
+				Else
+
+					Var PayDetail = "1/" + HURR_FOREVER
+					Var PayDetail = PayDetail + "/"  
+					Var PayDetail = PayDetail + ""
+					Var PayDetail = PayDetail + "/"
+					Var PayDetail = PayDetail + ""
+					Var PayDetail = PayDetail + "/XML|"
+					Var PayDetail = PayDetail +  Seeker.OrderChanel
+				EndIf
+			EndIf
+
+
 			Var ServiceType = "coffee-refund"
 			Var ServiceCredit = SelectDrink
 			Var SuggestID  = ""

xml/page_board.xml

@@ -1195,7 +1195,11 @@
 		EndIf
 	EndIf
 
-	If ProYuzu250Enable = 0 Then
+	If IgnoreProfileFromRunEV = "" Then
+		Var IgnoreProfileFromRunEV = 0
+	EndIf
+
+	If IgnoreProfileFromRunEV = 0 Then
 		TRY "ROOT/taobin_project/xml/profile/run.ev"
 	EndIf
 
@@ -1325,7 +1329,12 @@
     ; lang-lock-until-done
 	If LangProcess = "Done" Then
 	    Var ShowButtonClick = "Enable"
-        ;Var ShowButtonClickFull = "Enable"
+
+		If UsePepsiTheme = 1 Then
+			Var ShowButtonClickFull = "Enable"
+		EndIf
+
+
     Else
         Var ShowButtonClick = "Invisible"
         Var ShowButtonClickFull = "Invisible"

xml/page_brewing3Conti.xml

@@ -1002,8 +1002,9 @@
 	EndIf
 	
 
-
 	
+	;include="ROOT/taobin_project/inc/timeout_lid_and_straw_step.inc"
+
 
 	Refresh
 	TimerReset
@@ -1036,14 +1037,6 @@
 ;include="ROOT/taobin_project/inc/video.inc"
 
 
-;<Image>
-;<X> 0 </X>
-;<Y> 0 </Y>
-;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
-;</Image>
-
-
-
 
 
 <Image>
@@ -1315,4 +1308,7 @@
 </Text>
 </Button>
 
+;include="ROOT/taobin_project/inc/button_request_lid_and_straw.inc"
+
+
 </Popup>

xml/page_payment.xml

@@ -294,6 +294,12 @@
 		Var Seeker.CodeChannel = 1
 		Var Seeker.CodeNumber = IDNum
 
+		SAVELOG "ModeFreeEnable ModeFreeEnable ModeFreeEnable ModeFreeEnable ModeFreeEnable"
+		If New_Payment = 1 Then
+			Var Seeker.ORDER_ID = ""
+			GenHashWithTimeStamp Seeker.ORDER_ID
+			__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+		EndIf
 
 		Open "ROOT/taobin_project/xml/page_payment_cash.xml"
 

xml/profile/run.ev

@@ -45,6 +45,8 @@
 	DEBUGVAR Only18
 	DEBUGVAR NoSugarStepRight2
 	DEBUGVAR HalfPrice
+	DEBUGVAR AllPriceUp05
+	DEBUGVAR AllPriceUp10
 
 
 	If Y18IDCARD_ENABLE = "true" Then