Re flow

inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml

@@ -61,6 +61,21 @@
         EndIf
     EndIf
 
+    If NextPage = "-" Then
+
+    Else
+            If CupOnArm = "true" Then
+                If Timeout > 9 Then
+                    SAVELOG "COA9"
+                    Open NextPage
+                EndIf
+            Else
+                If Timeout > 30 Then
+                    SAVELOG "COA30"
+                    Open NextPage
+                EndIf
+            EndIf
+    EndIf
 
     TimerReset
 </EventTimeout>

xml/page_lid_straw.xml

@@ -225,7 +225,7 @@
 					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
 				EndIf
 
-				If NextSmoothie = 1 Then
+				If Seeker.SmoothieToPayment = 1 Then
 					Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
 				EndIf
 				Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
@@ -247,7 +247,7 @@
 
 		EndIf
 	Else
-		; seeker
+		; seeker is curr ent
 
 
 		DEBUGVAR ChangeFlag2
@@ -267,8 +267,12 @@
 					If New_Payment = 1 Then
 						TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
 					EndIf
-
+					If Seeker.SmoothieToPayment = 1 Then
+						OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+						Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
+					Else
 						Open "ROOT/taobin_project/xml/page_brewing3.xml"
+					EndIf
 				Else
 					Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
 					Open Brew3Inter
@@ -278,9 +282,14 @@
 				If New_Payment = 1 Then
 					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
 				EndIf
+				If Seeker.SmoothieToPayment = 1 Then
 
+        			OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+					Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
+				Else
 					Open "ROOT/taobin_project/xml/page_brewing3.xml"
 				EndIf
+			EndIf
 		Else
 			If UsePepsiTheme = 1 Then
 				If CountryName = "Singapore" Then

xml/page_spiral_sell.xml

@@ -54,14 +54,6 @@
         DEBUGVAR SpiralPayDetail
         Var Seeker.sprial_pay_detail = SpiralPayDetail
 
-        If Seeker = "next" Then
-            Var NextOrder = "true"
-            Var NextSmoothie = 1
-
-            Open "ROOT/taobin_project/xml/page_thankyou.xml"
-        EndIf
-
-        OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
         Open "ROOT/taobin_project/xml/page_thankyou.xml"
     EndIf
 

xml/process/payment.ev

@@ -1,4 +1,4 @@
-DEBUGVAR "MIGGAZE0"
+DEBUGVAR " payment ev evaluate "
 If Seeker.PayWithQR = 1 Then
 
 		Var ServiceAmount2 = Seeker.ServiceAmount2

xml/sometime/make_drink.xml

@@ -1,4 +1,4 @@
-SAVELOG "[MAKE_DRINK]"
+SAVELOG "[MAKE_DRINK] V2"
 DEBUGVAR Seeker
 DEBUGVAR Seeker.SmoothieToPayment
 If Seeker = "curr" Then

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "9.88"
+	Var XMLPageVersion = "9.89"
-	Var XMLPageVersionInt = 988
+	Var XMLPageVersionInt = 989
 	
 	Var CurrentMainVideo = 2
 </EventOpen>

xml_main/startup_dev.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "10.88"
+	Var XMLPageVersion = "10.89"
-	Var XMLPageVersionInt = 1088
+	Var XMLPageVersionInt = 1089
 ;Oreo
 Var OreoGuarantee = 0