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,14 +56,10 @@ Else
 
         If ProEnableCount > 1 Then
 
-            If FromBeforeGoToOreo = 1 Then
+            If WeekdayDiscountProEventOn = 1 Then
-                If WeekdayDiscountProEventOn = 1 Then
+                Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml"
-                    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"
+                Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/weekday_discount/promotion_oreo_discount_11.xml"
             EndIf
 
         Else

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
@@ -475,7 +475,7 @@ EndIf
 
 
 If OreoEnable = "true" Then
-	
+
 Else
     Var OreoDiscount11Pro = 0
 EndIf
@@ -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
@@ -19,16 +17,16 @@
 
         Var GettingDiscountStatus = 0
 
-    	If SELLONLINE = 1 Then
+        If SELLONLINE = 1 Then
- 			If GettingDiscountStatus = 0 Then
+            If GettingDiscountStatus = 0 Then
-				Var GettingDiscountStatus = 1
+                Var GettingDiscountStatus = 1
-				Var AC = "2/0899999999"
+                Var AC = "2/0899999999"
-				GETACCEXT AC 38
+                GETACCEXT AC 38
- 			EndIf
+            EndIf
-    	Else
+        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
-    	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
+                Var cupCount = Ext1b
-			INT cupCount
+                INT cupCount
 
-			DEBUGVAR cupCount
+                DEBUGVAR cupCount
-			SAVELOG "Ext1a=ok get oreo qoutar"
+
-		Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_11_fixed.xml"
-			SAVELOG "Ext1a=error not oreo qoutar"
+            Else
+                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/topview2.xml

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