7up update image

xml/page_drink_stuck.xml

@@ -109,6 +109,7 @@
 		EndIf
 	EndIf
 
+	Var CoundUpDelayCertainStage = 0
 
 
 </EventOpen>
@@ -189,11 +190,8 @@
 
 	EndIf
 
-	If DoorCupPosition = "bottom" Then
-		Var buttonRemoveCup = "Enable"
-		Var txtDrinkOKState = "Enable"
-	EndIf
 
+	
 	; away
 	If  NextOrder = "true" Then
 
@@ -232,7 +230,7 @@
 
 								TransferVar "next" "curr"
 								Var Seeker = "curr"
-								SAVELOG "Make next order by take-cup"
+								SAVELOG "Make next order by take-cup pagedrinkstuct"
 								Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
 								; END
 
@@ -249,26 +247,11 @@
 	;
 	
 	If MachineStage = "remove-cup" Then
-		If CART_COUNT = 0 Then
-			If  NextOrder = "false" Then
-				Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
-			Else
-				Var buttonRemoveCup = "Enable"
-				Var txtDrinkOKState = "Enable"
-
-				Var Timeout2 = Timeout2 + 1
-
-				If Timeout2 > 15 Then
-					Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
-					Var Timeout2 = 0
-				EndIf
-
-			EndIf
-		Else
-	
-			Var buttonRemoveCup = "Enable"
-			Var txtDrinkOKState = "Enable"
 		
+		If  NextOrder = "false" Then
+			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+		Else
+			Var txtDrinkOKState = "Enable"
 
 			Var Timeout2 = Timeout2 + 1
 
@@ -280,6 +263,7 @@
 		EndIf
 
 	EndIf
+	
 
 	If Timeout = 5 Then
 		If show_eng = "true" Then 
@@ -293,18 +277,6 @@
 		Else
 			Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
 			
-			; Play Sound #zone
-			If SoundBackToSchoolEnable = 1 Then
-				
-				If SoundBackToSchoolType = 1 Then 
-					Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
-				EndIf
-				If SoundBackToSchoolType = 2 Then 
-					Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
-				EndIf
-				Var PlaySoundLag = RootPathSoundBackToSchool + "drinkfinish.wav"
-			EndIf
-
 			Play PlaySoundLag
 		EndIf
 	EndIf
@@ -327,6 +299,26 @@
 		EndIf
 	EndIf
 
+	If DoorCupPosition = "bottom" Then
+
+	Else
+		Var buttonRemoveCup = "Invisible"
+		Var CoundUpDelayCertainStage = 0
+	EndIf
+
+
+	If HaveCup = "true" Then
+		If DoorCupPosition = "bottom" Then
+			If buttonRemoveCup = "Invisible" Then
+				Var CoundUpDelayCertainStage = CoundUpDelayCertainStage + 1
+				If CoundUpDelayCertainStage > 8 Then
+					Var buttonRemoveCup = "Enable"
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+
 
 	If txtDrinkOKState = "Enable" Then
 		Var TextBottomShow = "Invisible"
@@ -347,6 +339,7 @@
 	EndIf
 </EventChangeStatus>
 
+;include=ROOT/taobin_project/inc/remove_cup_tag_event.inc
 
 ;include="ROOT/taobin_project/inc/video.inc"
 
@@ -452,9 +445,7 @@
 <Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
 <EventClick> 
-	;Var buttonRemoveCup = "Invisible"
+	;include=ROOT/taobin_project/inc/remove_cup_button.inc
-	Machine RemoveCup
-	Machine DoorLidOpen
 	Refresh
 </EventClick>
 </Button>

xml/page_topping_select7.xml

@@ -6349,240 +6349,6 @@
 </Button>
 
 
