pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Pakin 2024-03-08 16:41:05 +07:00
commit 98acaff105
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xml/menu_new_layout_gen.py
View file

@ -6,13 +6,13 @@
elif product_code_3 in price_list: elif product_code_3 in price_list:
return price_list[product_code_3] return price_list[product_code_3]
else: else:
return "" return '"-"'
def GetPrice(price_list, product_code): def GetPrice(price_list, product_code):
if product_code in price_list: if product_code in price_list:
return price_list[product_code] return price_list[product_code]
else: else:
return "" return '"-"'
def GetOriginalPrice_Old(original_price_list, product_code_1, product_code_2, product_code_3): def GetOriginalPrice_Old(original_price_list, product_code_1, product_code_2, product_code_3):
if product_code_1 in original_price_list: if product_code_1 in original_price_list:
@ -22,13 +22,13 @@
elif product_code_3 in original_price_list: elif product_code_3 in original_price_list:
return original_price_list[product_code_3] return original_price_list[product_code_3]
else: else:
return "" return '"-"'
def GetOriginalPrice(original_price_list, product_code): def GetOriginalPrice(original_price_list, product_code):
if product_code in original_price_list: if product_code in original_price_list:
return original_price_list[product_code] return original_price_list[product_code]
else: else:
return "" return '"-"'
def GetTricker(tricker_list, product_code_1, product_code_2, product_code_3): def GetTricker(tricker_list, product_code_1, product_code_2, product_code_3):
if product_code_1 in tricker_list: if product_code_1 in tricker_list:

24
xml/page_catalog_group_pro_monday_banana.xml
View file

@ -564,10 +564,10 @@
Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar" Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk_monday_banana.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk_monday_banana.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = Var PriceD1 = "-"
Var PriceD2 = 30 Var PriceD2 = 30
Var PriceD3 = 35 Var PriceD3 = 35
Var OriginalPriceD1 = Var OriginalPriceD1 = "-"
Var OriginalPriceD2 = 40 Var OriginalPriceD2 = 40
Var OriginalPriceD3 = 45 Var OriginalPriceD3 = 45
Var PD_CODE1 = "##-##-##-####" Var PD_CODE1 = "##-##-##-####"
@ -691,7 +691,7 @@ is RELIEVE" </Value>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
<Value> StringFmt( , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>
@ -820,11 +820,11 @@ is RELIEVE" </Value>
Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo" Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie_monday_banana.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie_monday_banana.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = Var PriceD1 = "-"
Var PriceD2 = Var PriceD2 = "-"
Var PriceD3 = 40 Var PriceD3 = 40
Var OriginalPriceD1 = Var OriginalPriceD1 = "-"
Var OriginalPriceD2 = Var OriginalPriceD2 = "-"
Var OriginalPriceD3 = 50 Var OriginalPriceD3 = 50
Var PD_CODE1 = "##-##-##-####" Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "##-##-##-####" Var PD_CODE2 = "##-##-##-####"
@ -948,7 +948,7 @@ Sugar, Oreo" </Value>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
<Value> StringFmt( , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>
@ -966,7 +966,7 @@ Sugar, Oreo" </Value>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
<Value> StringFmt( , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 146 </X> <X> 146 </X>
@ -1077,10 +1077,10 @@ Sugar, Oreo" </Value>
Var DrinkDescription = "Banana Syrup, milk and Ice" Var DrinkDescription = "Banana Syrup, milk and Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Banana_milk_monday_banana.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Banana_milk_monday_banana.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = Var PriceD1 = "-"
Var PriceD2 = 25 Var PriceD2 = 25
Var PriceD3 = 30 Var PriceD3 = 30
Var OriginalPriceD1 = Var OriginalPriceD1 = "-"
Var OriginalPriceD2 = 35 Var OriginalPriceD2 = 35
Var OriginalPriceD3 = 40 Var OriginalPriceD3 = 40
Var PD_CODE1 = "##-##-##-####" Var PD_CODE1 = "##-##-##-####"
@ -1205,7 +1205,7 @@ is a MONEY BOOST" </Value>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
<Value> StringFmt( , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( "-" , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>