DO

video/script1.ev

@@ -19,13 +19,6 @@ Else
 		EndIf
 	EndIf
 
-	If BoxID = 173149 Then
-		Var EventTurnOn = 1
-	EndIf
-
-	If BoxID = 172644 Then
-		Var EventTurnOn = 1
-	EndIf
 
 	If EventTurnOn = 1 Then
 		Var CountDownShowButton = 0

xml/page_identity_verification.xml

@@ -435,7 +435,7 @@
 
 
 <Image>
-<X> 423 </X>
+<X> 370 </X>
 <Y> FrameOfFaceYPosition </Y>
 <State> CameraStage </State>
 <Filename> "ROOT/taobin_project/image/liveness/bg3.png" </Filename>

xml/page_payment_cash-MYR.xml

@@ -6,6 +6,7 @@
 <Volume> SoundVolume </Volume>
 <Sound> PlaySoundLag </Sound>
 <EventOpen>
+	
 
 	Var cash_disable = "0"
 	READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
@@ -1756,7 +1757,7 @@ EndIf
 <X> 249 </X>
 <Y> 748 </Y>
 <State> alphaState </State>
-<Filename> Var( DirImage + QR_POPUP )</Filename>
+<Filename> "ROOT/taobin_project/inter/mys/image/payment/img_popup1.png" </Filename>
 </Image>
 
 
@@ -1843,7 +1844,7 @@ EndIf
 	 		Var return = "Enable"
 	 	EndIf
  	EndIf
- 	DEBUGVAR return
+ 	
 	)  
 </State>
 <Animation>
@@ -2061,11 +2062,20 @@ EndIf
 </Text>
 
 
+<Image>
+<X> 483 </X>
+<Y> 791 </Y>
+<State> alphaState </State>
+<Filename> "ROOT/taobin_project/inter/mys/image/LOGO_DuitNow.png" </Filename>
+</Image>
+
+
 <QRCode>
 <X> 445 </X>
 <Y> 958 </Y>
 <Width> 200 </Width>
 <Height> 200 </Height>
+<Color>  "0xFFFFFF" </Color>
 <QRColor> "0xE61A5F" </QRColor>
 <State> alphaState </State>
 <Service> testservice </Service>
@@ -2165,8 +2175,27 @@ EndIf
 
 
 
+; Test QR
+<EventUnitTest2>
+	Var QR_POPUP = "/img_popup12.png"
+			
+	Var QRCODE99 = ""
 
+	Var LOADING_STATE = "Invisible"
 
+	Var FlagQROpened = 1
+	Var PayInfoCFlag = 0
+	
+	Var testservice = "Herr"
+	Var alphaState = "Enable"
+	Refresh
+</EventUnitTest2>
+
+<EventUnitTest1>
+	
+	Var testservice = "Herr"
+	Open CurrentXMLFileName2
+</EventUnitTest1>
 
 
 

xml/page_show_error.xml

@@ -14,6 +14,9 @@
 	DEBUGVAR MachineStage
 	DEBUGVAR stop_now
 
+
+	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
+
 	Var show_error_normal = "Invisible"
 	Var show_error_sp1 = "Enable"
 

xml/page_topping_select5.xml

@@ -43,7 +43,7 @@
 	Var showText7 = "Invisible"
 
 	DEBUGVAR UserSelectProductCode
-
+	DEBUGVAR JXMLVersionInt
 
 	Var CHECK_EventOpen_Double = 0
 	If JXMLVersionInt > 448 Then

xml/page_topping_select7.xml

@@ -9,7 +9,7 @@
 			
 	Var UserSeletedSugar = 0
 
-	SAVELOG "Event Open Select 6"
+	SAVELOG "Event Open Select 7"
 
 	If NoWaitMachineEnable = 1 Then
 		Var ConfirmDrinkButtonState = "Enable"
@@ -360,7 +360,25 @@
 
 	DEBUGVar MenuReady
 	If SelectDrinkType = 1 Then
+		
 		If MenuReady = "YES" Then
+			
+
+			; echo -n true > /mnt/sdcard/coffeevending/menu_blend_free
+
+			READ_FILE "/mnt/sdcard/coffeevending/menu_blend_free" menu_blend_free
+			DEBUGVAR menu_blend_free
+			DEBUGVAR blend_button_state
+				
+			If menu_blend_free = "true" Then
+				If blend_button_state = "PressForever" Then
+					Var PriceDrinkNoTop = 0
+					Var PriceDrink = 0
+					Var PriceDrinkTmpShow = "Free"
+				EndIf
+			EndIf
+
+
 			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
 			Open "ROOT/taobin_project/xml/page_payment.xml" 
 		EndIf
@@ -3866,9 +3884,10 @@
 		If UserSelectProductCode = "-" Then
 
 		Else
+
 			
 			If SelectDrinkType = 1 Then
-				; MenuReady
+				; Move to MenuReady
 				;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
 				;Open "ROOT/taobin_project/xml/page_payment.xml" 
 			EndIf
@@ -4203,8 +4222,6 @@
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 
 
-	
-
 	If SelectDrinkType = 0 Then
 		Var PriceDrinkTmpShow = "---"
 	Else
@@ -4220,6 +4237,21 @@
 		DEBUGVAR PriceDrinkTmpShow
 	EndIf
 
+
+	; echo -n true > /mnt/sdcard/coffeevending/menu_blend_free
+
+	READ_FILE "/mnt/sdcard/coffeevending/menu_blend_free" menu_blend_free
+	DEBUGVAR menu_blend_free
+	DEBUGVAR blend_button_state
+		
+	If menu_blend_free = "true" Then
+		If blend_button_state = "PressForever" Then
+			Var PriceDrinkNoTop = 0
+			Var PriceDrinkTmpShow = "Free"
+		EndIf
+	EndIf
+
+
 	CRLFToSpace showname
 	CRLFToSpace showdesc
 	DEBUGVAR showname

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "7.40"
+	Var XMLPageVersion = "7.44"
-	Var XMLPageVersionInt = 740
+	Var XMLPageVersionInt = 744
 ;Oreo
 Var OreoGuarantee = 0
 </EventOpen>