pro apple

2025-07-11 13:55:59 +07:00 · 2025-07-11 13:55:59 +07:00 · e9e595dd71
commit e9e595dd71
parent abd25e0f9a b38ab0d9fc
294 changed files with 41389 additions and 5912 deletions
--- a/xml/event/double_promotion_americano_and_apple_farm_festival.xml
+++ b/xml/event/double_promotion_americano_and_apple_farm_festival.xml
--- a/xml/event/ignore_multi_promotion_config_americano_taiwanese_tea.json
+++ b/xml/event/ignore_multi_promotion_config_americano_taiwanese_tea.json
--- a/xml/event/multi_promotion_config_americano_apple_fastival.json
+++ b/xml/event/multi_promotion_config_americano_apple_fastival.json
@ -0,0 +1,30 @@
+[
+  {
+    "name": "americano",
+    "template": "/event/promotion_video_template.inc",
+    "config": {
+      "normal_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "normal_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "press_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "press_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "disable_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "disable_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "video_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
+      "video_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
+      "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml"
+    }
+  },
+  {
+    "name": "apple_farm_festival",
+    "template": "/event/promotion_template.inc",
+    "config": {
+        "normal_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "normal_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "press_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "press_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "disable_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "disable_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_apple_farm_festival.xml"
+    }
+  }
+]
--- a/xml/event/promotion_apple_farm_festival.xml
+++ b/xml/event/promotion_apple_farm_festival.xml
--- a/xml/event/script_common_for_open_promotion_xml.ev
+++ b/xml/event/script_common_for_open_promotion_xml.ev
@ -5,10 +5,10 @@ DEBUGVAR CocktailShow
 DEBUGVAR OpenFromPageBoard

 DEBUGVAR SchoolOvaltinePro
-DEBUGVAR AppleFarmFestivalPro
 DEBUGVAR HappyTriosPro
 DEBUGVAR TaiwaneseTeaPro
 DEBUGVAR AmericanoPro
+DEBUGVAR AppleFarmFestivalPro
 DEBUGVAR Discount7_7Pro

 Var PromotionState1 = "Invisible"
@ -75,6 +75,15 @@ Else
 			    Var PromotionState2 = "Enable"
 				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_americano_and_taiwanese_tea.xml"
 			EndIf
+
+			If AppleFarmFestivalPro = 1 Then
+                Var PromotionState2 = "Enable"
+    			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_americano_and_apple_farm_festival.xml"
+			EndIf
+		Else
+		    If AppleFarmFestivalPro = 1 Then
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_apple_farm_festival.xml"
+			EndIf
 		EndIf

 	EndIf
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@ -83,9 +83,6 @@ Var MatchaEveryDayPro = 0
 ; Oreo volcano, 1 - 31 May
 Var OreoVolcanoPro = 0

-; Apple Farm Festival, 1 - 30 June
-Var AppleFarmFestivalPro = 0
-
 ; Happy Trios, 1 - 30 June
 Var HappyTriosPro = 0

@ -101,6 +98,9 @@ Var AmericanoPro = 0
 ;7.7 discount code,  7 - 13 July
 Var Discount7_7Pro = 0

+; Apple Farm Festival, 15 - 31 July
+Var AppleFarmFestivalPro = 0
+
 Var NewCollectPoint = 1
 Var PaymentCodeShouldCollectPromotionPoint = 0

@ -182,7 +182,6 @@ EndIf
 If SystemDateMonthInt = 7 Then

    Var AmericanoPro = 1
-    Var TaiwaneseTeaPro = 1

    If SystemDateDayInt >= 7 Then
        If SystemDateDayInt <= 13 Then
@ -190,6 +189,12 @@ If SystemDateMonthInt = 7 Then
        EndIf
    EndIf

+    If SystemDateDayInt >= 15 Then
+        Var AppleFarmFestivalPro = 1
+    Else
+        Var TaiwaneseTeaPro = 1
+    EndIf
+
 EndIf


