Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

inc/button_topping_select_confirm_order.inc

@@ -0,0 +1,413 @@
+
+	;Var Seeker = "curr"
+	Var Timeout = 0
+
+	If showOvaltineEnable = "Press" Then
+		;Var CustomOvaltineCheckState = "Press"
+		Var SelectToppingType = 1
+	EndIf
+
+	If showOreoAddEnable = "Press" Then
+		;Var CustomOreoCheckState = "Press"
+		Var SelectToppingType = 1
+	EndIf
+
+	If showCocoaEnable = "Press" Then
+		;Var CustomCocoaCheckState = "Press"
+		Var SelectToppingType = 1
+	EndIf
+
+
+
+
+
+		Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
+		
+		__CMD "statement" 0 StatementCheckMenu "-"
+
+		
+		DEBUGVAR PriceDrinkTmp
+		
+		;Var Seeker.PriceDrink = PriceDrinkTmp
+		
+		Var PriceDrink = PriceDrinkTmp
+		
+		SAVELOG "USER press next ( topping ) - newwwwww"
+
+		If CustomSweetState[0] = "PressForever" Then
+			If ShiftSugarStep = 1 Then
+				Var topping1 = toppingID1index1
+			EndIf
+		EndIf
+
+		If CustomSweetState[1] = "PressForever" Then
+			If ShiftSugarStep = 1 Then
+				Var topping1 = toppingID1index2
+			EndIf
+			If ShiftSugarStep = 2 Then
+				Var topping1 = toppingID1index1
+			EndIf
+
+		EndIf
+
+		If CustomSweetState[2] = "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 CustomSweetState[2] = "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 CustomMilkState[0] = "PressForever" Then
+			Var topping11 = toppingID11index1
+		EndIf
+		If CustomMilkState[1] = "PressForever" Then
+			Var topping11 = toppingID11index2
+		EndIf
+		If CustomMilkState[2] = "PressForever" Then
+			Var topping11 = toppingID11index3
+		EndIf
+
+
+		If CustomSweetState[3] = "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 CustomSweetState[4] = "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
+
+		If showCustomCoffee = "Enable" Then
+			If showCoffeeWater = "Enable" Then
+				If CustomCoffeeWaterState[0] = "PressForever" Then
+					Var topping7 = toppingID7index1
+				EndIf
+				If CustomCoffeeWaterState[1] = "PressForever" Then
+					Var topping7 = toppingID7index2
+				EndIf
+				If CustomCoffeeWaterState[2] = "PressForever" Then
+					Var topping7 = toppingID7index3
+				EndIf
+				If CustomCoffeeWaterState[3] = "PressForever" Then
+					Var topping7 = toppingID7index4
+				EndIf
+				If CustomCoffeeWaterState[4] = "PressForever" Then
+					Var topping7 = toppingID7index5
+				EndIf
+			Else
+				Var topping7 = 0
+			EndIf
+		
+			If showCoffeeQuantity = "Enable" Then
+				If CustomCoffeeQuantityState[0] = "PressForever" Then
+					Var topping2 = toppingID2index1
+				EndIf
+				If CustomCoffeeQuantityState[1] = "PressForever" Then
+					Var topping2 = toppingID2index2
+				EndIf
+				If CustomCoffeeQuantityState[2] = "PressForever" Then
+					Var topping2 = toppingID2index3
+				EndIf
+			Else
+				If toppingID2index3 = "" Then
+				Else
+					Var topping2 = 0
+				EndIf
+			EndIf
+
+			If showCoffeeLevel = "Enable" Then
+				If CustomCoffeeLevelState[0] = "PressForever" Then
+					Var topping9 = toppingID9index1
+				EndIf
+				If CustomCoffeeLevelState[1] = "PressForever" Then
+					Var topping9 = toppingID9index2
+				EndIf
+				If CustomCoffeeLevelState[2] = "PressForever" Then
+					Var topping9 = toppingID9index3
+				EndIf
+				If CustomCoffeeLevelState[3] = "PressForever" Then
+					Var topping9 = toppingID9index4
+				EndIf
+			Else
+				Var topping9 = 0
+			EndIf
+
+			If showCoffeeTamping = "Enable" Then
+				If CustomCoffeeTampingState[0] = "PressForever" Then
+					Var topping8 = toppingID8index1
+				EndIf
+				If CustomCoffeeTampingState[1] = "PressForever" Then
+					Var topping8 = toppingID8index2
+				EndIf
+				If CustomCoffeeTampingState[2] = "PressForever" Then
+					Var topping8 = toppingID8index3
+				EndIf
+			Else
+				Var topping8 = 0
+			EndIf
+		Else
+			If toppingID2index3 = "" Then
+			Else
+				Var topping2 = 0
+			EndIf
+			Var topping7 = 0
+			Var topping8 = 0
+			Var topping9 = 0
+			Var topping10 = 0
+		EndIf
+
+		; Post Topping
+		DEBUGVAR SugarZeroCalEnable
+		DEBUGVAR SugarZeroCalCheck
+		If SugarZeroCalEnable = "true" Then
+			Var sugarToppingID = 1000
+			If SugarZeroCalCheck = "PressForever" Then
+				Var sugarToppingID = 1001
+			Else
+				Var sugarToppingID = 1000
+			EndIf
+		EndIf
+
+		DEBUGVAR sugarToppingID
+		
+		If Seeker = "next" Then
+			SAVELOG "NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT NEXT "
+		EndIf
+
+		Var Seeker.topping1 = topping1
+		Var Seeker.topping2 = topping2
+		Var Seeker.topping3 = topping3
+		Var Seeker.topping6 = topping6
+		Var Seeker.topping7 = topping7
+		Var Seeker.topping8 = topping8
+		Var Seeker.topping9 = topping9
+		Var Seeker.topping10 = topping10
+		Var Seeker.topping11 = topping11
+		Var Seeker.topping12 = topping12
+		Var Seeker.topping13 = topping13
+
+		Var Seeker.PostTopping1 = sugarToppingID
+		
+		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.topping7
+		DEBUGVAR Seeker.topping8
+		DEBUGVAR Seeker.topping9
+		DEBUGVAR Seeker.topping10
+		DEBUGVAR Seeker.topping11
+		DEBUGVAR Seeker.topping12
+		DEBUGVAR Seeker.topping13
+		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
+		; 
+		
+
+		DEBUGVAR PromotionIDCurrentOrder
+		
+		
+		Var SelectDrink = UserSelectProductCode
+		
+		Var Seeker.selected_a_drink = UserSelectProductCode
+		DEBUGVAR Seeker.selected_a_drink
+
+		; Set drink 
+
+		If Seeker = "curr" Then
+
+			;include="ROOT/taobin_project/inc/select_drink_current.inc"
+
+			If SelectToppingType = 0 Then
+				
+			Else
+
+				Topping "ClearMultiTopping" "Test 4"
+
+				Topping "Multiply6-ID" strMulti6_1
+				Topping "Multiply6-ID" strMulti6_2
+				Topping "Multiply6-ID" strMulti6_3
+				Topping "Multiply6-ID" strMulti6_5
+				Topping "Multiply6-ID" strMulti6_6
+
+				Topping "Pack" ExtendDataCurr
+			EndIf
+
+		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
+			Topping "__select7-id" topping7
+			Topping "__select8-id" topping8
+			Topping "__select9-id" topping9
+			Topping "__select10-id" topping10
+			Topping "__select11-id" topping11
+			Topping "__select12-id" topping12
+			Topping "__select13-id" topping13
+
+			Topping "__posttopping1-ID" sugarToppingID
+			; Pack
+			Topping "__pack" ExtendDataNext
+
+			Var NextUserSelectDrinkFromPaid = UserSelectProductCode
+			Var NextUserSelecttopping1Paid = topping1
+			Var NextUserSelecttopping2Paid = topping2
+			Var NextUserSelecttopping3Paid = topping3
+			Var NextUserSelecttopping6Paid = topping6
+			Var NextUserSelecttopping7Paid = topping7
+			Var NextUserSelecttopping8Paid = topping8
+			Var NextUserSelecttopping9Paid = topping9
+			Var NextUserSelecttopping10Paid = topping10
+			Var NextUserSelecttopping11Paid = topping11
+			Var NextUserSelecttopping12Paid = topping12
+			Var NextUserSelecttopping13Paid = topping13
+
+
+		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
+				; Move to MenuReady
+				;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+				;Open "ROOT/taobin_project/xml/page_payment.xml" 
+			EndIf
+		EndIf
+		
+		DEBUGVAR SelectToppingType
+		If SelectDrinkType = 0 Then
+			Var high_light_drink_type = "Enable"
+		Else
+			If SelectToppingType = 0 Then
+				If blend_button_state = "PressForever" Then
+					Var toppingSelectState = "Enable"
+					If toppingSelectState = "Enable" Then
+						Var CustomOreoState = "Enable"
+						Var CustomOvaltineState = "Enable"
+						Var CustomCocoaState = "Enable"
+						
+						Var PopupToppingSelect = "Enable"
+
+
+						Var CustomOreoCheckState = "Enable"
+						Var CustomOvaltineCheckState = "Enable"
+						Var CustomCocoaCheckState = "Enable"
+					EndIf
+				EndIf
+			EndIf
+		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

