Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

xml/event/script_common_for_open_promotion_xml.ev

@@ -56,15 +56,11 @@ Else
 
         If ProEnableCount > 1 Then
 
-            If FromBeforeGoToOreo = 1 Then
             If WeekdayDiscountProEventOn = 1 Then
                 Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml"
             Else
                 Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_oreo_discount_11.xml"
             EndIf
-            Else
-                Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/before_go_to_oreo_discount.xml"
-            EndIf
 
         Else
             If WeekdayDiscountProEventOn = 1 Then

xml/event/tricker.ev

@@ -138,7 +138,7 @@ Var JemilaRewardOutOfStock = 0
 Var HalloweenPro = 0
 Var FromHalloweenPro = 0
 
-; Weekday discount, 4 Nov - 31 Dec
+; Weekday discount, 4 Nov - 30 Nov
 Var WeekdayDiscountPro = 0
 Var WeekdayDiscountProEventOn = 0
 Var FromWeekdayDiscountProEventOn = 0
@@ -489,6 +489,11 @@ Var CurrentMainVideoTemp = 0
 READ_FILE "/mnt/sdcard/coffeevending/jemila_reward_out_of_stock" JemilaRewardOutOfStock
 DEBUGVAR JemilaRewardOutOfStock
 
+READ_FILE "/mnt/sdcard/coffeevending/pro_oreo_11_disable" Oreo11DisableFromFile
+DEBUGVAR Oreo11DisableFromFile
+If Oreo11DisableFromFile = 1 Then
+    Var OreoDiscount11Pro = 0
+EndIf
 
 ; Control collect promotion point behavior
 Var New_Payment = 0

xml/event/weekday_discount/before_go_to_oreo_discount.xml

@@ -7,8 +7,6 @@
     <EventOpen>
         Var Timeout = 0
 
-        Var FromBeforeGoToOreo = 1
-
         Var SELLONLINE = 0
     	If SELLSTATUS = "SELLONLINE" Then
     		Var SELLONLINE = 1
@@ -26,10 +24,10 @@
                 GETACCEXT AC 38
             EndIf
         Else
-            Var OreoDiscount11Pro = 0
+            Open "ROOT/taobin_project/xml/event/weekday_discount/oreo_discount_11_error.xml"
-            TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
         EndIf
 
+
     </EventOpen>
 
 
@@ -38,33 +36,41 @@
         Var Timeout = Timeout + 1
 
         If Timeout > 5 Then
-            Var OreoDiscount11Pro = 0
+            Open "ROOT/taobin_project/xml/event/weekday_discount/oreo_discount_11_error.xml"
-            TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
         EndIf
+
+        Refresh
+        TimerReset
     </EventTimeout>
 
     <EventActionOk>
         If GettingDiscountStatus = 1 Then
-
+            DEBUGVAR Ext1a
             If Ext1a = "ok" Then
                 Var cupCount = Ext1b
                 INT cupCount
 
                 DEBUGVAR cupCount
-			SAVELOG "Ext1a=ok get oreo qoutar"
+
+                Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_11_fixed.xml"
             Else
-			SAVELOG "Ext1a=error not oreo qoutar"
+                If Ext1a = "error" Then
+                    WRITE_FILE "/mnt/sdcard/coffeevending/pro_oreo_11_disable" "1"
+
+                    Open "ROOT/taobin_project/xml/event/weekday_discount/oreo_discount_11_error.xml"
+                EndIf
             EndIf
-            TRY "ROOT/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
         EndIf
     </EventActionOk>
 
+    ;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
     <GIF>
         <X> 493 </X>
         <Y> 968 </Y>
         <Width> 94 </Width>
         <Height> 94 </Height>
-        <State> LOADING_STATE </State>
+        <State> "Enable </State>
         <Filename> "ROOT/taobin_project/image/page_payment_en/page_payment/loading.gif" </Filename>
     </GIF>
 </Popup>

xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml

@@ -118,7 +118,7 @@
                 <FilenameDisable> "ROOT/taobin_project/image/event/oreo_11/oreo_11_th.png" </FilenameDisable>
             <EventOnClick>
 