--- a/xml/function2.inc
+++ b/xml/function2.inc
@ -137,8 +137,30 @@
 		Var Seeker.NameDrinkTH = menu_name_thai_hot

 		Var text_hot_color = "0xFFFFFF"
-		Var text_cold_color = "0x84776F"
-		Var text_blender_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
+		If PriceDiscount[1] > 0 Then
+			Var text_cold_color = "0xFF0000"
+			Var popup_discount_cold_show = "Enable"
+		Else
+			Var text_cold_color = "0x84776F"
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
+		If PriceDiscount[2] > 0 Then
+			Var text_blender_color = "0xFF0000"
+			If text_show_eng = "Enable" Then
+				Var popup_discount_blend_show_eng = "Enable"
+				Var popup_discount_blend_show_thai = "Invisible"
+			Else
+				Var popup_discount_blend_show_eng = "Invisible"
+				Var popup_discount_blend_show_thai = "Enable"
+			EndIf
+		Else
+			Var text_blender_color = "0x84776F"
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

@ -180,9 +202,31 @@
 		Var Seeker.NameDrinkEN = menu_name_eng_cold
 		Var Seeker.NameDrinkTH = menu_name_thai_cold

-		Var text_hot_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			Var text_hot_color = "0xFF0000"
+			Var popup_discount_hot_show = "Enable"
+		Else
+			Var text_hot_color = "0x84776F"
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
 		Var text_cold_color = "0xFFFFFF"
-		Var text_blender_color = "0x84776F"
+		If PriceDiscount[1] > 0 Then
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
+		If PriceDiscount[2] > 0 Then
+			Var text_blender_color = "0xFF0000"
+			If text_show_eng = "Enable" Then
+				Var popup_discount_blend_show_eng = "Enable"
+				Var popup_discount_blend_show_thai = "Invisible"
+			Else
+				Var popup_discount_blend_show_eng = "Invisible"
+				Var popup_discount_blend_show_thai = "Enable"
+			EndIf
+		Else
+			Var text_blender_color = "0x84776F"
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

@ -232,9 +276,25 @@
 		Var Seeker.NameDrinkEN = menu_name_eng_blender
 		Var Seeker.NameDrinkTH = menu_name_thai_blender

-		Var text_hot_color = "0x84776F"
-		Var text_cold_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			Var text_hot_color = "0xFF0000"
+			Var popup_discount_hot_show = "Enable"
+		Else
+			Var text_hot_color = "0x84776F"
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
+		If PriceDiscount[1] > 0 Then
+			Var text_cold_color = "0xFF0000"
+			Var popup_discount_cold_show = "Enable"
+		Else
+			Var text_cold_color = "0x84776F"
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
 		Var text_blender_color = "0xFFFFFF"
+		If PriceDiscount[2] > 0 Then
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -8,7 +8,15 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; tab_menu hide
-	;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+	If CountryName = "Thailand" Then
+	    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+	EndIf
+	If CountryName = "HongKong" Then
+	    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
+	EndIf
+	If CountryName = "Australia" Then
+	    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
+	EndIf

 	RootLayoutVisible 3 "hide"

@ -627,9 +635,13 @@
    	If POS_SELL_MODE = "NORMAL" Then

    	Else
-            Var BackgroundColor = "0x2C2F4E"
-            OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
-            Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+            If POS_SELL_MODE = "CLOSE" Then
+                Var BackgroundColor = "0x2C2F4E"
+                OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
+                Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+            Else
+                OpenInst 0 "ROOT/taobin_project/xml/page_pos_machine_network_down.xml"
+            EndIf
    	EndIf
 	EndIf

@ -2048,7 +2060,15 @@ PRICE "Reset" "-"
 <Timeout> 1000 </Timeout>
 <EventTimeout>

