DO blender and disable

xml/menu_catalog.xml

@@ -4,8 +4,14 @@
     If NextPage = "-" Then
 
     Else
-        If Timeout > 30 Then
-            Open NextPage
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
         EndIf
     EndIf
 

xml/menu_gen.py

@@ -40,8 +40,11 @@
       #out_xml( '\t\tVar PriceShowValue = "Free"\r\n')
 
       out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
+      out_xml( '\t\tSTRCONTAIN "Smoothie" $' + product_code[i] + '.Button IsSmoRet\r\n')
+
       out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_alter.xml"\r\n')
-  
+
+
       out_xml( '\t</EventOnClick>\r\n')
       out_xml( '\t</Button>\r\n')
  
@@ -55,6 +58,7 @@
       out_xml( '\t<Font> KanitTTF </Font>\r\n')
       out_xml( '\t<Color> 0xB78F24 </Color>\r\n')
       out_xml( '\t<Value> $' + product_code[i] + '.Price </Value>\r\n')
+      #out_xml( '\t<Value> eval( STRCONTAIN "Smoothie" $' + product_code[i] + '.Button SmoRet \n If SmoRet = "true" Then\n Var return = "Enable"\n Else\n Var return = "Invisible"\n  EndIf\n)  </Value> \r\n')
       out_xml( '\t</Text>\r\n')
   
       out_xml( '\t<Text>\r\n')

xml/page_catalog_choose_drink.xml

@@ -53,8 +53,14 @@
     If NextPage = "-" Then
 
     Else
-        If Timeout > 30 Then
-            Open NextPage
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
         EndIf
     EndIf
 
@@ -287,6 +293,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_1.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -392,6 +399,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -497,6 +505,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -602,6 +611,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -707,6 +717,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-02-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -812,6 +823,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-02-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -917,6 +929,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1022,6 +1035,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1127,6 +1141,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1232,6 +1247,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0007.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1337,6 +1353,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0008.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1442,6 +1459,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0007.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1547,6 +1565,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0021.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1652,6 +1671,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0013.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1757,6 +1777,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0012.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1862,6 +1883,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0009.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>

xml/page_catalog_choose_drink1.xml

@@ -53,8 +53,14 @@
     If NextPage = "-" Then
 
     Else
-        If Timeout > 30 Then
-            Open NextPage
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
         EndIf
     EndIf
 
@@ -287,6 +293,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_1.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -392,6 +399,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_2.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -497,6 +505,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_3.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -602,6 +611,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_4.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -707,6 +717,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_5.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -812,6 +823,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_6.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -917,6 +929,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_7.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1022,6 +1035,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_8.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1127,6 +1141,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_9.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1232,6 +1247,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_10.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1337,6 +1353,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_11.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1442,6 +1459,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_12.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1547,6 +1565,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_13.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1652,6 +1671,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_14.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1757,6 +1777,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_15.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1862,6 +1883,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $best_seller_16.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>

xml/page_catalog_choose_drink2.xml

@@ -56,8 +56,14 @@
     If NextPage = "-" Then
 
     Else
-        If Timeout > 30 Then
-            Open NextPage
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
         EndIf
     EndIf
 
@@ -291,6 +297,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -396,6 +403,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0013.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -501,6 +509,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0020.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -606,6 +615,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0022.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -711,6 +721,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-11-01-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -816,6 +827,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -921,6 +933,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0014.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1026,6 +1039,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0019.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1131,6 +1145,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0021.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1236,6 +1251,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1341,6 +1357,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0005.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1446,6 +1463,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0006.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1551,6 +1569,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0007.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1656,6 +1675,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0009.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1761,6 +1781,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0010.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1866,6 +1887,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0011.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1971,6 +1993,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0012.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2076,6 +2099,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0017.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2181,6 +2205,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0018.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2286,6 +2311,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0020.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2391,6 +2417,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0022.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2496,6 +2523,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-11-02-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2601,6 +2629,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2706,6 +2735,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0011.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2811,6 +2841,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0019.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2916,6 +2947,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0021.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3021,6 +3053,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3126,6 +3159,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-11-02-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3231,6 +3265,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3336,6 +3371,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3441,6 +3477,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0005.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3546,6 +3583,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0007.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3651,6 +3689,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0008.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3756,6 +3795,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0009.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3861,6 +3901,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0017.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3966,6 +4007,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-01-02-0009.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>

