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

inc/video.inc

@@ -78,6 +78,9 @@
             If ProReducedPriceEnable = 1 Then
                 Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
             EndIf
+            If ProYuzu250Enable = 1 Then
+                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+            EndIf
             If UseSlideShowVideo = 1 Then
                 Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
             EndIf
@@ -137,6 +140,9 @@
         If ProReducedPriceEnable = 1 Then
             Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
         EndIf
+        If ProYuzu250Enable = 1 Then
+            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+        EndIf
         If UseSlideShowVideo = 1 Then
             Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
         EndIf
@@ -211,6 +217,9 @@
             If ProReducedPriceEnable = 1 Then
                 Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
             EndIf
+            If ProYuzu250Enable = 1 Then
+                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+            EndIf
             If UseSlideShowVideo = 1 Then
                 Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
             EndIf
@@ -263,6 +272,10 @@
             Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
         EndIf
 
+        If ProYuzu250Enable = 1 Then
+            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+        EndIf
+
         If UseSlideShowVideo = 1 Then
             Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
         EndIf

inter/mys/xml/event/event_profile.ev

@@ -12,22 +12,60 @@ DEBUGVAR ProYuzu250Enable
 If ProReducedPriceEnable = 1 Then
 
 Else
+    DEBUGVAR "Case pro reduce end"
     ; case-pro-reduce-end
     If ProYuzu250Enable = 1 Then
+        DEBUGVAR "Pro yuzu ongoing"
         ; concat-profile
         If HasProYuzu250Concat = "true" Then
-
+            DEBUGVAR "Pro yuzu concat"
         Else
 
             If IsProfileReduce = "true" Then
+                DEBUGVAR "Pro reduce was set but disabled from trick"
+                CacheVarStr "get" XMLProfilePreEvent
+                If XMLProfilePreEvent = "" Then
+                    DEBUGVAR "Get PreEvent Empty"
+                    Var XMLProfile = "General"
+                Else
+                    DEBUGVAR "Restore profile by pre-event, also concat Yuzu"
+                    DEBUGVAR XMLProfilePreEvent
+                    Var XMLProfile = XMLProfilePreEvent + "-"
+                    Var XMLProfile = XMLProfile + "PromoYuzu250"
+                EndIf
 
             Else
+                DEBUGVAR "No pro reduce, concat pro yuzu"
                 CacheVarStr "put" XMLProfilePreEvent
 
                 Var XMLProfile = XMLProfile + "-"
                 Var XMLProfile = XMLProfile + "PromoYuzu250"
             EndIf
         EndIf
+    Else
+        If IsProfileReduce = "true" Then
+            DEBUGVAR "No yuzu but set pro reduce"
+            CacheVarStr "get" XMLProfilePreEvent
+            If XMLProfilePreEvent = "" Then
+                DEBUGVAR "PreEvent empty, set General"
+                Var XMLProfile = "General"
+            Else
+                DEBUGVAR "Restore profile by pre-event"
+                Var XMLProfile = XMLProfilePreEvent
+            EndIf
+
+        Else
+
+            If HasProYuzu250Concat = "true" Then
+                CacheVarStr "get" XMLProfilePreEvent
+                Var XMLProfile = XMLProfilePreEvent
+            EndIf
+
+            DEBUGVAR "Store profile pre event"
+            DEBUGVAR XMLProfilePreEvent
+            CacheVarStr "put" XMLProfilePreEvent
+        EndIf
+
     EndIf
 
 EndIf

inter/mys/xml/event/tricker.ev

@@ -44,6 +44,9 @@ Var EnablePayLaterMode = 0
 ; Slide show Video
 Var UseSlideShowVideo = 0
 
+Var NoTrickPriceProfile = 0
+
+
 If SystemDateMonthInt = 9 Then
 	If SystemDateDayInt < 17 Then
 		Var PromotionOreoToppingFreeEnable = 1
@@ -73,6 +76,11 @@ EndIf
 
 If SystemDateMonthInt = 12 Then
     Var ProYuzu250Enable = 1
+
+    If SetProReduceByBO = 1 Then
+        Var ProReducedPriceEnable = 0
+    EndIf
+
 EndIf
 
 If SystemDateMonthInt = 1 Then
@@ -83,6 +91,17 @@ If SystemDateMonthInt = 1 Then
     EndIf
 EndIf
 
+If SystemDateMonthInt < 10 Then
+    Var ProReducedPriceEnable = 0
+EndIf
+
+If ProReducedPriceEnable = 0 Then
+    If XMLProfile = "PromoReduced" Then
+        Var NoTrickPriceProfile = 1
+
+    EndIf
+EndIf
+
 If BoxID = 177746 Then
 	Var ProThaiTeaEnable = 1
 	Var ProYuzuEnable = 1
@@ -94,8 +113,8 @@ If BoxID = 177746 Then
 
 	Var UseSlideShowVideo = 0
 
-    Var ProReducedPriceEnable = 0
+    ;Var ProReducedPriceEnable = 0
-	Var ProYuzu250Enable = 1
+	;Var ProYuzu250Enable = 1
 EndIf
 
 If BoxID = 210037 Then