-	;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+    If CountryName = "Thailand" Then
+	    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+	EndIf
+	If CountryName = "HongKong" Then
+	    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
+	EndIf
+	If CountryName = "Australia" Then
+	    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
+	EndIf

 	DEBUGVAR XMLEngineFrontStage

@ -2520,9 +2540,13 @@ PRICE "Reset" "-"
            If POS_SELL_MODE = "NORMAL" Then

            Else
-                Var BackgroundColor = "0x2C2F4E"
-                OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
-                Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+                If POS_SELL_MODE = "CLOSE" Then
+                    Var BackgroundColor = "0x2C2F4E"
+                    OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
+                    Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+                Else
+                    OpenInst 0 "ROOT/taobin_project/xml/page_pos_machine_network_down.xml"
+                EndIf
            EndIf
 		EndIf
 	EndIf
--- a/xml/page_catalog_group_pro_apple_farm_festival.xml
+++ b/xml/page_catalog_group_pro_apple_farm_festival.xml
@ -2325,9 +2325,9 @@ Longback" </Value>
 	<State> Flag( 12-03-03-0107.Button,$Sum1203030107) </State> 
 	<Button>
 	<State> $Sum1203030107 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Apple_Oreo_Volcano.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Apple_Oreo_Volcano.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Apple_Oreo_Volcano.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Apple_Oreo_Volcano_banner.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Apple_Oreo_Volcano_banner.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Apple_Oreo_Volcano_banner.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-03-03-0107, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
@ -2336,7 +2336,7 @@ Longback" </Value>
 		Var NameDrinkTH = "แอปเปิ้ลโอริโอ"
 		Var DrinkDescriptionTH = "แอปเปิ้ล นม โอรีโอ"
 		Var DrinkDescription = "Apple Milk Oreo"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Apple_Oreo_Volcano.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Apple_Oreo_Volcano_banner.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $-.Price
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@ -124,6 +124,9 @@
 	   Var PriceDrink = OriginalPrice + TOPPING_PRICE
 	EndIf

+	If Seeker.PriceDiscount > 0 Then
+		Var PriceDrink = Seeker.PriceMain + TOPPING_PRICE
+	EndIf

 	DEBUGVAR PriceDrink
 	DEBUGVAR PromotionPriceDrink
@ -456,6 +459,10 @@
 		If SELLSTATUS = "SELLNOCASH" Then
 			Var SELLONLINE = 1
 		EndIf
+		
+		If POS_SELL_MODE = "OFFLINE" Then
+		    Var SELLONLINE = 0
+		EndIf

 		If SELLONLINE = 0 Then
 			SAVELOG "POS-MACHINE: OFFLINE in page_payment.xml"
--- a/xml/page_pos_machine_network_down.xml
+++ b/xml/page_pos_machine_network_down.xml
@ -32,7 +32,9 @@
        EndIf

        If SELLONLINE = 1 Then
-            Open "ROOT/taobin_project/xml/page_board.xml"
+            If POS_SELL_MODE = "NORMAL" Then
+                Open "ROOT/taobin_project/xml/page_board.xml"
+           	EndIf
        EndIf

        Var Timeout = 0
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@ -48,6 +48,12 @@

 	Var DisableAllNotFreeTopping = 0

+	;Discount-promotion-state
+	Var popup_discount_hot_show = "Invisible"
+	Var popup_discount_cold_show = "Invisible"
+	Var popup_discount_blend_show_eng = "Invisible"
+	Var popup_discount_hot_show_thai = "Invisible"
+
 	Var SaveProductCodeSelect = "-"
 	Var UserSelectProductCode = "-"

@ -171,6 +177,7 @@
 	Var topping2 = "31"
 	Var topping3 = "31"

+	Var DirImageToppingInter = "ROOT/taobin_project/image/topping_inter"

 	Var BugFlag = 0

@ -333,9 +340,23 @@

 	Var high_light_drink_type = "Invisible"

