doing

image/event/image_template2

@@ -1,6 +1,3 @@
-normal_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
+normal_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
-normal_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
+press_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
-press_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
+disable_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
-press_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-disable_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-disable_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png

inter/aus/video/script_video.ev

@@ -1,5 +1,7 @@
 Var MainfileSize = 0
 Var EventTurnOn = 0
+Var EventAO = 0
+Var StPatrickEvent = 0
 
 
 
@@ -33,6 +35,15 @@ If SystemDateMonthInt = 1 Then
     EndIf
 EndIf
 
+If SystemDateMonthInt = 3 Then
+    GetFileSizeK "taobin_project/inter/aus/video/video_main_StPatrick.mp4" MainfileSize
+    DEBUGVAR MainfileSize
+    If MainfileSize = 17941307 Then
+        Var StPatrickEvent = 1
+    Else
+        DEBUGVAR "StPatrick: Video size incorrect"
+    EndIf
+EndIf
 
 DEBUGVAR EventTurnOn
 
@@ -49,4 +60,8 @@ EndIf
 If EventAO = 1 Then
 
     Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main_ao.mp4"
+EndIf
+
+If StPatrickEvent = 1 Then
+    Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main_StPatrick.mp4"
 EndIf

inter/aus/xml/page_brewing3.lxml

@@ -1172,8 +1172,8 @@
 
 					If Seeker.CreditCard = 1 Then
 
-							;CashlessReq SUCCESS
+							;CashlessReq SUCCESS ""
-							;CashlessReq FAIL
+							;CashlessReq FAIL ""
 
 					EndIf
 
@@ -1182,8 +1182,8 @@
 
 						If Seeker.CreditCard = 1 Then
 
-							;CashlessReq SUCCESS
+							;CashlessReq SUCCESS ""
-							;CashlessReq FAIL
+							;CashlessReq FAIL ""
 
 						EndIf
 
@@ -1251,7 +1251,7 @@
 			If Seeker.PayWithQR = 0 Then
 
 				If Seeker.CreditCard = 1 Then
-					;CashlessReq FAIL
+					;CashlessReq FAIL ""
 					Var ChangeFlag = 1
 					Var CreditCardVoid = 1
 				Else

inter/aus/xml/page_brewing3Conti.xml

@@ -678,8 +678,8 @@
 
 					If Seeker.CreditCard = 1 Then
 
-							CashlessReq SUCCESS
+							CashlessReq SUCCESS ""
-							;CashlessReq FAIL
+							;CashlessReq FAIL ""
 
 					EndIf
 					Var PayDetail2 = Seeker.PayDetail2
@@ -690,8 +690,8 @@
 						If Seeker.CreditCard = 1 Then
 
 
-							CashlessReq SUCCESS
+							CashlessReq SUCCESS ""
-							;CashlessReq FAIL
+							;CashlessReq FAIL ""
 
 						EndIf
 						Var PayDetail2 = Seeker.PayDetail2
@@ -770,7 +770,7 @@
 			If Seeker.PayWithQR = 0 Then
 
 				If Seeker.CreditCard = 1 Then
-					;CashlessReq FAIL
+					;CashlessReq FAIL ""
 					Var ChangeFlag = 1
 					Var CreditCardVoid = 1
 					Var ChangeOK = 2

inter/aus/xml/page_collect_point_3.lxml

@@ -980,39 +980,39 @@
 </EventClick>
 </Button>
 
