diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index d82611e8..08a0dfd9 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -6,13 +6,13 @@ elif product_code_3 in price_list: return price_list[product_code_3] else: - return "" + return '"-"' def GetPrice(price_list, product_code): if product_code in price_list: return price_list[product_code] else: - return "" + return '"-"' def GetOriginalPrice_Old(original_price_list, product_code_1, product_code_2, product_code_3): if product_code_1 in original_price_list: @@ -22,13 +22,13 @@ elif product_code_3 in original_price_list: return original_price_list[product_code_3] else: - return "" + return '"-"' def GetOriginalPrice(original_price_list, product_code): if product_code in original_price_list: return original_price_list[product_code] else: - return "" + return '"-"' def GetTricker(tricker_list, product_code_1, product_code_2, product_code_3): if product_code_1 in tricker_list: diff --git a/xml/page_catalog_group_pro_monday_banana.xml b/xml/page_catalog_group_pro_monday_banana.xml index 94a1851b..19feb4ac 100644 --- a/xml/page_catalog_group_pro_monday_banana.xml +++ b/xml/page_catalog_group_pro_monday_banana.xml @@ -564,10 +564,10 @@ Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk_monday_banana.png" Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = + Var PriceD1 = "-" Var PriceD2 = 30 Var PriceD3 = 35 - Var OriginalPriceD1 = + Var OriginalPriceD1 = "-" Var OriginalPriceD2 = 40 Var OriginalPriceD3 = 45 Var PD_CODE1 = "##-##-##-####" @@ -691,7 +691,7 @@ is RELIEVE" 0x6F5F51 0xEAE6E1 "Invisible" - StringFmt( , DisplayFormat, PreScaleConvertShow) ; test + StringFmt( "-" , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -820,11 +820,11 @@ is RELIEVE" Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie_monday_banana.png" Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = - Var PriceD2 = + Var PriceD1 = "-" + Var PriceD2 = "-" Var PriceD3 = 40 - Var OriginalPriceD1 = - Var OriginalPriceD2 = + Var OriginalPriceD1 = "-" + Var OriginalPriceD2 = "-" Var OriginalPriceD3 = 50 Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "##-##-##-####" @@ -948,7 +948,7 @@ Sugar, Oreo" 0x6F5F51 0xEAE6E1 "Invisible" - StringFmt( , DisplayFormat, PreScaleConvertShow) ; test + StringFmt( "-" , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -966,7 +966,7 @@ Sugar, Oreo" 0x6F5F51 0xEAE6E1 "Invisible" - StringFmt( , DisplayFormat, PreScaleConvertShow) ; test + StringFmt( "-" , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1077,10 +1077,10 @@ Sugar, Oreo" Var DrinkDescription = "Banana Syrup, milk and Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Banana_milk_monday_banana.png" Var OpenFromXML = CurrentXMLFileName2 - Var PriceD1 = + Var PriceD1 = "-" Var PriceD2 = 25 Var PriceD3 = 30 - Var OriginalPriceD1 = + Var OriginalPriceD1 = "-" Var OriginalPriceD2 = 35 Var OriginalPriceD3 = 40 Var PD_CODE1 = "##-##-##-####" @@ -1205,7 +1205,7 @@ is a MONEY BOOST" 0x6F5F51 0xEAE6E1 "Invisible" - StringFmt( , DisplayFormat, PreScaleConvertShow) ; test + StringFmt( "-" , DisplayFormat, PreScaleConvertShow) ; test 81