-                    Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_11_fixed.xml"
+                    Open "ROOT/taobin_project/xml/event/weekday_discount/before_go_to_oreo_discount.xml"
 
             </EventOnClick>
 
@@ -3190,7 +3190,7 @@ SMOOTHIE" </Value>
 	<EventOnClick>
 		Var NameDrink = "ICED SUPER COCOA X3"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3"
-		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3272,7 +3272,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3441,7 +3441,7 @@ SMOOTHIE" </Value>
 	<EventOnClick>
 		Var NameDrink = "ICE SUPER COCOA X2"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2"
-		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3523,7 +3523,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/event/weekday_discount/oreo_discount_11_error.xml

@@ -0,0 +1,53 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    ;<Background> "0xeae6e1" </Background>
+    <Volume> SoundVolume </Volume>
+    <EventOpen>
+        Var Timeout = 0
+
+        If show_eng = "true" Then
+            Var ImageError = "ROOT/taobin_project/image/event/oreo_11/error_en.png"
+            Var ButtonImg = "ROOT/taobin_project/image/event/oreo_11/bn_close_en.png"
+            Var ButtonPressedImg = "ROOT/taobin_project/image/event/oreo_11/bp_close_en.png"
+        Else
+            Var ImageError = "ROOT/taobin_project/image/event/oreo_11/error_th.png"
+            Var ButtonImg = "ROOT/taobin_project/image/event/oreo_11/bn_close_th.png"
+            Var ButtonPressedImg = "ROOT/taobin_project/image/event/oreo_11/bp_close_th.png"
+        EndIf
+    </EventOpen>
+
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        Var Timeout = Timeout + 1
+
+        If Timeout > 5 Then
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
+
+        Refresh
+        TimerReset
+    </EventTimeout>
+
+
+
+    <Image>
+        <X> 0 </X>
+        <Y> 380 </Y>
+        <Filename> ImageError </Filename>
+    </Image>
+
+
+    <Button>
+        <X> 410 </X>
+        <Y> 1771 </Y>
+        <Filename> ButtonImg </Filename>
+        <FilenamePress> ButtonPressedImg </FilenamePress>
+        <EventOnClick>
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        </EventOnClick>
+    </Button>
+
+</Popup>

xml/event/weekday_discount/promotion_oreo_discount_11.xml

@@ -3876,7 +3876,7 @@ SMOOTHIE" </Value>
 	<EventOnClick>
 		Var NameDrink = "ICED SUPER COCOA X3"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3"
-		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3958,7 +3958,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4127,7 +4127,7 @@ SMOOTHIE" </Value>
 	<EventOnClick>
 		Var NameDrink = "ICE SUPER COCOA X2"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2"
-		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4209,7 +4209,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -5158,7 +5158,7 @@ SMOOTHIE" </Value>
      </FilenameDisable>
 <EventOnClick>
 
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_11_fixed.xml"
+    Open "ROOT/taobin_project/xml/event/weekday_discount/before_go_to_oreo_discount.xml"
 
 </EventOnClick>
 

xml/event/weekday_discount/promotion_weekday_discount.xml

@@ -2893,7 +2893,7 @@ SMOOTHIE" </Value>
 	<EventOnClick>
 		Var NameDrink = "ICED SUPER COCOA X3"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3"
-		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2975,7 +2975,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3144,7 +3144,7 @@ SMOOTHIE" </Value>
 	<EventOnClick>
 		Var NameDrink = "ICE SUPER COCOA X2"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2"
-		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3226,7 +3226,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/event/weekday_discount/promotion_weekday_discount_event_on.xml

@@ -3874,7 +3874,7 @@ SMOOTHIE" </Value>
 	<EventOnClick>
 		Var NameDrink = "ICED SUPER COCOA X3"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3"
-		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3956,7 +3956,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4125,7 +4125,7 @@ SMOOTHIE" </Value>
 	<EventOnClick>
 		Var NameDrink = "ICE SUPER COCOA X2"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2"
-		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4207,7 +4207,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/menutab/page_catalog_group_coffee.xml

@@ -157,6 +157,13 @@
 
     SetInstanceIgnoreTouch
 
