Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

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

@@ -108,6 +108,7 @@
         out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
         out_xml('\t\t\t\t\t\tElse\n')
         out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\t\tEndIf\n')
         out_xml('\t\t\t\t\tEndIf\n')
         out_xml('\t\t\t\tEndIf\n')
         out_xml('\t\t\t)\n')
@@ -124,6 +125,7 @@
         out_xml('\t\t\t\t\tElse\n')
         out_xml('\t\t\t\t\t\tIf $' + pd_code_1 + '.Discount = > 0 Then\n')
         out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\t\tEndIf\n')
         out_xml('\t\t\t\t\tEndIf\n')
         out_xml('\t\t\t\tEndIf\n')
         out_xml('\t\t\t)\n')
@@ -145,6 +147,7 @@
         out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
         out_xml('\t\t\t\t\t\tElse\n')
         out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\t\tEndIf\n')
         out_xml('\t\t\t\t\tEndIf\n')
         out_xml('\t\t\t\tEndIf\n')
         out_xml('\t\t\t)\n')
@@ -161,6 +164,7 @@
         out_xml('\t\t\t\t\tElse\n')
         out_xml('\t\t\t\t\t\tIf $' + pd_code_2 + '.Discount = > 0 Then\n')
         out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\t\tEndIf\n')
         out_xml('\t\t\t\t\tEndIf\n')
         out_xml('\t\t\t\tEndIf\n')
         out_xml('\t\t\t)\n')
@@ -179,6 +183,7 @@
       out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
       out_xml('\t\t\t\t\t\tElse\n')
       out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+      out_xml('\t\t\t\t\t\tEndIf\n')
       out_xml('\t\t\t\t\tEndIf\n')
       out_xml('\t\t\t\tEndIf\n')
       out_xml('\t\t\t)\n')
@@ -195,6 +200,7 @@
       out_xml('\t\t\t\t\tElse\n')
       out_xml('\t\t\t\t\t\tIf $' + pd_code_3 + '.Discount = > 0 Then\n')
       out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+      out_xml('\t\t\t\t\t\tEndIf\n')
       out_xml('\t\t\t\t\tEndIf\n')
       out_xml('\t\t\t\tEndIf\n')
       out_xml('\t\t\t)\n')

inter/aus/xml/multi/v3/page_catalog_group_appfast.lxml

