diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index 378adb89..b8a10f47 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -835,6 +835,8 @@ out_xml( '\t StringFmt( $' + spl[4] + '.Price - 7 , DisplayFormat, PreScaleConvertShow) ; test\r\n') elif passion_mint: out_xml( '\t StringFmt( ' + str(GetPrice(passion_mint_fix_price, spl[4])) + ' , DisplayFormat, PreScaleConvertShow) ; test\r\n') + elif from_12_day_12_menu: + out_xml( '\t StringFmt( ' + str(GetPrice(price_12_day_12_menu, spl[4])) + ' , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: out_xml( '\t StringFmt( $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: @@ -850,6 +852,8 @@ out_xml( '\t Var( "฿" + $' + spl[4] + '.Price - 7 ) \r\n') elif passion_mint: out_xml( '\t "฿' + str(GetPrice(passion_mint_fix_price, spl[4])) + '" \r\n') + elif from_12_day_12_menu: + out_xml( '\t "฿' + str(GetPrice(price_12_day_12_menu, spl[4])) + '" \r\n') else: out_xml( '\t Var( "฿" + $' + spl[4] + '.Price ) \r\n') out_xml( '\t\r\n') @@ -1481,6 +1485,8 @@ out_xml( '\t StringFmt( $' +spl[8] + '.Price - 7 , DisplayFormat, PreScaleConvertShow) ; test\r\n') elif passion_mint: out_xml( '\t StringFmt( ' + str(GetPrice(passion_mint_fix_price, spl[8])) + ' , DisplayFormat, PreScaleConvertShow) ; test\r\n') + elif price_12_day_12_menu: + out_xml( '\t StringFmt( ' + str(GetPrice(price_12_day_12_menu, spl[8])) + ' , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: out_xml( '\t StringFmt( $' +spl[8] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: @@ -1490,6 +1496,8 @@ out_xml( '\t Var( "฿" + $' + spl[8] + '.Price - 7 ) \r\n') elif passion_mint: out_xml( '\t "฿' + str(GetPrice(passion_mint_fix_price, spl[8])) + '" \r\n') + elif price_12_day_12_menu: + out_xml( '\t "฿' + str(GetPrice(price_12_day_12_menu, spl[8])) + '" \r\n') else: out_xml( '\t Var( "฿" + $' + spl[8] + '.Price ) \r\n') @@ -1542,6 +1550,8 @@ out_xml( '\t StringFmt( $' +spl[9] + '.Price - 7, DisplayFormat, PreScaleConvertShow) ; test\r\n') elif passion_mint: out_xml( '\t StringFmt( ' + str(GetPrice(passion_mint_fix_price, spl[9])) + ' , DisplayFormat, PreScaleConvertShow) ; test\r\n') + elif from_12_day_12_menu: + out_xml( '\t StringFmt( ' + str(GetPrice(price_12_day_12_menu, spl[9])) + ' , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: out_xml( '\t StringFmt( $' +spl[9] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: @@ -1551,6 +1561,8 @@ out_xml( '\t Var( "฿" + $' + spl[9] + '.Price - 7 ) \r\n') elif passion_mint: out_xml( '\t "฿' + str(GetPrice(passion_mint_fix_price, spl[9])) + '" \r\n') + elif from_12_day_12_menu: + out_xml( '\t "฿' + str(GetPrice(price_12_day_12_menu, spl[9])) + '" \r\n') else: out_xml( '\t Var( "฿" + $' + spl[9] + '.Price ) \r\n') @@ -1602,6 +1614,8 @@ out_xml( '\t StringFmt( $' +spl[10] + '.Price - 7, DisplayFormat, PreScaleConvertShow) ; test\r\n') elif passion_mint: out_xml( '\t StringFmt( ' + str(GetPrice(passion_mint_fix_price, spl[10])) + ' , DisplayFormat, PreScaleConvertShow) ; test\r\n') + elif from_12_day_12_menu: + out_xml( '\t StringFmt( ' + str(GetPrice(price_12_day_12_menu, spl[10])) + ' , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: out_xml( '\t StringFmt( $' +spl[10] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: @@ -1611,6 +1625,8 @@ out_xml( '\t Var( "฿" + $' + spl[10] + '.Price - 7 ) \r\n') elif passion_mint: out_xml( '\t "฿' + str(GetPrice(passion_mint_fix_price, spl[10])) + '" \r\n') + elif from_12_day_12_menu: + out_xml( '\t "฿' + str(GetPrice(price_12_day_12_menu, spl[10])) + '" \r\n') else: out_xml( '\t Var( "฿" + $' + spl[10] + '.Price ) \r\n')