+
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 2 Then
+		Var SlientRefreshIndex = 3
+
+	EndIf
 </EventOpen>
 
 
@@ -185,13 +192,13 @@
     EndIf
 
 
-    GetVisible inst_show
+     GetVisible inst_show2
-    ;DEBUGVAR inst_show
+    ;DEBUGVAR inst_show2
 
+
+    If inst_show2 = 1 Then
         InstanceGetString SaveStringInst
         ;DEBUGVAR SaveStringInst
-
-    If inst_show = 1 Then
         If SaveStringInst = "RefreshNow" Then
             GetXMLFileNameCurrentRunning CurrentOpenFile
             Open CurrentOpenFile
@@ -201,7 +208,6 @@
             Else
                 InstanceSetString "ShowThai"
             EndIf
-       
         EndIf
     EndIf
 
@@ -222,6 +228,16 @@
         EndIf
     EndIf
 
+	 If SlientRefreshIndex = 2 Then
+		If inst_show2 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile2
+			Open CurrentOpenFile2
+			
+		Else
+			Var SlientRefreshIndex = 3
+		EndIf
+    EndIf
+
 
     TimerReset
 </EventTimeout> 

xml/menutab/page_catalog_group_forkid.xml

@@ -165,6 +165,12 @@
 
     SetInstanceIgnoreTouch
 
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 5 Then
+		Var SlientRefreshIndex = 6
+	EndIf
+
 </EventOpen>
 
 
@@ -194,13 +200,13 @@
     EndIf
 
 
-    GetVisible inst_show
+    GetVisible inst_show5
-    ;DEBUGVAR inst_show
+    ;DEBUGVAR inst_show5
 
+
+    If inst_show5 = 1 Then
         InstanceGetString SaveStringInst
         ;DEBUGVAR SaveStringInst
-
-    If inst_show = 1 Then
         If SaveStringInst = "RefreshNow" Then
             GetXMLFileNameCurrentRunning CurrentOpenFile
             Open CurrentOpenFile
@@ -210,7 +216,6 @@
             Else
                 InstanceSetString "ShowThai"
             EndIf
-       
         EndIf
     EndIf
 
@@ -232,6 +237,16 @@
     EndIf
 
 
+	If SlientRefreshIndex = 5 Then
+		If inst_show5 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile5
+			Open CurrentOpenFile5
+		Else
+			Var SlientRefreshIndex = 6
+		EndIf
+    EndIf
+
+
     TimerReset
 </EventTimeout> 
 

xml/menutab/page_catalog_group_health.xml

@@ -156,6 +156,12 @@
 
     SetInstanceIgnoreTouch
 
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 6 Then
+		Var SlientRefreshIndex = 7
+	EndIf
+
 </EventOpen>
 
 
@@ -185,13 +191,14 @@
     EndIf
 
 
-    GetVisible inst_show
+    GetVisible inst_show6
-    ;DEBUGVAR inst_show
+    ;DEBUGVAR inst_show6
 
+    
+
+    If inst_show6 = 1 Then
         InstanceGetString SaveStringInst
         ;DEBUGVAR SaveStringInst
-
-    If inst_show = 1 Then
         If SaveStringInst = "RefreshNow" Then
             GetXMLFileNameCurrentRunning CurrentOpenFile
             Open CurrentOpenFile
@@ -222,6 +229,15 @@
         EndIf
     EndIf
 
+	If SlientRefreshIndex = 6 Then
+		If inst_show6 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile6
+			Open CurrentOpenFile6
+		Else
+			Var SlientRefreshIndex = 7
+		EndIf
+    EndIf
+
 
     TimerReset
 </EventTimeout> 

xml/menutab/page_catalog_group_milk.xml

@@ -155,6 +155,12 @@
 
     SetInstanceIgnoreTouch
 
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 4 Then
+		Var SlientRefreshIndex = 5
+	EndIf
+
 </EventOpen>
 
 
@@ -183,13 +189,14 @@
     EndIf
 
 
-    GetVisible inst_show
+    GetVisible inst_show4
-    ;DEBUGVAR inst_show
+    ;DEBUGVAR inst_show4
 
