DO 5.87

adv/sync_0.file

@@ -1,24 +1,35 @@
-.:
+total 164976
-total 63912
+-rw-r--r--  1 wanloprungsiyangkul  staff        0 Dec 22 23:42 sync_0.file
--rw-rw---- 1 root sdcard_rw       0 2021-11-25 18:35 sync_0.file
+-rwxr--r--  1 wanloprungsiyangkul  staff  3772465 Jul  7 16:02 taobin_adv_00.mp4
--rw-rw---- 1 root sdcard_rw 3772465 2021-11-01 19:29 taobin_adv_00.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  3647528 Jul  6 15:30 taobin_adv_01.mp4
--rw-rw---- 1 root sdcard_rw 3647528 2021-11-01 19:29 taobin_adv_01.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  3184464 Jun 22  2021 taobin_adv_02.mp4
--rw-rw---- 1 root sdcard_rw 3184464 2021-11-01 19:29 taobin_adv_02.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  4349971 Apr 21  2021 taobin_adv_03.mp4
--rw-rw---- 1 root sdcard_rw 4349971 2021-11-01 19:29 taobin_adv_03.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  3064661 Sep 27 13:44 taobin_adv_04.mp4
--rw-rw---- 1 root sdcard_rw 5099473 2021-11-01 19:29 taobin_adv_04.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2211917 Sep 23 10:57 taobin_adv_05.mp4
--rw-rw---- 1 root sdcard_rw 3004470 2021-11-01 19:29 taobin_adv_05.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  3772465 Jul  7 16:02 taobin_adv_06.mp4
--rw-rw---- 1 root sdcard_rw 3772465 2021-11-01 19:29 taobin_adv_06.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  1637056 Sep 21 09:57 taobin_adv_07.mp4
--rw-rw---- 1 root sdcard_rw 2622440 2021-11-01 19:29 taobin_adv_menu2_00.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  1962660 Sep 17 16:42 taobin_adv_08.mp4
--rw-rw---- 1 root sdcard_rw 2755962 2021-11-01 19:29 taobin_adv_menu2_01.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  1598810 Sep 23 11:27 taobin_adv_09.mp4
--rw-rw---- 1 root sdcard_rw 2814749 2021-11-01 19:29 taobin_adv_menu2_02.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2573704 Dec 22 11:09 taobin_adv_10.mp4
--rw-rw---- 1 root sdcard_rw 3111677 2021-11-01 19:29 taobin_adv_menu2_03.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2622440 Jul  7 16:55 taobin_adv_menu2_00.mp4
--rw-rw---- 1 root sdcard_rw 3497485 2021-11-01 19:29 taobin_adv_menu2_04.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2755962 Jul  7 15:35 taobin_adv_menu2_01.mp4
--rw-rw---- 1 root sdcard_rw 1971554 2021-11-01 19:29 taobin_adv_menu2_05.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2814749 Jul  7 14:44 taobin_adv_menu2_02.mp4
--rw-rw---- 1 root sdcard_rw 2622440 2021-11-01 19:29 taobin_adv_menu2_06.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  3111677 Apr 21  2021 taobin_adv_menu2_03.mp4
--rw-rw---- 1 root sdcard_rw 2625751 2021-11-01 19:29 taobin_adv_menu_00.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2809964 Sep 27 13:43 taobin_adv_menu2_04.mp4
--rw-rw---- 1 root sdcard_rw 2587515 2021-11-01 19:29 taobin_adv_menu_01.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  1809071 Sep 23 10:57 taobin_adv_menu2_05.mp4
--rw-rw---- 1 root sdcard_rw 2645861 2021-11-01 19:29 taobin_adv_menu_02.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2622440 Jul  7 16:55 taobin_adv_menu2_06.mp4
--rw-rw---- 1 root sdcard_rw 3117015 2021-11-01 19:29 taobin_adv_menu_03.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  1653061 Sep 21 10:00 taobin_adv_menu2_07.mp4
--rw-rw---- 1 root sdcard_rw 3646218 2021-11-01 19:29 taobin_adv_menu_04.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2098002 Sep 17 16:42 taobin_adv_menu2_08.mp4
--rw-rw---- 1 root sdcard_rw 1834168 2021-11-01 19:29 taobin_adv_menu_05.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  1970490 Sep 23 11:27 taobin_adv_menu2_09.mp4
--rw-rw---- 1 root sdcard_rw 2625751 2021-11-01 19:29 taobin_adv_menu_06.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2128630 Dec 22 11:11 taobin_adv_menu2_10.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2625751 Jul  7 16:01 taobin_adv_menu_00.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2587515 Jul  7 15:35 taobin_adv_menu_01.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2645861 Jul  7 14:44 taobin_adv_menu_02.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  3117015 Apr 21  2021 taobin_adv_menu_03.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2929148 Sep 27 13:44 taobin_adv_menu_04.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  1885128 Sep 23 10:57 taobin_adv_menu_05.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2625751 Jul  7 16:01 taobin_adv_menu_06.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  1805549 Sep 21 10:00 taobin_adv_menu_07.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  1873183 Sep 17 16:42 taobin_adv_menu_08.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  1967036 Sep 23 11:27 taobin_adv_menu_09.mp4
+-rwxr--r--  1 wanloprungsiyangkul  staff  2148052 Dec 22 11:11 taobin_adv_menu_10.mp4