xml/page_catalog_choose_drink3.xml

@@ -52,8 +52,14 @@
     If NextPage = "-" Then
 
     Else
-        If Timeout > 30 Then
-            Open NextPage
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
         EndIf
     EndIf
 
@@ -287,6 +293,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -392,6 +399,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -497,6 +505,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0020.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -602,6 +611,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -707,6 +717,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -812,6 +823,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0006.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -917,6 +929,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0021.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1022,6 +1035,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0007.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1127,6 +1141,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0008.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1232,6 +1247,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0019.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1337,6 +1353,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0009.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1442,6 +1459,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0022.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1547,6 +1565,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0010.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1652,6 +1671,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0011.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1757,6 +1777,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0012.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1862,6 +1883,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0017.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1967,6 +1989,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0020.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2072,6 +2095,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2177,6 +2201,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2282,6 +2307,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2387,6 +2413,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2492,6 +2519,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0005.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2597,6 +2625,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0006.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2702,6 +2731,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0007.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2807,6 +2837,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0008.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2912,6 +2943,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0019.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3017,6 +3049,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0009.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3122,6 +3155,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0022.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3227,6 +3261,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0010.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3332,6 +3367,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0011.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3437,6 +3473,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0012.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3542,6 +3579,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0027.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>

xml/page_catalog_choose_drink4.xml

@@ -52,8 +52,14 @@
     If NextPage = "-" Then
 
     Else
-        If Timeout > 30 Then
-            Open NextPage
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
         EndIf
     EndIf
 
@@ -288,6 +294,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-01-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -393,6 +400,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-01-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -498,6 +506,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-01-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -603,6 +612,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-01-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -708,6 +718,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-01-0005.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -813,6 +824,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-02-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -918,6 +930,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-02-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1023,6 +1036,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-02-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1128,6 +1142,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-02-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1233,6 +1248,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-02-0006.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1338,6 +1354,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-02-0005.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1443,6 +1460,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-02-0007.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1548,6 +1566,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-03-03-0009.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>

xml/page_catalog_choose_drink5.xml

@@ -52,8 +52,14 @@
     If NextPage = "-" Then
 
     Else
-        If Timeout > 30 Then
-            Open NextPage
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
         EndIf
     EndIf
 
@@ -288,6 +294,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-01-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -393,6 +400,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -498,6 +506,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -603,6 +612,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -708,6 +718,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -813,6 +824,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0005.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -918,6 +930,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0040.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1023,6 +1036,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0006.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>

xml/page_catalog_choose_drink6.xml

@@ -51,8 +51,14 @@
     If NextPage = "-" Then
 
     Else
-        If Timeout > 30 Then
-            Open NextPage
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
         EndIf
     EndIf
 
@@ -289,6 +295,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0007.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -394,6 +401,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0019.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -499,6 +507,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0020.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -604,6 +613,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0021.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -709,6 +719,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0035.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -814,6 +825,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0010.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -919,6 +931,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0011.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1024,6 +1037,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0033.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1129,6 +1143,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0028.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1234,6 +1249,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0012.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1339,6 +1355,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0041.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1444,6 +1461,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0013.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1549,6 +1567,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0031.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1654,6 +1673,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0008.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1759,6 +1779,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0009.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1864,6 +1885,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0024.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1969,6 +1991,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0038.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2074,6 +2097,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0029.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2179,6 +2203,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0025.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2284,6 +2309,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0039.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2389,6 +2415,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0014.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2494,6 +2521,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0015.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2599,6 +2627,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-01-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2704,6 +2733,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2809,6 +2839,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0034.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -2914,6 +2945,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3019,6 +3051,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0032.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3124,6 +3157,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0005.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3229,6 +3263,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0040.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3334,6 +3369,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0006.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3439,6 +3475,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0026.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3544,6 +3581,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0030.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3649,6 +3687,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3754,6 +3793,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3859,6 +3899,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0016.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -3964,6 +4005,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0017.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -4069,6 +4111,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-02-0018.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -4174,6 +4217,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-05-01-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>

xml/page_catalog_choose_drink7.xml

@@ -50,8 +50,14 @@
     If NextPage = "-" Then
 
     Else
-        If Timeout > 30 Then
-            Open NextPage
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
         EndIf
     EndIf
 