@@ -106,9 +125,9 @@ If BoxID = 210011 Then
 	Var UseSlideShowVideo = 1
 EndIf
 
-If BoxID = 200002 Then
+;If BoxID = 200002 Then
-	Var UseSlideShowVideo = 1
+;	Var UseSlideShowVideo = 1
-EndIf
+;EndIf
 
 ;If BoxID = Something Then
 ;	Var EnablePayLaterMode = 1

xml/event/promotion_jemila.xml

@@ -7407,6 +7407,513 @@ Sugar, Biscof" </Value>
 	</Text>
 </Block>
 	; - - - 
+	; ==================> Len = 12
+	; 12-01-01-0081 12-01-01-0081 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-01-0081.Button,12-01-01-0081.Button,Disable=Invisible,$Sum12010100811201010081) </State> 
+	<Button>
+	<State> $Sum12010100811201010081 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_blackcoffee.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_blackcoffee.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_blackcoffee.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-01-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "BLACK COFFEE"
+		Var NameDrinkTH = "กาแฟดำ"
+		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
+		Var DrinkDescription = "Dark shot Espresso, Water"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_blackcoffee.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-01-01-0081.Price
+		Var PriceD2 = $12-01-01-0081.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "12-01-01-0081"
+		Var PD_CODE2 = "12-01-01-0081"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = $12-01-01-0081.Button
+		Var PD_STAGE_2 = $12-01-01-0081.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var OverlayMenuFilter !assigned xmlpro( 12-01-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-01-0081"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0081"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-01-01-0081.NameE
+		Var menu_desc_eng_hot = $12-01-01-0081.descriptionE
+		Var menu_name_thai_hot = $12-01-01-0081.Name
+		Var menu_desc_thai_hot = $12-01-01-0081.description
+		
+		Var menu_name_eng_cold = $12-01-01-0081.NameE
+		Var menu_desc_eng_cold = $12-01-01-0081.descriptionE
+		Var menu_name_thai_cold = $12-01-01-0081.Name
+		Var menu_desc_thai_cold = $12-01-01-0081.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		Var OpenFromInstMenuTab = 0
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟดำ" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟ และน้ำ " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "BLACK COFFEE" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Dark shot Espresso, Water" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-01-01-0081.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-01-01-0081.Button </State>
+	<Value> StringFmt(  $12-01-01-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $12-01-01-0081.Button </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-01-01-0081.Button </State>
+	<Value> StringFmt( $12-01-01-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 180 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum12010100811201010081 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum12010100811201010081 = "Disable" Then
+				STRCONTAIN "ERR" $12-01-01-0081.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-01-01-0081.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum12010100811201010081 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; 12-21-01-0081 12-21-02-0081 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-21-01-0081.Button,12-21-02-0081.Button,Disable=Invisible,$Sum12210100811221020081) </State> 
+	<Button>
+	<State> $Sum12210100811221020081 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_blackcoffee.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_blackcoffee.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_blackcoffee.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<OverlayImage> xmlpro( 12-21-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<EventOnClick> 
+		Var NameDrink = "BLACK COFFEE"
+		Var NameDrinkTH = "กาแฟดำ"
+		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
+		Var DrinkDescription = "Dark shot Espresso, Water"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_blackcoffee.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-21-01-0081.Price
+		Var PriceD2 = $12-21-02-0081.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "12-21-01-0081"
+		Var PD_CODE2 = "12-21-02-0081"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = $12-21-01-0081.Button
+		Var PD_STAGE_2 = $12-21-02-0081.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var OverlayMenuFilter !assigned xmlpro( 12-21-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0081"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0081"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-21-01-0081.NameE
+		Var menu_desc_eng_hot = $12-21-01-0081.descriptionE
+		Var menu_name_thai_hot = $12-21-01-0081.Name
+		Var menu_desc_thai_hot = $12-21-01-0081.description
+		
+		Var menu_name_eng_cold = $12-21-02-0081.NameE
+		Var menu_desc_eng_cold = $12-21-02-0081.descriptionE
+		Var menu_name_thai_cold = $12-21-02-0081.Name
+		Var menu_desc_thai_cold = $12-21-02-0081.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟดำ" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟ และน้ำ " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "BLACK COFFEE" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Dark shot Espresso, Water" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-21-01-0081.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-21-01-0081.Button </State>
+	<Value> StringFmt(  $12-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $12-21-02-0081.Button </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-21-02-0081.Button </State>
+	<Value> StringFmt(  $12-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum12210100811221020081 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum12210100811221020081 = "Disable" Then
+				STRCONTAIN "ERR" $12-21-01-0081.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-21-02-0081.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum12210100811221020081 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
 	; ==================> Len = 17
 	; 12-01-01-0014 12-01-02-0011 - 
 <Block>

xml/page_board.xml

@@ -633,6 +633,9 @@
 	DEBUGVAR EventTurnOn
 
 	Var UsePepsiTheme = 0
+
+	Var NoTrickPriceProfile = 0
+
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
 
 
@@ -1734,6 +1737,8 @@ PRICE "Reset" "-"
 		DEBUGVAR XMLProfile
 		DEBUGVAR XMLProfilePrevious
 
+		If NoTrickPriceProfile = 0 Then
+
     		If TimeProfilePrice = 5 Then
     			PRICE "Reset" "-"
     			PRICE "Load" "-"
@@ -1758,6 +1763,10 @@ PRICE "Reset" "-"
 
 		EndIf
 
+
+	EndIf
+
+
 	Refresh
 
 	TimerReset

xml/page_collect_point_1.xml

@@ -762,59 +762,7 @@
 				EndIf
 			EndIf
 
-			If MyMintEnable = 1 Then
+			If NotCollectPointPromotion = 0 Then
-				If FromMyMintPro = 1 Then
-					GETACCEXT TelephoneNumber 32
-					Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml"
-				EndIf
-			EndIf
-
-			If ProBadValentineEnable = 1 Then
-				If FromBadValentinePro = 1 Then
-					GETACCEXT TelephoneNumber 32
-					Open "ROOT/taobin_project/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_2.xml"
-				EndIf
-			EndIf
-
-			If LipitPro = 1 Then
-				If FromLipitPro = 1 Then
-					If Seeker.CodeChannel = 1 Then
-						If Seeker.CollectPointPromotion = 1 Then
-							If LipitRewardOutOfStock = 0 Then
-								GETACCEXT TelephoneNumber 32
-								Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
-							EndIf
-						EndIf
-					Else
-						If LipitRewardOutOfStock = 0 Then
-							GETACCEXT TelephoneNumber 32
-							Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
-						EndIf
-					EndIf
-				EndIf
-			EndIf
-
-			DEBUGVAR NamHomCoconutPro
-			DEBUGVAR FromNamHomCoconutPro
-			DEBUGVAR Seeker.CodeChannel
-			If NamHomCoconutPro = 1 Then
-				If FromNamHomCoconutPro = 1 Then
-					If Seeker.CodeChannel = 1 Then
-						If Seeker.CollectPointPromotion = 1 Then
-							If NamHomCoconutRewardOutOfStock = 0 Then
-								GETACCEXT TelephoneNumber 32
-								Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
-							EndIf
-						EndIf
-					Else
-						If NamHomCoconutRewardOutOfStock = 0 Then
-							GETACCEXT TelephoneNumber 32
-							Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
-						EndIf
-					EndIf
-				EndIf
-			EndIf
-
 				If RobinsonBeautyPro = 1 Then
 					If FromRobinsonBeautyPro = 1 Then
 						If Seeker.CodeChannel = 1 Then
@@ -829,6 +777,25 @@
 					EndIf
 				EndIf
 
+				If JemilaPro = 1 Then
+					If FromJemilaPro = 1 Then
+					    If JemilaRewardOutOfStock = 1 Then
+                            SAVELOG "Jemila prize out of stock skip collect promotion point."
+                        Else
+                            If Seeker.CodeChannel = 1 Then
+                                If Seeker.CollectPointPromotion = 0 Then
+                                    GETACCEXT TelephoneNumber 40
+                                    Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
+                                EndIf
+                            Else
+                                GETACCEXT TelephoneNumber 40
+                                Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
+                            EndIf
+                        EndIf
+					EndIf
+				EndIf
+			EndIf
+
 			GETACCEXT Param1 23
 			;Open "ROOT/taobin_project/xml/page_catalog.xml"
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"

xml/page_payment_cash-UAE.xml

@@ -747,6 +747,13 @@
 
 	EndIf
 
+	If VendingCashless = "END" Then
+        If ReqPayInfoFromCashOther = 2 Then
+            DEBUGVAR "CashlessReq OFF"
+           	CashlessReq OFF
+        EndIf
+	EndIf
+
 </EventActionOk>
 
 <EventActionError>
@@ -1494,7 +1501,8 @@
     		If CancelFlag = 0 Then
                 Var QR_POPUP = "/img_popup8.png"
                 Var alphaState = "Enable"
-                ;Coin CARD
+                Coin CARD
+
                 Var ReqPayInfoFromCashOther = 2
                 Var CreditCardRef = ""
 
@@ -1516,9 +1524,7 @@
          			Var Timeout = 0
           		EndIf
 
-          		Var QRErrorState = "Invisible"
           		Var VendingCashless = "-"
-          		Var LOADING_STATE = "Enable"
           		Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
           		CashlessPay RemainAmountX CreditCardRef
           		Var CashlessPayFlag = 1
@@ -1738,18 +1744,11 @@
     ;CoinVending ON
     ;VendingQR OFF
 
-
-    If ReqPayInfoFromCashOther = 2 Then
-        DEBUGVAR "CashlessReq OFF by user"
-	  	CashlessReq OFF
-    EndIf
-
     If CashlessPayFlag = 1 Then
         Var CashlessPayFlag = 0
         CashlessReq FAIL
     EndIf
 
-
     Refresh
 </EventClick>
 </Button>