-	Var text_hot_color = "0x84776F"
-	Var text_cold_color = "0x84776F"
-	Var text_blender_color = "0x84776F"
+	If PriceDiscount[0] > 0 Then
+		Var text_hot_color = "0xFF0000"
+	Else
+		Var text_hot_color = "0x84776F"
+	EndIf
+	If PriceDiscount[1] > 0 Then
+		Var text_cold_color = "0xFF0000"
+	Else
+		Var text_cold_color = "0x84776F"
+	EndIf
+	If PriceDiscount[2] > 0 Then
+		Var text_blender_color = "0xFF0000"
+	Else
+		Var text_blender_color = "0x84776F"
+	EndIf
+
+	Var text_original_price_color = "0x84776F"

 	If new_layout = "true" Then
 		Var PriceDrinkTmpShow = "---"
@ -392,20 +413,51 @@

 	If hot_button_state = "Disable2" Then
 		Var text_price_d1 = ""
+		Var text_price_original_d1 = ""
 	Else
 		Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormat, PreScaleConvertShow)
+		Var text_price_original_d1 !assigned StringFmt( PriceMain[0] , DisplayFormat, PreScaleConvertShow)
+
+		If PriceDiscount[0] > 0 Then
+			Var popup_discount_hot_show = "Enable"
+		Else
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
 	EndIf

 	If cold_button_state = "Disable2" Then
 		Var text_price_d2 = ""
+		Var text_price_original_d2 = ""
 	Else
 		Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormat, PreScaleConvertShow)
+		Var text_price_original_d2 !assigned StringFmt( PriceMain[1] , DisplayFormat, PreScaleConvertShow)
+
+		If PriceDiscount[1] > 0 Then
+			Var popup_discount_cold_show = "Enable"
+		Else
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
 	EndIf

 	If blend_button_state = "Disable2" Then
 		Var text_price_d3 = ""
+		Var text_price_original_d3 = ""
 	Else
 		Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormat, PreScaleConvertShow)
+		Var text_price_original_d3 !assigned StringFmt( PriceMain[2] , DisplayFormat, PreScaleConvertShow)
+
+		If PriceDiscount[2] > 0 Then
+			If text_show_eng = "Enable" Then
+				Var popup_discount_blend_show_eng = "Enable"
+				Var popup_discount_blend_show_thai = "Invisible"
+			Else
+				Var popup_discount_blend_show_thai = "Enable"
+				Var popup_discount_blend_show_eng = "Invisible"
+			EndIf
+		Else
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf
 	EndIf

 	DEBUGVAR PD_CODE1
@ -2714,6 +2766,7 @@
 	Topping "Load" PD_CODE1

 	Var high_light_drink_type = "Invisible"
+	Var IndexDrinktType = 0



@ -2766,6 +2819,8 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE2

+	Var IndexDrinktType = 1
+


 </EventClick>
@ -2816,6 +2871,8 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE3

+	Var IndexDrinktType = 2
+



@ -2860,6 +2917,94 @@
 <Value> text_price_d3 </Value>
 </Text>

+<Image>
+	<X> 552 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_hot_show </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 552 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_hot_show </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 562 </X>
+<Y> 55 </Y>
+<State> popup_discount_hot_show </State>
+<Font> KanitRegularTTF </Font>
+<Size> 21 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d1 </Value>
+</Text>
+
+<Image>
+	<X> 710 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_cold_show </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 710 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_cold_show </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 720 </X>
+<Y> 55 </Y>
+<State> popup_discount_cold_show </State>
+<Font> KanitRegularTTF </Font>
+<Size> 21 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d2 </Value>
+</Text>
+
+<Image>
+	<X> 852 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_thai </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 852 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_thai </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 862 </X>
+<Y> 55 </Y>
+<State> popup_discount_blend_show_thai </State>
+<Font> KanitRegularTTF </Font>
+<Size> 23 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d3 </Value>
+</Text>
+
+<Image>
+	<X> 892 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_eng </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 892 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_eng </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 902 </X>
+<Y> 55 </Y>
+<State> popup_discount_blend_show_eng </State>
+<Font> KanitRegularTTF </Font>
+<Size> 23 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d3 </Value>
+</Text>
+
 </Block>