@@ -288,6 +294,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -393,6 +400,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -498,6 +506,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -603,6 +612,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0013.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -708,6 +718,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -813,6 +824,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0005.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -918,6 +930,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0006.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1023,6 +1036,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0007.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1128,6 +1142,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0008.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1233,6 +1248,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0009.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1338,6 +1354,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0010.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1443,6 +1460,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-04-02-0011.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>

xml/page_catalog_choose_drink8.xml

@@ -51,8 +51,14 @@
     If NextPage = "-" Then
 
     Else
-        If Timeout > 30 Then
-            Open NextPage
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
         EndIf
     EndIf
 
@@ -289,6 +295,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-99-05-0001.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -394,6 +401,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-99-05-0002.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -499,6 +507,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-99-05-0003.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -604,6 +613,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-99-05-0004.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -709,6 +719,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-99-05-0005.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -814,6 +825,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-99-05-0006.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -919,6 +931,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-99-05-0007.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1024,6 +1037,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-99-05-0008.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1129,6 +1143,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-99-05-0009.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -1234,6 +1249,7 @@
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $11-99-05-0010.Button IsSmoRet
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>

xml/page_topping_select3.xml

@@ -49,8 +49,6 @@
 	Var ShotCoffeePremium = "Invisible"
 
 
-	Var StarwState = "Enable"
-
 	; On open
 	Var LidState = Lid1Status
 	
@@ -147,7 +145,9 @@
 		EndIf
 	EndIf
 
-	
+	Var LidDeactiveButton = "Invisible" 
+	Var StrawDeactiveButton = "Invisible" 
+
 	Machine DoorClose
 </EventOpen>
 <Timeout> 2000 </Timeout>
@@ -250,6 +250,8 @@
 </Button>
 
 <EventMachine>
+	DEBUGVAR MAT_ID_9701
+	DEBUGVAR MAT_ID_9601
 	
 
 	DEBUGVAR SubMenuProductCode1
@@ -322,7 +324,17 @@
 			Var blendedStateShow = "Enable"
 
 			Var PriceDiff = SubMenuPrice1 - PriceDrinkNoTop
- 
+ 			
+ 			DEBUGVAR IsSmoRet
+
+ 			If IsSmoRet = "true" Then
+ 				Var blendedState = "ForceSet"
+ 				Var blendedStateTxt = "Enable"
+ 				Function 1
+ 			Else
+ 				Var blendedStateTxt = "Invisible"
+ 			
+ 			EndIf
 
 		EndIf
 
@@ -330,25 +342,54 @@
 			Var IgnoreLidStraw = "false"
 			Var ShowLidStraw = "Invisible" 
 			Var ShowLidOnly = "Invisible" 
-			Var ShowStrawOnly = "Invisible" 
-		
+			Var ShowStrawOnly = "Invisible"
+			
+
 		Else
-			If LidState = "Enable" Then
-				Var ShowLidStraw = "Enable" 
-				Var ShowLidOnly = "Invisible" 
+			Var ShowLidStraw = "Enable" 
+
+			If MAT_ID_9701 = "Enable" Then
+				Var StrawState = MAT_ID_9701
 			Else
-				Var ShowLidStraw = "Invisible" 
-				Var ShowStrawOnly = "Enable" 
+				Var StrawState = MAT_ID_9701
 			EndIf
+		
+			If MAT_ID_9601 = "Enable" Then
+				Var LidState = MAT_ID_9601
+			Else
+				Var LidState = MAT_ID_9601
+			EndIf
+			
 		EndIf
 		
+		; Override all
 		If Service_LidStraw = "Disable" Then
-			Var ShowLidStraw = "Invisible" 
-			Var ShowLidOnly = "Invisible" 
-			Var ShowStawOnly = "Invisible" 
-		
+			Var ShowLidStraw = "Enable" 
+			;Var ShowLidOnly = "Invisible" 
+			;Var ShowStawOnly = "Invisible"
+
+			
+			Var StrawState = "Disable"
+			Var LidState = "Disable"
+
 		EndIf
 
+		If StrawState = "Enable" Then
+			Var StrawDeactiveButton = "Invisible" 
+		Else
+			Var StrawDeactiveButton = "Enable" 
+		EndIf
+		
+
+		If LidState = "Enable" Then
+			Var LidDeactiveButton = "Invisible" 
+		Else
+			Var LidDeactiveButton = "Enable" 
+		EndIf
+		
+			
+			
+
 		;PressForever
 		If TOPPING1 = "Sugar" Then
 			
