5.88 release new single origin two menu

xml/page_board.xml

@@ -494,7 +494,7 @@
 
 		DEBUGVAR CountUpReloadAll
 		
-		If CountUpReloadAll > 80 Then
+		If CountUpReloadAll > 60 Then
 
 			Var StartUpExt = "-"
 			Var CountUpReloadAll = 0

xml/page_catalog_choose_drink2.pml

@@ -8,22 +8,27 @@
 
  product_code = []
  product_code.append('12-01-01-0001')
- # esp
+ # Bean 3 esp
  product_code.append('12-01-01-0013')
  product_code.append('12-01-01-0020')
  product_code.append('12-01-01-0022')
+ product_code.append('12-01-01-0026')
+ product_code.append('12-01-01-0024')
 
+ # Normal esp
  product_code.append('12-11-01-0001')
  product_code.append('12-01-01-0003')
- # hot ameri
+ 
+ # Bean 3 hot ameri 
  product_code.append('12-01-01-0014')
  product_code.append('12-01-01-0019')
  product_code.append('12-01-01-0021')
-
- product_code.append('12-01-01-0004')
-
- product_code.append('12-01-01-0005')
+ product_code.append('12-01-01-0025')
+ product_code.append('12-01-01-0023')
  
+ # End
+ product_code.append('12-01-01-0004')
+ product_code.append('12-01-01-0005')
  product_code.append('12-01-01-0006')
  product_code.append('12-01-01-0007')
 
@@ -32,19 +37,26 @@
  product_code.append('12-01-01-0011')
  product_code.append('12-01-01-0012')
  product_code.append('12-01-01-0017')
- # Dirty
+ 
+ # Bean 3 Dirty
  product_code.append('12-01-02-0018')
  product_code.append('12-01-02-0020')
  product_code.append('12-01-02-0022')
+ product_code.append('12-01-02-0026')
+ product_code.append('12-01-02-0024')
 
+ # End
  product_code.append('12-11-02-0001')
  product_code.append('12-01-02-0001')
 
- # Ice ameri
+ # Bean 3 Ice ameri
  product_code.append('12-01-02-0011')
  product_code.append('12-01-02-0019')
  product_code.append('12-01-02-0021')
+ product_code.append('12-01-02-0025')
+ product_code.append('12-01-02-0023')
 
+ # End
  product_code.append('12-01-02-0002')
  product_code.append('12-11-02-0002')
 

xml/page_payment_cash.xml

@@ -1516,6 +1516,12 @@
 <Color> "0xFF0000" </Color>
 <Width> 1080 </Width>
 <Height> 60 </Height>
+<EventClick>
+	If IgnoreNetCore = "true" Then
+		MakeDrinkV1  SelectDrink SelectSugarID
+		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+	EndIf
+</EventClick>
 </Button>
 
 <Text>

xml/page_thankyouConti.xml

@@ -26,6 +26,7 @@
 	Var Tel_Confirm_Flag = 0
 	Var LastMakeDrinkResult = "-"
 	
+	DEBUGVAR NextOrderStatus
 
 	If show_eng = "true" Then 
 		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" 
@@ -82,6 +83,7 @@
 
 		; Pack
 		Topping "Pack" ExtendData
+	
 
 
 	EndIf
@@ -96,8 +98,8 @@
 	Var CountDownThankyou = CountDownThankyou - 1
 
 	Var Timeout = Timeout + 1 
-	If Timeout = 3 Then
-	
+	If Timeout = 4 Then
+
 
 		Var VideoPlayFile = VideoPath
 		Var VideoPlayFile = VideoPlayFile + VideoFileBegin

xml/page_topping_select.xml

@@ -10,6 +10,7 @@
 	WEB "DISABLE"
 
 	
+	Open "ROOT/taobin_project/xml/page_topping_select3.xml"
 	
 	If JXMLVersionInt >= 369 Then
 		If EnableSelectMenuBetweenBrew = "Enable" Then
@@ -17,7 +18,6 @@
 		EndIf
 	EndIf
 
-	Open "ROOT/taobin_project/xml/page_topping_select3.xml"
 	
 		
 	DEBUGVAR BrewVersionInt

xml/page_topping_select3.xml

@@ -626,7 +626,7 @@
 			DEBUGVAR TOPPING2
 			Refresh
 		EndIf
-	If TOPPING2 = "shot coffee 1007" Then
+		If TOPPING2 = "shot coffee 1007" Then
 	
 			Var ShotCoffeePremium = "Enable"
 			Var showShotEnable = "Enable"
@@ -642,6 +642,22 @@
 			DEBUGVAR TOPPING2
 			Refresh
 		EndIf
+		If TOPPING2 = "add-show-1009" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+		If TOPPING2 = "add-show-1010" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
 
 ;-END
 		If TOPPING3 = "Collagen" Then