+    
+
+    If inst_show4 = 1 Then
         InstanceGetString SaveStringInst
         ;DEBUGVAR SaveStringInst
-
-    If inst_show = 1 Then
         If SaveStringInst = "RefreshNow" Then
             GetXMLFileNameCurrentRunning CurrentOpenFile
             Open CurrentOpenFile
@@ -220,6 +227,17 @@
         EndIf
     EndIf
 
+	If SlientRefreshIndex = 4 Then
+		If inst_show4 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile4
+			Open CurrentOpenFile4
+			
+		Else
+			Var SlientRefreshIndex = 5
+			
+		EndIf
+    EndIf
+
 
     TimerReset
 </EventTimeout> 

xml/menutab/page_catalog_group_other.xml

@@ -156,6 +156,14 @@
 
     SetInstanceIgnoreTouch
 
+
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 7 Then
+		Var SlientRefreshIndex = 8
+	EndIf
+
+
 </EventOpen>
 
 
@@ -184,13 +192,14 @@
     EndIf
 
 
-    GetVisible inst_show
+    GetVisible inst_show7
-    ;DEBUGVAR inst_show
+    ;DEBUGVAR inst_show7
 
+    
+
+    If inst_show7 = 1 Then
         InstanceGetString SaveStringInst
         ;DEBUGVAR SaveStringInst
-
-    If inst_show = 1 Then
         If SaveStringInst = "RefreshNow" Then
             GetXMLFileNameCurrentRunning CurrentOpenFile
             Open CurrentOpenFile
@@ -222,6 +231,16 @@
     EndIf
 
 
+	If SlientRefreshIndex = 7 Then
+		If inst_show7 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile7
+			Open CurrentOpenFile7
+		Else
+			Var SlientRefreshIndex = 8
+		EndIf
+    EndIf
+
+
     TimerReset
 </EventTimeout> 
 

xml/menutab/page_catalog_group_pepsi_7up.xml

@@ -156,6 +156,12 @@
 
     SetInstanceIgnoreTouch
 
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 9 Then
+		Var SlientRefreshIndex = 0
+	EndIf
+
 </EventOpen>
 
 
@@ -184,13 +190,14 @@
     EndIf
 
 
-    GetVisible inst_show
+    GetVisible inst_show9
-    ;DEBUGVAR inst_show
+    ;DEBUGVAR inst_show9
 
+    
+
+    If inst_show9 = 1 Then
         InstanceGetString SaveStringInst
         ;DEBUGVAR SaveStringInst
-
-    If inst_show = 1 Then
         If SaveStringInst = "RefreshNow" Then
             GetXMLFileNameCurrentRunning CurrentOpenFile
             Open CurrentOpenFile
@@ -222,6 +229,16 @@
     EndIf
 
 
+	If SlientRefreshIndex = 9 Then
+		If inst_show9 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile5
+			Open CurrentOpenFile5
+		Else
+			Var SlientRefreshIndex = 0
+		EndIf
+    EndIf
+
+
     TimerReset
 </EventTimeout> 
 

xml/menutab/page_catalog_group_tea.xml

@@ -156,6 +156,13 @@
 
     SetInstanceIgnoreTouch
 
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 3 Then
+		Var SlientRefreshIndex = 4
+
+	EndIf
+
 </EventOpen>
 
 
@@ -185,13 +192,14 @@
     EndIf
 
 
-    GetVisible inst_show
+    GetVisible inst_show3
-    ;DEBUGVAR inst_show
+    ;DEBUGVAR inst_show3
 
+    
+
+    If inst_show3 = 1 Then
         InstanceGetString SaveStringInst
         ;DEBUGVAR SaveStringInst
-
-    If inst_show = 1 Then
         If SaveStringInst = "RefreshNow" Then
             GetXMLFileNameCurrentRunning CurrentOpenFile
             Open CurrentOpenFile
@@ -203,21 +211,18 @@
             EndIf
        
         EndIf
+		
     EndIf
 
     ; setvarint SlientRefreshEnable 1
     ;DEBUGVAR SlientRefreshEnable
 
