Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

xml/page_topping_select7.xml

@@ -320,6 +320,8 @@
 		EndIf
 	EndIf
 
+	DEBUGVAR btnAddCart
+
 	Var LidDeactiveButton = "Invisible"
 	Var StrawDeactiveButton = "Invisible"
 
@@ -8020,6 +8022,75 @@
 </Function2>
 
 
+; add cart
+<Button>
+<State> btnAddCart  </State>
+<X> 285 </X>
+<Y> 1785 </Y>
+<Filename> Var( DirImage + "/bn_add.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_add.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	Var PriceDrink = PriceDrinkTmp
+	SAVELOG "USER press next ( topping ) - new"
+	DEBUGVAR topping1
+	DEBUGVAR topping2
+	DEBUGVAR topping3
+
+	DEBUGVAR LidState
+	DEBUGVAR StrawState
+	DEBUGVAR UserSelectProductCode
+	DEBUGVAR HAVE_UV_DOOR_LID
+
+
+	If StrawState = "Press" Then
+		Machine StrawOrder	
+		Var LedLidBlink = "true"
+	EndIf
+
+	If LidState = "Press" Then
+		Machine LidOrder	
+		Var LedLidBlink = "true"
+	EndIf
+
+	Var StrawState = "Enable"
+	Var LidState = "Enable"
+	; 
+		
+
+	
+
+	Var SelectDrink = UserSelectProductCode
+	; Set drink 
+	Topping "Select" UserSelectProductCode
+
+	; Set option toppinng and pack 
+	Topping "Select1-ID" topping1
+	Topping "Select2-ID" topping2
+	Topping "Select3-ID" topping3
+
+	; Pack
+	Topping "Pack" ExtendData
+
+	Var Seeker.ExtendData = ExtendData
+
+	If CART1_STATUS = "EMPTY" Then
+		Cart "AddMenuID" 1
+	Else
+		If CART2_STATUS = "EMPTY" Then
+			Cart "AddMenuID" 2
+		Else
+			If CART3_STATUS = "EMPTY" Then
+				Cart "AddMenuID" 3
+			EndIf
+		EndIf
+	EndIf
+	
+	Var CartUpdate = "true"
+</EventClick>
+</Button>