THAI: Discount promotions [topping_select7, 8]

inc/button_topping_select_confirm_order.inc

@@ -446,6 +446,21 @@ If CART_COUNT  = 0 Then
                 EndIf
             EndIf
         EndIf
+
+        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
     
 Else

inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py

@@ -279,6 +279,15 @@
       out_xml('\t\t\tElse\n')
       out_xml('\t\t\t\tVar PriceD3 = $' + pd_code_3 + '.Price\n')
       out_xml('\t\t\tEndIf\n')
+      out_xml('\t\t\tVar PriceMain[0] = $' + pd_code_1 + '.Price\n')
+      out_xml('\t\t\tVar PriceMain[1] = $' + pd_code_2 + '.Price\n')
+      out_xml('\t\t\tVar PriceMain[2] = $' + pd_code_3 + '.Price\n')
+      out_xml('\t\t\tVar PriceDiscount[0] = $' + pd_code_1 + '.Discount\n')
+      out_xml('\t\t\tVar PriceDiscount[1] = $' + pd_code_2 + '.Discount\n')
+      out_xml('\t\t\tVar PriceDiscount[2] = $' + pd_code_3 + '.Discount\n')
+      out_xml('\t\t\tVar PriceTag[0] !assigned GETS($' + pd_code_1 + '.TAG,"PROMOS")\n')
+      out_xml('\t\t\tVar PriceTag[1] !assigned GETS($' + pd_code_2 + '.TAG,"PROMOS")\n')
+      out_xml('\t\t\tVar PriceTag[2] !assigned GETS($' + pd_code_3 + '.TAG,"PROMOS")\n')
       out_xml('\t\t\tVar PD_CODE1 = "' + pd_code_1 + '"\n')
       out_xml('\t\t\tVar PD_CODE2 = "' + pd_code_2 + '"\n')
       out_xml('\t\t\tVar PD_CODE3 = "' + pd_code_3 + '"\n')

xml/function2.inc

@@ -137,8 +137,30 @@
 		Var Seeker.NameDrinkTH = menu_name_thai_hot
 
 		Var text_hot_color = "0xFFFFFF"
-		Var text_cold_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
-		Var text_blender_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
+		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"
+		If PriceDiscount[0] > 0 Then
-		Var text_cold_color = "0x84776F"
+			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
 

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

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"
+	If PriceDiscount[0] > 0 Then
-	Var text_cold_color = "0x84776F"
+		Var text_hot_color = "0xFF0000"
-	Var text_blender_color = "0x84776F"
+	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
@@ -2728,6 +2780,7 @@
 	Topping "Load" PD_CODE1
 
 	Var high_light_drink_type = "Invisible"
+	Var IndexDrinktType = 0
 
 
 
@@ -2780,6 +2833,8 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE2
 
+	Var IndexDrinktType = 1
+
 
 
 </EventClick>
@@ -2830,6 +2885,8 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE3
 
+	Var IndexDrinktType = 2
+
 
 
 
@@ -2874,6 +2931,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>
 
 
@@ -6878,6 +7023,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
 
@@ -7147,6 +7305,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
@@ -7656,8 +7828,30 @@
 		Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_hot
 
 		Var text_hot_color = "0xFFFFFF"
-		Var text_cold_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
-		Var text_blender_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
+		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
 
@@ -7695,9 +7889,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
 
@@ -7743,9 +7959,25 @@
 		Var Seeker.NameDrinkTH = menu_name_thai_blender
 		Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_blender
 
-		Var text_hot_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
-		Var text_cold_color = "0x84776F"
+			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
 

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"
+	If PriceDiscount[0] > 0 Then
-	Var text_cold_color = "0x84776F"
+		Var text_hot_color = "0xFF0000"
-	Var text_blender_color = "0x84776F"
+	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
@@ -4503,7 +4554,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"
 	
@@ -4564,7 +4616,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 = "---"
 	
@@ -4624,7 +4677,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 = "---"
@@ -4675,6 +4729,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>
 
 

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