-    If SlientRefreshEnable = 1 Then
+    If SlientRefreshIndex = 3 Then
-        If SaveStringInst = "RefreshNow" Then
+		If inst_show3 = 0 Then
-            GetXMLFileNameCurrentRunning CurrentOpenFile
+			GetXMLFileNameCurrentRunning CurrentOpenFile3
-            Open CurrentOpenFile
+			Open CurrentOpenFile3	
-
-            If show_eng = "true" Then 
-                InstanceSetString "ShowEng"
 		Else
-                InstanceSetString "ShowThai"
+			Var SlientRefreshIndex = 4
-            EndIf
 			
 		EndIf
     EndIf

xml/menutab/page_catalog_group_whey.xml

@@ -161,6 +161,13 @@
 
     SetInstanceIgnoreTouch
 
+
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 8 Then
+		Var SlientRefreshIndex = 9
+	EndIf
+
 </EventOpen>
 
 
@@ -190,13 +197,15 @@
     EndIf
 
 
-    GetVisible inst_show
+    GetVisible inst_show8
-    ;DEBUGVAR inst_show
+    ;DEBUGVAR inst_show8
 
     InstanceGetString SaveStringInst
     ;DEBUGVAR SaveStringInst
 
-    If inst_show = 1 Then
+    If inst_show8 = 1 Then
+        InstanceGetString SaveStringInst
+        ;DEBUGVAR SaveStringInst
         If SaveStringInst = "RefreshNow" Then
             GetXMLFileNameCurrentRunning CurrentOpenFile
             Open CurrentOpenFile
@@ -228,6 +237,16 @@
     EndIf
 
 
+	If SlientRefreshIndex = 8 Then
+		If inst_show8 = 0 Then
+			GetXMLFileNameCurrentRunning CurrentOpenFile8
+			Open CurrentOpenFile8
+		Else
+			Var SlientRefreshIndex = 9
+		EndIf
+    EndIf
+
+
     TimerReset
 </EventTimeout> 
 

xml/page_catalog_group_recommend.xml

@@ -41,7 +41,426 @@
 </EventOpen>
 
 