xml/menu_catalog.xml

@@ -16,7 +16,11 @@
     EndIf
 
     If Timeout > 60 Then
-        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
     EndIf
 
     If BrewCommand = "RefreshAll" Then

xml/menu_gen.py

@@ -42,7 +42,7 @@
       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\tOpen "ROOT/taobin_project/xml/page_topping_select.xml"\r\n')
 
 
       out_xml( '\t</EventOnClick>\r\n')

xml/page_board.xml

@@ -358,6 +358,16 @@
 		Var WebAppShow = "Invisible"
 	EndIf
 
+	Var can_select_menu = ""
+	READ_FILE "/mnt/sdcard/can_select_menu" can_select_menu
+
+	DEBUGVAR can_select_menu
+	If can_select_menu = "1" Then
+		Var EnableSelectMenuBetweenBrew = "Enable"
+	Else
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+	EndIf
+
 	
 	Machine CancelWepApp
 

xml/page_brewing3.xml

@@ -989,9 +989,12 @@
 <Button>
 <X> 10 </X>
 <Y> 424 </Y>
+<State>EnableSelectMenuBetweenBrew</State>
 <Filename> next_pic_bg </Filename>
 <EventClick> 
 	
+	SAVELOG "User click next button"
+
 	Var Seeker = "next"
 	Var MultiPayEnable = "false"
 	CoinPause

xml/page_brewing3Conti.xml

@@ -145,6 +145,7 @@
 	EndIf
 
 	If waitAckPay = 1 Then	
+		SAVELOG "waitAckPay = 1"
 		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
 		
 	EndIf
@@ -261,6 +262,8 @@
 	If  waitAckPay = 1 Then  
 		If Timeout > 60 Then
 			Var VendingTSIDTmp1 = ""
+			SAVELOG "waitAckPay = 1 tineout > 60"
+		
 			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
 
 		EndIf
@@ -551,6 +554,9 @@
 
 		Var ServiceSuccess = "yes"
 		If  waitAckPay = 0 Then
+
+			SAVELOG "waitAckPay = 0 Timeout"
+		
 			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
 		EndIf
 
@@ -734,6 +740,7 @@
 
 	If IgnoreNetCore = "true" Then 
 		If CountDownBrewing = 0 Then
+			SAVELOG "CountDownBrewing = 0"
 			Open "ROOT/taobin_project/xml/page_drinkok.xml"
 		EndIf
 	EndIf

xml/page_catalog.xml

@@ -191,8 +191,11 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	If  Seeker = "next" Then 
-	
+        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+    Else
+        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+    EndIf
 </EventClick>
 </Button>
 

xml/page_catalog_choose_drink.xml

@@ -88,7 +88,11 @@
     EndIf
 
     If Timeout > 60 Then
-        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
     EndIf
 
     If BrewCommand = "RefreshAll" Then
@@ -336,7 +340,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_1.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -442,7 +446,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -548,7 +552,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -654,7 +658,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -760,7 +764,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-02-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -866,7 +870,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-02-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -972,7 +976,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1078,7 +1082,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1184,7 +1188,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1290,7 +1294,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0007.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1396,7 +1400,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0008.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1502,7 +1506,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0007.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1608,7 +1612,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0021.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1714,7 +1718,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0013.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1820,7 +1824,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0012.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1926,7 +1930,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0009.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>

xml/page_catalog_choose_drink1.xml

@@ -89,12 +89,11 @@
     EndIf
 
     If Timeout > 60 Then
-		If  Seeker = "next" Then 
+        If  Seeker = "next" Then 
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-		Else
+        Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf
+        EndIf
-        
     EndIf
 
     If BrewCommand = "RefreshAll" Then
@@ -147,11 +146,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	If  Seeker = "next" Then 
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
 	
 </EventClick>
 </Button>