@@ -88,7 +88,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -134,6 +134,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -149,6 +150,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -165,6 +167,7 @@
 							Var return !assigned StringFmt(  $51-04-02-1018.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-1018.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -180,6 +183,7 @@
 					Else
 						If $51-04-02-1018.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-1018.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -196,6 +200,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -211,6 +216,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -425,6 +431,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -440,6 +447,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -456,6 +464,7 @@
 							Var return !assigned StringFmt(  $51-04-02-1019.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-1019.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -471,6 +480,7 @@
 					Else
 						If $51-04-02-1019.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-1019.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -487,6 +497,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -502,6 +513,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -716,6 +728,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -731,6 +744,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -747,6 +761,7 @@
 							Var return !assigned StringFmt(  $51-04-02-1020.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-1020.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -762,6 +777,7 @@
 					Else
 						If $51-04-02-1020.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-1020.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -778,6 +794,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -793,6 +810,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1007,6 +1025,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1022,6 +1041,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1038,6 +1058,7 @@
 							Var return !assigned StringFmt(  $51-04-02-1021.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-1021.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1053,6 +1074,7 @@
 					Else
 						If $51-04-02-1021.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-1021.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1069,6 +1091,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1084,6 +1107,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1298,6 +1322,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1313,6 +1338,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1329,6 +1355,7 @@
 							Var return !assigned StringFmt(  $51-04-02-1022.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-1022.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1344,6 +1371,7 @@
 					Else
 						If $51-04-02-1022.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-1022.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1360,6 +1388,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1375,6 +1404,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)

inter/aus/xml/multi/v3/page_catalog_group_dessert.lxml

@@ -131,7 +131,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -177,6 +177,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -192,6 +193,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -208,6 +210,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -223,6 +226,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -239,6 +243,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0009.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -254,6 +259,7 @@
 					Else
 						If $51-03-03-0009.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -468,6 +474,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -483,6 +490,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -499,6 +507,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -514,6 +523,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -530,6 +540,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0034.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0034.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -545,6 +556,7 @@
 					Else
 						If $51-03-03-0034.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0034.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -759,6 +771,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -774,6 +787,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -790,6 +804,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -805,6 +820,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -821,6 +837,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0027.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0027.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -836,6 +853,7 @@
 					Else
 						If $51-03-03-0027.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0027.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1050,6 +1068,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1065,6 +1084,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1081,6 +1101,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1096,6 +1117,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1112,6 +1134,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0010.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1127,6 +1150,7 @@
 					Else
 						If $51-03-03-0010.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1341,6 +1365,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1356,6 +1381,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1372,6 +1398,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1387,6 +1414,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1403,6 +1431,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0051.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0051.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1418,6 +1447,7 @@
 					Else
 						If $51-03-03-0051.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0051.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1632,6 +1662,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1647,6 +1678,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1663,6 +1695,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1678,6 +1711,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1694,6 +1728,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0052.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0052.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1709,6 +1744,7 @@
 					Else
 						If $51-03-03-0052.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0052.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1923,6 +1959,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1938,6 +1975,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1954,6 +1992,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1969,6 +2008,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1985,6 +2025,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0053.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0053.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2000,6 +2041,7 @@
 					Else
 						If $51-03-03-0053.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0053.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2214,6 +2256,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2229,6 +2272,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2245,6 +2289,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2260,6 +2305,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2276,6 +2322,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0055.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0055.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2291,6 +2338,7 @@
 					Else
 						If $51-03-03-0055.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0055.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2505,6 +2553,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2520,6 +2569,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2536,6 +2586,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2551,6 +2602,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2567,6 +2619,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0056.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0056.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2582,6 +2635,7 @@
 					Else
 						If $51-03-03-0056.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0056.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2796,6 +2850,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2811,6 +2866,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2827,6 +2883,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2842,6 +2899,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2858,6 +2916,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0045.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0045.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2873,6 +2932,7 @@
 					Else
 						If $51-03-03-0045.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0045.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3087,6 +3147,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3102,6 +3163,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3118,6 +3180,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3133,6 +3196,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3149,6 +3213,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0046.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0046.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3164,6 +3229,7 @@
 					Else
 						If $51-03-03-0046.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0046.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3378,6 +3444,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3393,6 +3460,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3409,6 +3477,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3424,6 +3493,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3440,6 +3510,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0047.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0047.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3455,6 +3526,7 @@
 					Else
 						If $51-03-03-0047.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0047.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)

inter/aus/xml/multi/v3/page_catalog_group_energy_drink.lxml

@@ -131,7 +131,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -177,6 +177,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -192,6 +193,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -208,6 +210,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0035.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -223,6 +226,7 @@
 					Else
 						If $51-05-02-0035.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0035.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -239,6 +243,7 @@
 							Var return !assigned StringFmt(  $51-05-03-0035.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -254,6 +259,7 @@
 					Else
 						If $51-05-03-0035.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-03-0035.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -468,6 +474,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -483,6 +490,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -499,6 +507,7 @@
 							Var return !assigned StringFmt(  $51-05-02-9990.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-9990.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -514,6 +523,7 @@
 					Else
 						If $51-05-02-9990.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-9990.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -530,6 +540,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -545,6 +556,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -759,6 +771,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -774,6 +787,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -790,6 +804,7 @@
 							Var return !assigned StringFmt(  $51-05-02-9991.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-9991.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -805,6 +820,7 @@
 					Else
 						If $51-05-02-9991.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-9991.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -821,6 +837,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -836,6 +853,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1050,6 +1068,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1065,6 +1084,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1081,6 +1101,7 @@
 							Var return !assigned StringFmt(  $51-05-02-9992.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-9992.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1096,6 +1117,7 @@
 					Else
 						If $51-05-02-9992.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-9992.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1112,6 +1134,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1127,6 +1150,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1341,6 +1365,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1356,6 +1381,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1372,6 +1398,7 @@
 							Var return !assigned StringFmt(  $51-05-02-9993.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-9993.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1387,6 +1414,7 @@
 					Else
 						If $51-05-02-9993.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-9993.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1403,6 +1431,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1418,6 +1447,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1632,6 +1662,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1647,6 +1678,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1663,6 +1695,7 @@
 							Var return !assigned StringFmt(  $51-05-02-9994.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-9994.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1678,6 +1711,7 @@
 					Else
 						If $51-05-02-9994.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-9994.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1694,6 +1728,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1709,6 +1744,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1923,6 +1959,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1938,6 +1975,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1954,6 +1992,7 @@
 							Var return !assigned StringFmt(  $51-05-02-9995.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-9995.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1969,6 +2008,7 @@
 					Else
 						If $51-05-02-9995.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-9995.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1985,6 +2025,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2000,6 +2041,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2214,6 +2256,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2229,6 +2272,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2245,6 +2289,7 @@
 							Var return !assigned StringFmt(  $51-05-02-9996.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-9996.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2260,6 +2305,7 @@
 					Else
 						If $51-05-02-9996.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-9996.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2276,6 +2322,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2291,6 +2338,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)

inter/aus/xml/multi/v3/page_catalog_group_milk.lxml

@@ -118,7 +118,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -164,6 +164,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0005.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -179,6 +180,7 @@
 					Else
 						If $51-03-01-0005.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -195,6 +197,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0005.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -210,6 +213,7 @@
 					Else
 						If $51-03-02-0005.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -226,6 +230,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0005.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -241,6 +246,7 @@
 					Else
 						If $51-03-03-0005.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -455,6 +461,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -470,6 +477,7 @@
 					Else
 						If $51-03-01-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -486,6 +494,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -501,6 +510,7 @@
 					Else
 						If $51-03-02-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -517,6 +527,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -532,6 +543,7 @@
 					Else
 						If $51-03-03-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -746,6 +758,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -761,6 +774,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -777,6 +791,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -792,6 +807,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -808,6 +824,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0011.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0011.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -823,6 +840,7 @@
 					Else
 						If $51-03-03-0011.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0011.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1037,6 +1055,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0039.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1052,6 +1071,7 @@
 					Else
 						If $51-03-01-0039.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1068,6 +1088,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0039.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1083,6 +1104,7 @@
 					Else
 						If $51-03-02-0039.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1099,6 +1121,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0039.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1114,6 +1137,7 @@
 					Else
 						If $51-03-03-0039.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1328,6 +1352,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0022.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1343,6 +1368,7 @@
 					Else
 						If $51-03-01-0022.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0022.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1359,6 +1385,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1374,6 +1401,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1390,6 +1418,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1405,6 +1434,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1619,6 +1649,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0036.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0036.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1634,6 +1665,7 @@
 					Else
 						If $51-03-01-0036.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0036.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1650,6 +1682,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0036.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0036.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1665,6 +1698,7 @@
 					Else
 						If $51-03-02-0036.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0036.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1681,6 +1715,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0036.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0036.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1696,6 +1731,7 @@
 					Else
 						If $51-03-03-0036.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0036.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1910,6 +1946,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1925,6 +1962,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1941,6 +1979,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0058.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1956,6 +1995,7 @@
 					Else
 						If $51-03-02-0058.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1972,6 +2012,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0058.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1987,6 +2028,7 @@
 					Else
 						If $51-03-03-0058.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2201,6 +2243,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0001.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2216,6 +2259,7 @@
 					Else
 						If $51-03-01-0001.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0001.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2232,6 +2276,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0001.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2247,6 +2292,7 @@
 					Else
 						If $51-03-02-0001.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0001.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2263,6 +2309,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0001.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2278,6 +2325,7 @@
 					Else
 						If $51-03-03-0001.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0001.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2492,6 +2540,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0041.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2507,6 +2556,7 @@
 					Else
 						If $51-03-01-0041.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2523,6 +2573,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0041.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2538,6 +2589,7 @@
 					Else
 						If $51-03-02-0041.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2554,6 +2606,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0041.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2569,6 +2622,7 @@
 					Else
 						If $51-03-03-0041.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2783,6 +2837,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0004.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2798,6 +2853,7 @@
 					Else
 						If $51-03-01-0004.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2814,6 +2870,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0004.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2829,6 +2886,7 @@
 					Else
 						If $51-03-02-0004.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2845,6 +2903,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0004.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2860,6 +2919,7 @@
 					Else
 						If $51-03-03-0004.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3074,6 +3134,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0040.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3089,6 +3150,7 @@
 					Else
 						If $51-03-01-0040.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3105,6 +3167,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0040.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3120,6 +3183,7 @@
 					Else
 						If $51-03-02-0040.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3136,6 +3200,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0040.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3151,6 +3216,7 @@
 					Else
 						If $51-03-03-0040.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3320,297 +3386,6 @@
 			
 			
 			
-		</EventOnClick>
-		</Menu>
-
-			; ==================> Len = 3
-		; 51-03-01-0041 51-03-02-0041 51-03-03-0041 
-		<Menu>
-		<State> Flag( 51-03-01-0041.Button,51-03-02-0041.Button,51-03-03-0041.Button,$Sum510301004151030200415103030041) </State>
-		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Vanilla_cocoa.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Vanilla_cocoa.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Vanilla_cocoa.png" </DisableImage>
-		<Name>
-			<LanguageGroup>
-				<LanguageSlot1>Vanilla Cocoa</LanguageSlot1>
-				<LanguageSlot2></LanguageSlot2>
-				<LanguageSlot3></LanguageSlot3>
-				<LanguageSlot4></LanguageSlot4>
-				<LanguageSlot5></LanguageSlot5>
-				<LanguageSlot6></LanguageSlot6>
-			</LanguageGroup>
-		</Name>
-		<Description>
-			<LanguageGroup>
-				<LanguageSlot1>Milk,Vanilla syrup,</LanguageSlot1>
-				<LanguageSlot2></LanguageSlot2>
-				<LanguageSlot3></LanguageSlot3>
-				<LanguageSlot4></LanguageSlot4>
-				<LanguageSlot5></LanguageSlot5>
-				<LanguageSlot6></LanguageSlot6>
-			</LanguageGroup>
-		</Description>
-		<HotState> $51-03-01-0041.Button </HotState>
-		<IceState> $51-03-02-0041.Button </IceState>
-		<BlendState> $51-03-03-0041.Button </BlendState>
-		<HotPrice>
-			eval(
-				If $51-03-01-0041.Price = -1 Then
-					Var return = "Free"
-				Else
-					If $51-03-01-0041.Discount = "" Then
-						Var return !assigned StringFmt(  $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow)
-					Else
-						If $51-03-01-0041.Discount = > 0 Then
-							Var return !assigned StringFmt(  $51-03-01-0041.Discount , DisplayFormat, PreScaleConvertShow)
-						Else
-							Var return !assigned StringFmt(  $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow)
-					EndIf
-				EndIf
-			)
-		</HotPrice>
-		<HotOriginalPrice>
-			eval(
-				Var return = ""
-				If $51-03-01-0041.Price = -1 Then
-					Var return = ""
-				Else
-					If $51-03-01-0041.Discount = "" Then
-						Var return ""
-					Else
-						If $51-03-01-0041.Discount = > 0 Then
-							Var return !assigned StringFmt(  $51-03-01-0041.Price , DisplayFormat, PreScaleConvertShow)
-					EndIf
-				EndIf
-			)
-		</HotOriginalPrice>
-		<IcePrice>
-			eval(
-				If $51-03-02-0041.Price = -1 Then
-					Var return = "Free"
-				Else
-					If $51-03-02-0041.Discount = "" Then
-						Var return !assigned StringFmt(  $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow)
-					Else
-						If $51-03-02-0041.Discount = > 0 Then
-							Var return !assigned StringFmt(  $51-03-02-0041.Discount , DisplayFormat, PreScaleConvertShow)
-						Else
-							Var return !assigned StringFmt(  $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow)
-					EndIf
-				EndIf
-			)
-		</IcePrice>
-		<IceOriginalPrice>
-			eval(
-				Var return = ""
-				If $51-03-02-0041.Price = -1 Then
-					Var return = ""
-				Else
-					If $51-03-02-0041.Discount = "" Then
-						Var return ""
-					Else
-						If $51-03-02-0041.Discount = > 0 Then
-							Var return !assigned StringFmt(  $51-03-02-0041.Price , DisplayFormat, PreScaleConvertShow)
-					EndIf
-				EndIf
-			)
-		</IceOriginalPrice>
-		<BlendPrice>
-			eval(
-				If $51-03-03-0041.Price = -1 Then
-					Var return = "Free"
-				Else
-					If $51-03-03-0041.Discount = "" Then
-						Var return !assigned StringFmt(  $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow)
-					Else
-						If $51-03-03-0041.Discount = > 0 Then
-							Var return !assigned StringFmt(  $51-03-03-0041.Discount , DisplayFormat, PreScaleConvertShow)
-						Else
-							Var return !assigned StringFmt(  $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow)
-					EndIf
-				EndIf
-			)
-		</BlendPrice>
-		<BlendOriginalPrice>
-			eval(
-				Var return = ""
-				If $51-03-03-0041.Price = -1 Then
-					Var return = ""
-				Else
-					If $51-03-03-0041.Discount = "" Then
-						Var return ""
-					Else
-						If $51-03-03-0041.Discount = > 0 Then
-							Var return !assigned StringFmt(  $51-03-03-0041.Price , DisplayFormat, PreScaleConvertShow)
-					EndIf
-				EndIf
-			)
-		</BlendOriginalPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "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
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<ConditionalDisable>
-			<Script>
-				If $Sum510301004151030200415103030041 = "Disable" Then
-					STRCONTAIN "STG=CLOSE" $51-03-01-0041.TAG tag1_is_disable
-					STRCONTAIN "STG=CLOSE" $51-03-02-0041.TAG tag2_is_disable
-					STRCONTAIN "STG=CLOSE" $51-03-03-0041.TAG tag3_is_disable
-					If tag1_is_disable = "true" Then
-						Var $Sum510301004151030200415103030041Tag = $51-03-01-0041.TAG
-					EndIf
-					If tag2_is_disable = "true" Then
-						Var $Sum510301004151030200415103030041Tag = $51-03-02-0041.TAG
-					EndIf
-					If tag3_is_disable = "true" Then
-						Var $Sum510301004151030200415103030041Tag = $51-03-03-0041.TAG
-					EndIf
-					Var $Sum510301004151030200415103030041TextValue !assigned GETS($Sum510301004151030200415103030041Tag,"MSG")
-					Var $Sum510301004151030200415103030041TextID !assigned GETS($Sum510301004151030200415103030041Tag,"TextID")
-					If $Sum510301004151030200415103030041TextID != "" Then
-						Var $Sum510301004151030200415103030041TextValue = ""
-					EndIf
-					If $Sum510301004151030200415103030041TextValue = "" Then
-						If $Sum510301004151030200415103030041TextID = "" Then
-							Var $Sum510301004151030200415103030041TextID = "000013"
-						EndIf
-					EndIf
-				EndIf
-			</Script>
-			<ID> $Sum510301004151030200415103030041TextID </ID>
-			<Value> $Sum510301004151030200415103030041TextValue </Value>
-		</ConditionalDisable>
-		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Vanilla_cocoa.png"
-			GetInstanceIDMenuTab OpenFromInstMenuTab
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $51-03-01-0041.Price
-			Var PriceD2 = $51-03-02-0041.Price
-			Var PriceD3 = $51-03-03-0041.Price
-			Var PD_CODE1 = "51-03-01-0041"
-			Var PD_CODE2 = "51-03-02-0041"
-			Var PD_CODE3 = "51-03-03-0041"
-			; begin lang
-			Var aliasName[0] = "Vanilla Cocoa"
-			Var aliasDesc[0] = "Milk,Vanilla syrup,"
-			Var aliasName[1] = ""
-			Var aliasDesc[1] = ""
-			Var aliasName[2] = ""
-			Var aliasDesc[2] = ""
-			Var aliasName[3] = ""
-			Var aliasDesc[3] = ""
-			Var aliasName[4] = ""
-			Var aliasDesc[4] = ""
-			Var aliasName[5] = ""
-			Var aliasDesc[5] = ""
-			Var NameLang[0][0] = "Hot VANILLA cocoa"
-			Var NameLang[0][1] = "นมวานิลาร้อน"
-			Var NameLang[0][2] = ""
-			Var NameLang[0][3] = ""
-			Var NameLang[0][4] = ""
-			Var NameLang[0][5] = ""
-			Var DescLang[0][0] = "Milk,Vanilla syrup,"
-			Var DescLang[0][1] = " นม น้ำเชื่อมวานิลา"
-			Var DescLang[0][2] = ""
-			Var DescLang[0][3] = ""
-			Var DescLang[0][4] = ""
-			Var DescLang[0][5] = ""
-			Var NameLang[1][0] = "Iced  VANILLA cocoa"
-			Var NameLang[1][1] = "นมวานิลาเย็น"
-			Var NameLang[1][2] = ""
-			Var NameLang[1][3] = ""
-			Var NameLang[1][4] = ""
-			Var NameLang[1][5] = ""
-			Var DescLang[1][0] = "Milk,Vanilla syrup,"
-			Var DescLang[1][1] = " นม น้ำเชื่อมวานิลา"
-			Var DescLang[1][2] = ""
-			Var DescLang[1][3] = ""
-			Var DescLang[1][4] = ""
-			Var DescLang[1][5] = ""
-			Var NameLang[2][0] = "VANILLA cocoa frappe"
-			Var NameLang[2][1] = "นมวานิลาปั่น"
-			Var NameLang[2][2] = ""
-			Var NameLang[2][3] = ""
-			Var NameLang[2][4] = ""
-			Var NameLang[2][5] = ""
-			Var DescLang[2][0] = "Milk,Vanilla syrup,"
-			Var DescLang[2][1] = "นม น้ำเชื่อมวานิลา"
-			Var DescLang[2][2] = ""
-			Var DescLang[2][3] = ""
-			Var DescLang[2][4] = ""
-			Var DescLang[2][5] = ""
-			; end lang
-			Var PD_STAGE_1 = $51-03-01-0041.Button
-			Var PD_STAGE_2 = $51-03-02-0041.Button
-			Var PD_STAGE_3 = $51-03-03-0041.Button
-			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" "51-03-02-0041"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "51-03-01-0041"
-				Else
-				Topping "Load" "51-03-03-0041"
-				EndIf
-			EndIf
-			;include="ROOT/taobin_project/inter/aus/xml/multi/tab_menu_hide.lxml"
-			Var OpenFromXML = "ROOT/taobin_project/inter/aus/xml/multi/v3/page_catalog_group_milk.lxml"
-			
-			
-			TabMenuVisibleInst 99
-			If RedirectToNormalVersion = 1 Then
-				Var menu_name_eng_hot = NameLang[0][0]
-				Var menu_desc_eng_hot = DescLang[0][0]
-				Var menu_name_eng_cold = NameLang[1][0]
-				Var menu_desc_eng_cold = DescLang[1][0]
-				Var menu_name_eng_blender = NameLang[2][0]
-				Var menu_desc_eng_blender = DescLang[2][0]
-				
-				
-				
-				Var menu_name_thai_hot = NameLang[0][1]
-				Var menu_desc_thai_hot = DescLang[0][1]
-				Var menu_name_thai_cold = NameLang[1][1]
-				Var menu_desc_thai_cold = DescLang[1][1]
-				Var menu_name_thai_blender = NameLang[2][1]
-				Var menu_desc_thai_blender = DescLang[2][1]
-				DEBUGVAR menu_name_thai_cold
-				DEBUGVAR menu_desc_thai_cold
-				Var NameDrink = aliasName[0]
-				Var DrinkDescription =  aliasDesc[0]
-				Var show_eng =  "true"
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_topping_select6.lxml"
-			EndIf
-			
-			
-			
 		</EventOnClick>
 		</Menu>
 
@@ -3656,6 +3431,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3671,6 +3447,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3687,6 +3464,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3702,6 +3480,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3718,6 +3497,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0010.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3733,6 +3513,7 @@
 					Else
 						If $51-03-03-0010.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0010.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3947,6 +3728,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3962,6 +3744,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3978,6 +3761,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0059.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3993,6 +3777,7 @@
 					Else
 						If $51-03-02-0059.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4009,6 +3794,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0059.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4024,6 +3810,7 @@
 					Else
 						If $51-03-03-0059.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4238,6 +4025,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0025.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0025.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4253,6 +4041,7 @@
 					Else
 						If $51-03-01-0025.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0025.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4269,6 +4058,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0025.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0025.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4284,6 +4074,7 @@
 					Else
 						If $51-03-02-0025.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0025.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4300,6 +4091,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0025.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0025.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4315,6 +4107,7 @@
 					Else
 						If $51-03-03-0025.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0025.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4529,6 +4322,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4544,6 +4338,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4560,6 +4355,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0037.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0037.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4575,6 +4371,7 @@
 					Else
 						If $51-03-02-0037.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0037.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4591,6 +4388,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0037.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0037.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4606,6 +4404,7 @@
 					Else
 						If $51-03-03-0037.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0037.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)

inter/aus/xml/multi/v3/page_catalog_group_pro_autumn_breeze.lxml

@@ -72,7 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -118,6 +118,7 @@
 							Var return !assigned StringFmt(  $51-01-01-0006.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -133,6 +134,7 @@
 					Else
 						If $51-01-01-0006.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -149,6 +151,7 @@
 							Var return !assigned StringFmt(  $51-01-02-0003.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -164,6 +167,7 @@
 					Else
 						If $51-01-02-0003.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -180,6 +184,7 @@
 							Var return !assigned StringFmt(  $51-01-03-0003.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -195,6 +200,7 @@
 					Else
 						If $51-01-03-0003.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -409,6 +415,7 @@
 							Var return !assigned StringFmt(  $51-21-01-0006.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -424,6 +431,7 @@
 					Else
 						If $51-21-01-0006.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -440,6 +448,7 @@
 							Var return !assigned StringFmt(  $51-21-02-0003.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -455,6 +464,7 @@
 					Else
 						If $51-21-02-0003.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -471,6 +481,7 @@
 							Var return !assigned StringFmt(  $51-21-03-0003.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -486,6 +497,7 @@
 					Else
 						If $51-21-03-0003.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -700,6 +712,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -715,6 +728,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -731,6 +745,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0010.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -746,6 +761,7 @@
 					Else
 						If $51-05-02-0010.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0010.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -762,6 +778,7 @@
 							Var return !assigned StringFmt(  $51-05-03-0010.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -777,6 +794,7 @@
 					Else
 						If $51-05-03-0010.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-03-0010.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -991,6 +1009,7 @@
 							Var return !assigned StringFmt(  $51-03-01-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1006,6 +1025,7 @@
 					Else
 						If $51-03-01-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-01-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1022,6 +1042,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1037,6 +1058,7 @@
 					Else
 						If $51-03-02-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1053,6 +1075,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1068,6 +1091,7 @@
 					Else
 						If $51-03-03-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)

inter/aus/xml/multi/v3/page_catalog_group_pro_happy_easter.lxml

@@ -72,7 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -118,6 +118,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -133,6 +134,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -149,6 +151,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0044.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -164,6 +167,7 @@
 					Else
 						If $51-05-02-0044.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -180,6 +184,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -195,6 +200,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -409,6 +415,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -424,6 +431,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -440,6 +448,7 @@
 							Var return !assigned StringFmt(  $51-01-02-0068.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -455,6 +464,7 @@
 					Else
 						If $51-01-02-0068.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -471,6 +481,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -486,6 +497,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -700,6 +712,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -715,6 +728,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -731,6 +745,7 @@
 							Var return !assigned StringFmt(  $51-21-02-0068.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -746,6 +761,7 @@
 					Else
 						If $51-21-02-0068.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -762,6 +778,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -777,6 +794,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -991,6 +1009,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1006,6 +1025,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1022,6 +1042,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0063.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0063.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1037,6 +1058,7 @@
 					Else
 						If $51-05-02-0063.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0063.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1053,6 +1075,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1068,6 +1091,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1153,7 +1177,7 @@
 			Var DescLang[0][3] = ""
 			Var DescLang[0][4] = ""
 			Var DescLang[0][5] = ""
-			Var NameLang[1][0] = "STRAWBERRY & MINT SPARKLING"
+			Var NameLang[1][0] = "Sparkling Strawberry and Mint"
 			Var NameLang[1][1] = "สตรอเบอร์รี่มินต์โซดา"
 			Var NameLang[1][2] = "-"
 			Var NameLang[1][3] = "-"

inter/aus/xml/multi/v3/page_catalog_group_pro_hug_in_a_cup.skt

@@ -0,0 +1,42 @@
+<?hurr
+    #include=menu_head.py
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_default_init.lxml"
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_new_menu.lxml"
+    SetInstanceIgnoreTouch
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    ;include="ROOT/taobin_project/inter/aus/xml/multi/ForProGroup.inc"
+
+
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/aus/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+
+</Popup>

inter/aus/xml/multi/v3/page_catalog_group_pro_st_patrick.lxml

@@ -72,7 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -118,6 +118,7 @@
 							Var return !assigned StringFmt(  $51-01-01-0006.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -133,6 +134,7 @@
 					Else
 						If $51-01-01-0006.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-01-0006.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -149,6 +151,7 @@
 							Var return !assigned StringFmt(  $51-01-02-0003.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -164,6 +167,7 @@
 					Else
 						If $51-01-02-0003.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -180,6 +184,7 @@
 							Var return !assigned StringFmt(  $51-01-03-0003.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -195,6 +200,7 @@
 					Else
 						If $51-01-03-0003.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -409,6 +415,7 @@
 							Var return !assigned StringFmt(  $51-21-01-0006.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -424,6 +431,7 @@
 					Else
 						If $51-21-01-0006.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-01-0006.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -440,6 +448,7 @@
 							Var return !assigned StringFmt(  $51-21-02-0003.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -455,6 +464,7 @@
 					Else
 						If $51-21-02-0003.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-02-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -471,6 +481,7 @@
 							Var return !assigned StringFmt(  $51-21-03-0003.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -486,6 +497,7 @@
 					Else
 						If $51-21-03-0003.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -700,6 +712,7 @@
 							Var return !assigned StringFmt(  $51-01-01-0004.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -715,6 +728,7 @@
 					Else
 						If $51-01-01-0004.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-01-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -731,6 +745,7 @@
 							Var return !assigned StringFmt(  $51-01-02-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -746,6 +761,7 @@
 					Else
 						If $51-01-02-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -762,6 +778,7 @@
 							Var return !assigned StringFmt(  $51-01-03-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -777,6 +794,7 @@
 					Else
 						If $51-01-03-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -991,6 +1009,7 @@
 							Var return !assigned StringFmt(  $51-21-01-0004.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1006,6 +1025,7 @@
 					Else
 						If $51-21-01-0004.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-01-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1022,6 +1042,7 @@
 							Var return !assigned StringFmt(  $51-21-02-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1037,6 +1058,7 @@
 					Else
 						If $51-21-02-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1053,6 +1075,7 @@
 							Var return !assigned StringFmt(  $51-21-03-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1068,6 +1091,7 @@
 					Else
 						If $51-21-03-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1244,9 +1268,9 @@
 		; 51-01-01-0007 51-01-02-0004 51-01-03-0004 
 		<Menu>
 		<State> Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,$Sum510101000751010200045101030004) </State>
-		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>CARAMEL LATTE</LanguageSlot1>
@@ -1282,6 +1306,7 @@
 							Var return !assigned StringFmt(  $51-01-01-0007.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1297,6 +1322,7 @@
 					Else
 						If $51-01-01-0007.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-01-0007.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1313,6 +1339,7 @@
 							Var return !assigned StringFmt(  $51-01-02-0004.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1328,6 +1355,7 @@
 					Else
 						If $51-01-02-0004.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-02-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1344,6 +1372,7 @@
 							Var return !assigned StringFmt(  $51-01-03-0004.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1359,6 +1388,7 @@
 					Else
 						If $51-01-03-0004.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-03-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1410,7 +1440,7 @@
 			<Value> $Sum510101000751010200045101030004TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_hug_in_a_cup.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $51-01-01-0007.Price
@@ -1535,9 +1565,9 @@
 		; 51-21-01-0007 51-21-02-0004 51-21-03-0004 
 		<Menu>
 		<State> Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,$Sum512101000751210200045121030004) </State>
-		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_hug_in_a_cup.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_hug_in_a_cup.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_hug_in_a_cup.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>CARAMEL LATTE</LanguageSlot1>
@@ -1573,6 +1603,7 @@
 							Var return !assigned StringFmt(  $51-21-01-0007.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1588,6 +1619,7 @@
 					Else
 						If $51-21-01-0007.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-01-0007.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1604,6 +1636,7 @@
 							Var return !assigned StringFmt(  $51-21-02-0004.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1619,6 +1652,7 @@
 					Else
 						If $51-21-02-0004.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-02-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1635,6 +1669,7 @@
 							Var return !assigned StringFmt(  $51-21-03-0004.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1650,6 +1685,7 @@
 					Else
 						If $51-21-03-0004.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-03-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1701,7 +1737,7 @@
 			<Value> $Sum512101000751210200045121030004TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_hug_in_a_cup.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $51-21-01-0007.Price

inter/aus/xml/multi/v3/page_catalog_group_pro_taste_the_journey.lxml

@@ -72,7 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -118,6 +118,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -133,6 +134,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -149,6 +151,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0033.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0033.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -164,6 +167,7 @@
 					Else
 						If $51-05-02-0033.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0033.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -180,6 +184,7 @@
 							Var return !assigned StringFmt(  $51-05-03-0033.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-03-0033.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -195,6 +200,7 @@
 					Else
 						If $51-05-03-0033.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-03-0033.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -409,6 +415,7 @@
 							Var return !assigned StringFmt(  $51-21-01-0060.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -424,6 +431,7 @@
 					Else
 						If $51-21-01-0060.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-01-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -440,6 +448,7 @@
 							Var return !assigned StringFmt(  $51-21-02-0060.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -455,6 +464,7 @@
 					Else
 						If $51-21-02-0060.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-02-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -471,6 +481,7 @@
 							Var return !assigned StringFmt(  $51-21-03-0060.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -486,6 +497,7 @@
 					Else
 						If $51-21-03-0060.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-03-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -700,6 +712,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -715,6 +728,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -731,6 +745,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -746,6 +761,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -762,6 +778,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0009.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -777,6 +794,7 @@
 					Else
 						If $51-03-03-0009.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0009.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)

inter/aus/xml/multi/v3/page_catalog_group_pro_valentine.lxml

@@ -72,7 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -80,9 +80,9 @@
 		; - 51-05-02-0045 - 
 		<Menu>
 		<State> Flag( 51-05-02-0045.Button,$Sum5105020045) </State>
-		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_hug_in_a_cup.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_hug_in_a_cup.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_hug_in_a_cup.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>SPARKLING YUZU</LanguageSlot1>
@@ -118,6 +118,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -133,6 +134,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -149,6 +151,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0045.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -164,6 +167,7 @@
 					Else
 						If $51-05-02-0045.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0045.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -180,6 +184,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -195,6 +200,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -246,7 +252,7 @@
 			<Value> $Sum5105020045TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda_hug_in_a_cup.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
@@ -409,6 +415,7 @@
 							Var return !assigned StringFmt(  $51-01-01-0040.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -424,6 +431,7 @@
 					Else
 						If $51-01-01-0040.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-01-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -440,6 +448,7 @@
 							Var return !assigned StringFmt(  $51-01-02-0040.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -455,6 +464,7 @@
 					Else
 						If $51-01-02-0040.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -471,6 +481,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -486,6 +497,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -700,6 +712,7 @@
 							Var return !assigned StringFmt(  $51-21-01-0040.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -715,6 +728,7 @@
 					Else
 						If $51-21-01-0040.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-01-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -731,6 +745,7 @@
 							Var return !assigned StringFmt(  $51-21-02-0040.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -746,6 +761,7 @@
 					Else
 						If $51-21-02-0040.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -762,6 +778,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -777,6 +794,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -991,6 +1009,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0039.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1006,6 +1025,7 @@
 					Else
 						If $51-02-01-0039.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1022,6 +1042,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0039.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1037,6 +1058,7 @@
 					Else
 						If $51-02-02-0039.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1053,6 +1075,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0039.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1068,6 +1091,7 @@
 					Else
 						If $51-02-03-0039.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)

inter/aus/xml/multi/v3/page_catalog_group_promotion_coconut.lxml

@@ -72,7 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -118,6 +118,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -133,6 +134,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -149,6 +151,7 @@
 							Var return !assigned StringFmt(  $51-01-02-0068.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -164,6 +167,7 @@
 					Else
 						If $51-01-02-0068.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-01-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -180,6 +184,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -195,6 +200,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -409,6 +415,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -424,6 +431,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -440,6 +448,7 @@
 							Var return !assigned StringFmt(  $51-21-02-0068.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -455,6 +464,7 @@
 					Else
 						If $51-21-02-0068.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-21-02-0068.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -471,6 +481,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -486,6 +497,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -700,6 +712,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -715,6 +728,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -731,6 +745,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0058.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -746,6 +761,7 @@
 					Else
 						If $51-03-02-0058.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0058.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -762,6 +778,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0058.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -777,6 +794,7 @@
 					Else
 						If $51-03-03-0058.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0058.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -991,6 +1009,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1006,6 +1025,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1022,6 +1042,7 @@
 							Var return !assigned StringFmt(  $51-03-02-0059.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1037,6 +1058,7 @@
 					Else
 						If $51-03-02-0059.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-02-0059.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1053,6 +1075,7 @@
 							Var return !assigned StringFmt(  $51-03-03-0059.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1068,6 +1091,7 @@
 					Else
 						If $51-03-03-0059.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-03-03-0059.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1282,6 +1306,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0060.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1297,6 +1322,7 @@
 					Else
 						If $51-02-01-0060.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1313,6 +1339,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0060.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1328,6 +1355,7 @@
 					Else
 						If $51-02-02-0060.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1344,6 +1372,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0060.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1359,6 +1388,7 @@
 					Else
 						If $51-02-03-0060.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1573,6 +1603,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0061.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1588,6 +1619,7 @@
 					Else
 						If $51-02-01-0061.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1604,6 +1636,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0061.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1619,6 +1652,7 @@
 					Else
 						If $51-02-02-0061.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1635,6 +1669,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0061.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1650,6 +1685,7 @@
 					Else
 						If $51-02-03-0061.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1864,6 +1900,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1879,6 +1916,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1895,6 +1933,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0062.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1910,6 +1949,7 @@
 					Else
 						If $51-02-02-0062.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1926,6 +1966,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0062.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1941,6 +1982,7 @@
 					Else
 						If $51-02-03-0062.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2155,6 +2197,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2170,6 +2213,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2186,6 +2230,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0063.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2201,6 +2246,7 @@
 					Else
 						If $51-02-02-0063.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2217,6 +2263,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0063.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2232,6 +2279,7 @@
 					Else
 						If $51-02-03-0063.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2446,6 +2494,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2461,6 +2510,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2477,6 +2527,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0064.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2492,6 +2543,7 @@
 					Else
 						If $51-02-02-0064.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2508,6 +2560,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0064.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2523,6 +2576,7 @@
 					Else
 						If $51-02-03-0064.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2737,6 +2791,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2752,6 +2807,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2768,6 +2824,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0065.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2783,6 +2840,7 @@
 					Else
 						If $51-02-02-0065.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2799,6 +2857,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0065.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2814,6 +2873,7 @@
 					Else
 						If $51-02-03-0065.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3028,6 +3088,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3043,6 +3104,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3059,6 +3121,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3074,6 +3137,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3090,6 +3154,7 @@
 							Var return !assigned StringFmt(  $51-05-03-0092.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-03-0092.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3105,6 +3170,7 @@
 					Else
 						If $51-05-03-0092.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-03-0092.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3319,6 +3385,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3334,6 +3401,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3350,6 +3418,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0090.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3365,6 +3434,7 @@
 					Else
 						If $51-05-02-0090.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0090.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3381,6 +3451,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3396,6 +3467,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3481,7 +3553,7 @@
 			Var DescLang[0][3] = ""
 			Var DescLang[0][4] = ""
 			Var DescLang[0][5] = ""
-			Var NameLang[1][0] = "COCONUT SODA"
+			Var NameLang[1][0] = "SPARKLING COCONUT"
 			Var NameLang[1][1] = ""
 			Var NameLang[1][2] = ""
 			Var NameLang[1][3] = ""
@@ -3610,6 +3682,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3625,6 +3698,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3641,6 +3715,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0091.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3656,6 +3731,7 @@
 					Else
 						If $51-05-02-0091.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3672,6 +3748,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0091.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3687,6 +3764,7 @@
 					Else
 						If $51-05-02-0091.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0091.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3901,6 +3979,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3916,6 +3995,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3932,6 +4012,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0117.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3947,6 +4028,7 @@
 					Else
 						If $51-05-02-0117.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0117.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3963,6 +4045,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3978,6 +4061,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4192,6 +4276,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4207,6 +4292,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4223,6 +4309,7 @@
 							Var return !assigned StringFmt(  $51-05-02-0093.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-05-02-0093.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4238,6 +4325,7 @@
 					Else
 						If $51-05-02-0093.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-05-02-0093.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4254,6 +4342,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4269,6 +4358,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)

inter/aus/xml/multi/v3/page_catalog_group_tea.lxml

@@ -173,7 +173,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -219,6 +219,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0026.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -234,6 +235,7 @@
 					Else
 						If $51-02-01-0026.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0026.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -250,6 +252,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0026.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -265,6 +268,7 @@
 					Else
 						If $51-02-02-0026.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0026.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -281,6 +285,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0026.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -296,6 +301,7 @@
 					Else
 						If $51-02-03-0026.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0026.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -510,6 +516,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0071.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -525,6 +532,7 @@
 					Else
 						If $51-02-01-0071.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0071.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -541,6 +549,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0071.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -556,6 +565,7 @@
 					Else
 						If $51-02-02-0071.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -572,6 +582,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0071.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -587,6 +598,7 @@
 					Else
 						If $51-02-03-0071.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0071.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -801,6 +813,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0027.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0027.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -816,6 +829,7 @@
 					Else
 						If $51-02-01-0027.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0027.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -832,6 +846,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0027.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0027.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -847,6 +862,7 @@
 					Else
 						If $51-02-02-0027.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0027.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -863,6 +879,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0027.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0027.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -878,6 +895,7 @@
 					Else
 						If $51-02-03-0027.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0027.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1092,6 +1110,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0028.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0028.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1107,6 +1126,7 @@
 					Else
 						If $51-02-01-0028.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0028.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1123,6 +1143,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0028.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0028.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1138,6 +1159,7 @@
 					Else
 						If $51-02-02-0028.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0028.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1154,6 +1176,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0028.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0028.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1169,6 +1192,7 @@
 					Else
 						If $51-02-03-0028.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0028.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1383,6 +1407,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0060.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1398,6 +1423,7 @@
 					Else
 						If $51-02-01-0060.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1414,6 +1440,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0060.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1429,6 +1456,7 @@
 					Else
 						If $51-02-02-0060.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1445,6 +1473,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0060.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1460,6 +1489,7 @@
 					Else
 						If $51-02-03-0060.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0060.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1674,6 +1704,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0061.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1689,6 +1720,7 @@
 					Else
 						If $51-02-01-0061.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1705,6 +1737,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0061.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1720,6 +1753,7 @@
 					Else
 						If $51-02-02-0061.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1736,6 +1770,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0061.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1751,6 +1786,7 @@
 					Else
 						If $51-02-03-0061.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0061.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1965,6 +2001,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0039.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1980,6 +2017,7 @@
 					Else
 						If $51-02-01-0039.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1996,6 +2034,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0039.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2011,6 +2050,7 @@
 					Else
 						If $51-02-02-0039.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2027,6 +2067,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0039.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2042,6 +2083,7 @@
 					Else
 						If $51-02-03-0039.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0039.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2256,6 +2298,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0047.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0047.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2271,6 +2314,7 @@
 					Else
 						If $51-02-01-0047.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0047.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2287,6 +2331,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0047.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0047.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2302,6 +2347,7 @@
 					Else
 						If $51-02-02-0047.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0047.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2318,6 +2364,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2333,6 +2380,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2547,6 +2595,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0040.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2562,6 +2611,7 @@
 					Else
 						If $51-02-01-0040.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2578,6 +2628,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0040.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2593,6 +2644,7 @@
 					Else
 						If $51-02-02-0040.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2609,6 +2661,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0040.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2624,6 +2677,7 @@
 					Else
 						If $51-02-03-0040.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0040.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2838,6 +2892,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2853,6 +2908,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2869,6 +2925,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0062.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2884,6 +2941,7 @@
 					Else
 						If $51-02-02-0062.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0062.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2900,6 +2958,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0062.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2915,6 +2974,7 @@
 					Else
 						If $51-02-03-0062.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0062.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3096,7 +3156,7 @@
 		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_THAI_BLACK_TEA.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
-				<LanguageSlot1>Coconut Thai Black Tea</LanguageSlot1>
+				<LanguageSlot1>Coconut Thai\nBlack Tea</LanguageSlot1>
 				<LanguageSlot2></LanguageSlot2>
 				<LanguageSlot3></LanguageSlot3>
 				<LanguageSlot4></LanguageSlot4>
@@ -3129,6 +3189,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3144,6 +3205,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3160,6 +3222,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0063.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3175,6 +3238,7 @@
 					Else
 						If $51-02-02-0063.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0063.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3191,6 +3255,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0063.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3206,6 +3271,7 @@
 					Else
 						If $51-02-03-0063.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0063.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3267,7 +3333,7 @@
 			Var PD_CODE2 = "51-02-02-0063"
 			Var PD_CODE3 = "51-02-03-0063"
 			; begin lang
-			Var aliasName[0] = "Coconut Thai Black Tea"
+			Var aliasName[0] = "Coconut Thai\nBlack Tea"
 			Var aliasDesc[0] = "Coconut Syrup, Thai Tea and Water"
 			Var aliasName[1] = ""
 			Var aliasDesc[1] = ""
@@ -3382,9 +3448,9 @@
 		; 51-02-01-0046 51-02-02-0046 - 
 		<Menu>
 		<State> Flag( 51-02-01-0046.Button,51-02-02-0046.Button,$Sum51020100465102020046) </State>
-		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_jasmine_milk_tea.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_jasmine_milk_tea_hug_in_a_cup.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_jasmine_milk_tea.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_jasmine_milk_tea_hug_in_a_cup.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_jasmine_milk_tea.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_jasmine_milk_tea_hug_in_a_cup.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>Jasmine Milk Tea</LanguageSlot1>
@@ -3420,6 +3486,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0046.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0046.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3435,6 +3502,7 @@
 					Else
 						If $51-02-01-0046.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0046.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3451,6 +3519,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0046.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0046.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3466,6 +3535,7 @@
 					Else
 						If $51-02-02-0046.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0046.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3482,6 +3552,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3497,6 +3568,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3548,7 +3620,7 @@
 			<Value> $Sum51020100465102020046TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea_hug_in_a_cup.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $51-02-01-0046.Price
@@ -3711,6 +3783,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0045.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0045.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3726,6 +3799,7 @@
 					Else
 						If $51-02-01-0045.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0045.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3742,6 +3816,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0045.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0045.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3757,6 +3832,7 @@
 					Else
 						If $51-02-02-0045.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0045.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3773,6 +3849,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -3788,6 +3865,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4002,6 +4080,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4017,6 +4096,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4033,6 +4113,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0064.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4048,6 +4129,7 @@
 					Else
 						If $51-02-02-0064.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0064.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4064,6 +4146,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0064.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4079,6 +4162,7 @@
 					Else
 						If $51-02-03-0064.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0064.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4293,6 +4377,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4308,6 +4393,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4324,6 +4410,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0065.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4339,6 +4426,7 @@
 					Else
 						If $51-02-02-0065.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0065.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4355,6 +4443,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0065.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4370,6 +4459,7 @@
 					Else
 						If $51-02-03-0065.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0065.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4584,6 +4674,7 @@
 							Var return !assigned StringFmt(  $51-02-01-0050.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-01-0050.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4599,6 +4690,7 @@
 					Else
 						If $51-02-01-0050.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-01-0050.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4615,6 +4707,7 @@
 							Var return !assigned StringFmt(  $51-02-02-0050.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-02-0050.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4630,6 +4723,7 @@
 					Else
 						If $51-02-02-0050.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-02-0050.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4646,6 +4740,7 @@
 							Var return !assigned StringFmt(  $51-02-03-0050.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-02-03-0050.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -4661,6 +4756,7 @@
 					Else
 						If $51-02-03-0050.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-02-03-0050.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)

inter/aus/xml/multi/v3/page_catalog_group_whey.lxml

@@ -114,7 +114,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
-		<ShowOriginalPrice> ShowOriginalPrice </ShowOriginalPrice>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -160,6 +160,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -175,6 +176,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -191,6 +193,7 @@
 							Var return !assigned StringFmt(  $51-04-02-0011.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-0011.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -206,6 +209,7 @@
 					Else
 						If $51-04-02-0011.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-0011.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -222,6 +226,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -237,6 +242,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -451,6 +457,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -466,6 +473,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -482,6 +490,7 @@
 							Var return !assigned StringFmt(  $51-04-02-0016.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -497,6 +506,7 @@
 					Else
 						If $51-04-02-0016.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -513,6 +523,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -528,6 +539,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -742,6 +754,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -757,6 +770,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -773,6 +787,7 @@
 							Var return !assigned StringFmt(  $51-04-02-0002.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -788,6 +803,7 @@
 					Else
 						If $51-04-02-0002.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-0002.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -804,6 +820,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -819,6 +836,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1033,6 +1051,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1048,6 +1067,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1064,6 +1084,7 @@
 							Var return !assigned StringFmt(  $51-04-02-0009.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-0009.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1079,6 +1100,7 @@
 					Else
 						If $51-04-02-0009.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-0009.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1095,6 +1117,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1110,6 +1133,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1324,6 +1348,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1339,6 +1364,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1355,6 +1381,7 @@
 							Var return !assigned StringFmt(  $51-04-02-0062.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1370,6 +1397,7 @@
 					Else
 						If $51-04-02-0062.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1386,6 +1414,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1401,6 +1430,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1615,6 +1645,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1630,6 +1661,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1646,6 +1678,7 @@
 							Var return !assigned StringFmt(  $51-04-02-0004.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1661,6 +1694,7 @@
 					Else
 						If $51-04-02-0004.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-0004.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1677,6 +1711,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1692,6 +1727,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1906,6 +1942,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1921,6 +1958,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1937,6 +1975,7 @@
 							Var return !assigned StringFmt(  $51-04-02-0013.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-0013.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1952,6 +1991,7 @@
 					Else
 						If $51-04-02-0013.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-0013.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1968,6 +2008,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -1983,6 +2024,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2197,6 +2239,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2212,6 +2255,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2228,6 +2272,7 @@
 							Var return !assigned StringFmt(  $51-04-02-0018.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-0018.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2243,6 +2288,7 @@
 					Else
 						If $51-04-02-0018.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-0018.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2259,6 +2305,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2274,6 +2321,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2488,6 +2536,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2503,6 +2552,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2519,6 +2569,7 @@
 							Var return !assigned StringFmt(  $51-04-02-0055.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-0055.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2534,6 +2585,7 @@
 					Else
 						If $51-04-02-0055.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-0055.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2550,6 +2602,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2565,6 +2618,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2779,6 +2833,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2794,6 +2849,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2810,6 +2866,7 @@
 							Var return !assigned StringFmt(  $51-04-02-0010.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $51-04-02-0010.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2825,6 +2882,7 @@
 					Else
 						If $51-04-02-0010.Discount = > 0 Then
 							Var return !assigned StringFmt(  $51-04-02-0010.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2841,6 +2899,7 @@
 							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
 						Else
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)
@@ -2856,6 +2915,7 @@
 					Else
 						If $##-##-##-####.Discount = > 0 Then
 							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+						EndIf
 					EndIf
 				EndIf
 			)

inter/aus/xml/page_topping_select6.lxml

@@ -19,9 +19,10 @@
 
 	If NoWaitMachineEnable = 1 Then
 		Var ConfirmDrinkButtonState = "Enable"
+		Var ShowNormalNextButton = "Invisible"
 	Else
-
 		Var ConfirmDrinkButtonState = "Invisible"
+		Var ShowNormalNextButton = "Enable"
 	EndIf
 
 	Var y_topping_bg = 912
@@ -63,7 +64,6 @@
 	Var ShowStrawOnly = "Invisible"
 	Var ShowLidOnly = "Invisible"
 
-	Var ShowNormalNextButton = "Enable"
 
 	; On open
 	Var lidAndStrawOldPageIgnore = "true"
@@ -463,6 +463,8 @@
 		DEBUGVAR ConfirmDrinkButtonState
 		If MachineStage = "close-maintenance" Then
 			Var ConfirmDrinkButtonState = "Enable"
+			Var ShowNormalNextButton = "Invisible"
+
 
 			If stop_now = "true" Then
 					SAVELOG "stop_now is true page_topping_select7.xml"
@@ -470,6 +472,7 @@
 			EndIf
 		Else
 			Var ConfirmDrinkButtonState = "Invisible"
+			Var ShowNormalNextButton = "Enable"
 		EndIf
 
 	EndIf
@@ -545,6 +548,7 @@
 			Else
 				Var TextSelfTestCntColor = "0x513C2F"
 				Var ConfirmDrinkButtonState = "Enable"
+				Var ShowNormalNextButton = "Invisible"
 
 				Var ShowTextSelfTestCountDown = "Please take out the glass."
 			EndIf
@@ -553,10 +557,12 @@
 
 	If MenuReason = "brew-stg" Then
 		Var ConfirmDrinkButtonState = "Enable"
+		Var ShowNormalNextButton = "Invisible"
 		If Timeout > 15 Then
 			Var MenuReason = "-"
 			Var Timeout = 0
 			Var ConfirmDrinkButtonState = "Invisible"
+			Var ShowNormalNextButton = "Enable"
 		EndIf
 
 	EndIf

inter/gbr/xml/page_catalog_group_other.lxml

@@ -8704,7 +8704,7 @@
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "LYCHEE SPARKLING\nLIMENADE"
-		Var aliasDesc[0] = "Strawberry Syrup,\nLimenade, Soda & Ice"
+		Var aliasDesc[0] = "Lychee Syrup,\nLimenade, Soda & Ice"
 		Var aliasName[1] = "ลิ้นจี่มะนาวโซดา"
 		Var aliasDesc[1] = "น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา"
 		Var aliasName[2] = "-"
@@ -8727,13 +8727,13 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "Iced LYCHEE LIMENADE SODA"
+		Var NameLang[1][0] = "LYCHEE SPARKLING LIMENADE"
 		Var NameLang[1][1] = "ลิ้นจี่มะนาวโซดาเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = "SODA LAICI LIMAU"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Strawberry Syrup,Limenade,Soda, Ice"
+		Var DescLang[1][0] = "Lychee Syrup, Limenade, Soda & Ice"
 		Var DescLang[1][1] = "น้ำเชื่อมสตอเบอร์รี่ มะนาว โซดา และน้ำแข็ง"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
@@ -8814,9 +8814,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Strawberry Syrup,\nLimenade, Soda & Ice</LanguageSlot1>
+		<LanguageSlot1>Lychee Syrup,\nLimenade, Soda & Ice</LanguageSlot1>
 		<LanguageSlot2>น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา</LanguageSlot2>
-		<LanguageSlot3>Strawberry Syrup,\nLimenade, Soda & Ice</LanguageSlot3>
+		<LanguageSlot3>Lychee Syrup,\nLimenade, Soda & Ice</LanguageSlot3>
 		<LanguageSlot4>น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา</LanguageSlot6>

inter/gbr/xml/page_catalog_group_recommend.lxml

@@ -4989,7 +4989,7 @@
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "LYCHEE SPARKLING\nLIMENADE"
-		Var aliasDesc[0] = "Strawberry Syrup,\nLimenade, Soda & Ice"
+		Var aliasDesc[0] = "Lychee Syrup,\nLimenade, Soda & Ice"
 		Var aliasName[1] = "ลิ้นจี่มะนาวโซดา"
 		Var aliasDesc[1] = "น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา"
 		Var aliasName[2] = "-"
@@ -5012,13 +5012,13 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "Iced LYCHEE LIMENADE SODA"
+		Var NameLang[1][0] = "LYCHEE SPARKLING LIMENADE"
 		Var NameLang[1][1] = "ลิ้นจี่มะนาวโซดาเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = "SODA LAICI LIMAU"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Strawberry Syrup,Limenade,Soda, Ice"
+		Var DescLang[1][0] = "Lychee Syrup, Limenade, Soda & Ice"
 		Var DescLang[1][1] = "น้ำเชื่อมสตอเบอร์รี่ มะนาว โซดา และน้ำแข็ง"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
@@ -5099,9 +5099,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Strawberry Syrup,\nLimenade, Soda & Ice</LanguageSlot1>
+		<LanguageSlot1>Lychee Syrup,\nLimenade, Soda & Ice</LanguageSlot1>
 		<LanguageSlot2>น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา</LanguageSlot2>
-		<LanguageSlot3>Strawberry Syrup,\nLimenade, Soda & Ice</LanguageSlot3>
+		<LanguageSlot3>Lychee Syrup,\nLimenade, Soda & Ice</LanguageSlot3>
 		<LanguageSlot4>น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา</LanguageSlot6>

inter/gbr/xml/page_catalog_group_recommend_multi_pro.lxml

@@ -4964,7 +4964,7 @@
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "LYCHEE SPARKLING\nLIMENADE"
-		Var aliasDesc[0] = "Strawberry Syrup,\nLimenade, Soda & Ice"
+		Var aliasDesc[0] = "Lychee Syrup,\nLimenade, Soda & Ice"
 		Var aliasName[1] = "ลิ้นจี่มะนาวโซดา"
 		Var aliasDesc[1] = "น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา"
 		Var aliasName[2] = "-"
@@ -4987,13 +4987,13 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "Iced LYCHEE LIMENADE SODA"
+		Var NameLang[1][0] = "LYCHEE SPARKLING LIMENADE"
 		Var NameLang[1][1] = "ลิ้นจี่มะนาวโซดาเย็น"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = "SODA LAICI LIMAU"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Strawberry Syrup,Limenade,Soda, Ice"
+		Var DescLang[1][0] = "Lychee Syrup, Limenade, Soda & Ice"
 		Var DescLang[1][1] = "น้ำเชื่อมสตอเบอร์รี่ มะนาว โซดา และน้ำแข็ง"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
@@ -5074,9 +5074,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Strawberry Syrup,\nLimenade, Soda & Ice</LanguageSlot1>
+		<LanguageSlot1>Lychee Syrup,\nLimenade, Soda & Ice</LanguageSlot1>
 		<LanguageSlot2>น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา</LanguageSlot2>
-		<LanguageSlot3>Strawberry Syrup,\nLimenade, Soda & Ice</LanguageSlot3>
+		<LanguageSlot3>Lychee Syrup,\nLimenade, Soda & Ice</LanguageSlot3>
 		<LanguageSlot4>น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา</LanguageSlot6>

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

@@ -93,25 +93,25 @@
 
       out_xml('\t\t<BlendState> ' + pd_stage3 + ' </BlendState>\n')
 
-			if "show-blend-only" in xml_parameter:
+      if "show-blend-only" in xml_parameter:
-				print("Hot price ignore ")
+        print("Hot price ignore ")
-			else:
+      else:
-				out_xml('\t\t<HotPrice>\n')
+        out_xml('\t\t<HotPrice>\n')
-				out_xml('\t\t\teval(\n')
+        out_xml('\t\t\teval(\n')
-				out_xml('\t\t\t\tIf $' + pd_code_1 +'.Price = -1 Then\n')
+        out_xml('\t\t\t\tIf $' + pd_code_1 +'.Price = -1 Then\n')
-				out_xml('\t\t\t\t\tVar return = "Free"\n')
+        out_xml('\t\t\t\t\tVar return = "Free"\n')
-				out_xml('\t\t\t\tElse\n')
+        out_xml('\t\t\t\tElse\n')
-				out_xml('\t\t\t\t\tIf $' + pd_code_1 + '.Discount = "" Then\n')
+        out_xml('\t\t\t\t\tIf $' + pd_code_1 + '.Discount = "" Then\n')
-				out_xml('\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
-				out_xml('\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\tElse\n')
-				out_xml('\t\t\t\t\t\tIf $' + pd_code_1 + '.Discount = > 0 Then\n')
+        out_xml('\t\t\t\t\t\tIf $' + pd_code_1 + '.Discount = > 0 Then\n')
-				out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Discount , DisplayFormat, PreScaleConvertShow)\n')
-				out_xml('\t\t\t\t\t\tElse\n')
+        out_xml('\t\t\t\t\t\tElse\n')
-				out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
+        out_xml('\t\t\t\t\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
-				out_xml('\t\t\t\t\tEndIf\n')
+        out_xml('\t\t\t\t\tEndIf\n')
-				out_xml('\t\t\t\tEndIf\n')
+        out_xml('\t\t\t\tEndIf\n')
-				out_xml('\t\t\t)\n')
+        out_xml('\t\t\t)\n')
-				out_xml('\t\t</HotPrice>\n')
+        out_xml('\t\t</HotPrice>\n')
 
         out_xml('\t\t<HotOriginalPrice>\n')
         out_xml('\t\t\teval(\n')
@@ -366,27 +366,30 @@
       out_xml( '\t\t\t\tVar menu_name_eng_blender = NameLang[2][0]\n')
       out_xml( '\t\t\t\tVar menu_desc_eng_blender = DescLang[2][0]\n')
       out_xml( '\t\t\t\t\n')
-      out_xml( '\t\t\t\t\n')
-      out_xml( '\t\t\t\t\n')
       out_xml( '\t\t\t\tVar menu_name_thai_hot = NameLang[0][1]\n')
       out_xml( '\t\t\t\tVar menu_desc_thai_hot = DescLang[0][1]\n')
       out_xml( '\t\t\t\tVar menu_name_thai_cold = NameLang[1][1]\n')
       out_xml( '\t\t\t\tVar menu_desc_thai_cold = DescLang[1][1]\n')
       out_xml( '\t\t\t\tVar menu_name_thai_blender = NameLang[2][1]\n')
       out_xml( '\t\t\t\tVar menu_desc_thai_blender = DescLang[2][1]\n')
+
+      out_xml('\t\t\t\tVar menu_name_for_aot_eng_hot = $' + hot_pd.replace("-alter", "") + '.NameE\n')
+      out_xml('\t\t\t\tVar menu_name_for_aot_eng_cold = $' + cold_pd.replace("-alter", "") + '.NameE\n')
+      out_xml('\t\t\t\tVar menu_name_for_aot_eng_blender = $' + blend_pd.replace("-alter", "") + '.NameE\n')
+
       out_xml( '\t\t\t\tDEBUGVAR menu_name_thai_cold\n')
       out_xml( '\t\t\t\tDEBUGVAR menu_desc_thai_cold\n')
 
-      out_xml( '\t\t\t\t\tVar NameDrink = aliasName[0]\n')
+      out_xml( '\t\t\t\tVar NameDrink = aliasName[0]\n')
-      out_xml( '\t\t\t\t\tVar DrinkDescription =  aliasDesc[0]\n')
+      out_xml( '\t\t\t\tVar DrinkDescription =  aliasDesc[0]\n')
-      out_xml( '\t\t\t\t\tVar NameDrinkTH = aliasName[1]\n')
+      out_xml( '\t\t\t\tVar NameDrinkTH = aliasName[1]\n')
-      out_xml( '\t\t\t\t\tVar DrinkDescriptionTH = aliasDesc[1]\n')
+      out_xml( '\t\t\t\tVar DrinkDescriptionTH = aliasDesc[1]\n')
 
-      out_xml( '\t\t\tIf LanguageShow = "THAI" Then\n')
+      out_xml( '\t\t\t\tIf LanguageShow = "THAI" Then\n')
-      out_xml( '\t\t\t\tVar show_eng =  "false"\n')
+      out_xml( '\t\t\t\t\tVar show_eng =  "false"\n')
-      out_xml( '\t\t\tElse\n')
+      out_xml( '\t\t\t\tElse\n')
-      out_xml( '\t\t\t\tVar show_eng =  "true"\n')
+      out_xml( '\t\t\t\t\tVar show_eng =  "true"\n')
-      out_xml( '\t\t\tEndIf\n')
+      out_xml( '\t\t\t\tEndIf\n')
 
       if len( topping_xml_file) > 0 :
         print("topping_xml_file=" + topping_xml_file)

inter/tha/xml/multi/v3/page_catalog_group_appfast.lxml

@@ -58,7 +58,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -77,9 +77,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -87,6 +88,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -120,27 +122,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-04-02-1018.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-04-02-1018.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-04-02-1018.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-04-02-1018.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-04-02-1018.Discount = "" Then
+						Var return !assigned StringFmt(  $12-04-02-1018.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-04-02-1018.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-04-02-1018.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-04-02-1018.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-04-02-1018.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-04-02-1018.Discount = "" Then
+						Var return ""
+					Else
+						If $12-04-02-1018.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-04-02-1018.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -288,25 +362,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-04-02-1018.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -347,27 +422,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-04-02-1019.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-04-02-1019.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-04-02-1019.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-04-02-1019.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-04-02-1019.Discount = "" Then
+						Var return !assigned StringFmt(  $12-04-02-1019.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-04-02-1019.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-04-02-1019.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-04-02-1019.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-04-02-1019.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-04-02-1019.Discount = "" Then
+						Var return ""
+					Else
+						If $12-04-02-1019.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-04-02-1019.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -515,25 +662,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-04-02-1019.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -574,27 +722,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-04-02-1020.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-04-02-1020.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-04-02-1020.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-04-02-1020.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-04-02-1020.Discount = "" Then
+						Var return !assigned StringFmt(  $12-04-02-1020.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-04-02-1020.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-04-02-1020.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-04-02-1020.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-04-02-1020.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-04-02-1020.Discount = "" Then
+						Var return ""
+					Else
+						If $12-04-02-1020.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-04-02-1020.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -742,25 +962,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-04-02-1020.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -801,27 +1022,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-04-02-1021.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-04-02-1021.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-04-02-1021.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-04-02-1021.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-04-02-1021.Discount = "" Then
+						Var return !assigned StringFmt(  $12-04-02-1021.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-04-02-1021.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-04-02-1021.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-04-02-1021.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-04-02-1021.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-04-02-1021.Discount = "" Then
+						Var return ""
+					Else
+						If $12-04-02-1021.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-04-02-1021.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -969,25 +1262,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-04-02-1021.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -1028,27 +1322,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-04-02-1022.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-04-02-1022.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-04-02-1022.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-04-02-1022.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-04-02-1022.Discount = "" Then
+						Var return !assigned StringFmt(  $12-04-02-1022.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-04-02-1022.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-04-02-1022.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-04-02-1022.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-04-02-1022.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-04-02-1022.Discount = "" Then
+						Var return ""
+					Else
+						If $12-04-02-1022.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-04-02-1022.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1196,25 +1562,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-04-02-1022.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

inter/tha/xml/multi/v3/page_catalog_group_deep_fryer.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -104,27 +106,99 @@
 		<HotState> $TAOTIM.Button </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-51-01-0001.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $TAOTIM.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $TAOTIM.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $TAOTIM.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $TAOTIM.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $TAOTIM.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-51-01-0001.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-51-01-0001.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $TAOTIM.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $TAOTIM.Discount = "" Then
+						Var return ""
+					Else
+						If $TAOTIM.Discount = > 0 Then
+							Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-51-01-0001.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-51-01-0001.Discount = "" Then
+						Var return !assigned StringFmt(  $12-51-01-0001.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-51-01-0001.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-51-01-0001.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-51-01-0001.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-51-01-0001.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-51-01-0001.Discount = "" Then
+						Var return ""
+					Else
+						If $12-51-01-0001.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-51-01-0001.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -272,25 +346,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $TAOTIM.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-51-01-0001.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -331,27 +406,99 @@
 		<HotState> $TAOTIM.Button </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-51-01-0002.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $TAOTIM.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $TAOTIM.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $TAOTIM.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $TAOTIM.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $TAOTIM.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-51-01-0002.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-51-01-0002.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $TAOTIM.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $TAOTIM.Discount = "" Then
+						Var return ""
+					Else
+						If $TAOTIM.Discount = > 0 Then
+							Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-51-01-0002.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-51-01-0002.Discount = "" Then
+						Var return !assigned StringFmt(  $12-51-01-0002.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-51-01-0002.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-51-01-0002.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-51-01-0002.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-51-01-0002.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-51-01-0002.Discount = "" Then
+						Var return ""
+					Else
+						If $12-51-01-0002.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-51-01-0002.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -499,25 +646,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $TAOTIM.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-51-01-0002.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -558,27 +706,99 @@
 		<HotState> $TAOTIM.Button </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-51-01-0003.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $TAOTIM.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $TAOTIM.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $TAOTIM.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $TAOTIM.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $TAOTIM.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-51-01-0003.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-51-01-0003.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $TAOTIM.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $TAOTIM.Discount = "" Then
+						Var return ""
+					Else
+						If $TAOTIM.Discount = > 0 Then
+							Var return !assigned StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-51-01-0003.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-51-01-0003.Discount = "" Then
+						Var return !assigned StringFmt(  $12-51-01-0003.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-51-01-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-51-01-0003.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-51-01-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-51-01-0003.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-51-01-0003.Discount = "" Then
+						Var return ""
+					Else
+						If $12-51-01-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-51-01-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -726,25 +946,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $TAOTIM.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-51-01-0003.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml

@@ -100,7 +100,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -119,9 +119,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -129,6 +130,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -160,13 +162,37 @@
 			</LanguageGroup>
 		</Description>
 		<BlendState> $12-00-07-0000.Button </BlendState>
-		<BlendPrice> eval( 
+		<BlendPrice>
-		If $12-00-07-0000.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-00-07-0000.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-00-07-0000.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-00-07-0000.Discount = "" Then
-		) </BlendPrice>
+						Var return !assigned StringFmt(  $12-00-07-0000.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-00-07-0000.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-00-07-0000.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-00-07-0000.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-00-07-0000.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-00-07-0000.Discount = "" Then
+						Var return ""
+					Else
+						If $12-00-07-0000.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-00-07-0000.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -312,25 +338,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-00-07-0000.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
@@ -369,13 +396,37 @@
 			</LanguageGroup>
 		</Description>
 		<BlendState> $12-06-03-0001.Button </BlendState>
-		<BlendPrice> eval( 
+		<BlendPrice>
-		If $12-06-03-0001.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-06-03-0001.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-06-03-0001.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-06-03-0001.Discount = "" Then
-		) </BlendPrice>
+						Var return !assigned StringFmt(  $12-06-03-0001.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-06-03-0001.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0001.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-06-03-0001.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-06-03-0001.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-06-03-0001.Discount = "" Then
+						Var return ""
+					Else
+						If $12-06-03-0001.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0001.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -521,25 +572,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-06-03-0001.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
@@ -578,13 +630,37 @@
 			</LanguageGroup>
 		</Description>
 		<BlendState> $12-06-03-0002.Button </BlendState>
-		<BlendPrice> eval( 
+		<BlendPrice>
-		If $12-06-03-0002.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-06-03-0002.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-06-03-0002.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-06-03-0002.Discount = "" Then
-		) </BlendPrice>
+						Var return !assigned StringFmt(  $12-06-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-06-03-0002.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0002.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-06-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-06-03-0002.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-06-03-0002.Discount = "" Then
+						Var return ""
+					Else
+						If $12-06-03-0002.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0002.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -730,25 +806,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-06-03-0002.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
@@ -787,13 +864,37 @@
 			</LanguageGroup>
 		</Description>
 		<BlendState> $12-06-03-0003.Button </BlendState>
-		<BlendPrice> eval( 
+		<BlendPrice>
-		If $12-06-03-0003.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-06-03-0003.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-06-03-0003.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-06-03-0003.Discount = "" Then
-		) </BlendPrice>
+						Var return !assigned StringFmt(  $12-06-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-06-03-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0003.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-06-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-06-03-0003.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-06-03-0003.Discount = "" Then
+						Var return ""
+					Else
+						If $12-06-03-0003.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0003.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -939,25 +1040,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-06-03-0003.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
@@ -996,13 +1098,37 @@
 			</LanguageGroup>
 		</Description>
 		<BlendState> $12-06-03-0004.Button </BlendState>
-		<BlendPrice> eval( 
+		<BlendPrice>
-		If $12-06-03-0004.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-06-03-0004.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-06-03-0004.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-06-03-0004.Discount = "" Then
-		) </BlendPrice>
+						Var return !assigned StringFmt(  $12-06-03-0004.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-06-03-0004.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0004.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-06-03-0004.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-06-03-0004.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-06-03-0004.Discount = "" Then
+						Var return ""
+					Else
+						If $12-06-03-0004.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0004.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1148,25 +1274,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-06-03-0004.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
@@ -1205,13 +1332,37 @@
 			</LanguageGroup>
 		</Description>
 		<BlendState> $12-06-03-0005.Button </BlendState>
-		<BlendPrice> eval( 
+		<BlendPrice>
-		If $12-06-03-0005.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-06-03-0005.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-06-03-0005.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-06-03-0005.Discount = "" Then
-		) </BlendPrice>
+						Var return !assigned StringFmt(  $12-06-03-0005.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-06-03-0005.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0005.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-06-03-0005.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-06-03-0005.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-06-03-0005.Discount = "" Then
+						Var return ""
+					Else
+						If $12-06-03-0005.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0005.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1357,25 +1508,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-06-03-0005.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
@@ -1414,13 +1566,37 @@
 			</LanguageGroup>
 		</Description>
 		<BlendState> $12-06-03-0006.Button </BlendState>
-		<BlendPrice> eval( 
+		<BlendPrice>
-		If $12-06-03-0006.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-06-03-0006.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-06-03-0006.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-06-03-0006.Discount = "" Then
-		) </BlendPrice>
+						Var return !assigned StringFmt(  $12-06-03-0006.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-06-03-0006.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0006.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-06-03-0006.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-06-03-0006.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-06-03-0006.Discount = "" Then
+						Var return ""
+					Else
+						If $12-06-03-0006.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-06-03-0006.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1566,25 +1742,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-06-03-0006.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml"

inter/tha/xml/multi/v3/page_catalog_group_pro_coconut_milk.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -104,27 +106,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-03-03-0103.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-03-03-0103.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-03-03-0103.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-03-03-0103.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-03-0103.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-03-0103.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-03-0103.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0103.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-03-0103.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-03-0103.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-03-0103.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-03-0103.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0103.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -272,25 +346,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-03-03-0103.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -331,27 +406,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-03-03-0104.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-03-03-0104.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-03-03-0104.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-03-03-0104.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-03-0104.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-03-0104.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-03-0104.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0104.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-03-0104.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-03-0104.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-03-0104.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-03-0104.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0104.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -499,25 +646,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-03-03-0104.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -558,27 +706,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-03-03-0105.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-03-03-0105.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-03-03-0105.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-03-03-0105.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-03-0105.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-03-0105.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-03-0105.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0105.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-03-0105.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-03-0105.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-03-0105.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-03-0105.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0105.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -726,25 +946,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-03-03-0105.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -785,27 +1006,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-03-03-0106.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-03-03-0106.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-03-03-0106.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-03-03-0106.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-03-0106.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-03-0106.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-03-0106.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0106.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-03-0106.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-03-0106.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-03-0106.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-03-0106.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0106.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -953,25 +1246,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-03-03-0106.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -1012,27 +1306,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-01-03-0090.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-01-03-0090.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-01-03-0090.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-01-03-0090.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-01-03-0090.Discount = "" Then
+						Var return !assigned StringFmt(  $12-01-03-0090.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-01-03-0090.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-01-03-0090.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-01-03-0090.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-01-03-0090.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-01-03-0090.Discount = "" Then
+						Var return ""
+					Else
+						If $12-01-03-0090.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-01-03-0090.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1180,25 +1546,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-01-03-0090.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -1239,27 +1606,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-21-03-0090.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-21-03-0090.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-21-03-0090.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-21-03-0090.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-21-03-0090.Discount = "" Then
+						Var return !assigned StringFmt(  $12-21-03-0090.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-21-03-0090.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-21-03-0090.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-21-03-0090.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-21-03-0090.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-21-03-0090.Discount = "" Then
+						Var return ""
+					Else
+						If $12-21-03-0090.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-21-03-0090.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1407,25 +1846,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-21-03-0090.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

inter/tha/xml/multi/v3/page_catalog_group_pro_freefile.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -104,27 +106,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-99-03-0026.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-99-03-0026.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-99-03-0026.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-99-03-0026.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-03-0026.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-03-0026.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-03-0026.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0026.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-03-0026.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-03-0026.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-03-0026.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-03-0026.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0026.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -272,25 +346,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-99-03-0026.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -331,27 +406,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-99-03-0067.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-99-03-0067.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-99-03-0067.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-99-03-0067.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-03-0067.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-03-0067.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-03-0067.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0067.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-03-0067.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-03-0067.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-03-0067.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-03-0067.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0067.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -499,25 +646,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-99-03-0067.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -558,27 +706,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-99-03-0066.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-99-03-0066.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-99-03-0066.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-99-03-0066.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-03-0066.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-03-0066.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-03-0066.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0066.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-03-0066.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-03-0066.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-03-0066.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-03-0066.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0066.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -726,25 +946,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-99-03-0066.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

inter/tha/xml/multi/v3/page_catalog_group_pro_happy_trios.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -104,27 +106,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-01-03-0078.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-01-03-0078.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-01-03-0078.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-01-03-0078.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-01-03-0078.Discount = "" Then
+						Var return !assigned StringFmt(  $12-01-03-0078.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-01-03-0078.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-01-03-0078.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-01-03-0078.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-01-03-0078.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-01-03-0078.Discount = "" Then
+						Var return ""
+					Else
+						If $12-01-03-0078.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-01-03-0078.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -272,25 +346,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-01-03-0078.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -331,27 +406,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-21-03-0078.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-21-03-0078.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-21-03-0078.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-21-03-0078.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-21-03-0078.Discount = "" Then
+						Var return !assigned StringFmt(  $12-21-03-0078.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-21-03-0078.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-21-03-0078.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-21-03-0078.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-21-03-0078.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-21-03-0078.Discount = "" Then
+						Var return ""
+					Else
+						If $12-21-03-0078.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-21-03-0078.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -499,25 +646,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-21-03-0078.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -558,27 +706,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-02-03-0057.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-02-03-0057.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-02-03-0057.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-02-03-0057.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-02-03-0057.Discount = "" Then
+						Var return !assigned StringFmt(  $12-02-03-0057.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-02-03-0057.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-03-0057.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-02-03-0057.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-02-03-0057.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-02-03-0057.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-03-0057.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-03-0057.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -726,25 +946,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-02-03-0057.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -785,27 +1006,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-02-03-0058.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-02-03-0058.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-02-03-0058.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-02-03-0058.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-02-03-0058.Discount = "" Then
+						Var return !assigned StringFmt(  $12-02-03-0058.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-02-03-0058.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-03-0058.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-02-03-0058.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-02-03-0058.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-02-03-0058.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-03-0058.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-03-0058.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -953,25 +1246,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-02-03-0058.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

inter/tha/xml/multi/v3/page_catalog_group_pro_melon.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -104,27 +106,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-99-02-0011.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-02-0011.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-02-0011.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-02-0011.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-02-0011.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-02-0011.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-02-0011.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0011.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-02-0011.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-02-0011.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-02-0011.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-02-0011.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0011.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -272,25 +346,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-02-0011.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -331,27 +406,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-99-02-0013.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-02-0013.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-02-0013.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-02-0013.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-02-0013.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-02-0013.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-02-0013.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0013.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-02-0013.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-02-0013.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-02-0013.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-02-0013.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0013.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -499,25 +646,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-02-0013.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -558,27 +706,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-99-02-0014.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-02-0014.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-02-0014.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-02-0014.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-02-0014.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-02-0014.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-02-0014.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0014.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-02-0014.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-02-0014.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-02-0014.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-02-0014.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0014.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -726,25 +946,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-02-0014.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -785,27 +1006,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-99-02-0015.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-02-0015.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-02-0015.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-02-0015.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-02-0015.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-02-0015.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-02-0015.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0015.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-02-0015.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-02-0015.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-02-0015.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-02-0015.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0015.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -953,25 +1246,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-02-0015.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -1012,27 +1306,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-99-02-0016.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-02-0016.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-02-0016.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-02-0016.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-02-0016.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-02-0016.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-02-0016.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0016.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-02-0016.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-02-0016.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-02-0016.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-02-0016.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0016.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1180,25 +1546,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-02-0016.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -1239,27 +1606,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-99-02-0018.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-02-0018.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-02-0018.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-02-0018.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-02-0018.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-02-0018.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-02-0018.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0018.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-02-0018.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-02-0018.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-02-0018.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-02-0018.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0018.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1407,25 +1846,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-02-0018.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

inter/tha/xml/multi/v3/page_catalog_group_pro_monday_banana.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -104,27 +106,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-03-02-0024.Button </IceState>
 		<BlendState> $12-03-03-0024.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-03-02-0024.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-03-02-0024.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-03-03-0024.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-03-02-0024.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-02-0024.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-02-0024.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-02-0024.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-02-0024.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-02-0024.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-02-0024.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-02-0024.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-02-0024.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-02-0024.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-03-03-0024.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-03-0024.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-03-0024.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0024.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-03-0024.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-03-0024.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-03-0024.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -272,25 +346,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-03-02-0024.NameE
+				Var menu_name_for_aot_eng_blender = $12-03-03-0024.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -331,27 +406,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-03-03-0029.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-03-03-0029.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-03-03-0029.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-03-03-0029.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-03-0029.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-03-0029.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-03-0029.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0029.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-03-0029.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-03-0029.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-03-0029.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-03-0029.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0029.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -499,25 +646,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-03-03-0029.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -558,27 +706,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-03-02-0023.Button </IceState>
 		<BlendState> $12-03-03-0023.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-03-02-0023.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-03-02-0023.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-03-03-0023.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-03-03-0023.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-03-02-0023.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-02-0023.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-02-0023.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-02-0023.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-02-0023.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-02-0023.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-02-0023.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-02-0023.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-02-0023.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-02-0023.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-03-03-0023.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-03-0023.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-03-0023.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-03-0023.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0023.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-03-0023.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-03-0023.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-03-0023.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-03-0023.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0023.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -726,25 +946,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-03-02-0023.NameE
+				Var menu_name_for_aot_eng_blender = $12-03-03-0023.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

inter/tha/xml/multi/v3/page_catalog_group_pro_pepween.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners

inter/tha/xml/multi/v3/page_catalog_group_pro_red_string_of_fate.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -104,27 +106,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-03-03-0100.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-03-03-0100.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-03-03-0100.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-03-03-0100.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-03-0100.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-03-0100.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-03-0100.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0100.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-03-0100.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-03-0100.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-03-0100.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-03-0100.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0100.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -272,25 +346,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-03-03-0100.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -331,27 +406,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-03-03-0101.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-03-03-0101.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-03-03-0101.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-03-03-0101.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-03-0101.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-03-0101.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-03-0101.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0101.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-03-0101.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-03-0101.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-03-0101.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-03-0101.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0101.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -499,25 +646,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-03-03-0101.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -558,27 +706,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-03-03-0102.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-03-03-0102.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-03-03-0102.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-03-03-0102.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-03-03-0102.Discount = "" Then
+						Var return !assigned StringFmt(  $12-03-03-0102.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-03-03-0102.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0102.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-03-03-0102.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-03-03-0102.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-03-03-0102.Discount = "" Then
+						Var return ""
+					Else
+						If $12-03-03-0102.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-03-03-0102.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -726,25 +946,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-03-03-0102.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

inter/tha/xml/multi/v3/page_catalog_group_pro_thick_tea_by_brewer.lxml

@@ -42,7 +42,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -61,9 +61,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -71,6 +72,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -104,27 +106,99 @@
 		<HotState> $12-02-01-0083.Button </HotState>
 		<IceState> $12-02-02-0083.Button </IceState>
 		<BlendState> $12-02-03-0083.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $12-02-01-0083.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-02-01-0083.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-02-01-0083.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-02-02-0083.Price = -1 Then
+						If $12-02-01-0083.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $12-02-01-0083.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-02-03-0083.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $12-02-01-0083.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $12-02-01-0083.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-01-0083.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-02-02-0083.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-02-02-0083.Discount = "" Then
+						Var return !assigned StringFmt(  $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-02-02-0083.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-02-0083.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-02-02-0083.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-02-02-0083.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-02-0083.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-02-03-0083.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-02-03-0083.Discount = "" Then
+						Var return !assigned StringFmt(  $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-02-03-0083.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-03-0083.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-02-03-0083.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-02-03-0083.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-03-0083.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -272,25 +346,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $12-02-01-0083.NameE
+				Var menu_name_for_aot_eng_cold = $12-02-02-0083.NameE
+				Var menu_name_for_aot_eng_blender = $12-02-03-0083.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -331,27 +406,99 @@
 		<HotState> $12-02-01-0084.Button </HotState>
 		<IceState> $12-02-02-0084.Button </IceState>
 		<BlendState> $12-02-03-0084.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $12-02-01-0084.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-02-01-0084.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-02-01-0084.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-02-01-0084.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $12-02-01-0084.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-02-02-0084.Price = -1 Then
+						If $12-02-01-0084.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $12-02-01-0084.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-02-02-0084.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $12-02-01-0084.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-02-03-0084.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-02-03-0084.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $12-02-01-0084.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $12-02-01-0084.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-01-0084.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-01-0084.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-02-02-0084.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-02-02-0084.Discount = "" Then
+						Var return !assigned StringFmt(  $12-02-02-0084.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-02-02-0084.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-02-0084.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-02-02-0084.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-02-02-0084.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-02-02-0084.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-02-0084.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-02-0084.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-02-03-0084.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-02-03-0084.Discount = "" Then
+						Var return !assigned StringFmt(  $12-02-03-0084.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-02-03-0084.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-03-0084.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-02-03-0084.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-02-03-0084.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-02-03-0084.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-03-0084.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-03-0084.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -499,25 +646,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $12-02-01-0084.NameE
+				Var menu_name_for_aot_eng_cold = $12-02-02-0084.NameE
+				Var menu_name_for_aot_eng_blender = $12-02-03-0084.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -558,27 +706,99 @@
 		<HotState> $12-02-01-0085.Button </HotState>
 		<IceState> $12-02-02-0085.Button </IceState>
 		<BlendState> $12-02-03-0085.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $12-02-01-0085.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-02-01-0085.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-02-01-0085.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-02-01-0085.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $12-02-01-0085.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-02-02-0085.Price = -1 Then
+						If $12-02-01-0085.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $12-02-01-0085.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-02-02-0085.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $12-02-01-0085.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-02-03-0085.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-02-03-0085.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $12-02-01-0085.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $12-02-01-0085.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-01-0085.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-01-0085.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-02-02-0085.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-02-02-0085.Discount = "" Then
+						Var return !assigned StringFmt(  $12-02-02-0085.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-02-02-0085.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-02-0085.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-02-02-0085.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-02-02-0085.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-02-02-0085.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-02-0085.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-02-0085.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-02-03-0085.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-02-03-0085.Discount = "" Then
+						Var return !assigned StringFmt(  $12-02-03-0085.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-02-03-0085.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-03-0085.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-02-03-0085.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-02-03-0085.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-02-03-0085.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-03-0085.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-03-0085.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -726,25 +946,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $12-02-01-0085.NameE
+				Var menu_name_for_aot_eng_cold = $12-02-02-0085.NameE
+				Var menu_name_for_aot_eng_blender = $12-02-03-0085.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

inter/tha/xml/multi/v3/page_catalog_group_songkran.lxml

@@ -43,7 +43,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -62,9 +62,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -72,6 +73,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -105,27 +107,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-01-02-0053.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-01-02-0053.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-01-02-0053.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-01-02-0053.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-01-02-0053.Discount = "" Then
+						Var return !assigned StringFmt(  $12-01-02-0053.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-01-02-0053.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-01-02-0053.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-01-02-0053.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-01-02-0053.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-01-02-0053.Discount = "" Then
+						Var return ""
+					Else
+						If $12-01-02-0053.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-01-02-0053.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -273,25 +347,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-01-02-0053.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -332,27 +407,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-01-02-0054.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-01-02-0054.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-01-02-0054.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-01-02-0054.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-01-02-0054.Discount = "" Then
+						Var return !assigned StringFmt(  $12-01-02-0054.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-01-02-0054.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-01-02-0054.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-01-02-0054.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-01-02-0054.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-01-02-0054.Discount = "" Then
+						Var return ""
+					Else
+						If $12-01-02-0054.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-01-02-0054.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -500,25 +647,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-01-02-0054.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -559,27 +707,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-02-02-0043.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-02-02-0043.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-02-02-0043.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-02-02-0043.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-02-02-0043.Discount = "" Then
+						Var return !assigned StringFmt(  $12-02-02-0043.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-02-02-0043.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-02-0043.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-02-02-0043.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-02-02-0043.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-02-02-0043.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-02-0043.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-02-0043.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -727,25 +947,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-02-02-0043.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -786,27 +1007,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-02-02-0044.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-02-02-0044.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-02-02-0044.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-02-02-0044.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-02-02-0044.Discount = "" Then
+						Var return !assigned StringFmt(  $12-02-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-02-02-0044.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-02-0044.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-02-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-02-02-0044.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-02-02-0044.Discount = "" Then
+						Var return ""
+					Else
+						If $12-02-02-0044.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-02-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -954,25 +1247,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-02-02-0044.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -1013,27 +1307,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-05-02-0055.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-05-02-0055.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-05-02-0055.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-05-02-0055.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-05-02-0055.Discount = "" Then
+						Var return !assigned StringFmt(  $12-05-02-0055.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-05-02-0055.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-05-02-0055.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-05-02-0055.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-05-02-0055.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-05-02-0055.Discount = "" Then
+						Var return ""
+					Else
+						If $12-05-02-0055.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-05-02-0055.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1181,25 +1547,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-05-02-0055.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -1240,27 +1607,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-05-02-0056.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-05-02-0056.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-05-02-0056.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-05-02-0056.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-05-02-0056.Discount = "" Then
+						Var return !assigned StringFmt(  $12-05-02-0056.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-05-02-0056.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-05-02-0056.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-05-02-0056.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-05-02-0056.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-05-02-0056.Discount = "" Then
+						Var return ""
+					Else
+						If $12-05-02-0056.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-05-02-0056.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1408,25 +1847,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-05-02-0056.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

inter/tha/xml/multi/v3/page_catalog_momday.lxml

@@ -34,7 +34,7 @@
 			<Color> 0x322B26 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
 			<AutoResizeConfiguration>
-				<Min> 16 </Min>
+				<Min> 10 </Min>
 				<Max> 22 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
@@ -53,9 +53,10 @@
 			<Font> KanitRegularTTF </Font>
 			<Color> 0x6F5F51 </Color>
 			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<ColorDiscount> 0xCC0A14 </ColorDiscount>
 			<AutoResizeConfiguration>
 				<Min> 4 </Min>
-				<Max> 20 </Max>
+				<Max> 14 </Max>
 				<AdjustStep> 1 </AdjustStep>
 			</AutoResizeConfiguration>
 		</MenuPriceTextConfiguration>
@@ -63,6 +64,7 @@
 		<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
 		<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+		<ShowOriginalPrice> "true" </ShowOriginalPrice>
 	</Configuration>
 	<Menus>
 ;banners
@@ -96,27 +98,99 @@
 		<HotState> $12-99-01-0042.Button </HotState>
 		<IceState> $12-99-02-0044.Button </IceState>
 		<BlendState> $12-99-03-0046.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $12-99-01-0042.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-99-01-0042.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-99-01-0042.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-99-01-0042.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $12-99-01-0042.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-02-0044.Price = -1 Then
+						If $12-99-01-0042.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $12-99-01-0042.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-02-0044.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $12-99-01-0042.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-99-03-0046.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-99-03-0046.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $12-99-01-0042.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $12-99-01-0042.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-01-0042.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-01-0042.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-02-0044.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-02-0044.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-02-0044.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0044.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-02-0044.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-02-0044.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-02-0044.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0044.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-99-03-0046.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-03-0046.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-03-0046.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-03-0046.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0046.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-03-0046.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-03-0046.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-03-0046.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-03-0046.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0046.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -264,25 +338,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $12-99-01-0042.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-02-0044.NameE
+				Var menu_name_for_aot_eng_blender = $12-99-03-0046.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -323,27 +398,99 @@
 		<HotState> $12-99-01-0043.Button </HotState>
 		<IceState> $12-99-02-0045.Button </IceState>
 		<BlendState> $12-99-03-0047.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $12-99-01-0043.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-99-01-0043.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-99-01-0043.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-99-01-0043.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $12-99-01-0043.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-02-0045.Price = -1 Then
+						If $12-99-01-0043.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $12-99-01-0043.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-02-0045.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $12-99-01-0043.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-99-03-0047.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-99-03-0047.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $12-99-01-0043.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $12-99-01-0043.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-01-0043.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-01-0043.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-02-0045.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-02-0045.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-02-0045.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-02-0045.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0045.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-02-0045.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-02-0045.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-02-0045.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-02-0045.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0045.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-99-03-0047.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-03-0047.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-03-0047.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-03-0047.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0047.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-03-0047.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-03-0047.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-03-0047.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-03-0047.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0047.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -491,25 +638,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $12-99-01-0043.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-02-0045.NameE
+				Var menu_name_for_aot_eng_blender = $12-99-03-0047.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -550,27 +698,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> "Disable2" </IceState>
 		<BlendState> $12-99-03-0048.Button </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $##-##-##-####.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $12-99-03-0048.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $12-99-03-0048.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $12-99-03-0048.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-03-0048.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-03-0048.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-03-0048.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0048.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-03-0048.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-03-0048.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-03-0048.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-03-0048.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-03-0048.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -718,25 +938,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $-.NameE
+				Var menu_name_for_aot_eng_blender = $12-99-03-0048.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -777,27 +998,99 @@
 		<HotState> $12-99-01-0049.Button </HotState>
 		<IceState> $12-99-02-0050.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $12-99-01-0049.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $12-99-01-0049.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $12-99-01-0049.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $12-99-01-0049.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $12-99-01-0049.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-02-0050.Price = -1 Then
+						If $12-99-01-0049.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $12-99-01-0049.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-02-0050.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $12-99-01-0049.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $12-99-01-0049.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $12-99-01-0049.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-01-0049.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-01-0049.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-02-0050.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-02-0050.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-02-0050.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-02-0050.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0050.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-02-0050.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-02-0050.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-02-0050.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-02-0050.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-02-0050.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -945,25 +1238,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $12-99-01-0049.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-02-0050.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -1004,27 +1298,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-99-05-0051.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-05-0051.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-05-0051.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-05-0051.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-05-0051.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-05-0051.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-05-0051.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-05-0051.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-05-0051.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-05-0051.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-05-0051.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-05-0051.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-05-0051.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1172,25 +1538,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-05-0051.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
@@ -1231,27 +1598,99 @@
 		<HotState> "Disable2" </HotState>
 		<IceState> $12-99-05-0052.Button </IceState>
 		<BlendState> "Disable2" </BlendState>
-		<HotPrice> eval( 
+		<HotPrice>
-		If $##-##-##-####.Price = -1 Then
+			eval(
-			Var return = "Free"
+				If $##-##-##-####.Price = -1 Then
-		Else
+					Var return = "Free"
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Else
-		EndIf
+					If $##-##-##-####.Discount = "" Then
-		) </HotPrice>
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		<IcePrice> eval( 
+					Else
-		If $12-99-05-0052.Price = -1 Then
+						If $##-##-##-####.Discount = > 0 Then
-			Var return = "Free"
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
-		Else
+						Else
-			Var return !assigned StringFmt(  $12-99-05-0052.Price , DisplayFormat, PreScaleConvertShow) 
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
-		EndIf
+					EndIf
-		) </IcePrice>
+				EndIf
-		<BlendPrice> eval( 
+			)
-		If $##-##-##-####.Price = -1 Then
+		</HotPrice>
-			Var return = "Free"
+		<HotOriginalPrice>
-		Else
+			eval(
-			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+				Var return = ""
-		EndIf
+				If $##-##-##-####.Price = -1 Then
-		) </BlendPrice>
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</HotOriginalPrice>
+		<IcePrice>
+			eval(
+				If $12-99-05-0052.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $12-99-05-0052.Discount = "" Then
+						Var return !assigned StringFmt(  $12-99-05-0052.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $12-99-05-0052.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-05-0052.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $12-99-05-0052.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IcePrice>
+		<IceOriginalPrice>
+			eval(
+				Var return = ""
+				If $12-99-05-0052.Price = -1 Then
+					Var return = ""
+				Else
+					If $12-99-05-0052.Discount = "" Then
+						Var return ""
+					Else
+						If $12-99-05-0052.Discount = > 0 Then
+							Var return !assigned StringFmt(  $12-99-05-0052.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</IceOriginalPrice>
+		<BlendPrice>
+			eval(
+				If $##-##-##-####.Price = -1 Then
+					Var return = "Free"
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Discount , DisplayFormat, PreScaleConvertShow)
+						Else
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendPrice>
+		<BlendOriginalPrice>
+			eval(
+				Var return = ""
+				If $##-##-##-####.Price = -1 Then
+					Var return = ""
+				Else
+					If $##-##-##-####.Discount = "" Then
+						Var return ""
+					Else
+						If $##-##-##-####.Discount = > 0 Then
+							Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow)
+					EndIf
+				EndIf
+			)
+		</BlendOriginalPrice>
 		<IceProcessingState>
 			eval(
 				If ICE_PROCESS_STATUS = 2 Then
@@ -1399,25 +1838,26 @@
 				Var menu_name_eng_blender = NameLang[2][0]
 				Var menu_desc_eng_blender = DescLang[2][0]
 				
-				
-				
 				Var menu_name_thai_hot = NameLang[0][1]
 				Var menu_desc_thai_hot = DescLang[0][1]
 				Var menu_name_thai_cold = NameLang[1][1]
 				Var menu_desc_thai_cold = DescLang[1][1]
 				Var menu_name_thai_blender = NameLang[2][1]
 				Var menu_desc_thai_blender = DescLang[2][1]
+				Var menu_name_for_aot_eng_hot = $-.NameE
+				Var menu_name_for_aot_eng_cold = $12-99-05-0052.NameE
+				Var menu_name_for_aot_eng_blender = $-.NameE
 				DEBUGVAR menu_name_thai_cold
 				DEBUGVAR menu_desc_thai_cold
-					Var NameDrink = aliasName[0]
+				Var NameDrink = aliasName[0]
-					Var DrinkDescription =  aliasDesc[0]
+				Var DrinkDescription =  aliasDesc[0]
-					Var NameDrinkTH = aliasName[1]
+				Var NameDrinkTH = aliasName[1]
-					Var DrinkDescriptionTH = aliasDesc[1]
+				Var DrinkDescriptionTH = aliasDesc[1]
-			If LanguageShow = "THAI" Then
+				If LanguageShow = "THAI" Then
-				Var show_eng =  "false"
+					Var show_eng =  "false"
-			Else
+				Else
-				Var show_eng =  "true"
+					Var show_eng =  "true"
-			EndIf
+				EndIf
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"

xml/page_payment.xml

@@ -405,14 +405,15 @@
 
 		DEBUGVAR Seeker.NameDrinkTH
 		DEBUGVAR Seeker.NameDrinkEN
+		DEBUGVAR Seeker.NameDrinkPOS
 
 		Var param1 = Seeker.ORDER_ID
-		Var param2 = Seeker.NameDrinkEN
+		Var param2 = Seeker.NameDrinkPOS
 		Var param3 = DiscountCampaignCode
 
-		STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
+		STRCONTAIN "size" Seeker.NameDrinkPOS SizeFromSheet
 		If SizeFromSheet = "true" Then
-			SPLIT Seeker.NameDrinkEN "###" 1 PureName
+			SPLIT Seeker.NameDrinkPOS "###" 1 PureName
 			Var param2 = PureName
 		EndIf
 

xml/page_topping_select7.xml

@@ -14,7 +14,7 @@
 	Machine WakeUp
 
 	Var EndOfTopping = 0
-	
+
 	Var Seeker.orderFromNewTopping  = 0
 
 	Var TextSelfTestCntColor = "0x746253"
@@ -138,9 +138,9 @@
 	Var CustomCoffeeQuantityText[2] = "16g"
 
 ; End Customer Coffee
-	
+
 	Var topping12 = 80
-	
+
 	Var showShotEnableSoda = "Disable"
 	Var CustomEnergyState[0] = "Disable"
 	Var CustomEnergyState[1] = "Disable"
@@ -563,7 +563,7 @@
 	DEBUGVAR CupRemain
 
 	DEBUGVAR CLOSE_ORDER_NOW
-	
+
 	If CLOSE_ORDER_NOW = "true" Then
 		;include="ROOT/taobin_project/inc/return_condition.ev"
 	EndIf
@@ -597,7 +597,7 @@
 
 
 	DEBUGVAR SelectDrinkType
-	
+
 	If SelectDrinkType = 1 Then
 
 		If MenuReady = "YES" Then
@@ -2537,7 +2537,7 @@
 		DEBUGVAR toppingID2price2
 		DEBUGVAR toppingID2price3
 		DEBUGVAR toppingID2price4
-		
+
 		DEBUGVAR toppingID9price1
 		DEBUGVAR toppingID9price2
 		DEBUGVAR toppingID9price3
@@ -7653,6 +7653,7 @@
 
 		Var Seeker.NameDrinkEN = menu_name_eng_hot
 		Var Seeker.NameDrinkTH = menu_name_thai_hot
+		Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_hot
 
 		Var text_hot_color = "0xFFFFFF"
 		Var text_cold_color = "0x84776F"
@@ -7692,6 +7693,7 @@
 
 		Var Seeker.NameDrinkEN = menu_name_eng_cold
 		Var Seeker.NameDrinkTH = menu_name_thai_cold
+		Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_cold
 
 		Var text_hot_color = "0x84776F"
 		Var text_cold_color = "0xFFFFFF"
@@ -7739,6 +7741,7 @@
 
 		Var Seeker.NameDrinkEN = menu_name_eng_blender
 		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"
@@ -8053,7 +8056,7 @@
 <FilenamePress> Var( DirImage + "/bp_add.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 
 	Var PriceDrink = PriceDrinkTmp
 	SAVELOG "USER press next ( topping ) - new"
@@ -8068,27 +8071,27 @@
 
 
 	If StrawState = "Press" Then
-		Machine StrawOrder	
+		Machine StrawOrder
 		Var LedLidBlink = "true"
 	EndIf
 
 	If LidState = "Press" Then
-		Machine LidOrder	
+		Machine LidOrder
 		Var LedLidBlink = "true"
 	EndIf
 
 	Var StrawState = "Enable"
 	Var LidState = "Enable"
-	; 
+	;
-		
+
+
 
-	
 
 	Var SelectDrink = UserSelectProductCode
-	; Set drink 
+	; Set drink
 	Topping "Select" UserSelectProductCode
 
-	; Set option toppinng and pack 
+	; Set option toppinng and pack
 	Topping "Select1-ID" topping1
 	Topping "Select2-ID" topping2
 	Topping "Select3-ID" topping3
@@ -8109,7 +8112,7 @@
 			EndIf
 		EndIf
 	EndIf
-	
+
 	Var CartUpdate = "true"
 </EventClick>
 </Button>