-;<Button>
+<Button>
-;<X> 548 </X>
+<X> 548 </X>
-;<Y> 1752 </Y>
+<Y> 1752 </Y>
-;<State> redeemButtonState </State>
+<State> redeemButtonState </State>
-;<Filename> Var( DirImage + "/redeem_btn.png" )</Filename>
+<Filename> Var( DirImage + "/redeem_btn.png" )</Filename>
-;<FilenamePress> Var( DirImage + "/redeem_btn_pressed.png" )</FilenamePress>
+<FilenamePress> Var( DirImage + "/redeem_btn_pressed.png" )</FilenamePress>
-;<FilenameDisable> Var( DirImage + "/redeem_btn_disable.png" ) </FilenameDisable>
+<FilenameDisable> Var( DirImage + "/redeem_btn_disable.png" ) </FilenameDisable>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
+<Volume> SoundVolume </Volume>
-;<EventClick>
+<EventClick>
-;	; goto lid straw
+	; goto lid straw
-;
+
-;	If CoffeePoint >= 10 Then
+	If CoffeePoint >= 10 Then
-;		Var RedeemType = "1_dollar"
+		Var RedeemType = "1_dollar"
-;	EndIf
+	EndIf
-;
+
-;	If CoffeePoint >= 20 Then
+	If CoffeePoint >= 20 Then
-;		Var RedeemType = "2_dollar"
+		Var RedeemType = "2_dollar"
-;	EndIf
+	EndIf
-;
+
-;	If CoffeePoint >= 30 Then
+	If CoffeePoint >= 30 Then
-;		Var RedeemType = "get_free"
+		Var RedeemType = "get_free"
-;	EndIf
+	EndIf
-;
+
-;	DEBUGVAR RedeemType
+	DEBUGVAR RedeemType
-;
+
-;	If RedeemType = "" Then
+	If RedeemType = "" Then
-;		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-;	Else
+	Else
-;		Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
+		Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
-;	EndIf
+	EndIf
-;</EventClick>
+</EventClick>
-;</Button>
+</Button>
 
 
 

inter/aus/xml/page_member_topup.lxml

@@ -80,9 +80,9 @@
 
 		If CashlessPayFlag = 1 Then
 			Var CashlessPayFlag = 0
-			CashlessReq FAIL
+			CashlessReq FAIL ""
 		Else
-			CashlessReq OFF
+			CashlessReq OFF ""
 		EndIf
 
 		VendingQR OFF
@@ -120,7 +120,7 @@
     If WaitQRPay = 1 Then
         If VendingExtResult = "" Then
         Else
-            Var PayCreditChannel = "fatzebra"
+            Var PayCreditChannel = "qr_code"
 
     		Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
     		Open ToppupSuccessPage
@@ -163,7 +163,7 @@
     EndIf
 
 	If VendingCashless = "OK" Then
-		CashlessReq SUCCESS
+		CashlessReq SUCCESS ""
 
 		Var PayCreditChannel = "credit-card"
 
@@ -184,7 +184,7 @@
 			Var LOADING_STATE = "Invisible"
 		EndIf
 
-		CashlessReq FAIL
+		CashlessReq FAIL ""
 
 	EndIf
 
@@ -261,13 +261,12 @@
 <Button>
 <X> 287 </X>
 <Y> 778 </Y>
-<State> "Invisible" </State>
+<Filename> Var( DirImage2 + "/bn_qr_code.png" ) </Filename>
-<Filename> Var( DirImage2 + "/bn_fatzebra.png" ) </Filename>
+<FilenamePress> Var( DirImage2 + "/bp_qr_code.png" ) </FilenamePress>
-<FilenamePress> Var( DirImage2 + "/bp_fatzebra.png" ) </FilenamePress>
+<FilenameDisable> Var( DirImage2 + "/bd_qr_code.png" ) </FilenameDisable>
-<FilenameDisable> Var( DirImage2 + "/bd_fatzebra.png" ) </FilenameDisable>
 <EventOnClick>
     Var Timeout = 0
-    Var SelectedPaymentMedthod = "fatzebra"
+    Var SelectedPaymentMedthod = "qr_code"
     Var SelectOptionPopupState = "Enable"
     Var BlurBackgroundState = "Enable"
 </EventOnClick>
@@ -492,15 +491,15 @@
         SAVELOG "Canceling credit card"
         Var QR_POPUP = "/img_popup8-2.png"
 
-        CashlessReq OFF
+        CashlessReq OFF ""
         If CashlessPayFlag = 1 Then
             Var CashlessPayFlag = 0
-            CashlessReq FAIL
+            CashlessReq FAIL ""
         EndIf
 	EndIf
 
-	If SelectedPaymentMedthod = "fatzebra" Then
+	If SelectedPaymentMedthod = "qr_code" Then
-	   SAVELOG "Canceling fatzebra"
+	   SAVELOG "Canceling qr_code"
 	   VendingQR OFF
 	EndIf
 
@@ -541,7 +540,7 @@
         Coin CARD
     EndIf
 
-    if SelectedPaymentMedthod = "fatzebra" Then
+    if SelectedPaymentMedthod = "qr_code" Then
         Var QR_POPUP = "/img_popup1-AUS.png"
         Var LOADING_TEXT = "Just Moment Please"
         Var LOADING_STATE = "Enable"

inter/aus/xml/page_remove_cup.lxml

@@ -18,68 +18,66 @@
 		
 	LED LedDoorDoor 5 255 255 255 255
 