@@ -346,7 +341,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_1.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -452,7 +447,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_2.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -558,7 +553,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_3.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -664,7 +659,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_4.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -770,7 +765,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_5.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -876,7 +871,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_6.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -982,7 +977,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_7.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1088,7 +1083,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_8.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1194,7 +1189,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_9.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1300,7 +1295,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_10.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1406,7 +1401,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_11.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1512,7 +1507,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_12.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1618,7 +1613,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_13.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1724,7 +1719,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_14.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1830,7 +1825,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_15.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1936,7 +1931,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $best_seller_16.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>

xml/page_catalog_choose_drink2.xml

@@ -68,11 +68,11 @@
     EndIf
 
     If Timeout > 60 Then
-       If  Seeker = "next" Then 
+        If  Seeker = "next" Then 
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-		Else
+        Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf
+        EndIf
     EndIf
 
     If BrewCommand = "RefreshAll" Then
@@ -125,11 +125,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	If  Seeker = "next" Then 
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
 	
 </EventClick>
 </Button>
@@ -325,7 +321,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -431,7 +427,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0013.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -537,7 +533,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0020.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -643,7 +639,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0022.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -749,7 +745,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-11-01-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -855,7 +851,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -961,7 +957,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0014.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1067,7 +1063,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0019.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1173,7 +1169,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0021.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1279,7 +1275,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1385,7 +1381,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0005.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1491,7 +1487,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0006.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1597,7 +1593,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0007.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1703,7 +1699,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0009.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1809,7 +1805,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0010.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1915,7 +1911,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0011.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2021,7 +2017,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0012.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2127,7 +2123,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-01-0017.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2233,7 +2229,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0018.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2339,7 +2335,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0020.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2445,7 +2441,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0022.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2551,7 +2547,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-11-02-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2657,7 +2653,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2763,7 +2759,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0011.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2869,7 +2865,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0019.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2975,7 +2971,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0021.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3081,7 +3077,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3187,7 +3183,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-11-02-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3293,7 +3289,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3399,7 +3395,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3505,7 +3501,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0005.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3611,7 +3607,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0007.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3717,7 +3713,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0008.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3823,7 +3819,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0009.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3929,7 +3925,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0017.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -4035,7 +4031,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-01-02-0006.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>

xml/page_catalog_choose_drink3.xml

@@ -65,10 +65,10 @@
 
     If Timeout > 60 Then
         If  Seeker = "next" Then 
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-		Else
+        Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf
+        EndIf
     EndIf
 
     If BrewCommand = "RefreshAll" Then
@@ -121,11 +121,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	If  Seeker = "next" Then 
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
 	
 </EventClick>
 </Button>
@@ -321,7 +317,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -427,7 +423,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -533,7 +529,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0020.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -639,7 +635,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -745,7 +741,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -851,7 +847,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0006.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -957,7 +953,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0021.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1063,7 +1059,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0007.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1169,7 +1165,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0008.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1275,7 +1271,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0019.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1381,7 +1377,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0009.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1487,7 +1483,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0022.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1593,7 +1589,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0010.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1699,7 +1695,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0011.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1805,7 +1801,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0012.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1911,7 +1907,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-01-0017.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2017,7 +2013,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0020.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2123,7 +2119,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2229,7 +2225,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2335,7 +2331,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2441,7 +2437,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2547,7 +2543,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0005.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2653,7 +2649,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0006.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2759,7 +2755,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0007.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2865,7 +2861,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0008.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2971,7 +2967,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0019.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3077,7 +3073,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0009.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3183,7 +3179,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0022.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3289,7 +3285,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0010.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3395,7 +3391,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0011.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3501,7 +3497,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-02-02-0012.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3607,7 +3603,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0027.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>

xml/page_catalog_choose_drink4.xml

@@ -65,10 +65,10 @@
 
     If Timeout > 60 Then
         If  Seeker = "next" Then 
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-		Else
+        Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf
+        EndIf
     EndIf
 
     If BrewCommand = "RefreshAll" Then
@@ -121,11 +121,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	If  Seeker = "next" Then 
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
 	
 </EventClick>
 </Button>
@@ -322,7 +318,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-01-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -428,7 +424,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-01-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -534,7 +530,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-01-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -640,7 +636,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-01-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -746,7 +742,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-01-0005.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -852,7 +848,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-02-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -958,7 +954,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-02-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1064,7 +1060,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-02-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1170,7 +1166,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-02-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1276,7 +1272,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-02-0006.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1382,7 +1378,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-03-0011.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1488,7 +1484,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-03-0010.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1594,7 +1590,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-02-0005.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1700,7 +1696,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-02-0007.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1806,7 +1802,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-03-03-0009.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>

