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 1ec0360f..b28f4355 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
@@ -93,78 +93,78 @@
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\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\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("Cold price ignore ")
else:
- out_xml('\t\t\n')
- out_xml('\t\t\teval(\n')
- out_xml('\t\t\t\tIf $' + pd_code_2 +'.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_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\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\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\tIf $' + pd_code_2 +'.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_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\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\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_2 +'.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_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\t\tVar return !assigned StringFmt( $' + pd_code_2 +'.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_2 +'.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_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\t\tVar return !assigned StringFmt( $' + pd_code_2 +'.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')
@@ -525,7 +525,7 @@
out_xml('\t\t 000082 \n')
out_xml('\t\t 000083 \n')
out_xml('\t\t 000013 \n')
- out_xml('\t\t "Enable" \n')
+ out_xml('\t\t "true" \n')
out_xml('\t\n')
out_xml('\t\n')
out_xml(';banners\n')