diff --git a/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py b/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py
index b28f4355..1e7ab9e6 100644
--- a/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py
+++ b/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py
@@ -82,52 +82,54 @@
out_xml('\t\t\n')
if "show-blend-only" in xml_parameter:
- print("Hot price ignore ")
+ print("Hot price ignore ")
else:
- out_xml('\t\t ' + pd_stage1 + ' \n')
+ out_xml('\t\t ' + pd_stage1 + ' \n')
if "show-blend-only" in xml_parameter:
- print("Cold price ignore ")
+ print("Cold price ignore ")
else:
- out_xml('\t\t ' + pd_stage2 + ' \n')
+ out_xml('\t\t ' + pd_stage2 + ' \n')
out_xml('\t\t ' + pd_stage3 + ' \n')
- if "show-blend-only" in xml_parameter:
- print("Hot price ignore ")
- else:
- out_xml('\t\t\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\t\tVar return = "Free"\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\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\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\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\tEndIf\n')
- out_xml('\t\t\t\tEndIf\n')
- out_xml('\t\t\t)\n')
- out_xml('\t\t\n')
+ if "show-blend-only" in xml_parameter:
+ print("Hot price ignore ")
+ else:
+ out_xml('\t\t\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\t\tVar return = "Free"\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\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\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\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')
+ out_xml('\t\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\teval(\n')
- out_xml('\t\t\t\tVar return = ""\n')
- out_xml('\t\t\t\tIf $' + pd_code_1 +'.Price = -1 Then\n')
- out_xml('\t\t\t\t\tVar return = ""\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\t\tVar return ""\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\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\tEndIf\n')
- out_xml('\t\t\t)\n')
- out_xml('\t\t\n')
+ out_xml('\t\t\n')
+ out_xml('\t\t\teval(\n')
+ out_xml('\t\t\t\tVar return = ""\n')
+ out_xml('\t\t\t\tIf $' + pd_code_1 +'.Price = -1 Then\n')
+ out_xml('\t\t\t\t\tVar return = ""\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\t\tVar return ""\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\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')
+ out_xml('\t\t\n')
if "show-blend-only" in xml_parameter:
@@ -141,10 +143,11 @@
out_xml('\t\t\t\t\tIf $' + pd_code_2 + '.Discount = "" Then\n')
out_xml('\t\t\t\t\t\tVar return !assigned StringFmt( $' + pd_code_2 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
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\tIf $' + pd_code_2 + '.Discount > 0 Then\n')
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')
@@ -159,8 +162,9 @@
out_xml('\t\t\t\t\tIf $' + pd_code_2 + '.Discount = "" Then\n')
out_xml('\t\t\t\t\t\tVar return ""\n')
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\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')
@@ -174,10 +178,11 @@
out_xml('\t\t\t\t\tIf $' + pd_code_3 + '.Discount = "" Then\n')
out_xml('\t\t\t\t\t\tVar return !assigned StringFmt( $' + pd_code_3 +'.Price , DisplayFormat, PreScaleConvertShow)\n')
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\tIf $' + pd_code_3 + '.Discount > 0 Then\n')
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')
@@ -192,8 +197,9 @@
out_xml('\t\t\t\t\tIf $' + pd_code_3 + '.Discount = "" Then\n')
out_xml('\t\t\t\t\t\tVar return ""\n')
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\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')
@@ -258,9 +264,21 @@
out_xml('\t\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\n')
out_xml('\t\t\tGetInstanceIDMenuTab OpenFromInstMenuTab\n')
#out_xml('\t\t\tVar OpenFromXML = CurrentXMLFileName2\n')
- out_xml('\t\t\tVar PriceD1 = $' + pd_code_1 + '.Price\n')
- out_xml('\t\t\tVar PriceD2 = $' + pd_code_2 + '.Price\n')
- out_xml('\t\t\tVar PriceD3 = $' + pd_code_3 + '.Price\n')
+ out_xml('\t\t\tIf $' + pd_code_1 + '.Discount > 0 Then\n')
+ out_xml('\t\t\t\tVar PriceD1 = $' + pd_code_1 + '.Discount\n')
+ out_xml('\t\t\tElse\n')
+ out_xml('\t\t\t\tVar PriceD1 = $' + pd_code_1 + '.Price\n')
+ out_xml('\t\t\tEndIf\n')
+ out_xml('\t\t\tIf $' + pd_code_2 + '.Discount > 0 Then\n')
+ out_xml('\t\t\t\tVar PriceD2 = $' + pd_code_2 + '.Discount\n')
+ out_xml('\t\t\tElse\n')
+ out_xml('\t\t\t\tVar PriceD2 = $' + pd_code_2 + '.Price\n')
+ out_xml('\t\t\tEndIf\n')
+ out_xml('\t\t\tIf $' + pd_code_3 + '.Discount > 0 Then\n')
+ out_xml('\t\t\t\tVar PriceD3 = $' + pd_code_3 + '.Discount\n')
+ out_xml('\t\t\tElse\n')
+ out_xml('\t\t\t\tVar PriceD3 = $' + pd_code_3 + '.Price\n')
+ out_xml('\t\t\tEndIf\n')
out_xml('\t\t\tVar PD_CODE1 = "' + pd_code_1 + '"\n')
out_xml('\t\t\tVar PD_CODE2 = "' + pd_code_2 + '"\n')
out_xml('\t\t\tVar PD_CODE3 = "' + pd_code_3 + '"\n')