xml/page_catalog_choose_drink5.xml

@@ -65,10 +65,10 @@
 
     If Timeout > 60 Then
         If  Seeker = "next" Then 
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-		Else
+        Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf
+        EndIf
     EndIf
 
     If BrewCommand = "RefreshAll" Then
@@ -121,11 +121,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	If  Seeker = "next" Then 
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
 	
 </EventClick>
 </Button>
@@ -322,7 +318,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-01-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -428,7 +424,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -534,7 +530,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -640,7 +636,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -746,7 +742,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -852,7 +848,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0005.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -958,7 +954,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0040.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1064,7 +1060,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0006.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>

xml/page_catalog_choose_drink6.xml

@@ -63,11 +63,11 @@
     EndIf
 
     If Timeout > 60 Then
-       If  Seeker = "next" Then 
+        If  Seeker = "next" Then 
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-		Else
+        Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf
+        EndIf
     EndIf
 
     If BrewCommand = "RefreshAll" Then
@@ -120,11 +120,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	If  Seeker = "next" Then 
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
 	
 </EventClick>
 </Button>
@@ -323,7 +319,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0007.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -429,7 +425,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0019.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -535,7 +531,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0020.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -641,7 +637,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0021.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -747,7 +743,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0035.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -853,7 +849,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0010.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -959,7 +955,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0011.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1065,7 +1061,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0033.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1171,7 +1167,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0028.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1277,7 +1273,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0012.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1383,7 +1379,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0041.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1489,7 +1485,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0013.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1595,7 +1591,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0031.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1701,7 +1697,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0008.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1807,7 +1803,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0009.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1913,7 +1909,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0024.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2019,7 +2015,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0038.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2125,7 +2121,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0029.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2231,7 +2227,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0025.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2337,7 +2333,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0039.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2443,7 +2439,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0014.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2549,7 +2545,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0015.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2655,7 +2651,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-01-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2761,7 +2757,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2867,7 +2863,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0034.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -2973,7 +2969,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3079,7 +3075,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0032.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3185,7 +3181,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0005.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3291,7 +3287,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0040.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3397,7 +3393,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0006.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3503,7 +3499,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0026.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3609,7 +3605,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0030.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3715,7 +3711,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3821,7 +3817,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -3927,7 +3923,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0016.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -4033,7 +4029,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0017.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -4139,7 +4135,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-02-0018.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -4245,7 +4241,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-05-01-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>

xml/page_catalog_choose_drink7.xml

@@ -63,10 +63,10 @@
 
     If Timeout > 60 Then
         If  Seeker = "next" Then 
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-		Else
+        Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf
+        EndIf
     EndIf
 
     If BrewCommand = "RefreshAll" Then
@@ -119,11 +119,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	If  Seeker = "next" Then 
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
 	
 </EventClick>
 </Button>
@@ -322,7 +318,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -428,7 +424,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -534,7 +530,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -640,7 +636,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0013.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -746,7 +742,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -852,7 +848,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0005.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -958,7 +954,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0006.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1064,7 +1060,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0007.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1170,7 +1166,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0008.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1276,7 +1272,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0009.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1382,7 +1378,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0010.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1488,7 +1484,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0011.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1594,7 +1590,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $12-04-02-0014.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>

xml/page_catalog_choose_drink8.xml

@@ -63,11 +63,11 @@
     EndIf
 
     If Timeout > 60 Then
-       If  Seeker = "next" Then 
+        If  Seeker = "next" Then 
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-		Else
+        Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf
+        EndIf
     EndIf
 
     If BrewCommand = "RefreshAll" Then
@@ -120,11 +120,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	If  Seeker = "next" Then 
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
 	
 </EventClick>
 </Button>
@@ -323,7 +319,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0001.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -429,7 +425,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0002.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -535,7 +531,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0003.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -641,7 +637,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0004.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -747,7 +743,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0005.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -853,7 +849,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0006.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -959,7 +955,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0007.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1065,7 +1061,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0008.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1171,7 +1167,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0009.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1277,7 +1273,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0010.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1383,7 +1379,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0012.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
@@ -1489,7 +1485,7 @@
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Var OpenFromXML = CurrentXMLFileName2
 		STRCONTAIN "Smoothie" $11-99-05-0013.Button IsSmoRet
-		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
 	</EventOnClick>
 	</Button>
 	<Text>

xml/page_payment_cash.xml

@@ -115,6 +115,7 @@
 			Var PayState4 = "Enable"
 			Var PayState5 = "Enable"
 		Else 