inc/remove_cup_button.inc

@@ -1,6 +1,6 @@
 Machine RemoveCup
 Machine DoorLidOpen
-Var buttonRemoveCup = "Invisible"
+Var buttonRemoveCup = "Disable2"
 
 ; protect value update too slow.
 Var DoorCupPosition = "-"

inc/remove_cup_step.inc

@@ -125,19 +125,19 @@ If HaveCup = "true" Then
 
 Else
     If buttonRemoveCup = "Enable" Then
-        Var buttonRemoveCup = "Invisible"
+        Var buttonRemoveCup = "Disable"
     EndIf
 EndIf
 
 If DoorCupPosition = "bottom" Then
 
 Else
-    Var buttonRemoveCup = "Invisible"
+    Var buttonRemoveCup = "Disable2"
     Var CoundUpDelayCertainStage = 0
 EndIf
 
 If CupArmMove = "true" Then
-    Var buttonRemoveCup = "Invisible"
+    Var buttonRemoveCup = "Disable"
     If show_eng = "true" Then
         Var MachineErrorDetailAll = "Please wait."
     Else
@@ -153,6 +153,12 @@ Else
                         Var buttonRemoveCup = "Enable"
                     EndIf
                 EndIf
+                 If buttonRemoveCup = "Disable" Then
+                    Var CoundUpDelayCertainStage = CoundUpDelayCertainStage + 1
+                    If CoundUpDelayCertainStage > 8 Then
+                        Var buttonRemoveCup = "Enable"
+                    EndIf
+                EndIf
             EndIf
         EndIf
     EndIf