@@ -564,6 +605,14 @@
 			DEBUGVAR TOPPING2
 			Refresh
 		EndIf
+		If TOPPING2 = "shot coffee 1008" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
 
 ;-END
 		If TOPPING3 = "Collagen" Then
@@ -702,6 +751,7 @@
 <Filename> Var( DirImage + "/bn_blended.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress>
 <FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable>
+<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -732,6 +782,7 @@
 <Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
 <FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -758,6 +809,13 @@
 <Filename>  Var( DirImage + "/text7.png" ) </Filename>
 </Image>
 
+<Image>
+<State> blendedStateTxt </Stage>
+<X> 602 </X>
+<Y> 64 </Y>
+<Filename>  Var( DirImage + "/text5.png" ) </Filename>
+</Image>
+
 </Block>
 
 ;- Begin topping1
@@ -1040,7 +1098,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	SAVELOG "premium shot press"
-ป	
+	
 	If showShotEnable = "Press" Then
 		Var showShotEnable = "Enable"
 		Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
@@ -1176,129 +1234,6 @@
 ;
 ;	
 ;-BEGIN Collagen
-
-;- END
-;
-;
-;
-;-BEGIN Lid only
-<Block>
-<Width> 987 </Width>
-<Height> 188 </Height>
-<MarginTop> 20 </MarginTop>
-<State> ShowLidOnly </State> 
-<Image>
-<State> "Enable" </State>
-<Filename> bg_lid_only </Filename>
-</Image>
-
-; lid left
-<Button>
-<X> 40 </X>
-<Y> 79 </Y>
-<State> LidState </State>
-<Mode> "No" </Mode>
-<Filename> "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
-<EventClick> 
-	SAVELOG "Click lid only cb"
-	If LidState = "Press" Then
-		Var LidState = "Enable"	
-	Else
-		Var LidState = "Press"
-	EndIf
-	Refresh
-</EventClick>
-</Button>
-
-<Button>
-<X> 896 </X>
-<Y> 79 </Y>
-<State> LidState </State>
-<Mode> "No" </Mode>
-<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
-<EventClick> 
-	SAVELOG "Click lid only cb"
-	If LidState = "Press" Then
-		Var LidState = "Enable"	
-	Else
-		Var LidState = "Press"
-	EndIf
-	Refresh
-</EventClick>
-</Button>
-
-</Block>
-;- END
-;
-;
-;
-;
-;
-;
-;
-;
-;
-;-BEGIN Straw only
-<Block>
-<Width> 987 </Width>
-<Height> 188 </Height>
-<MarginTop> 20 </MarginTop>
-<State> ShowStrawOnly </State> 
-<Image>
-<State> "Enable" </State>
-<Filename> bg_straw_only </Filename>
-</Image>
-
-
-; straw left
-<Button>
-<X> 40 </X>
-<Y> 72 </Y>
-<State> StarwState </State>
-<Mode> "No" </Mode>
-<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
-<EventClick> 
-	SAVELOG "Click straw cb"
-	If StarwState = "Press" Then
-		Var StarwState = "Enable"	
-	Else
-		Var StarwState = "Press"
-	EndIf
-	Refresh
-</EventClick>
-</Button>
-
-<Button>
-<X> 896 </X>
-<Y> 79 </Y>
-<State> StarwState </State>
-<Mode> "No" </Mode>
-<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
-<EventClick> 
-	SAVELOG "Click straw cb"
-	If StarwState = "Press" Then
-		Var StarwState = "Enable"	
-	Else
-		Var StarwState = "Press"
-	EndIf
-	Refresh
-</EventClick>
-</Button>
-
-</Block>
-;- END
-;
-;
-;
-;
-;
-;
-;
-;
 ;		
 ;-BEGIN Lid straw
 <Block>
@@ -1314,16 +1249,17 @@
 <Button>
 <X> 40 </X>
 <Y> 72 </Y>
-<State> StarwState </State>
+<State> StrawState </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
 <EventClick> 
 	SAVELOG "Click straw cb"
-	If StarwState = "Press" Then
-		Var StarwState = "Enable"	
+	If StrawState = "Press" Then
+		Var StrawState = "Enable"	
 	Else
-		Var StarwState = "Press"
+		Var StrawState = "Press"
 	EndIf
 	Refresh
 </EventClick>
@@ -1332,21 +1268,24 @@
 <Button>
 <X> 896 </X>
 <Y> 79 </Y>
-<State> StarwState </State>
+<State> StrawState </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
 <EventClick> 
 	SAVELOG "Click straw cb"
-	If StarwState = "Press" Then
-		Var StarwState = "Enable"	
+	If StrawState = "Press" Then
+		Var StrawState = "Enable"	
 	Else
-		Var StarwState = "Press"
+		Var StrawState = "Press"
 	EndIf
 	Refresh
 </EventClick>
 </Button>
 
+
+
 ; LID left
 <Button>
 <X> 40 </X>
@@ -1355,6 +1294,7 @@
 <Mode> "No" </Mode>
 <Filename>  "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
 <EventClick> 
 	SAVELOG "Click LID pic"
 	If LidState = "Press" Then
@@ -1373,6 +1313,7 @@
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
 <EventClick> 
 	SAVELOG "Click LID cb"
 	If LidState = "Press" Then
@@ -1383,7 +1324,25 @@
 	Refresh
 </EventClick>
 </Button>
+
+<Image>
+<State> StrawDeactiveButton </Stage>
+<X> 602 </X>
+<Y> 64 </Y>
+<Filename>  Var( DirImage + "/text20.png" ) </Filename>
+</Image>
+
+
+<Image>
+<State> LidDeactiveButton </Stage>
+<X> 602 </X>
+<Y> 150 </Y>
+<Filename>  Var( DirImage + "/text21.png" ) </Filename>
+</Image>
+
 </Block>
+
+
 ;
 ;
 ;
@@ -1435,13 +1394,13 @@
 	DEBUGVAR topping3
 
 	DEBUGVAR LidState
-	DEBUGVAR StarwState
+	DEBUGVAR StrawState
 	DEBUGVAR UserSelectProductCode
 	DEBUGVAR HAVE_UV_DOOR_LID
 
 	If HAVE_UV_DOOR_LID = "true" Then
 
-		If StarwState = "Press" Then
+		If StrawState = "Press" Then
 			Machine StrawOrder	
 			Var LedLidBlink = "true"
 		EndIf
@@ -1451,7 +1410,7 @@
 			Var LedLidBlink = "true"
 		EndIf
 
-		Var StarwState = "Enable"
+		Var StrawState = "Enable"
 		Var LidState = "Enable"
 		; 
 		
@@ -1501,13 +1460,13 @@
 	DEBUGVAR topping3
 
 	DEBUGVAR LidState
-	DEBUGVAR StarwState
+	DEBUGVAR StrawState
 	DEBUGVAR UserSelectProductCode
 	DEBUGVAR HAVE_UV_DOOR_LID
 
 	If HAVE_UV_DOOR_LID = "true" Then
 
-		If StarwState = "Press" Then
+		If StrawState = "Press" Then
 			Machine StrawOrder	
 			Var LedLidBlink = "true"
 		EndIf
@@ -1517,7 +1476,7 @@
 			Var LedLidBlink = "true"
 		EndIf
 
-		Var StarwState = "Enable"
+		Var StrawState = "Enable"
 		Var LidState = "Enable"
 		; 
 		
@@ -1550,21 +1509,29 @@
 	DEBUGVAR showShotEnable
 	DEBUGVAR blendedState
 
-
-	If blendedState = "Press" Then
+	If blendedState = "ForceSet" Then
 		Var TOPPING_PRICE = PriceDiff
 		Var UserSelectProductCode = SubMenuProductCode1
 
 		Var showShotEnable = "Disable"
 		Var showText4 = "Enable"
 	Else
-		
-		Var UserSelectProductCode = SaveProductCodeSelect
-		If showShotEnable = "Disable" Then
-			Var showShotEnable = "Enable"
+
+		If blendedState = "Press" Then
+			Var TOPPING_PRICE = PriceDiff
+			Var UserSelectProductCode = SubMenuProductCode1
+
+			Var showShotEnable = "Disable"
+			Var showText4 = "Enable"
+		Else
+			
+			Var UserSelectProductCode = SaveProductCodeSelect
+			If showShotEnable = "Disable" Then
+				Var showShotEnable = "Enable"
+			EndIf
+			
+			Var showText4 = "Invisible"
 		EndIf
-		
-		Var showText4 = "Invisible"
 	EndIf
 
 	DEBUGVAR UserSelectProductCode