+			SAVELOG "Cash only IntVendingCampaign"
 			Var PayState2 = "Disable"
 			Var PayState4 = "Disable"
 			Var PayState5 = "Disable"
@@ -122,8 +123,9 @@
 		Var PayState3 = "Enable"
 		
 		
-
+		DEBUGVAR CoinAmount
 		If CoinAmount > 0 Then
+			SAVELOG "Cash only CoinAmount"
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"
 			Var PayState4 = "Disable"
@@ -132,6 +134,7 @@
 		EndIf
 
 		If Seeker.IntVendingCredit > 0 Then
+			SAVELOG "Cash only IntVendingCredit"
 			Var PayState2 = "Disable"
 			Var PayState4 = "Disable"
 			Var PayState5 = "Disable"
@@ -237,6 +240,7 @@
 	
 
 	If NetworkStatus = "DOWN" Then
+			SAVELOG "Cash only NetworkStatus down"
 			
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"

xml/page_thankyou.xml

@@ -28,11 +28,15 @@
 	Var ChangeAmountSum = 0
 	
 	Var Tel_Confirm_Flag = 0
-	If Seeker = "curr"
+
+	DEBUGVAR Seeker
+
+	If Seeker = "curr" Then
 		Var LastMakeDrinkResult = "-"
 	EndIf
 	
 		
+
 	If show_eng = "true" Then 
 		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" 
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"

xml/page_thankyouConti.xml

@@ -60,6 +60,19 @@
 
 
     If Seeker = "curr" Then
+    	SAVELOG "Call from thankyou Conti"
+    	
+
+    	If Seeker.get_a_straw  = "Press" Then
+			Machine StrawOrder	
+			Var LedLidBlink = "true"
+		EndIf
+
+		If Seeker.get_a_lid = "Press" Then
+			Machine LidOrder	
+			Var LedLidBlink = "true"
+		EndIf
+
 		Topping "Select" Seeker.selected_a_drink
 
 		; Set option toppinng and pack 
@@ -70,10 +83,12 @@
 		; Pack
 		Topping "Pack" ExtendData
 
+
 	EndIf
 
 
 	
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -83,8 +98,19 @@
 	Var Timeout = Timeout + 1 
 	If Timeout = 3 Then
 	
+
+		Var VideoPlayFile = VideoPath
+		Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+		Var VideoPlayFile = VideoPlayFile + "1"
+		Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+		Var PictureFile = PicturePath
+		Var PictureFile = PictureFile + PictureBegin
+		Var PictureFile = PictureFile + "1"
+		Var PictureFile = PictureFile + PictureEnd
+
 		If 	CART_INDEX = 0  Then   
-            MakeDrinkV1  SelectDrink SelectSugarID
+            MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
 		Else
 			;Cart "MakeID" CART_INDEX
 		EndIf

xml/page_topping_select.xml

@@ -10,13 +10,15 @@
 	WEB "DISABLE"
 
 	
-	Open "ROOT/taobin_project/xml/page_topping_select3.xml"
 	
 	If JXMLVersionInt >= 369 Then
-
+		If EnableSelectMenuBetweenBrew = "Enable" Then
-		Open "ROOT/taobin_project/xml/page_topping_select4.xml"
+			Open "ROOT/taobin_project/xml/page_topping_select4.xml"
+		EndIf
 	EndIf
 
+	Open "ROOT/taobin_project/xml/page_topping_select3.xml"
+	
 		
 	DEBUGVAR BrewVersionInt
 	If BrewVersionInt >= 419 Then

xml/page_topping_select4.xml

@@ -7,6 +7,8 @@
 <EventOpen>
 	Var y_topping_bg = 912
 	
+	DEBUGVAR Seeker
+
 	DEBUGVAR video_menu_0
 
 	DEBUGVAR SelectDrink
@@ -1528,6 +1530,7 @@
 
 	;Var Seeker = "curr"
 
+
 	Var Seeker.PriceDrink = PriceDrinkTmp
 	SAVELOG "USER press next ( topping ) - new"
 
@@ -1585,7 +1588,8 @@
 
 		; Pack
 		Topping "Pack" ExtendData
-
+	Else
+		Topping "SetNextOrder" UserSelectProductCode
 	EndIf
 
 	Var Seeker.PictureDrink = PictureDrink

xml/video_loop2.xml

@@ -8,7 +8,7 @@
 <Filename>	HeadVideoFilename </Filename>
 </Video>
 <EventOpen>
-	DEBUGVAR HeadVideoFilename
+	;DEBUGVAR HeadVideoFilename
 	Var ClickCountMainTe = 0
 </EventOpen>