inc/select_drink_current.inc

@@ -1,5 +1,6 @@
 
-    
+    SAVELOG " select_drink_current.inc  select_drink_current.inc  "
+
     Topping "Select" Seeker.selected_a_drink
 
     ; Set option toppinng and pack 
@@ -13,6 +14,9 @@
     Topping "Select8-ID" Seeker.topping8
     Topping "Select9-ID" Seeker.topping9
     Topping "Select10-ID" Seeker.topping10
+    Topping "Select11-ID" Seeker.topping11
+    Topping "Select12-ID" Seeker.topping12
+    Topping "Select13-ID" Seeker.topping13
 
     Topping "PostTopping1-ID" Seeker.PostTopping1
     ; Pack

inc/select_drink_next.inc

@@ -12,6 +12,9 @@
     Topping "__select8-id" topping8
     Topping "__select9-id" topping9
     Topping "__select10-id" topping10
+    Topping "__select11-id" topping11
+    Topping "__select12-id" topping12
+    Topping "__select13-id" topping13
 
     Topping "__posttopping1-ID" sugarToppingID
     ; Pack
@@ -26,3 +29,6 @@
     Var NextUserSelecttopping8Paid = topping8
     Var NextUserSelecttopping9Paid = topping9
     Var NextUserSelecttopping10Paid = topping10
+    Var NextUserSelecttopping11Paid = topping11
+    Var NextUserSelecttopping12Paid = topping12
+    Var NextUserSelecttopping13Paid = topping13

inter/hkg/animation01/play_list.tsv

@@ -885,24 +885,24 @@ PEPSI Max BANANA	54-05-02-0077
 PEPSI Max YUZU	54-05-02-0076
 PEPSI MINT	54-05-02-0068
 