@ -6864,6 +7009,19 @@


 			If SelectDrinkType = 1 Then
+				If hot_button_state = "PressForever" Then
+					Var IndexDrinktType = 0
+				EndIf
+				If cold_button_state = "PressForever" Then
+					Var IndexDrinktType = 1
+				EndIf
+				If blend_button_state = "PressForever" Then
+					Var IndexDrinktType = 2
+				EndIf
+
+				Var Seeker.PriceMain = PriceMain[IndexDrinktType]
+				Var Seeker.PriceDiscount = PriceDiscount[IndexDrinktType]
+				Var Seeker.PriceTag = PriceTag[IndexDrinktType]
 			EndIf
 		EndIf

@ -7133,6 +7291,20 @@
 		Else

 			If SelectDrinkType = 1 Then
+				If hot_button_state = "PressForever" Then
+					Var IndexDrinktType = 0
+				EndIf
+				If cold_button_state = "PressForever" Then
+					Var IndexDrinktType = 1
+				EndIf
+				If blend_button_state = "PressForever" Then
+					Var IndexDrinktType = 2
+				EndIf
+
+				Var Seeker.PriceMain = PriceMain[IndexDrinktType]
+				Var Seeker.PriceDiscount = PriceDiscount[IndexDrinktType]
+				Var Seeker.PriceTag = PriceTag[IndexDrinktType]
+
 				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
 				Open "ROOT/taobin_project/xml/page_identity_verification.xml"
 			EndIf
@ -7642,8 +7814,30 @@
 		Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_hot

 		Var text_hot_color = "0xFFFFFF"
-		Var text_cold_color = "0x84776F"
-		Var text_blender_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
+		If PriceDiscount[1] > 0 Then
+			Var text_cold_color = "0xFF0000"
+			Var popup_discount_cold_show = "Enable"
+		Else
+			Var text_cold_color = "0x84776F"
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
+		If PriceDiscount[2] > 0 Then
+			Var text_blender_color = "0xFF0000"
+			If text_show_eng = "Enable" Then
+				Var popup_discount_blend_show_eng = "Enable"
+				Var popup_discount_blend_show_thai = "Invisible"
+			Else
+				Var popup_discount_blend_show_eng = "Invisible"
+				Var popup_discount_blend_show_thai = "Enable"
+			EndIf
+		Else
+			Var text_blender_color = "0x84776F"
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

@ -7681,9 +7875,31 @@
 		Var Seeker.NameDrinkTH = menu_name_thai_cold
 		Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_cold

-		Var text_hot_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			Var text_hot_color = "0xFF0000"
+			Var popup_discount_hot_show = "Enable"
+		Else
+			Var text_hot_color = "0x84776F"
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
 		Var text_cold_color = "0xFFFFFF"
-		Var text_blender_color = "0x84776F"
+		If PriceDiscount[1] > 0 Then
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
+		If PriceDiscount[2] > 0 Then
+			Var text_blender_color = "0xFF0000"
+			If text_show_eng = "Enable" Then
+				Var popup_discount_blend_show_eng = "Enable"
+				Var popup_discount_blend_show_thai = "Invisible"
+			Else
+				Var popup_discount_blend_show_eng = "Invisible"
+				Var popup_discount_blend_show_thai = "Enable"
+			EndIf
+		Else
+			Var text_blender_color = "0x84776F"
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

@ -7729,9 +7945,25 @@
 		Var Seeker.NameDrinkTH = menu_name_thai_blender
 		Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_blender