-; liveness + camera + IDcard
-<Button>
-<State> DiscountWithIdentifyState  </State>
-<X> 285 </X>
-<Y> 1785 </Y>
-<Filename> Var( DirImage + "/bn_price5baht.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_price5baht.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	;Var Seeker = "curr"
-
-	
-	DEBUGVAR PriceDrinkTmp
-	
-	;Var Seeker.PriceDrink = PriceDrinkTmp
-	
-	Var PriceDrink = PriceDrinkTmp
-	
-	SAVELOG "USER press next ( topping ) - new"
-
-	If SugarState1 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index1
-		EndIf
-	EndIf
-
-	If SugarState2 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index2
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index1
-		EndIf
-
-	EndIf
-
-	If SugarState3 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index3
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index2
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index1
-		EndIf
-
-	EndIf
-
-	If SugarState3 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index3
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index2
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index1
-		EndIf
-
-	EndIf
-
-	If SugarState4 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index4
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index3
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index2
-		EndIf
-
-	EndIf
-
-	If SugarState5 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index5
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index4
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index3
-		EndIf
-
-	EndIf
-
-
-	Var Seeker.topping1 = topping1
-	Var Seeker.topping2 = topping2
-	Var Seeker.topping3 = topping3
-	Var Seeker.topping6 = topping6
-
-	Var Seeker.get_a_straw = StrawState
-	Var Seeker.get_a_lid = LidState
-
-
-	DEBUGVAR Seeker.topping1
-	DEBUGVAR Seeker.topping2
-	DEBUGVAR Seeker.topping3
-	DEBUGVAR Seeker.topping6
-	DEBUGVAR Seeker.get_a_straw
-	DEBUGVAR Seeker.get_a_lid
-
-	DEBUGVAR LidState
-	DEBUGVAR StrawState
-	DEBUGVAR UserSelectProductCode
-
-
-	If StrawState = "Press" Then
-		Machine StrawOrder	
-		Var LedLidBlink = "true"
-	EndIf
-
-	If LidState = "Press" Then
-		Machine LidOrder	
-		Var LedLidBlink = "true"
-		Var bg_lidProblem_ST = "Enable" 
-	Else
-		If LidState = "Disable" Then
-			Var bg_lidProblem_ST = "Disable"
-		Else
-			Var bg_lidProblem_ST = "Invisible"
-		EndIf
-	EndIf
-	
-	If SelectDrinkType = 0 Then
-		
-	Else
-		Var StrawState = "Enable"
-		Var LidState = "Enable"
-	EndIf
-	; 
-	
-	Var PromotionIDCurrentOrder = 0
-
-
-	Var SelectDrink = UserSelectProductCode
-	
-	Var Seeker.selected_a_drink = UserSelectProductCode
-	DEBUGVAR Seeker.selected_a_drink
-
-	; Set drink 
-
-	If Seeker = "curr" Then
-		Topping "Select" UserSelectProductCode
-
-		; Set option toppinng and pack 
-		Topping "Select1-ID" topping1
-		Topping "Select2-ID" topping2
-		Topping "Select3-ID" topping3
-		Topping "Select6-ID" topping6
-
-		; Pack
-		Topping "Pack" ExtendDataCurr
-
-	Else
-		Topping "SetNextOrder" UserSelectProductCode
-
-
-		Topping "__select" UserSelectProductCode
-		; Set option toppinng and pack 
-		Topping "__select1-id" topping1
-		Topping "__select2-id" topping2
-		Topping "__select3-id" topping3
-		Topping "__select6-id" topping6
-		; Pack
-		Topping "__pack" ExtendDataNext
-
-		Var NextUserSelectDrinkFromPaid = UserSelectProductCode
-		Var NextUserSelecttopping1Paid = topping1
-		Var NextUserSelecttopping2Paid = topping2
-		Var NextUserSelecttopping3Paid = topping3
-		Var NextUserSelecttopping6Paid = topping6
-
-
-
-	EndIf
-	DEBUGVAR Seeker
-	DEBUGVAR Seeker.ExtendData 
-
-	Var Seeker.PictureDrink = PictureDrink
-	Var Seeker.showname = showname
-
-	DEBUGVAR MenuCautionImageStage0
-	DEBUGVAR CustomerFilterEnable
-	DEBUGVAR CustomerFilterType
-
-	
-	GetLongTimeInMinute LastTimeClickOrder
-
-	If CART_COUNT  = 0 Then
-		If UserSelectProductCode = "-" Then
-
-		Else
-			
-			If SelectDrinkType = 1 Then
-				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-				Open "ROOT/taobin_project/xml/page_identity_verification.xml"
-			EndIf
-		EndIf
-
-		If SelectDrinkType = 0 Then
-			Var high_light_drink_type = "Enable"
-		EndIf
-	Else
-		
-		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"
-		Var ButtonNext = "true"
-
-	EndIf
-
-	Var LastTimeClickOrder = 0
-	
-	
-</EventClick>
-</Button>
-
-
-
 ; next
 <Button>
 <X> 673 </X>
@@ -6958,6 +6724,268 @@
 <Value> PriceDrinkTmpShow </Value>
 </Text>
 
+
+
+
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+; liveness + camera + IDcard
+<Button>
+<State> DiscountWithIdentifyState  </State>
+<X> 285 </X>
+<Y> 1785 </Y>
+<Filename> Var( DirImage + "/bn_price5baht.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_price5baht.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	;Var Seeker = "curr"
+
+	
+	DEBUGVAR PriceDrinkTmp
+	
+	;Var Seeker.PriceDrink = PriceDrinkTmp
+	
+	Var PriceDrink = PriceDrinkTmp
+	
+	SAVELOG "USER press next ( topping ) - new"
+
+	If SugarState1 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index1
+		EndIf
+	EndIf
+
+	If SugarState2 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index2
+		EndIf
+		If ShiftSugarStep = 2 Then
+			Var topping1 = toppingID1index1
+		EndIf
+
+	EndIf
+
+	If SugarState3 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index3
+		EndIf
+		If ShiftSugarStep = 2 Then
+			Var topping1 = toppingID1index2
+		EndIf
+		If ShiftSugarStep = 3 Then
+			Var topping1 = toppingID1index1
+		EndIf
+
+	EndIf
+
+	If SugarState3 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index3
+		EndIf
+		If ShiftSugarStep = 2 Then
+			Var topping1 = toppingID1index2
+		EndIf
+		If ShiftSugarStep = 3 Then
+			Var topping1 = toppingID1index1
+		EndIf
+
+	EndIf
+
+	If SugarState4 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index4
+		EndIf
+		If ShiftSugarStep = 2 Then
+			Var topping1 = toppingID1index3
+		EndIf
+		If ShiftSugarStep = 3 Then
+			Var topping1 = toppingID1index2
+		EndIf
+
+	EndIf
+
+	If SugarState5 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index5
+		EndIf
+		If ShiftSugarStep = 2 Then
+			Var topping1 = toppingID1index4
+		EndIf
+		If ShiftSugarStep = 3 Then
+			Var topping1 = toppingID1index3
+		EndIf
+
+	EndIf
+
+
+	Var Seeker.topping1 = topping1
+	Var Seeker.topping2 = topping2
+	Var Seeker.topping3 = topping3
+	Var Seeker.topping6 = topping6
+
+	Var Seeker.get_a_straw = StrawState
+	Var Seeker.get_a_lid = LidState
+
+
+	DEBUGVAR Seeker.topping1
+	DEBUGVAR Seeker.topping2
+	DEBUGVAR Seeker.topping3
+	DEBUGVAR Seeker.topping6
+	DEBUGVAR Seeker.get_a_straw
+	DEBUGVAR Seeker.get_a_lid
+
+	DEBUGVAR LidState
+	DEBUGVAR StrawState
+	DEBUGVAR UserSelectProductCode
+
+
+	If StrawState = "Press" Then
+		Machine StrawOrder	
+		Var LedLidBlink = "true"
+	EndIf
+
+	If LidState = "Press" Then
+		Machine LidOrder	
+		Var LedLidBlink = "true"
+		Var bg_lidProblem_ST = "Enable" 
+	Else
+		If LidState = "Disable" Then
+			Var bg_lidProblem_ST = "Disable"
+		Else
+			Var bg_lidProblem_ST = "Invisible"
+		EndIf
+	EndIf
+	
+	If SelectDrinkType = 0 Then
+		
+	Else
+		Var StrawState = "Enable"
+		Var LidState = "Enable"
+	EndIf
+	; 
+	
+	Var PromotionIDCurrentOrder = 0
+
+
+	Var SelectDrink = UserSelectProductCode
+	
+	Var Seeker.selected_a_drink = UserSelectProductCode
+	DEBUGVAR Seeker.selected_a_drink
+
+	; Set drink 
+
+	If Seeker = "curr" Then
+		Topping "Select" UserSelectProductCode
+
+		; Set option toppinng and pack 
+		Topping "Select1-ID" topping1
+		Topping "Select2-ID" topping2
+		Topping "Select3-ID" topping3
+		Topping "Select6-ID" topping6
+
+		; Pack
+		Topping "Pack" ExtendDataCurr
+
+	Else
+		Topping "SetNextOrder" UserSelectProductCode
+
+
+		Topping "__select" UserSelectProductCode
+		; Set option toppinng and pack 
+		Topping "__select1-id" topping1
+		Topping "__select2-id" topping2
+		Topping "__select3-id" topping3
+		Topping "__select6-id" topping6
+		; Pack
+		Topping "__pack" ExtendDataNext
+
+		Var NextUserSelectDrinkFromPaid = UserSelectProductCode
+		Var NextUserSelecttopping1Paid = topping1
+		Var NextUserSelecttopping2Paid = topping2
+		Var NextUserSelecttopping3Paid = topping3
+		Var NextUserSelecttopping6Paid = topping6
+
+
+
+	EndIf
+	DEBUGVAR Seeker
+	DEBUGVAR Seeker.ExtendData 
+
+	Var Seeker.PictureDrink = PictureDrink
+	Var Seeker.showname = showname
+
+	DEBUGVAR MenuCautionImageStage0
+	DEBUGVAR CustomerFilterEnable
+	DEBUGVAR CustomerFilterType
+
+	
+	GetLongTimeInMinute LastTimeClickOrder
+
+	If CART_COUNT  = 0 Then
+		If UserSelectProductCode = "-" Then
+
+		Else
+			
+			If SelectDrinkType = 1 Then
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+				Open "ROOT/taobin_project/xml/page_identity_verification.xml"
+			EndIf
+		EndIf
+
+		If SelectDrinkType = 0 Then
+			Var high_light_drink_type = "Enable"
+		EndIf
+	Else
+		
+		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"
+		Var ButtonNext = "true"
+
+	EndIf
+
+	Var LastTimeClickOrder = 0
+	
+	
+</EventClick>
+</Button>
+
+
+
 ; energy drink 1 bath
 <Button>
 <X> 673 </X>