-7UP SODA	12-05-02-0095	1	23	18							24	49	0:49	23
-7UP ENERGY PLUM LIME SODA	12-05-02-0096	1	18	12	33	23	13				24	120	19:00	23
-7UP PLUM LIME SODA	12-05-02-0097	1	18	33	23	13					24	120	20:00	23
-7UP PLUM LIME COFFEE	12-01-02-0069	1	18	12	2	3	5	23			24	120	21:00	23
-7UP PLUM SALAK LIME COFFEE	12-01-02-0070	1	18	12	21	2	3	5	23		24	120	22:00	23
-7UP PLUM LIME COFFEE	12-21-02-0069	1	18	12	2	3	5	23			24	120	23:00	23
-7UP PLUM SALAK LIME COFFEE	12-21-02-0070	1	18	12	21	2	3	5	23		24	120	0:00	23
-7UP SALAK LIME PLUM  SODA	12-05-02-0100	1	18	21	33	12	23	13			24	120	1:00	23
-7UP PLUM STRAW LIME SODA	12-05-02-0101	1	18	19	12	23	13				24	120	2:00	23
-7UP YUZU LIME	12-05-02-0102	1	18	53	12	23					24	120	3:00	23
-7UP COCONUT	12-05-02-0103	1	62	18	23						24	120	4:00	23
-7UP LYCHEE LIME	12-05-02-0115	1	11	18	12	23					24	120	5:00	23
-7UP MINT LIME	12-05-02-0116	1	59	18	23						24	120	6:00	23
+7UP SODA	54-05-02-0095	1	23	18							24	49	0:49	23
+7UP ENERGY PLUM LIME SODA	54-05-02-0096	1	18	12	33	23	13				24	120	19:00	23
+7UP PLUM LIME SODA	54-05-02-0097	1	18	33	23	13					24	120	20:00	23
+7UP PLUM LIME COFFEE	54-01-02-0069	1	18	12	2	3	5	23			24	120	21:00	23
+7UP PLUM SALAK LIME COFFEE	54-01-02-0070	1	18	12	21	2	3	5	23		24	120	22:00	23
+7UP PLUM LIME COFFEE	54-21-02-0069	1	18	12	2	3	5	23			24	120	23:00	23
+7UP PLUM SALAK LIME COFFEE	54-21-02-0070	1	18	12	21	2	3	5	23		24	120	0:00	23
+7UP SALAK LIME PLUM  SODA	54-05-02-0100	1	18	21	33	12	23	13			24	120	1:00	23
+7UP PLUM STRAW LIME SODA	54-05-02-0101	1	18	19	12	23	13				24	120	2:00	23
+7UP YUZU LIME	54-05-02-0102	1	18	53	12	23					24	120	3:00	23
+7UP COCONUT	54-05-02-0103	1	62	18	23						24	120	4:00	23
+7UP LYCHEE LIME	54-05-02-0115	1	11	18	12	23					24	120	5:00	23
+7UP MINT LIME	54-05-02-0116	1	59	18	23						24	120	6:00	23
 
-7UP MINT SODA	12-05-02-0121	1	18	59	23	13					24	120	2:00	23
-7UP BANANA	12-05-02-0118	1	18	56	23	13					24	120	2:00	23
-7UP MELON	12-05-02-0119	1	18	52	23	13					24	120	2:00	23
-7UP PEACH	12-05-02-0120	1	18	60	23	12					24	120	2:00	23
+7UP MINT SODA	54-05-02-0121	1	18	59	23	13					24	120	2:00	23
+7UP BANANA	54-05-02-0118	1	18	56	23	13					24	120	2:00	23
+7UP MELON	54-05-02-0119	1	18	52	23	13					24	120	2:00	23
+7UP PEACH	54-05-02-0120	1	18	60	23	12					24	120	2:00	23
 
 HOT GINGER MILK TEA	54-02-01-0053	1	6	70	10						24	120	2:00	23
 HOT GINGER YUZU TEA	54-02-01-0054	1	53								24	120	2:00	23
@@ -910,3 +910,14 @@ HOT GINGER STRAWBERRY 7UP	54-02-01-0079	1	19	18							24	120	2:00	23
 HOT GINGER MILK TEA OREO SMOOTHIE	54-02-03-0056	1	6	70	10						24	120	2:00	23
 ICED SANTA GINGER	54-03-02-0081	1	6	70	22	10					24	120	2:00	23
 HOT GINGER CAFE LATTE	54-21-01-0061	1	2	3	4	5	6	70			24	120	2:00	23
+Pepsi	54-05-02-0094	1	23	14							24	120	2:00	23
+Pepsi	54-05-03-0094	1	23	14	41						24	120	2:00	23
+ICED PEPSI PLUM	54-05-02-0104	1	14	33	23	13					24	120	2:00	23
+PEPSI PLUM SMOOTHIE	54-05-03-0104	1	14	33	23	41	13				24	120	2:00	23
+ICED PEPSI MELON	54-05-02-0105	1	14	52	23	13					24	120	2:00	23
+PEPSI MELON SMOOTHIE	54-05-03-0105	1	14	52	23	41	13				24	120	2:00	23
+PEPSI YUZU	54-05-02-0106	1	14	53	23	13					24	120	2:00	23
+PEPSI BANANA	54-05-02-0107	1	14	56	23	13					24	120	2:00	23
+PEPSI PEACH	54-05-02-0109	1	14	60	12	23					24	120	2:00	23
+ICED COCONUT PEPSI	54-05-02-0114	1	23	62	14						24	120	2:00	23
+COCONUT PEPSI SMOOTHIE	54-05-03-0114	1	23	62	14	41					24	120	2:00	23