merge from select7 copy

xml/page_topping_select7.xml

@@ -500,9 +500,40 @@
 
 
 			If  Seeker = "next" Then 
-				If CupRemain > 0 Then 
+				If CupRemain > 0 Then
-					OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+
-					Open "ROOT/taobin_project/xml/page_payment.xml" 
+					If Only18 = "true" Then
+						DEBUGVAR SelectDrink
+						MenuProfile SelectDrink "IsMenuInProfile"
+
+						; disable old verification
+						Var AdultState1 = "Invisible"
+
+						DEBUGVAR IsMenuInProfile
+
+						If IsMenuInProfile = "true" Then
+
+							; Check profile
+							
+							If EnableLiveness = "true" Then
+								DEBUGVAR EnableLiveness				
+								OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+								; full 
+								Open "ROOT/taobin_project/xml/page_identity_verification.xml" 
+							Else
+								OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+								; Only IDCard
+								Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+							EndIf
+
+						Else
+							OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+							Open "ROOT/taobin_project/xml/page_payment.xml" 
+						EndIf
+					Else
+						OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+						Open "ROOT/taobin_project/xml/page_payment.xml" 
+					EndIf
 				EndIf
 
 			Else
@@ -1415,6 +1446,21 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+
+
+
+
+				; No 2 right steps
+				;If NoSugarStepRight2 = "true" Then
+
+				;	Var SugarState5 = "Disable"
+				;	Var SugarState6 = "Disable"
+
+				;EndIf
+
+
+
+
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
@@ -1452,6 +1498,14 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				;If NoSugarStepRight2 = "true" Then
+
+				;	Var SugarState5 = "Disable"
+				;	Var SugarState6 = "Disable"
+
+				;EndIf
+
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
@@ -1500,6 +1554,18 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
@@ -1547,6 +1613,18 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
@@ -1597,6 +1675,19 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
@@ -1643,6 +1734,14 @@
 					Var SugarState5 = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var SugarState5 = "Disable"
+					Var SugarState6 = "Disable"
+
+				EndIf
 				
 				If sugar_default_flag = 0 Then
 					Var SugarState2 = "PressForever"
@@ -1685,6 +1784,18 @@
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+
 				If sugar_default_flag = 0 Then
 					Var SugarState3 = "PressForever"
 				EndIf
@@ -1726,6 +1837,19 @@
 					Var SugarState5 = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
 				
 				If sugar_default_flag = 0 Then
 					Var SugarState2 = "PressForever"
@@ -1826,6 +1950,17 @@
 			EndIf
 
 			
+			If TOPPING2 = "shot coffee termtem" Then
+		
+				Var ShotCoffeeBG = "Enable"
+				Var showShotEnable = "Enable"
+				
+				Var ExtraTopping = "Enable"
+				
+				DEBUGVAR TOPPING2
+				Refresh
+			EndIf
+
 			If TOPPING2 = "shot coffee 1003" Then
 		
 				If toppingID2index3 = "" Then
@@ -2089,8 +2224,20 @@
 			Topping "Pack" ExtendDataCurr
 			Var Seeker.ExtendDataCurr = ExtendDataCurr
 
-			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+
-			Open "ROOT/taobin_project/xml/page_payment.xml"
+			If RestrictedDrink = "true" Then
+
+				DEBUGVAR RestrictedDrink
+
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+				Open "ROOT/taobin_project/xml/page_identity_verification.xml"
+			Else
+
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+				Open "ROOT/taobin_project/xml/page_payment.xml"
+
+			EndIf
+
 		EndIf
 	
 		
@@ -2486,6 +2633,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2524,6 +2679,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2533,6 +2696,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2576,6 +2747,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2584,6 +2763,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 
 		EndIf
@@ -2619,6 +2806,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2627,6 +2822,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2635,6 +2838,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2669,6 +2880,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -2677,6 +2896,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2685,6 +2912,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2754,6 +2989,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2793,6 +3037,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2803,6 +3056,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2840,6 +3102,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2850,6 +3121,16 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2887,6 +3168,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2897,6 +3187,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2905,6 +3204,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2941,6 +3249,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -2951,6 +3268,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2959,6 +3285,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2995,6 +3330,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index6
 		EndIf
 
@@ -3005,6 +3349,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -3013,6 +3366,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -3082,6 +3444,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -3119,6 +3489,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -3154,6 +3532,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3188,6 +3574,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -3257,6 +3651,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -3294,6 +3696,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -3329,6 +3739,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3363,6 +3781,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -5072,12 +5498,22 @@
 	
 	__CMD "statement" 0 StatementCheckMenu "-"
 
-	
+	;If HalfPrice = "true" Then
+	;	; Discount 50
+	;	DEBUGVAR HalfPrice
+	;	__CMD "invoke-discount-50" UserSelectProductCode "-" "-"
+	;	
+	;Else
+	;	Var PriceDrink = PriceDrinkTmp		
+	;EndIf
+
 	DEBUGVAR PriceDrinkTmp
 	
 	;Var Seeker.PriceDrink = PriceDrinkTmp
 	
 	Var PriceDrink = PriceDrinkTmp
+
+	DEBUGVAR PriceDrink
 	
 	SAVELOG "USER press next ( topping ) - new"