-;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+; notice enable heathy menu
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080 </Width>
+<Height> 1540 </Height>
+<Color> "0xeae6e1" </Color>
+</Image>
+
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+    ;DEBUGVAR ICE_PROCESS_STATUS
+    
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+
+
+    If NextPage = "-" Then
+
+    Else
+            If CupOnArm = "true" Then
+                If Timeout > 9 Then
+                    SAVELOG "COA9"
+                    Open NextPage
+                EndIf
+            Else
+                If Timeout > 30 Then
+                    SAVELOG "COA30"
+                    Open NextPage
+                EndIf
+            EndIf
+    EndIf
+
+    If Timeout > 60 Then
+        SAVELOG "Timeout"
+        If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            SAVELOG "Back"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
+    EndIf
+
+    If BrewCommand = "RefreshAll" Then
+        ;Var BrewCommand = "-"
+        Open CurrentXMLFileName2
+    EndIf
+
+    If Seeker = "curr" Then
+        If DoorCupPosition = "bottom" Then
+            ; It normal 
+            Var EmergencyStop = "false"
+        Else
+            Var EmergencyStop = "true"
+            
+            ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" 
+
+        EndIf
+    EndIf
+
+    If IgnoreNetCore = "true" Then
+
+    Else
+        ;stop_now
+        
+    EndIf
+
+
+    ; zone cup on arm
+        ; zone cup on arm
+	If Seeker = "curr" Then
+		If CupOnArm = "true" Then
+
+			If CheckCupStateDoorCupClose = "" Then
+				If buttonRemoveCup =  "Enable" Then
+
+				Else
+					Refresh
+				EndIf
+
+				Var buttonRemoveCup = "Enable"
+
+			EndIf
+
+			If CheckCupStateDoorCupClose = "done" Then
+				If buttonRemoveCup =  "Enable" Then
+
+				Else
+					Refresh
+				EndIf
+				
+				Var buttonRemoveCup = "Enable"
+		
+			EndIf
+		Else
+			If buttonRemoveCup = "Enable" Then
+				Var buttonRemoveCup = "Invisible"
+				Refresh
+			EndIf
+		EndIf
+	Else
+		Var buttonRemoveCup = "Invisible"
+	EndIf
+
+    Var Timeout = Timeout + 1
+    TimerReset
+</EventTimeout> 
+
+
+; under line
+<Image>
+<X> 0 </X>
+<Y> 494 </Y>
+<Filename> "ROOT/taobin_project/image/page3/tab_line_bottom.png" </Filename>
+</Image>
+
+
+; under line
+<Image>
+<X> 0 </X>
+<Y> 358 </Y>
+<Filename> "ROOT/taobin_project/image/page3/bg1.png" </Filename>
+</Image>
+
+
+; back
+<Button>
+<X> 19 </X>
+<Y> 381 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    If SpiralOnline = "true" Then
+        If Seeker =  "curr" Then
+            Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+        Else
+            Open "ROOT/taobin_project/xml/page_catalog.xml" 
+        EndIf 
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 1000 </X>
+<Y> 381 </Y>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    ; eng
+    If show_eng = "true" Then 
+        Var show_eng = "false"
+        Var text_unavailable = "หมด###size=32"
+    Else
+        Var show_eng = "true"
+        Var text_unavailable = "UNAVAILABLE###size=16"
+    EndIf
+
+
+    Open CurrentXMLFileName2
+</EventClick>
+</Button>
+
+;
+<ListView1>
+    <Width> 1080 </Width>
+    <Height> "auto" </Height>   
+    <X> 0 </X>
+    <Y> 395 </Y>
+    <Row2>
+    <State>"Enable"</State>
+    <Width> 896 </Width>
+    <Height> 102 </Height> 
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu1Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            SAVELOG "Click rec"
+            Var NextPage = "-"
+       
+
+                TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+        </EventClick>
+        </Button>
+
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu2Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_coffee2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
+            
+        </EventClick>
+        </Button>
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu3Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            If new_layout = "true" Then
+                Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+            EndIf
+        </EventClick>
+        </Button>
+
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu4Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            If new_layout = "true" Then
+                Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+
+            EndIf
+        </EventClick>
+        </Button>
+
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu7Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            If new_layout = "true" Then
+                Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+            EndIf
+        </EventClick>
+        </Button>
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu11Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_appfast2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            If new_layout = "true" Then
+                Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+            EndIf
+        </EventClick>
+        </Button>
+
+
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu21Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+        </EventClick>
+        </Button>
+
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu22Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" 
+        </EventClick>
+        </Button>
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu8Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.xml" 
+        </EventClick>
+        </Button>
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu6Selected </State>
+        <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            If new_layout = "true" Then
+                Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+            EndIf
+        </EventClick>
+        </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu61Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_7up.xml" 
+                </EventClick>
+                </Button>
+
+        <Button>
+                <Layout> "linear" </Layout>
+                <State> Menu62Selected </State>
+                <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
+                <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
+                <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+                <Volume> SoundVolume </Volume>
+                <EventClick> 
+                    Var NextPage = "-"
+                    Open "ROOT/taobin_project/xml/page_catalog_group_other_other.xml" 
+             
+                </EventClick>
+                </Button>
+
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> MenuVSelected2 </State>
+        <Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick> 
+            Var NextPage = "-"
+            Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
+        </EventClick>
+        </Button>
+</Row2>
+</ListView1>
+
+<EventWebApp>
+
+    DEBUGVAR web_ready
+    If web_ready = "true" Then
+        If web_ref = QRCODE99x Then
+
+            Var web_readyOK = web_ready
+            Var web_telnumOK = web_telnum
+            
+            Var web_app_prepar = "true"
+            
+			; Handle penetrator
+
+			If Only18 = "true" Then
+				
+                Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+			Else
+				
+                Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+			EndIf
+
+            ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+        EndIf
+    Else
+    EndIf
+ 
+</EventWebApp>
+
+
 
 
 

xml/topview2.xml

@@ -191,6 +191,8 @@
     		InstanceOverSetString "RefreshNow" 11
     		; TODO
 
+			; Trick Refresh First
+			Var SlientRefreshIndex = 2
 
     	EndIf
     	If Not#CountDownForMulti = 99 Then