-	Var CheckCupStateDoorCupClose = ""
+	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
-	Var CheckCupStateDoorCupCloseCnt = 0
 
-	DEBUGVAR DoorCupPosition
+	Var ShowMenuNameAndImage = "Invisible"
-	If DoorCupPosition = "bottom" Then
+	Var RemoveCupOnArmID = -1
-		Var buttonRemoveCup = "Enable"
+	Var remove_cup_name = ""
-	EndIf
+	Var remove_cup_image = ""
+
+	RootLayoutVisible 3 "show"
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
 	
 	;SAVELOG MachineErrorDetail
-	Var MachineErrorDetailAll = MachineErrorDetailEng
+	Var MachineErrorDetailAll = MachineErrorDetail + " / "
-
+	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
-
-	If MachineStage = "show-menu" Then
-		Open "ROOT/taobin_project/xml/page_board.xml"
 
+	If InternationalEnable = 1 Then
+		Var MachineErrorDetailAll = MachineErrorDetailEng
 	EndIf
+
+
+	; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
+	If HaveCup = "false" Then
+		If MachineStage = "show-menu" Then
+			Open "ROOT/taobin_project/xml/page_board.xml"
+
+		EndIf
+	EndIf
+	If CupOnArm = "true" Then
+		If MachineStage = "show-menu" Then
+			Open "ROOT/taobin_project/xml/page_board.xml"
+
+		EndIf
+	EndIf
+
 	If MachineStage = "close-maintenance" Then
-		Open "ROOT/taobin_project/xml/page_show_error.lxml"
+		Open "ROOT/taobin_project/xml/page_show_error.xml"
+
 	EndIf
 
-	Var Timeout = Timeout + 1
+	;include=ROOT/taobin_project/inc/remove_cup_step.inc
-	DEBUGVAR Timeout
-	If Timeout > 5 Then
-		Var Timeout = 0
 
-		DEBUGVAR DoorCupPosition
+
+	Var RemoveCupOnArmID = 0
+	If RemoveCupOnArmID > 0 Then
 		If DoorCupPosition = "bottom" Then
-			Var buttonRemoveCup = "Enable"
+			Var ShowMenuNameAndImage = "Invisible"
+			Var RemoveCupOnArmID = -1
+		Else
+			DEBUGVAR RemoveCupOnArmID
+			DEBUGVAR DrinkImageOnArm[RemoveCupOnArmID]
+			DEBUGVAR DrinkNameOnArm[RemoveCupOnArmID]
+
+			Var remove_cup_image = DrinkImageOnArm[RemoveCupOnArmID]
+			Var remove_cup_name = DrinkNameOnArm[RemoveCupOnArmID]
+			Var ShowMenuNameAndImage = "Enable"
 		EndIf
 	EndIf
 
-	; Logic have differrent drinkfail3.xml 
-	; protect lock 
-	; 
-
-	If CheckCupStateDoorCupCloseCnt > 0 Then
-		Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
-	EndIf
-
-	If CheckCupStateDoorCupCloseCnt = 0 Then
-		Var CheckCupStateDoorCupClose = ""
-	EndIf
-
-	DEBUGVAR HaveCup
-
-	If HaveCup = "true" Then
-
-
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
-
-	DEBUGVAR buttonRemoveCup
-	DEBUGVAR CheckCupStateDoorCupClose
-
-
 	Refresh
 	TimerReset
 
@@ -115,13 +113,7 @@
 <Volume> SoundVolume </Volume>
 <State> buttonRemoveCup </State>
 <EventClick> 
-
+	;include=ROOT/taobin_project/inc/remove_cup_button.inc
-
-	Machine RemoveCup
-	Machine DoorLidOpen
-	Var buttonRemoveCup = "Invisible"
-   Var CheckCupStateDoorCupClose = "reset"
-   Var CheckCupStateDoorCupCloseCnt = 30
 </EventClick>
 <Language>
   <ID> 000411 </ID>
@@ -133,6 +125,38 @@
 </Button>
 
 