-		Var text_hot_color = "0x84776F"
-		Var text_cold_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			Var text_hot_color = "0xFF0000"
+			Var popup_discount_hot_show = "Enable"
+		Else
+			Var text_hot_color = "0x84776F"
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
+		If PriceDiscount[1] > 0 Then
+			Var text_cold_color = "0xFF0000"
+			Var popup_discount_cold_show = "Enable"
+		Else
+			Var text_cold_color = "0x84776F"
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
 		Var text_blender_color = "0xFFFFFF"
+		If PriceDiscount[2] > 0 Then
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@ -52,6 +52,11 @@

 	Var DisableAllNotFreeTopping = 0

+	;Discount-promotion-state
+	Var popup_discount_hot_show = "Invisible"
+	Var popup_discount_cold_show = "Invisible"
+	Var popup_discount_blend_show_eng = "Invisible"
+	Var popup_discount_hot_show_thai = "Invisible"

 	Var SaveProductCodeSelect = "-"
 	Var UserSelectProductCode = "-"
@ -269,6 +274,7 @@

 	Var BugFlag = 0
 	Var DirImageInter = "ROOT/taobin_project/image/topping_revamp_inter"
+	Var DirImageToppingInter = "ROOT/taobin_project/image/topping_inter"

 	If show_eng = "true" Then 
 		
@ -705,9 +711,23 @@
 	Var SelectedToppingCount = 0
 	Var SelectSyrupType = 0
 	
-	Var text_hot_color = "0x84776F"
-	Var text_cold_color = "0x84776F"
-	Var text_blender_color = "0x84776F"
+	If PriceDiscount[0] > 0 Then
+		Var text_hot_color = "0xFF0000"
+	Else
+		Var text_hot_color = "0x84776F"
+	EndIf
+	If PriceDiscount[1] > 0 Then
+		Var text_cold_color = "0xFF0000"
+	Else
+		Var text_cold_color = "0x84776F"
+	EndIf
+	If PriceDiscount[2] > 0 Then
+		Var text_blender_color = "0xFF0000"
+	Else
+		Var text_blender_color = "0x84776F"
+	EndIf
+
+	Var text_original_price_color = "0x84776F"

 	If new_layout = "true" Then
 		Var PriceDrinkTmpShow = "---"
@ -764,20 +784,51 @@

 	If hot_button_state = "Disable2" Then
 		Var text_price_d1 = ""
+		Var text_price_original_d1 = ""
 	Else
 		Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormat, PreScaleConvertShow)
+		Var text_price_original_d1 !assigned StringFmt( PriceMain[0] , DisplayFormat, PreScaleConvertShow)
+
+		If PriceDiscount[0] > 0 Then
+			Var popup_discount_hot_show = "Enable"
+		Else
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
 	EndIf

 	If cold_button_state = "Disable2" Then
 		Var text_price_d2 = ""
+		Var text_price_original_d2 = ""
 	Else
 		Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormat, PreScaleConvertShow)
+		Var text_price_original_d2 !assigned StringFmt( PriceMain[1] , DisplayFormat, PreScaleConvertShow)
+
+		If PriceDiscount[1] > 0 Then
+			Var popup_discount_cold_show = "Enable"
+		Else
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
 	EndIf

 	If blend_button_state = "Disable2" Then
 		Var text_price_d3 = ""
+		Var text_price_original_d3 = ""
 	Else
 		Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormat, PreScaleConvertShow)
+		Var text_price_original_d3 !assigned StringFmt( PriceMain[2] , DisplayFormat, PreScaleConvertShow)
+
+		If PriceDiscount[2] > 0 Then
+			If text_show_eng = "Enable" Then
+				Var popup_discount_blend_show_eng = "Enable"
+				Var popup_discount_blend_show_thai = "Invisible"
+			Else
+				Var popup_discount_blend_show_thai = "Enable"
+				Var popup_discount_blend_show_eng = "Invisible"
+			EndIf
+		Else
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf
 	EndIf

 	DEBUGVAR PD_CODE1
