MYS: add support for v1 credit card case void

inter/mys/xml/page_brewing3.lxml

@@ -120,7 +120,7 @@
 	Var CreditReference = ""
 	Var PayCredit = 0
 
-
+    ;include="ROOT/taobin_project/inc/check_version.inc"
 
 	If Seeker.PayWithQR = 1 Then
 		Var VendingTSIDTmp = Seeker.VendingTSID
@@ -320,8 +320,36 @@
 	EndIf
 
 	If Seeker.CreditCard = 1 Then
-		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
-		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+
+	    Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+	    Var SelectMenuBetweenBrewEnable1 = "Invisible"
+
+
+
+        DEBUGVAR VendingCashlessMyNext
+        If FeatureReceiveCCardEnablerFromNC = "true" Then
+
+
+    		If VendingCashlessMyNext = "" Then
+    		    Var VendingCashlessMyNext = "DISABLE"
+    		EndIf
+
+
+
+            ; case-v1
+    		If VendingCashlessMyNext = "DISABLE" Then
+    		    Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+    		    Var SelectMenuBetweenBrewEnable1 = "Invisible"
+    		EndIf
+
+    		; enable-by-v2-finexus
+    		If VendingCashlessMyNext = "ENABLE" Then
+    		    Var SelectMenuBetweenBrewEnable1Blink = "Enable"
+    		    Var SelectMenuBetweenBrewEnable1 = "Enable"
+    		EndIf
+
+		EndIf
+
 	EndIf
 
 	If NeedUpgrade = "true" Then
@@ -584,6 +612,8 @@
 		EndIf
 	EndIf
 
+    Var AppRunFlagState = ""
+    Var HasResumePreventFlag = "false"
 
 </EventOpen>
 <EventLanguageOnChange>

inter/mys/xml/page_brewing3Conti_event.lxml

@@ -2,6 +2,11 @@
 
 	If CreditCardVoid = 1 Then
 		Var ChangeOK = 2
+		; check-if-void-switch-finish
+		READ_FILE "/mnt/sdcard/app_run_flag"" AppRunFlagState
+
+		STRCONTAIN "1" AppRunFlagState HasResumePreventFlag
+
 	EndIf
 
 	If ActionOKCase = 1 Then
@@ -290,7 +295,33 @@
 		EndIf
 	EndIf
 
-	If  ChangeTimeout > 30 Then
+	; void-credit
+	DEBUGVAR HasResumePreventFlag
+	DEBUGVAR ChangeOK
+	DEBUGVAR CreditCardVoid
+	DEBUGVAR ActionOKCase
+
+	If CreditCardVoid = 1 Then
+
+	    If HasResumePreventFlag = "true" Then
+
+    	Else
+            DEBUGVAR "HasResumePreventFlag>false"
+            If ChangeOK = 2 Then
+        	   ; speed-up-timeout
+                Var ChangeTimeout = 21
+                Var HasResumePreventFlag = "true"
+                DEBUGVAR "Recv void ok, time left 10"
+            EndIf
+    	EndIf
+
+	EndIf
+
+
+
+    DEBUGVAR ChangeTimeout
+
+	If  ChangeTimeout > 20 Then
 		If ActionOKCase = 0 Then
 			If Seeker.TNumberTaobinCredit = "" Then
 				Var TelephoneNumber = "0899999999"

inter/mys/xml/page_brewing3_event.lxml

@@ -2,6 +2,11 @@
 
 	If CreditCardVoid = 1 Then
 		Var ChangeOK = 2
+		; check-if-void-switch-finish
+		READ_FILE "/mnt/sdcard/app_run_flag"" AppRunFlagState
+
+		STRCONTAIN "1" AppRunFlagState HasResumePreventFlag
+
 	EndIf
 
 
@@ -379,7 +384,31 @@
 		EndIf
 	EndIf
 
-	If  ChangeTimeout > 30 Then
+	; void-credit
+	DEBUGVAR HasResumePreventFlag
+	DEBUGVAR ChangeOK
+	DEBUGVAR CreditCardVoid
+
+	If CreditCardVoid = 1 Then
+
+	    If HasResumePreventFlag = "true" Then
+
+    	Else
+            DEBUGVAR "HasResumePreventFlag>false"
+            If ChangeOK = 2 Then
+        	   ; speed-up-timeout
+                Var ChangeTimeout = 21
+                Var HasResumePreventFlag = "true"
+                DEBUGVAR "Recv void ok, time left 10, ChangeTimeout=21"
+            EndIf
+    	EndIf
+
+	EndIf
+
+
+
+    DEBUGVAR ChangeTimeout
+	If  ChangeTimeout > 20 Then
 		If ActionOKCase = 0 Then
 			If Seeker.TNumberTaobinCredit = "" Then
 				Var TelephoneNumber = "0899999999"

inter/mys/xml/page_void_credit_card.lxml

@@ -60,6 +60,13 @@
 
 
 </EventUnitTest5>
+<EventUnitTest6>
+    Var ChangeOK = 2
+	; check-if-void-switch-finish
+	READ_FILE "/mnt/sdcard/app_run_flag"" AppRunFlagState
 
+	STRCONTAIN "1" AppRunFlagState HasResumePreventFlag
+
+</EventUnitTest6>
 
 </Popup>