+<Image>
+<X> 125 </X>
+<Y> 1700 </Y>
+<Height> 300 </Height>
+<Width> 320 </Width>
+<State> ShowMenuNameAndImage </State>
+<Filename> remove_cup_image </Filename>
+</Image>
+
+<Text>
+<X> 300 </X>
+<Y> 1750 </Y>
+<State> ShowMenuNameAndImage </State>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Font> KanitLightTTF </Font>
+<Size> 48 </Size>
+<Color> HeadlineColor </Color>
+<Value>
+	eval(
+		STRCONTAIN "size" remove_cup_name SizeFromSheet
+		If SizeFromSheet = "true" Then
+			SPLIT Seeker.showname "###" 1 PureName
+			Var return = PureName
+		Else
+			Var return = Seeker.showname
+		EndIf
+	)
+</Value>
+</Text>
+
+
 <Text>
 <X> 5 </X>
 <Y> 1868 </Y>

inter/aus/xml/page_topping_select6.lxml

@@ -1226,6 +1226,13 @@
 					; select no sugar
 					Var SugarZeroCalCheck = "Disable"
 				EndIf
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var SugarState4 = "Disable"
+
+				EndIf
 			EndIf
 
 			; Suger 4 step hot
@@ -1267,9 +1274,18 @@
 					; select no sugar
 					Var SugarZeroCalCheck = "Disable"
 				EndIf
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var SugarState4 = "Disable"
+
+				EndIf
 			EndIf
 
 			DEBUGVAR RecipeTag2
+			DEBUGVAR NoSugarStepRight2
+			DEBUGVAR TOPPING1
 			;
 			If TOPPING1 = "Sugar" Then
 				Var SugarZeroCalOption = "Enable"
@@ -1318,6 +1334,19 @@
 					Var SugarZeroCalOption = "Invisible"
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
 
 			EndIf
 
@@ -1374,6 +1403,20 @@
 
 				DEBUGVAR toppingID1Default
 				DEBUGVAR SugarState1
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
 			EndIf
 
 
@@ -1422,6 +1465,19 @@
 					Var SugarState2 = "PressForever"
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
 			EndIf
 
 			If TOPPING1 = "Powder Sugar Premix 50" Then
@@ -1466,6 +1522,20 @@
 					Var SugarState3 = "PressForever"
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+
 			EndIf
 
 			If TOPPING1 = "Powder Sugar Premix 25" Then
@@ -1511,6 +1581,20 @@
 				If sugar_default_flag = 0 Then
 					Var SugarState2 = "PressForever"
 				EndIf
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
 			EndIf
 
 			Var SugarModeUpdateWhenChangeDrinkType = 0
@@ -2336,6 +2420,15 @@
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
 			Var topping1 = toppingID1index1
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
 		EndIf
 
 		Var SugarZeroCalOption = "Invisible"
@@ -2392,6 +2485,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2402,6 +2505,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2456,6 +2569,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2466,6 +2589,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2518,6 +2651,16 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2528,6 +2671,16 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2536,6 +2689,16 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2588,6 +2751,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -2598,6 +2771,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2606,6 +2789,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2658,6 +2851,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index6
 		EndIf
 
@@ -2668,6 +2871,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -2676,6 +2889,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2782,6 +3005,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2838,6 +3070,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+			
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2890,6 +3131,15 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 
 			Var SugarZeroCalCheck = "Enable"
@@ -2943,6 +3193,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 
 			Var SugarZeroCalCheck = "Enable"
@@ -3050,6 +3309,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -3107,6 +3375,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -3159,6 +3436,15 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3211,6 +3497,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -3446,6 +3741,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -3509,6 +3814,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -3519,6 +3834,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 
 			; select no sugar
@@ -3586,6 +3911,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3596,6 +3931,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 
 			; select no sugar
@@ -3662,6 +4007,16 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -3672,6 +4027,16 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3680,6 +4045,16 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 
 			; select no sugar
@@ -3747,6 +4122,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -3757,6 +4142,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -3765,6 +4160,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3821,6 +4226,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index6
 		EndIf
 
@@ -3831,6 +4246,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -3839,6 +4264,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -4057,6 +4492,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -4114,6 +4558,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -4170,6 +4623,15 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -4225,6 +4687,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -4445,6 +4916,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -4505,6 +4985,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -4560,6 +5049,15 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -4614,6 +5112,15 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 

inter/hkg/xml/page_topping_select6.lxml

@@ -2128,7 +2128,8 @@
 <Button>
 <X> 680 </X>
 <Y> 79 </Y>
-<State> SugarState5 </State>
+;<State> SugarState5 </State>
+<State> "Invisible" </State>
 <Filename> SugarNormalPicLv5 </Filename>
 <FilenamePress>  SugarPressPicLv5 </FilenamePress>
 <FilenameDisable>  "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg5.png" </FilenameDisable>