@ -4468,7 +4519,8 @@
 	Var BugFlag = 0
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE1
-
+	
+	Var IndexDrinktType = 0
 	Var high_light_drink_type = "Invisible"
 	Var ButtonConfirmOrderState = "Disable"
 	
@ -4529,7 +4581,8 @@ Var PriceDrinkTmpShow = "---"
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE2

-		Var high_light_drink_type = "Invisible"
+	Var IndexDrinktType = 1
+	Var high_light_drink_type = "Invisible"
 	Var ButtonConfirmOrderState = "Disable"
 	Var PriceDrinkTmpShow = "---"
 	
@ -4589,7 +4642,8 @@ Refresh
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE3

-		Var high_light_drink_type = "Invisible"
+	Var IndexDrinktType = 2
+	Var high_light_drink_type = "Invisible"
 	Var ButtonConfirmOrderState = "Disable"
 	
 Var PriceDrinkTmpShow = "---"
@ -4640,6 +4694,94 @@ Refresh
 <Value> text_price_d3 </Value>
 </Text>

+<Image>
+	<X> 552 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_hot_show </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 552 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_hot_show </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 562 </X>
+<Y> 55 </Y>
+<State> popup_discount_hot_show </State>
+<Font> KanitRegularTTF </Font>
+<Size> 21 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d1 </Value>
+</Text>
+
+<Image>
+	<X> 710 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_cold_show </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 710 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_cold_show </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 720 </X>
+<Y> 55 </Y>
+<State> popup_discount_cold_show </State>
+<Font> KanitRegularTTF </Font>
+<Size> 21 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d2 </Value>
+</Text>
+
+<Image>
+	<X> 852 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_thai </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 852 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_thai </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 862 </X>
+<Y> 55 </Y>
+<State> popup_discount_blend_show_thai </State>
+<Font> KanitRegularTTF </Font>
+<Size> 23 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d3 </Value>
+</Text>
+
+<Image>
+	<X> 892 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_eng </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 892 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_eng </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 902 </X>
+<Y> 55 </Y>
+<State> popup_discount_blend_show_eng </State>
+<Font> KanitRegularTTF </Font>
+<Size> 23 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d3 </Value>
+</Text>
+
 </Block>


--- a/xml/process/discount_from_promotion.ev
+++ b/xml/process/discount_from_promotion.ev
@ -39,6 +39,16 @@ If FromPassionMintPro = 1 Then
    Var Seeker.CampaignPPrice = PromotionPriceDrink
 EndIf

+If Seeker.PriceDiscount > 0 Then
+    Var PriceDiff = Seeker.PriceMain - Seeker.PriceDiscount
+    Var Seeker.VendingCode = Seeker.PriceTag
+    Var Seeker.CodeNumber = "00000000"
+    Var Seeker.CodeChannel = 1
+    Var Seeker.FreeVendingCampaign = 0
+    Var Seeker.IntVendingCampaign = PriceDiff
+    Var Seeker.VendingCampaignRI3 = PriceDiff
+EndIf
+
 If BoxID = 105005 Then
    If Seeker.selected_a_drink = "12-05-02-0045" Then
        Var PriceDiff = PriceDrink - 25
@ -99,6 +109,15 @@ If FromCoffeeDrink1BathPro = 1 Then
    Var PromotionIDCurrentOrder = 3
 EndIf

+If Seeker.ProductCodeDiscount > 0 Then
+    Var PriceDiff = PriceDrink - PromotionPriceDrink
+    Var Seeker.VendingCode = "DFB" + PriceDiff
+    Var Seeker.CodeNumber = "00000000"
+    Var Seeker.CodeChannel = 1
+    Var Seeker.FreeVendingCampaign = 0
+    Var Seeker.IntVendingCampaign = PriceDiff
+    Var Seeker.VendingCampaignRI3 = PriceDiff
+EndIf


 If InternationalEnable = 1 Then