clean code thankyou

inc/remove_cup_step.inc

@@ -33,7 +33,7 @@ EndIf
 
 Var Timeout = Timeout + 1
 
-If Timeout > 15 Then
+
     Var Timeout = 0
 
     DEBUGVAR HaveCup
@@ -42,7 +42,7 @@ If Timeout > 15 Then
     DEBUGVAR CupChecking
     DEBUGVAR CupArmMove
     DEBUGVAR buttonRemoveCup
-EndIf
+
 
 Var TimeoutInstance0 = TimeoutInstance0 + 1
 

inc/select_drink_current.inc

@@ -1,4 +1,5 @@
 
+    
     Topping "Select" Seeker.selected_a_drink
 
     ; Set option toppinng and pack 
@@ -17,4 +18,6 @@
     ; Pack
     Topping "Pack" ExtendDataCurr
 
+    ;Menu "set-name" Seeker.showname
+    ;Menu "set-image" Seeker.PictureDrink
 

xml/page_NewBrewing3Conti.xml

@@ -125,6 +125,8 @@
 	Var CreditCardVoid = 0
 
 	DEBUGVAR ButtonGameCountDownState
+	
+	SAVELOG "New brewing3 conti"
 
 </EventOpen>
 

xml/page_board.xml

@@ -1272,7 +1272,7 @@
 	DEBUGVAR CountDownPauseVideo2
 	Var TimeProfilePrice = 0
 
-	;Machine NewPaymentOpenBrewingXMLEnable
+	Machine NewPaymentOpenBrewingXMLEnable
 </EventOpen>
 
 <EventActionOk>

xml/page_remove_cup.xml

@@ -45,6 +45,8 @@
 	LED LedDoorDoor 5 255 255 255 255
 
 	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
+
+	Var ShowMenuNameAndImage = "Invisible"
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
@@ -131,6 +133,37 @@
 
 
 
+<Image>
+<X> 125 </X>
+<Y> 1700 </Y>
+<Height> 300 </Height>
+<Width> 320 </Width>
+<State> ShowMenuNameAndImage </State>
+<Filename> Seeker.PictureDrink </Filename>
+</Image>
+
+<Text>
+<X> 300 </X>
+<Y> 1750 </Y>
+<State> ShowMenuNameAndImage </State>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Font> KanitLightTTF </Font>
+<Size> 48 </Size>
+<Color> HeadlineColor </Color>
+<Value>
+	eval(
+		STRCONTAIN "size" Seeker.showname SizeFromSheet
+		If SizeFromSheet = "true" Then
+			SPLIT Seeker.showname "###" 1 PureName
+			Var return = PureName
+		Else
+			Var return = Seeker.showname
+		EndIf
+	)
+</Value>
+</Text>
+
 
 
 <Text>

xml/page_thankyouConti.xml

@@ -74,31 +74,26 @@
     If Seeker = "curr" Then
     	SAVELOG "Call from thankyou Conti"
     	
+		If Seeker.get_a_straw  = "Press" Then
+			Machine StrawOrder	
+			Var LedLidBlink = "true"
+			Var SaveTheWorldCount = SaveTheWorldCount + 1
 
-    	If PaySuccessWithDaemonTask = 1 Then
+			Var bg_lidProblem_ST = "Invisible"
-
-    	Else
-	    	If Seeker.get_a_straw  = "Press" Then
-				Machine StrawOrder	
-				Var LedLidBlink = "true"
-				Var SaveTheWorldCount = SaveTheWorldCount + 1
-
-				Var bg_lidProblem_ST = "Invisible"
-			EndIf
-
-			If Seeker.get_a_lid = "Press" Then
-				Machine LidOrder	
-				Var LedLidBlink = "true"
-				Var SaveTheWorldCount = SaveTheWorldCount + 1
-
-				Var bg_lidProblem_ST = "Enable"
-			EndIf
-
-			;include="ROOT/taobin_project/inc/select_drink_current.inc"
-
-
-			Topping "ClearNextOrder" "-"
 		EndIf
+
+		If Seeker.get_a_lid = "Press" Then
+			Machine LidOrder	
+			Var LedLidBlink = "true"
+			Var SaveTheWorldCount = SaveTheWorldCount + 1
+
+			Var bg_lidProblem_ST = "Enable"
+		EndIf
+
+		;include="ROOT/taobin_project/inc/select_drink_current.inc"
+
+
+		Topping "ClearNextOrder" "-"
 	EndIf
 
 
@@ -126,7 +121,13 @@
 
 	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
 
+	SAVELOG "Thank you conti version 1"
 
+	;PendingFlag InternationalEnable
+	;PendingFlag New_Payment
+	;PendingFlag New_Payment
+	
+	
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -224,21 +225,23 @@
 		Var MachineState_Result = 0
 		
 		If MachineStage = "show-menu" Then
-			If PaySuccessWithDaemonTask = 1 Then
+	
-
+			Var LastMakeDrinkResult = "-"
-			Else
+			If New_Payment = 1 Then 
-				Var LastMakeDrinkResult = "-"
+				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
-				If New_Payment = 1 Then 
+			EndIf
-					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
+			MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
-				EndIf
-       			MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
        	
-       		EndIf
+
        		If InternationalEnable = 1 Then
 				Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
                 Open Brew3Inter
 			Else
-				Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+				If New_Payment = 1 Then 
+					Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"  
+				Else
+					Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+				EndIf
 			EndIf  
      	EndIf
        
@@ -348,7 +351,7 @@
 <Width> 1080 </Width>
 <Align> end </Align>
 <Color> 0xFF0000 </Color>
-<Value> "THK"</Value>
+<Value> "TCT1"</Value>
 </Text>
 
 

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "8.99"
+	Var XMLPageVersion = "9.01"
-	Var XMLPageVersionInt = 899
+	Var XMLPageVersionInt = 901
 ;Oreo
 Var OreoGuarantee = 0