@@ -2182,7 +2183,8 @@
 <Button>
 <X> 820 </X>
 <Y> 79 </Y>
-<State> SugarState6 </State>
+;<State> SugarState6 </State>
+<State> "Invisible" </State>
 <Filename> SugarNormalPicLv6 </Filename>
 <FilenamePress>  SugarPressPicLv6 </FilenamePress>
 <FilenameDisable>  "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg6.png" </FilenameDisable>

inter/mys/xml/page_brewing3Conti_event.lxml

@@ -512,8 +512,8 @@
 
 					If Seeker.CreditCard = 1 Then
 
-							CashlessReq SUCCESS
+							CashlessReq SUCCESS ""
-							;CashlessReq FAIL
+							;CashlessReq FAIL ""
 
 					EndIf
 					Var PayDetail2 = Seeker.PayDetail2
@@ -524,8 +524,8 @@
 						If Seeker.CreditCard = 1 Then
 
 
-							CashlessReq SUCCESS
+							CashlessReq SUCCESS ""
-							;CashlessReq FAIL
+							;CashlessReq FAIL ""
 
 						EndIf
 						Var PayDetail2 = Seeker.PayDetail2

inter/mys/xml/page_brewing3_event.lxml

@@ -602,8 +602,8 @@
 					If Seeker.CreditCard = 1 Then
 
 							WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
-							CashlessReq SUCCESS
+							CashlessReq SUCCESS ""
-							;CashlessReq FAIL
+							;CashlessReq FAIL ""
 
 					EndIf
 
@@ -613,8 +613,8 @@
 						If Seeker.CreditCard = 1 Then
 
 							WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
-							CashlessReq SUCCESS
+							CashlessReq SUCCESS ""
-							;CashlessReq FAIL
+							;CashlessReq FAIL ""
 
 						EndIf
 
@@ -673,7 +673,7 @@
 				If Seeker.CreditCard = 1 Then
 				    ;DEBUGVAR "Credit::void.switch(app: finexus)"
 				    ;WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
-					;CashlessReq FAIL
+					;CashlessReq FAIL ""
 					;Var ChangeFlag = 1
 					;Var CreditCardVoid = 1
 

inter/mys/xml/page_member_topup.lxml

@@ -69,9 +69,9 @@
 
 		If CashlessPayFlag = 1 Then
 			Var CashlessPayFlag = 0 
-			CashlessReq FAIL
+			CashlessReq FAIL ""
 		Else
-			CashlessReq OFF
+			CashlessReq OFF ""
 		EndIf
 
 		Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@@ -90,7 +90,7 @@
 
 <EventActionOk>
 	If VendingCashless = "OK" Then
-		CashlessReq SUCCESS
+		CashlessReq SUCCESS ""
 
 		Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
 		Open ToppupSuccessPage
@@ -108,7 +108,7 @@
 			Var LOADING_STATE = "Invisible"	
 		EndIf
 
-		CashlessReq FAIL
+		CashlessReq FAIL ""
 
 	EndIf
 
@@ -277,7 +277,7 @@
 
 	If CashlessPayFlag = 1 Then
 		Var CashlessPayFlag = 0 
-		CashlessReq FAIL
+		CashlessReq FAIL ""
 	EndIf
 
 	Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@@ -332,11 +332,11 @@
 	Var QRErrorState = "Invisible"
 	Var alphaState = "Invisible"
 
-	CashlessReq OFF
+	CashlessReq OFF ""
 
 	If CashlessPayFlag = 1 Then
 		Var CashlessPayFlag = 0 
-		CashlessReq FAIL
+		CashlessReq FAIL ""
 	EndIf
 
 	DEBUGVAR LOADING_STATE

inter/mys/xml/page_void_credit_card.lxml

@@ -14,7 +14,7 @@
 
     DEBUGVAR "Credit::void.switch(app: finexus)"
     WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
-    CashlessReq FAIL
+    CashlessReq FAIL ""
     Var ChangeFlag = 1
 	Var CreditCardVoid = 1
 </EventOpen>

inter/mys/xml/page_void_credit_cardConti.lxml

@@ -14,7 +14,7 @@
 
     DEBUGVAR "Credit::void.switch(app: finexus).next(true)"
     WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
-    CashlessReq FAIL
+    CashlessReq FAIL ""
     Var ChangeFlag = 1
 	Var CreditCardVoid = 1
 </EventOpen>