diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 29d4e482..87f5bab0 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -198,6 +198,7 @@ ROSALYN ALMOST DIRTY 12-01-02-0037 1 7 50 2 3 4 5 24 66 6:06 32 นมลิ้นจี่ปั่น 12-03-03-0024 1 17 23 11 41 24 120 2:00 23 นมลิ้นจี่เย็น 12-03-02-0024 1 17 23 11 24 120 2:00 23 +นมลิ้นจี่ร้อน 12-03-01-0024 1 17 11 นมยูซุร้อน 12-03-01-0023 1 53 6 16 24 120 3:00 23 นมยูซุเย็น 12-03-02-0023 1 53 6 23 24 120 4:00 23 นมยูซุปั่น 12-03-03-0023 1 53 6 23 41 24 120 5:00 23 @@ -332,16 +333,17 @@ nUll 12-02-03-0037 24 1 1 32 +อเมริกาโนยูซุร้อน 12-01-01-0040 1 53 3 5 6 7 24 49 0:49 23 +อเมริกาโนยูซุเย็น 12-01-02-0040 1 53 3 5 6 7 23 24 49 0:49 23 +ชายูซุร้อน 12-02-01-0038 1 10 16 53 24 49 1:49 23 +ชายูซุเย็น 12-02-02-0038 1 10 16 53 23 24 49 2:49 23 +โกโก้ยูซุเย็น 12-03-02-0025 1 15 7 53 24 49 3:49 23 +โกโก้ยูซุร้อน 12-03-01-0025 1 15 7 53 23 24 49 4:49 23 +โกโก้ยูซุปั่น 12-03-03-0025 1 15 7 53 23 41 24 49 5:49 23 - - - - - - - - - +HOT BANANA CAFE LATTE 12-01-01-0042 +ICED BANANA CAFE LATTE 12-01-02-0042 +BANANA CAFE LATTE 12-01-03-0042 diff --git a/image/page_drink_disable_n2/bn_Banana_milk.png b/image/page_drink_disable_n2/bn_Banana_milk.png new file mode 100644 index 00000000..7372f511 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Banana_milk.png differ diff --git a/image/page_drink_disable_n2/bn_ChocoBanana_milk.png b/image/page_drink_disable_n2/bn_ChocoBanana_milk.png new file mode 100644 index 00000000..019c59e3 Binary files /dev/null and b/image/page_drink_disable_n2/bn_ChocoBanana_milk.png differ diff --git a/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png b/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png new file mode 100644 index 00000000..c96df54a Binary files /dev/null and b/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png differ diff --git a/image/page_drink_disable_n2/bn_Melon_smoothie.png b/image/page_drink_disable_n2/bn_Melon_smoothie.png index eb582366..92caddfb 100644 Binary files a/image/page_drink_disable_n2/bn_Melon_smoothie.png and b/image/page_drink_disable_n2/bn_Melon_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png new file mode 100644 index 00000000..f93508d1 Binary files /dev/null and b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Yuzu_smoothie.png b/image/page_drink_disable_n2/bn_Yuzu_smoothie.png index 22924ce6..eeb3ea19 100644 Binary files a/image/page_drink_disable_n2/bn_Yuzu_smoothie.png and b/image/page_drink_disable_n2/bn_Yuzu_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png b/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png new file mode 100644 index 00000000..4d8be495 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png b/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png index b96fae12..233453f7 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png and b/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png index 49b96fde..6ae9f17f 100644 Binary files a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_n/bn_ChocoYuzu_milk.png b/image/page_drink_n/bn_ChocoYuzu_milk.png new file mode 100644 index 00000000..feeeac79 Binary files /dev/null and b/image/page_drink_n/bn_ChocoYuzu_milk.png differ diff --git a/image/page_drink_n/bn_Melon_smoothie.png b/image/page_drink_n/bn_Melon_smoothie.png index f669797a..7a21c0bd 100644 Binary files a/image/page_drink_n/bn_Melon_smoothie.png and b/image/page_drink_n/bn_Melon_smoothie.png differ diff --git a/image/page_drink_n/bn_PinkOreo_smoothie.png b/image/page_drink_n/bn_PinkOreo_smoothie.png new file mode 100644 index 00000000..b3da405a Binary files /dev/null and b/image/page_drink_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_n/bn_hot_yuzu_tea.png b/image/page_drink_n/bn_hot_yuzu_tea.png new file mode 100644 index 00000000..4e3d1193 Binary files /dev/null and b/image/page_drink_n/bn_hot_yuzu_tea.png differ diff --git a/image/page_drink_n/bn_iced_Milk_Lychee_smoothie.png b/image/page_drink_n/bn_iced_Milk_Lychee_smoothie.png index 6221063e..242774a4 100644 Binary files a/image/page_drink_n/bn_iced_Milk_Lychee_smoothie.png and b/image/page_drink_n/bn_iced_Milk_Lychee_smoothie.png differ diff --git a/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png index 05d17a67..4c3db071 100644 Binary files a/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_ChocoYuzu_milk.png b/image/page_drink_picture2_n/bn_ChocoYuzu_milk.png new file mode 100644 index 00000000..ed0097ee Binary files /dev/null and b/image/page_drink_picture2_n/bn_ChocoYuzu_milk.png differ diff --git a/image/page_drink_picture2_n/bn_Melon_smoothie.png b/image/page_drink_picture2_n/bn_Melon_smoothie.png index d2f8380c..ab13d0f5 100644 Binary files a/image/page_drink_picture2_n/bn_Melon_smoothie.png and b/image/page_drink_picture2_n/bn_Melon_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png new file mode 100644 index 00000000..ae380f20 Binary files /dev/null and b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Yuzu_smoothie.png b/image/page_drink_picture2_n/bn_Yuzu_smoothie.png index e81dffa7..24e1da3e 100644 Binary files a/image/page_drink_picture2_n/bn_Yuzu_smoothie.png and b/image/page_drink_picture2_n/bn_Yuzu_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_hot_Yuzu_tea.png b/image/page_drink_picture2_n/bn_hot_Yuzu_tea.png new file mode 100644 index 00000000..7b062051 Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_Yuzu_tea.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Milk_Lychee_smoothie.png b/image/page_drink_picture2_n/bn_iced_Milk_Lychee_smoothie.png index d1c92c66..88b44f27 100644 Binary files a/image/page_drink_picture2_n/bn_iced_Milk_Lychee_smoothie.png and b/image/page_drink_picture2_n/bn_iced_Milk_Lychee_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png index 35f61559..90f305dc 100644 Binary files a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_press_n/Component 3.png b/image/page_drink_press_n/Component 3.png new file mode 100644 index 00000000..1fb58891 Binary files /dev/null and b/image/page_drink_press_n/Component 3.png differ diff --git a/image/page_drink_press_n/bn_Banana_milk.png b/image/page_drink_press_n/bn_Banana_milk.png new file mode 100644 index 00000000..0a40143a Binary files /dev/null and b/image/page_drink_press_n/bn_Banana_milk.png differ diff --git a/image/page_drink_press_n/bn_ChocoYuzu_milk.png b/image/page_drink_press_n/bn_ChocoYuzu_milk.png new file mode 100644 index 00000000..25e382ed Binary files /dev/null and b/image/page_drink_press_n/bn_ChocoYuzu_milk.png differ diff --git a/image/page_drink_press_n/bn_Melon_smoothie.png b/image/page_drink_press_n/bn_Melon_smoothie.png index f3abe763..b54a7236 100644 Binary files a/image/page_drink_press_n/bn_Melon_smoothie.png and b/image/page_drink_press_n/bn_Melon_smoothie.png differ diff --git a/image/page_drink_press_n/bn_PinkOreo_smoothie.png b/image/page_drink_press_n/bn_PinkOreo_smoothie.png new file mode 100644 index 00000000..1a4b4efc Binary files /dev/null and b/image/page_drink_press_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Yuzu_smoothie.png b/image/page_drink_press_n/bn_Yuzu_smoothie.png index afba8082..17954a60 100644 Binary files a/image/page_drink_press_n/bn_Yuzu_smoothie.png and b/image/page_drink_press_n/bn_Yuzu_smoothie.png differ diff --git a/image/page_drink_press_n/bn_hot_Yuzu_tea.png b/image/page_drink_press_n/bn_hot_Yuzu_tea.png new file mode 100644 index 00000000..b83f0083 Binary files /dev/null and b/image/page_drink_press_n/bn_hot_Yuzu_tea.png differ diff --git a/image/page_drink_press_n/bn_iced_Milk_Lychee_smoothie.png b/image/page_drink_press_n/bn_iced_Milk_Lychee_smoothie.png index 14718abe..fda460a9 100644 Binary files a/image/page_drink_press_n/bn_iced_Milk_Lychee_smoothie.png and b/image/page_drink_press_n/bn_iced_Milk_Lychee_smoothie.png differ diff --git a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png index f98e9c07..de6ac677 100644 Binary files a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png differ diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index 64d33bca..7f443300 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -79,6 +79,9 @@ out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n') for spl in menu_new_list: #product_code = s + if spl[0] == "IGNORE": + continue + out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n') menu_img = spl[7] out_xml( '\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \r\n') diff --git a/xml/page_board.xml b/xml/page_board.xml index 62dc9ae9..1a8d1682 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -212,19 +212,8 @@ ; Zone set video main page. Var CampaignEnableStr = "false" - If SystemDateMonthInt = 11 Then - Var CampaignEnableStr = "true" - EndIf - - If SystemDateMonthInt = 12 Then - Var CampaignEnableStr = "true" - EndIf - - If SystemDateMonthInt = 1 Then - If SystemDateDayInt = 1 Then - WRITE_FILE "/mnt/sdcard/coffeevending/CampaignEnable" "off" - EndIf - EndIf + Var adver_brewing_en = 1 + TRY "/mnt/sdcard/coffeevending/taobin_project/video/script1.ev" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 86f62048..dd2ffb1c 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -46,7 +46,6 @@ If show_eng = "true" Then - ;Var DirImage = "ROOT/taobin_project/image/collect_point1_en" Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" @@ -61,14 +60,14 @@ Var bnLidProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_lid_en.png" Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid_en.png" - Var CampaingFilename = "ROOT/taobin_project/image/page_campaign_en" Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png" Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png" + Var dir_page_doing = "ROOT/taobin_project/image/page_doing/brewing_txt_adv1_en.png" + Var XStraw = 336 Else - ;Var DirImage = "ROOT/taobin_project/image/collect_point1" Play "ROOT/taobin_project/sound_thai/thankyou.mp3" Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" @@ -83,11 +82,11 @@ Var bnLidProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_lid.png" Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid.png" - Var CampaingFilename = "ROOT/taobin_project/image/page_campaign" - + Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png" Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png" + Var dir_page_doing = "ROOT/taobin_project/image/page_doing/brewing_txt_adv1.png" Var XStraw = 382 EndIf @@ -296,15 +295,14 @@ Var CreditCardVoid = 0 - If CampaignEnableStr = "true" Then - Var CampaignEnable = 1 - Var CampaignVideoTimeCountDown = 14 - Var PictureFile = CampaingFilename + "/text_desc.png" - Var VideoPlayFile = "ROOT/taobin_project/image/page_campaign/video_desc.mp4" - Else - Var CampaignEnable = 0 + If adver_brewing_en = 1 Then + Var adver_brewing_play_index = 1 + Var adver_brewing_count_down = 9 + Var VideoPlayFile = "ROOT/taobin_project/image/page_doing/tao_adv1.png" EndIf + Var CampaignEnable = 0 + DEBUGVAR bg_lidProblem_ST @@ -1010,14 +1008,22 @@ DEBUGVAR CountUpBrewing ; animation video loop If AnimationOn = "true" Then - - If CampaignEnable = 1 Then - If CampaignVideoTimeCountDown > 0 Then - Var CampaignVideoTimeCountDown = CampaignVideoTimeCountDown - 1 + + If adver_brewing_play_index = 1 Then + + DEBUGVAR adver_brewing_count_down + If adver_brewing_count_down > 0 Then + Var adver_brewing_count_down = adver_brewing_count_down - 1 + + + Var PictureFile = dir_page_doing + EndIf - If CampaignVideoTimeCountDown = 0 Then - Var CampaignEnable = 0 + + If adver_brewing_count_down = 0 Then + Var adver_brewing_play_index = 0 EndIf + Else Var CountUpBrewing = CountUpBrewing + 1 diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 35274f33..dd868f50 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -672,7 +672,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -690,7 +690,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 $12-04-02-1018.Button - "Free" + StringFmt( $12-04-02-1018.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -708,7 +708,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -922,7 +922,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -940,7 +940,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 $12-04-02-1019.Button - "Free" + StringFmt( $12-04-02-1019.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -958,7 +958,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1173,7 +1173,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1191,7 +1191,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 $12-04-02-1020.Button - "Free" + StringFmt( $12-04-02-1020.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1209,7 +1209,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1424,7 +1424,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1442,7 +1442,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 $12-04-02-1021.Button - "Free" + StringFmt( $12-04-02-1021.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1460,7 +1460,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1675,7 +1675,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1693,7 +1693,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 $12-04-02-1022.Button - "Free" + StringFmt( $12-04-02-1022.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1711,7 +1711,7 @@ essential nutrients" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index f8dd01b1..8c3e7546 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -662,7 +662,7 @@ Soda, Ice, Malibu" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -680,7 +680,7 @@ Soda, Ice, Malibu" 0x6F5F51 0xEAE6E1 $11-99-05-0001.Button - "Free" + StringFmt( $11-99-05-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -698,7 +698,7 @@ Soda, Ice, Malibu" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -910,7 +910,7 @@ Soda, Ice, Malibu" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -928,7 +928,7 @@ Soda, Ice, Malibu" 0x6F5F51 0xEAE6E1 $11-99-05-0002.Button - "Free" + StringFmt( $11-99-05-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -946,7 +946,7 @@ Soda, Ice, Malibu" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1160,7 +1160,7 @@ Soda, Malibu" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1178,7 +1178,7 @@ Soda, Malibu" 0x6F5F51 0xEAE6E1 $11-99-05-0003.Button - "Free" + StringFmt( $11-99-05-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1196,7 +1196,7 @@ Soda, Malibu" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1409,7 +1409,7 @@ Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1427,7 +1427,7 @@ Mount Gay Rum" 0x6F5F51 0xEAE6E1 $11-99-05-0004.Button - "Free" + StringFmt( $11-99-05-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1445,7 +1445,7 @@ Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1659,7 +1659,7 @@ Soda, Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1677,7 +1677,7 @@ Soda, Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 $11-99-05-0005.Button - "Free" + StringFmt( $11-99-05-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1695,7 +1695,7 @@ Soda, Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1907,7 +1907,7 @@ Soda, Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1925,7 +1925,7 @@ Soda, Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 $11-99-05-0006.Button - "Free" + StringFmt( $11-99-05-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1943,7 +1943,7 @@ Soda, Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2155,7 +2155,7 @@ Soda, Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2173,7 +2173,7 @@ Soda, Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 $11-99-05-0007.Button - "Free" + StringFmt( $11-99-05-0007.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2191,7 +2191,7 @@ Soda, Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2405,7 +2405,7 @@ juice Ice, Malibu" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2423,7 +2423,7 @@ juice Ice, Malibu" 0x6F5F51 0xEAE6E1 $11-99-05-0008.Button - "Free" + StringFmt( $11-99-05-0008.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2441,7 +2441,7 @@ juice Ice, Malibu" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2655,7 +2655,7 @@ Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2673,7 +2673,7 @@ Mount Gay Rum" 0x6F5F51 0xEAE6E1 $11-99-05-0009.Button - "Free" + StringFmt( $11-99-05-0009.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2691,7 +2691,7 @@ Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2905,7 +2905,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2923,7 +2923,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 $11-99-05-0010.Button - "Free" + StringFmt( $11-99-05-0010.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2941,7 +2941,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3153,7 +3153,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3171,7 +3171,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 $11-99-05-0012.Button - "Free" + StringFmt( $11-99-05-0012.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3189,7 +3189,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3401,7 +3401,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3419,7 +3419,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 $11-99-05-0013.Button - "Free" + StringFmt( $11-99-05-0013.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3437,7 +3437,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3649,7 +3649,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3667,7 +3667,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 $11-99-05-0015.Button - "Free" + StringFmt( $11-99-05-0015.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3685,7 +3685,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3897,7 +3897,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3915,7 +3915,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 $11-99-05-0014.Button - "Free" + StringFmt( $11-99-05-0014.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3933,7 +3933,7 @@ Ice, Mount Gay Rum" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 3928451e..664cbf8d 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -517,7 +517,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 52 +; menu_new_list 46 ; ==================> Len = 16 ; 12-01-01-0001 - - @@ -660,7 +660,7 @@ 0x6F5F51 0xEAE6E1 $12-01-01-0001.Button - "Free" + StringFmt( $12-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -678,7 +678,7 @@ 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -696,7 +696,7 @@ 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -910,7 +910,7 @@ 0x6F5F51 0xEAE6E1 $12-21-01-0001.Button - "Free" + StringFmt( $12-21-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -928,7 +928,7 @@ 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -946,7 +946,7 @@ 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1162,7 +1162,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 $12-11-01-0001.Button - "Free" + StringFmt( $12-11-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1180,7 +1180,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1198,7 +1198,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1413,7 +1413,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 $12-31-01-0001.Button - "Free" + StringFmt( $12-31-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1431,7 +1431,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1449,7 +1449,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1664,7 +1664,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 $12-01-01-0003.Button - "Free" + StringFmt( $12-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1682,7 +1682,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 $12-01-02-0001.Button - "Free" + StringFmt( $12-01-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1700,7 +1700,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1914,7 +1914,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 $12-21-01-0003.Button - "Free" + StringFmt( $12-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1932,7 +1932,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 $12-21-02-0001.Button - "Free" + StringFmt( $12-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1950,7 +1950,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2169,7 +2169,7 @@ Strawberry, Orange, Floral" 0x6F5F51 0xEAE6E1 $12-01-01-0013.Button - "Free" + StringFmt( $12-01-01-0013.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2187,7 +2187,7 @@ Strawberry, Orange, Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2205,7 +2205,7 @@ Strawberry, Orange, Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2425,7 +2425,7 @@ Note: Blue Berry & Floral" 0x6F5F51 0xEAE6E1 $12-01-01-0020.Button - "Free" + StringFmt( $12-01-01-0020.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2443,7 +2443,7 @@ Note: Blue Berry & Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2461,7 +2461,7 @@ Note: Blue Berry & Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2681,7 +2681,7 @@ Note: Strawberry & Floral" 0x6F5F51 0xEAE6E1 $12-01-01-0022.Button - "Free" + StringFmt( $12-01-01-0022.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2699,7 +2699,7 @@ Note: Strawberry & Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2717,7 +2717,7 @@ Note: Strawberry & Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2937,7 +2937,7 @@ Note: Jasmine & Honey" 0x6F5F51 0xEAE6E1 $12-01-01-0024.Button - "Free" + StringFmt( $12-01-01-0024.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2955,7 +2955,7 @@ Note: Jasmine & Honey" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2973,7 +2973,7 @@ Note: Jasmine & Honey" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3193,7 +3193,7 @@ Note: Whisky & Vanilla" 0x6F5F51 0xEAE6E1 $12-01-01-0026.Button - "Free" + StringFmt( $12-01-01-0026.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3211,7 +3211,7 @@ Note: Whisky & Vanilla" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3229,7 +3229,7 @@ Note: Whisky & Vanilla" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3449,7 +3449,7 @@ Note: Peach, tea, chocolate" 0x6F5F51 0xEAE6E1 $12-01-01-0028.Button - "Free" + StringFmt( $12-01-01-0028.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3467,7 +3467,7 @@ Note: Peach, tea, chocolate" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3485,7 +3485,7 @@ Note: Peach, tea, chocolate" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3704,7 +3704,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 $12-01-01-0033.Button - "Free" + StringFmt( $12-01-01-0033.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3722,7 +3722,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3740,7 +3740,7 @@ ESPRESSO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3957,7 +3957,7 @@ GEISHA" 0x6F5F51 0xEAE6E1 $12-01-01-0036.Button - "Free" + StringFmt( $12-01-01-0036.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3975,7 +3975,7 @@ GEISHA" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3993,7 +3993,7 @@ GEISHA" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4212,7 +4212,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 $12-01-01-0037.Button - "Free" + StringFmt( $12-01-01-0037.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4230,7 +4230,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -4248,7 +4248,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4465,7 +4465,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4483,7 +4483,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 $12-01-02-0041.Button - "Free" + StringFmt( $12-01-02-0041.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -4501,7 +4501,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4712,7 +4712,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4730,7 +4730,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 $12-21-02-0041.Button - "Free" + StringFmt( $12-21-02-0041.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -4748,7 +4748,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4963,7 +4963,7 @@ Strawberry, Orange, Floral" 0x6F5F51 0xEAE6E1 $12-01-01-0014.Button - "Free" + StringFmt( $12-01-01-0014.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4981,7 +4981,7 @@ Strawberry, Orange, Floral" 0x6F5F51 0xEAE6E1 $12-01-02-0011.Button - "Free" + StringFmt( $12-01-02-0011.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -4999,7 +4999,7 @@ Strawberry, Orange, Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5219,7 +5219,7 @@ Note: Blue Berry & Floral" 0x6F5F51 0xEAE6E1 $12-01-01-0019.Button - "Free" + StringFmt( $12-01-01-0019.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5237,7 +5237,7 @@ Note: Blue Berry & Floral" 0x6F5F51 0xEAE6E1 $12-01-02-0019.Button - "Free" + StringFmt( $12-01-02-0019.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -5255,7 +5255,7 @@ Note: Blue Berry & Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5475,7 +5475,7 @@ Note: Strawberry & Floral" 0x6F5F51 0xEAE6E1 $12-01-01-0021.Button - "Free" + StringFmt( $12-01-01-0021.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5493,7 +5493,7 @@ Note: Strawberry & Floral" 0x6F5F51 0xEAE6E1 $12-01-02-0021.Button - "Free" + StringFmt( $12-01-02-0021.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -5511,7 +5511,7 @@ Note: Strawberry & Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5731,7 +5731,7 @@ Note: Whisky & Vanilla" 0x6F5F51 0xEAE6E1 $12-01-01-0025.Button - "Free" + StringFmt( $12-01-01-0025.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5749,7 +5749,7 @@ Note: Whisky & Vanilla" 0x6F5F51 0xEAE6E1 $12-01-02-0025.Button - "Free" + StringFmt( $12-01-02-0025.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -5767,7 +5767,7 @@ Note: Whisky & Vanilla" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5987,7 +5987,7 @@ Note: Jasmine & Honey" 0x6F5F51 0xEAE6E1 $12-01-01-0023.Button - "Free" + StringFmt( $12-01-01-0023.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -6005,7 +6005,7 @@ Note: Jasmine & Honey" 0x6F5F51 0xEAE6E1 $12-01-02-0023.Button - "Free" + StringFmt( $12-01-02-0023.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -6023,7 +6023,7 @@ Note: Jasmine & Honey" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -6243,7 +6243,7 @@ Note: Peach, tea, chocolate" 0x6F5F51 0xEAE6E1 $12-01-01-0027.Button - "Free" + StringFmt( $12-01-01-0027.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -6261,7 +6261,7 @@ Note: Peach, tea, chocolate" 0x6F5F51 0xEAE6E1 $12-01-02-0027.Button - "Free" + StringFmt( $12-01-02-0027.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -6279,7 +6279,7 @@ Note: Peach, tea, chocolate" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -6498,7 +6498,7 @@ AMERICANO" 0x6F5F51 0xEAE6E1 $12-01-01-0032.Button - "Free" + StringFmt( $12-01-01-0032.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -6516,7 +6516,7 @@ AMERICANO" 0x6F5F51 0xEAE6E1 $12-01-02-0032.Button - "Free" + StringFmt( $12-01-02-0032.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -6534,7 +6534,7 @@ AMERICANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -6752,7 +6752,7 @@ AMERICANO" 0x6F5F51 0xEAE6E1 $12-01-01-0035.Button - "Free" + StringFmt( $12-01-01-0035.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -6770,7 +6770,7 @@ AMERICANO" 0x6F5F51 0xEAE6E1 $12-01-02-0035.Button - "Free" + StringFmt( $12-01-02-0035.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -6788,7 +6788,7 @@ AMERICANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -7008,7 +7008,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 $12-01-01-0038.Button - "Free" + StringFmt( $12-01-01-0038.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -7026,7 +7026,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 $12-01-02-0038.Button - "Free" + StringFmt( $12-01-02-0038.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -7044,7 +7044,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -7264,7 +7264,7 @@ Note: Blue Berry & Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -7282,7 +7282,7 @@ Note: Blue Berry & Floral" 0x6F5F51 0xEAE6E1 $12-01-02-0020.Button - "Free" + StringFmt( $12-01-02-0020.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -7300,7 +7300,7 @@ Note: Blue Berry & Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -7516,7 +7516,7 @@ Note: Strawberry & Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -7534,7 +7534,7 @@ Note: Strawberry & Floral" 0x6F5F51 0xEAE6E1 $12-01-02-0022.Button - "Free" + StringFmt( $12-01-02-0022.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -7552,7 +7552,7 @@ Note: Strawberry & Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -7768,7 +7768,7 @@ Note: Whisky & Vanilla" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -7786,7 +7786,7 @@ Note: Whisky & Vanilla" 0x6F5F51 0xEAE6E1 $12-01-02-0026.Button - "Free" + StringFmt( $12-01-02-0026.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -7804,7 +7804,7 @@ Note: Whisky & Vanilla" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -8020,7 +8020,7 @@ Note: Jasmine & Honey" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -8038,7 +8038,7 @@ Note: Jasmine & Honey" 0x6F5F51 0xEAE6E1 $12-01-02-0024.Button - "Free" + StringFmt( $12-01-02-0024.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -8056,7 +8056,7 @@ Note: Jasmine & Honey" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -8272,7 +8272,7 @@ Strawberry, Orange, Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -8290,7 +8290,7 @@ Strawberry, Orange, Floral" 0x6F5F51 0xEAE6E1 $12-01-02-0018.Button - "Free" + StringFmt( $12-01-02-0018.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -8308,7 +8308,7 @@ Strawberry, Orange, Floral" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -8524,7 +8524,7 @@ Note: Peach, tea, chocolate" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -8542,7 +8542,7 @@ Note: Peach, tea, chocolate" 0x6F5F51 0xEAE6E1 $12-01-02-0028.Button - "Free" + StringFmt( $12-01-02-0028.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -8560,7 +8560,7 @@ Note: Peach, tea, chocolate" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -8775,7 +8775,7 @@ ALMOST DIRTY" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -8793,7 +8793,7 @@ ALMOST DIRTY" 0x6F5F51 0xEAE6E1 $12-01-02-0033.Button - "Free" + StringFmt( $12-01-02-0033.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -8811,7 +8811,7 @@ ALMOST DIRTY" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -9025,7 +9025,7 @@ ALMOST DIRTY" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -9043,7 +9043,7 @@ ALMOST DIRTY" 0x6F5F51 0xEAE6E1 $12-01-02-0036.Button - "Free" + StringFmt( $12-01-02-0036.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -9061,7 +9061,7 @@ ALMOST DIRTY" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -9277,7 +9277,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -9295,7 +9295,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 $12-01-02-0037.Button - "Free" + StringFmt( $12-01-02-0037.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -9313,7 +9313,7 @@ Pink​ Rose & Berry" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -9526,7 +9526,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -9544,7 +9544,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-11-02-0001.Button - "Free" + StringFmt( $12-11-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -9562,7 +9562,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-11-03-0001.Button - "Free" + StringFmt( $12-11-03-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -9773,7 +9773,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -9791,7 +9791,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-31-02-0001.Button - "Free" + StringFmt( $12-31-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -9809,7 +9809,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-31-03-0001.Button - "Free" + StringFmt( $12-31-03-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -10020,7 +10020,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-01-01-0004.Button - "Free" + StringFmt( $12-01-01-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -10038,7 +10038,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-01-02-0002.Button - "Free" + StringFmt( $12-01-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -10056,7 +10056,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-01-03-0002.Button - "Free" + StringFmt( $12-01-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -10270,7 +10270,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-21-01-0004.Button - "Free" + StringFmt( $12-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -10288,7 +10288,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-21-02-0002.Button - "Free" + StringFmt( $12-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -10306,7 +10306,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-21-03-0002.Button - "Free" + StringFmt( $12-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -10521,7 +10521,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-01-01-0005.Button - "Free" + StringFmt( $12-01-01-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -10539,7 +10539,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-11-02-0002.Button - "Free" + StringFmt( $12-11-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -10557,7 +10557,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-11-03-0002.Button - "Free" + StringFmt( $12-11-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -10771,7 +10771,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-21-01-0005.Button - "Free" + StringFmt( $12-21-01-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -10789,7 +10789,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-31-02-0002.Button - "Free" + StringFmt( $12-31-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -10807,7 +10807,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-31-03-0002.Button - "Free" + StringFmt( $12-31-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -11022,7 +11022,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-01-01-0006.Button - "Free" + StringFmt( $12-01-01-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -11040,7 +11040,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-01-02-0003.Button - "Free" + StringFmt( $12-01-02-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -11058,7 +11058,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-01-03-0003.Button - "Free" + StringFmt( $12-01-03-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -11272,7 +11272,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-21-01-0006.Button - "Free" + StringFmt( $12-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -11290,7 +11290,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-21-02-0003.Button - "Free" + StringFmt( $12-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -11308,7 +11308,7 @@ ICED ESPRESSO" 0x6F5F51 0xEAE6E1 $12-21-03-0003.Button - "Free" + StringFmt( $12-21-03-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -11525,7 +11525,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-01-01-0007.Button - "Free" + StringFmt( $12-01-01-0007.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -11543,7 +11543,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-01-02-0004.Button - "Free" + StringFmt( $12-01-02-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -11561,7 +11561,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-01-03-0004.Button - "Free" + StringFmt( $12-01-03-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -11777,7 +11777,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-21-01-0007.Button - "Free" + StringFmt( $12-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -11795,7 +11795,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-21-02-0004.Button - "Free" + StringFmt( $12-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -11813,7 +11813,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-21-03-0004.Button - "Free" + StringFmt( $12-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -12030,7 +12030,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-01-0031.Button - "Free" + StringFmt( $12-01-01-0031.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -12048,7 +12048,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-02-0031.Button - "Free" + StringFmt( $12-01-02-0031.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -12066,7 +12066,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-03-0031.Button - "Free" + StringFmt( $12-01-03-0031.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -12282,7 +12282,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-01-0031.Button - "Free" + StringFmt( $12-21-01-0031.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -12300,7 +12300,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-02-0031.Button - "Free" + StringFmt( $12-21-02-0031.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -12318,7 +12318,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-03-0031.Button - "Free" + StringFmt( $12-21-03-0031.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -12535,7 +12535,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-01-0008.Button - "Free" + StringFmt( $12-01-01-0008.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -12553,7 +12553,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-02-0005.Button - "Free" + StringFmt( $12-01-02-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -12571,7 +12571,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-03-0005.Button - "Free" + StringFmt( $12-01-03-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -12787,7 +12787,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-01-0008.Button - "Free" + StringFmt( $12-21-01-0008.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -12805,7 +12805,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-02-0005.Button - "Free" + StringFmt( $12-21-02-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -12823,7 +12823,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-03-0005.Button - "Free" + StringFmt( $12-21-03-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -13041,7 +13041,7 @@ Kokuto syrup" 0x6F5F51 0xEAE6E1 $12-01-01-0011.Button - "Free" + StringFmt( $12-01-01-0011.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -13059,7 +13059,7 @@ Kokuto syrup" 0x6F5F51 0xEAE6E1 $12-01-02-0008.Button - "Free" + StringFmt( $12-01-02-0008.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -13077,7 +13077,7 @@ Kokuto syrup" 0x6F5F51 0xEAE6E1 $12-01-03-0008.Button - "Free" + StringFmt( $12-01-03-0008.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -13294,7 +13294,7 @@ Kokuto syrup" 0x6F5F51 0xEAE6E1 $12-21-01-0011.Button - "Free" + StringFmt( $12-21-01-0011.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -13312,7 +13312,7 @@ Kokuto syrup" 0x6F5F51 0xEAE6E1 $12-21-02-0008.Button - "Free" + StringFmt( $12-21-02-0008.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -13330,7 +13330,7 @@ Kokuto syrup" 0x6F5F51 0xEAE6E1 $12-21-03-0008.Button - "Free" + StringFmt( $12-21-03-0008.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -13547,7 +13547,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-01-0039.Button - "Free" + StringFmt( $12-01-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -13565,7 +13565,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-02-0039.Button - "Free" + StringFmt( $12-01-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -13583,7 +13583,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -13799,7 +13799,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-01-0039.Button - "Free" + StringFmt( $12-21-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -13817,7 +13817,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-02-0039.Button - "Free" + StringFmt( $12-21-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -13835,7 +13835,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -14053,7 +14053,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-01-01-0009.Button - "Free" + StringFmt( $12-01-01-0009.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -14071,7 +14071,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-01-02-0006.Button - "Free" + StringFmt( $12-01-02-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -14089,7 +14089,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-01-03-0006.Button - "Free" + StringFmt( $12-01-03-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -14306,7 +14306,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-21-01-0009.Button - "Free" + StringFmt( $12-21-01-0009.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -14324,7 +14324,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-21-02-0006.Button - "Free" + StringFmt( $12-21-02-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -14342,7 +14342,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-21-03-0006.Button - "Free" + StringFmt( $12-21-03-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -14558,7 +14558,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-01-0029.Button - "Free" + StringFmt( $12-01-01-0029.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -14576,7 +14576,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-02-0029.Button - "Free" + StringFmt( $12-01-02-0029.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -14594,7 +14594,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-01-03-0029.Button - "Free" + StringFmt( $12-01-03-0029.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -14809,7 +14809,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-01-0029.Button - "Free" + StringFmt( $12-21-01-0029.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -14827,7 +14827,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-02-0029.Button - "Free" + StringFmt( $12-21-02-0029.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -14845,7 +14845,7 @@ CAFÉ LATTE" 0x6F5F51 0xEAE6E1 $12-21-03-0029.Button - "Free" + StringFmt( $12-21-03-0029.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -15063,7 +15063,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-01-01-0030.Button - "Free" + StringFmt( $12-01-01-0030.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -15081,7 +15081,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-01-02-0030.Button - "Free" + StringFmt( $12-01-02-0030.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -15099,7 +15099,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-01-03-0030.Button - "Free" + StringFmt( $12-01-03-0030.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -15316,7 +15316,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-21-01-0030.Button - "Free" + StringFmt( $12-21-01-0030.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -15334,7 +15334,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-21-02-0030.Button - "Free" + StringFmt( $12-21-02-0030.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -15352,7 +15352,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-21-03-0030.Button - "Free" + StringFmt( $12-21-03-0030.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -15569,7 +15569,7 @@ Sugar, Water" 0x6F5F51 0xEAE6E1 $12-01-01-0017.Button - "Free" + StringFmt( $12-01-01-0017.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -15587,7 +15587,7 @@ Sugar, Water" 0x6F5F51 0xEAE6E1 $12-01-02-0017.Button - "Free" + StringFmt( $12-01-02-0017.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -15605,7 +15605,7 @@ Sugar, Water" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -15821,7 +15821,7 @@ Sugar, Water" 0x6F5F51 0xEAE6E1 $12-21-01-0017.Button - "Free" + StringFmt( $12-21-01-0017.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -15839,7 +15839,7 @@ Sugar, Water" 0x6F5F51 0xEAE6E1 $12-21-02-0017.Button - "Free" + StringFmt( $12-21-02-0017.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -15857,7 +15857,7 @@ Sugar, Water" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -16074,7 +16074,7 @@ Sugar, Water" 0x6F5F51 0xEAE6E1 $12-01-01-0040.Button - "Free" + StringFmt( $12-01-01-0040.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -16092,7 +16092,7 @@ Sugar, Water" 0x6F5F51 0xEAE6E1 $12-01-02-0040.Button - "Free" + StringFmt( $12-01-02-0040.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -16110,7 +16110,7 @@ Sugar, Water" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -16183,15 +16183,15 @@ Sugar, Water" center-vertical-horizontal - ; 12-23-01-0023 12-23-02-0023 - + ; 12-21-01-0040 12-21-02-0040 - 33 22 225 296 - Flag( 12-23-01-0023.Button,12-23-02-0023.Button,$Sum12230100231223020023) + Flag( 12-21-01-0040.Button,12-21-02-0040.Button,$Sum12210100401221020040) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "YUZU TEA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "12-02-01-0038" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-02-02-0038.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-02-02-0038.Button - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum1202020038 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1202020038 = "Disable" Then - STRCONTAIN "ERR" $12-02-02-0038.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1202020038 - text_unavailable - center-vertical-horizontal - - - ; ฿30.00 - - 33 - 22 - 225 - 296 - Flag( .Button,.Button,฿30.00.Button,$Sum฿30.00) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "YUZU TEA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "12-02-01-0038" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $฿30.00.Button - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $฿30.00.Button - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum฿30.00 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $฿30.00.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum฿30.00 - text_unavailable - center-vertical-horizontal - - - ; ==================> Len = 15 - ; 12-03-02-0025 12-03-03-0025 - - 33 - 22 - 225 - 296 - Flag( 12-03-02-0025.Button,12-03-03-0025.Button,.Button,$Sum12030200251203030025) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "COCOA YUZU" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "12-03-01-0025" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-03-02-0025.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0025.Button - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-03-0025.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0025.Button - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum12030200251203030025 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum12030200251203030025 = "Disable" Then - STRCONTAIN "ERR" $12-03-02-0025.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-03-0025.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum12030200251203030025 - text_unavailable - center-vertical-horizontal - - - ; ฿35.00 - - 33 - 22 - 225 - 296 - Flag( .Button,.Button,฿35.00.Button,$Sum฿35.00) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "COCOA YUZU" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "12-03-01-0025" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $฿35.00.Button - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $฿35.00.Button - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum฿35.00 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $฿35.00.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum฿35.00 - text_unavailable - center-vertical-horizontal - - - ; ==================> Len = 12 - ; 12-05-02-0045 - - 33 - 22 - 225 - 296 - Flag( 12-05-02-0045.Button,.Button,.Button,$Sum1205020045) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "YUZU SODA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-05-02-0045.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0045.Button - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum1205020045 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1205020045 = "Disable" Then - STRCONTAIN "ERR" $12-05-02-0045.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1205020045 - text_unavailable - center-vertical-horizontal - - - ; - - 33 - 22 - 225 - 296 - Flag( .Button,.Button,.Button,$Sum) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "YUZU SODA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum - text_unavailable - center-vertical-horizontal - - - ; ==================> Len = 15 - ; 12-03-02-0023 12-03-03-0023 - - 33 - 22 - 225 - 296 - Flag( 12-03-02-0023.Button,12-03-03-0023.Button,.Button,$Sum12030200231203030023) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "BANANA MILK" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "12-03-01-0023" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-03-02-0023.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0023.Button - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-03-0023.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0023.Button - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum12030200231203030023 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum12030200231203030023 = "Disable" Then - STRCONTAIN "ERR" $12-03-02-0023.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-03-0023.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum12030200231203030023 - text_unavailable - center-vertical-horizontal - - - ; ฿30.00 - - 33 - 22 - 225 - 296 - Flag( .Button,.Button,฿30.00.Button,$Sum฿30.00) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "BANANA MILK" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "12-03-01-0023" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $฿30.00.Button - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $฿30.00.Button - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum฿30.00 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $฿30.00.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum฿30.00 - text_unavailable - center-vertical-horizontal - - - ; ==================> Len = 15 - ; 12-01-02-0042 12-01-03-0042 - - 33 - 22 - 225 - 296 - Flag( 12-01-02-0042.Button,12-01-03-0042.Button,.Button,$Sum12010200421201030042) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "BANANA LATTE" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "12-01-01-0042" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-01-02-0042.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-02-0042.Button - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-01-03-0042.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-03-0042.Button - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum12010200421201030042 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum12010200421201030042 = "Disable" Then - STRCONTAIN "ERR" $12-01-02-0042.TAG tag1_is_disable - STRCONTAIN "ERR" $12-01-03-0042.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum12010200421201030042 - text_unavailable - center-vertical-horizontal - - - ; ฿35.00 - - 33 - 22 - 225 - 296 - Flag( .Button,.Button,฿35.00.Button,$Sum฿35.00) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "BANANA LATTE" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "12-01-01-0042" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $฿35.00.Button - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $฿35.00.Button - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum฿35.00 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $฿35.00.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum฿35.00 - text_unavailable - center-vertical-horizontal - - - ; ==================> Len = 12 - ; 12-04-02-0018 - - 33 - 22 - 225 - 296 - Flag( 12-04-02-0018.Button,.Button,.Button,$Sum1204020018) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "BANANA SHAKE" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-04-02-0018.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-04-02-0018.Button - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum1204020018 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1204020018 = "Disable" Then - STRCONTAIN "ERR" $12-04-02-0018.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1204020018 - text_unavailable - center-vertical-horizontal - - - ; - - 33 - 22 - 225 - 296 - Flag( .Button,.Button,.Button,$Sum) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "BANANA SHAKE" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum - text_unavailable - center-vertical-horizontal - - - ; ==================> Len = 12 - ; 12-05-02-0050 - - 33 - 22 - 225 - 296 - Flag( 12-05-02-0050.Button,.Button,.Button,$Sum1205020050) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "BANANA SODA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-05-02-0050.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0050.Button - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum1205020050 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1205020050 = "Disable" Then - STRCONTAIN "ERR" $12-05-02-0050.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1205020050 - text_unavailable - center-vertical-horizontal - - - ; - - 33 - 22 - 225 - 296 - Flag( .Button,.Button,.Button,$Sum) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "BANANA SODA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum + $Sum12210100401221020040 text_unavailable center-vertical-horizontal diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index 8ccd9ca4..da85171e 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -669,7 +669,7 @@ 0x6F5F51 0xEAE6E1 $12-03-01-0005.Button - "Free" + StringFmt( $12-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -687,7 +687,7 @@ 0x6F5F51 0xEAE6E1 $12-03-02-0005.Button - "Free" + StringFmt( $12-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -705,7 +705,7 @@ 0x6F5F51 0xEAE6E1 $12-03-03-0005.Button - "Free" + StringFmt( $12-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -921,7 +921,7 @@ 0x6F5F51 0xEAE6E1 $12-03-01-0001.Button - "Free" + StringFmt( $12-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -939,7 +939,7 @@ 0x6F5F51 0xEAE6E1 $12-03-02-0001.Button - "Free" + StringFmt( $12-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -957,7 +957,7 @@ 0x6F5F51 0xEAE6E1 $12-03-03-0001.Button - "Free" + StringFmt( $12-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1174,7 +1174,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-01-0003.Button - "Free" + StringFmt( $12-03-01-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1192,7 +1192,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-02-0003.Button - "Free" + StringFmt( $12-03-02-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1210,7 +1210,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-03-0003.Button - "Free" + StringFmt( $12-03-03-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1427,7 +1427,7 @@ MILK" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1445,7 +1445,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-02-0006.Button - "Free" + StringFmt( $12-03-02-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1463,7 +1463,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-03-0006.Button - "Free" + StringFmt( $12-03-03-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1675,7 +1675,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-01-0002.Button - "Free" + StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1693,7 +1693,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-02-0002.Button - "Free" + StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1711,7 +1711,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-03-0002.Button - "Free" + StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1927,7 +1927,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-01-0022.Button - "Free" + StringFmt( $12-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1945,7 +1945,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-02-0022.Button - "Free" + StringFmt( $12-03-02-0022.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1963,7 +1963,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-03-0022.Button - "Free" + StringFmt( $12-03-03-0022.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2181,7 +2181,7 @@ SMOOTHIE" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2199,7 +2199,7 @@ SMOOTHIE" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2217,7 +2217,7 @@ SMOOTHIE" 0x6F5F51 0xEAE6E1 $12-03-03-0010.Button - "Free" + StringFmt( $12-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2430,7 +2430,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2448,7 +2448,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2466,7 +2466,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-03-0020.Button - "Free" + StringFmt( $12-03-03-0020.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2679,7 +2679,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2697,7 +2697,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2715,7 +2715,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-03-0021.Button - "Free" + StringFmt( $12-03-03-0021.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2927,7 +2927,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2945,7 +2945,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-05-02-0041.Button - "Free" + StringFmt( $12-05-02-0041.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2963,7 +2963,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-05-03-0041.Button - "Free" + StringFmt( $12-05-03-0041.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3175,7 +3175,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3193,7 +3193,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-05-02-0008.Button - "Free" + StringFmt( $12-05-02-0008.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3211,7 +3211,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-05-03-0008.Button - "Free" + StringFmt( $12-05-03-0008.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3424,7 +3424,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3442,7 +3442,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-05-02-0044.Button - "Free" + StringFmt( $12-05-02-0044.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3460,7 +3460,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3673,7 +3673,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3691,7 +3691,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-05-02-0045.Button - "Free" + StringFmt( $12-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3709,7 +3709,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3923,7 +3923,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3941,7 +3941,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3959,7 +3959,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-03-0009.Button - "Free" + StringFmt( $12-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) ; test 81 diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index 0d209de4..cc30146f 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -662,7 +662,7 @@ 0x6F5F51 0xEAE6E1 $12-01-01-1003.Button - "Free" + StringFmt( $12-01-01-1003.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -680,7 +680,7 @@ 0x6F5F51 0xEAE6E1 $12-01-02-1001.Button - "Free" + StringFmt( $12-01-02-1001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -698,7 +698,7 @@ 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -914,7 +914,7 @@ 0x6F5F51 0xEAE6E1 $12-21-01-1003.Button - "Free" + StringFmt( $12-21-01-1003.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -932,7 +932,7 @@ 0x6F5F51 0xEAE6E1 $12-21-02-1001.Button - "Free" + StringFmt( $12-21-02-1001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -950,7 +950,7 @@ 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1166,7 +1166,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 $12-01-01-1004.Button - "Free" + StringFmt( $12-01-01-1004.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1184,7 +1184,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 $12-01-02-1002.Button - "Free" + StringFmt( $12-01-02-1002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1202,7 +1202,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1417,7 +1417,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 $12-21-01-1004.Button - "Free" + StringFmt( $12-21-01-1004.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1435,7 +1435,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 $12-21-02-1002.Button - "Free" + StringFmt( $12-21-02-1002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1453,7 +1453,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1670,7 +1670,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-01-01-1006.Button - "Free" + StringFmt( $12-01-01-1006.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1688,7 +1688,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-01-02-1003.Button - "Free" + StringFmt( $12-01-02-1003.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1706,7 +1706,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1922,7 +1922,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-21-01-1006.Button - "Free" + StringFmt( $12-21-01-1006.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1940,7 +1940,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 $12-21-02-1003.Button - "Free" + StringFmt( $12-21-02-1003.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1958,7 +1958,7 @@ Milk, Sugar" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2174,7 +2174,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 $12-01-01-1099.Button - "Free" + StringFmt( $12-01-01-1099.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2192,7 +2192,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 $12-01-02-1099.Button - "Free" + StringFmt( $12-01-02-1099.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2210,7 +2210,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2425,7 +2425,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 $12-21-01-1099.Button - "Free" + StringFmt( $12-21-01-1099.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2443,7 +2443,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 $12-21-02-1099.Button - "Free" + StringFmt( $12-21-02-1099.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2461,7 +2461,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2676,7 +2676,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 $12-02-01-1024.Button - "Free" + StringFmt( $12-02-01-1024.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2694,7 +2694,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 $12-02-02-1024.Button - "Free" + StringFmt( $12-02-02-1024.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2712,7 +2712,7 @@ Foamed milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2930,7 +2930,7 @@ and Milk" 0x6F5F51 0xEAE6E1 $12-02-01-1025.Button - "Free" + StringFmt( $12-02-01-1025.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2948,7 +2948,7 @@ and Milk" 0x6F5F51 0xEAE6E1 $12-02-02-1025.Button - "Free" + StringFmt( $12-02-02-1025.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2966,7 +2966,7 @@ and Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3182,7 +3182,7 @@ and Milk" 0x6F5F51 0xEAE6E1 $12-02-01-1026.Button - "Free" + StringFmt( $12-02-01-1026.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3200,7 +3200,7 @@ and Milk" 0x6F5F51 0xEAE6E1 $12-02-02-1026.Button - "Free" + StringFmt( $12-02-02-1026.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3218,7 +3218,7 @@ and Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3434,7 +3434,7 @@ and Milk" 0x6F5F51 0xEAE6E1 $12-02-01-1027.Button - "Free" + StringFmt( $12-02-01-1027.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3452,7 +3452,7 @@ and Milk" 0x6F5F51 0xEAE6E1 $12-02-02-1027.Button - "Free" + StringFmt( $12-02-02-1027.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3470,7 +3470,7 @@ and Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3686,7 +3686,7 @@ and Milk" 0x6F5F51 0xEAE6E1 $12-02-01-1029.Button - "Free" + StringFmt( $12-02-01-1029.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3704,7 +3704,7 @@ and Milk" 0x6F5F51 0xEAE6E1 $12-02-02-1029.Button - "Free" + StringFmt( $12-02-02-1029.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3722,7 +3722,7 @@ and Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3939,7 +3939,7 @@ LIMENADE" 0x6F5F51 0xEAE6E1 $12-02-01-1030.Button - "Free" + StringFmt( $12-02-01-1030.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3957,7 +3957,7 @@ LIMENADE" 0x6F5F51 0xEAE6E1 $12-02-02-1030.Button - "Free" + StringFmt( $12-02-02-1030.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3975,7 +3975,7 @@ LIMENADE" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4191,7 +4191,7 @@ LIMENADE" 0x6F5F51 0xEAE6E1 $12-02-01-1031.Button - "Free" + StringFmt( $12-02-01-1031.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4209,7 +4209,7 @@ LIMENADE" 0x6F5F51 0xEAE6E1 $12-02-02-1031.Button - "Free" + StringFmt( $12-02-02-1031.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -4227,7 +4227,7 @@ LIMENADE" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4446,7 +4446,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 $12-02-01-1032.Button - "Free" + StringFmt( $12-02-01-1032.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4464,7 +4464,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 $12-02-02-1032.Button - "Free" + StringFmt( $12-02-02-1032.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -4482,7 +4482,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4698,7 +4698,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 $12-02-01-1037.Button - "Free" + StringFmt( $12-02-01-1037.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4716,7 +4716,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 $12-02-02-1037.Button - "Free" + StringFmt( $12-02-02-1037.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -4734,7 +4734,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4950,7 +4950,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 $12-03-01-1002.Button - "Free" + StringFmt( $12-03-01-1002.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4968,7 +4968,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 $12-03-02-1002.Button - "Free" + StringFmt( $12-03-02-1002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -4986,7 +4986,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5202,7 +5202,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 $12-03-01-1005.Button - "Free" + StringFmt( $12-03-01-1005.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5220,7 +5220,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 $12-03-02-1005.Button - "Free" + StringFmt( $12-03-02-1005.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -5238,7 +5238,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5454,7 +5454,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 $12-05-01-1001.Button - "Free" + StringFmt( $12-05-01-1001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5472,7 +5472,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 $12-05-02-1001.Button - "Free" + StringFmt( $12-05-02-1001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -5490,7 +5490,7 @@ Water, and Ice" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5707,7 +5707,7 @@ SODA" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -5725,7 +5725,7 @@ SODA" 0x6F5F51 0xEAE6E1 $12-05-02-1010.Button - "Free" + StringFmt( $12-05-02-1010.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -5743,7 +5743,7 @@ SODA" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index f18f9cbd..5acbc4b1 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -514,7 +514,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 14 +; menu_new_list 15 ; ==================> Len = 16 ; 12-03-01-0005 12-03-02-0005 12-03-03-0005 @@ -657,7 +657,7 @@ 0x6F5F51 0xEAE6E1 $12-03-01-0005.Button - "Free" + StringFmt( $12-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -675,7 +675,7 @@ 0x6F5F51 0xEAE6E1 $12-03-02-0005.Button - "Free" + StringFmt( $12-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -693,7 +693,7 @@ 0x6F5F51 0xEAE6E1 $12-03-03-0005.Button - "Free" + StringFmt( $12-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -909,7 +909,7 @@ 0x6F5F51 0xEAE6E1 $12-03-01-0001.Button - "Free" + StringFmt( $12-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -927,7 +927,7 @@ 0x6F5F51 0xEAE6E1 $12-03-02-0001.Button - "Free" + StringFmt( $12-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -945,7 +945,7 @@ 0x6F5F51 0xEAE6E1 $12-03-03-0001.Button - "Free" + StringFmt( $12-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1163,7 +1163,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-03-01-0004.Button - "Free" + StringFmt( $12-03-01-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1181,7 +1181,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-03-02-0004.Button - "Free" + StringFmt( $12-03-02-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1199,7 +1199,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-03-03-0004.Button - "Free" + StringFmt( $12-03-03-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1416,7 +1416,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-01-0003.Button - "Free" + StringFmt( $12-03-01-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1434,7 +1434,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-02-0003.Button - "Free" + StringFmt( $12-03-02-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1452,7 +1452,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-03-0003.Button - "Free" + StringFmt( $12-03-03-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1669,7 +1669,7 @@ MILK" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1687,7 +1687,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-02-0006.Button - "Free" + StringFmt( $12-03-02-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1705,7 +1705,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-03-0006.Button - "Free" + StringFmt( $12-03-03-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1917,7 +1917,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-01-0002.Button - "Free" + StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1935,7 +1935,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-02-0002.Button - "Free" + StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1953,7 +1953,7 @@ MILK" 0x6F5F51 0xEAE6E1 $12-03-03-0002.Button - "Free" + StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2171,7 +2171,7 @@ SMOOTHIE" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2189,7 +2189,7 @@ SMOOTHIE" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2207,7 +2207,7 @@ SMOOTHIE" 0x6F5F51 0xEAE6E1 $12-03-03-0010.Button - "Free" + StringFmt( $12-03-03-0010.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2421,7 +2421,7 @@ SMOOTHIE" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2439,7 +2439,7 @@ SMOOTHIE" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2457,7 +2457,7 @@ SMOOTHIE" 0x6F5F51 0xEAE6E1 $12-03-03-0011.Button - "Free" + StringFmt( $12-03-03-0011.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2671,7 +2671,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2689,7 +2689,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2707,7 +2707,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-03-0009.Button - "Free" + StringFmt( $12-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2919,7 +2919,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-01-0019.Button - "Free" + StringFmt( $12-03-01-0019.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2937,7 +2937,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-02-0019.Button - "Free" + StringFmt( $12-03-02-0019.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2955,7 +2955,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-03-0019.Button - "Free" + StringFmt( $12-03-03-0019.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3172,7 +3172,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3190,7 +3190,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3208,7 +3208,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-03-0020.Button - "Free" + StringFmt( $12-03-03-0020.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3421,7 +3421,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3439,7 +3439,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3457,7 +3457,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-03-0021.Button - "Free" + StringFmt( $12-03-03-0021.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3669,7 +3669,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-01-0022.Button - "Free" + StringFmt( $12-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3687,7 +3687,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-02-0022.Button - "Free" + StringFmt( $12-03-02-0022.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3705,7 +3705,7 @@ VOLCANO" 0x6F5F51 0xEAE6E1 $12-03-03-0022.Button - "Free" + StringFmt( $12-03-03-0022.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3789,9 +3789,9 @@ VOLCANO" Flag( 12-03-01-0025.Button,12-03-02-0025.Button,12-03-03-0025.Button,$Sum120301002512030200251203030025) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โกโก้ยูซุ" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "โกโก้ และยูซุ" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "Cocoa Yuzu" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Cocoa and Yuzu syrup" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - "Free" - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum - text_unavailable - center-vertical-horizontal - - + ; - - - ; Cart + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชายูซุ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชาไต้หวัน น้ำเชื่อมยูซุ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "YUZU TEA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Yuzu, Taiwanese tea, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0038.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0038.Button + StringFmt( $12-02-01-0038.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0038.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0038.Button + StringFmt( $12-02-02-0038.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12020100381202020038 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12020100381202020038 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0038.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0038.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12020100381202020038 + text_unavailable + center-vertical-horizontal + ; - - - diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index ed43842c..f2043040 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -521,7 +521,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 15 +; menu_new_list 16 ; ==================> Len = 16 ; - 12-04-02-0001 - @@ -665,7 +665,7 @@ Matcha, & Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -683,7 +683,7 @@ Matcha, & Milk" 0x6F5F51 0xEAE6E1 $12-04-02-0001.Button - "Free" + StringFmt( $12-04-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -701,7 +701,7 @@ Matcha, & Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -914,7 +914,7 @@ Matcha, & Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -932,7 +932,7 @@ Matcha, & Milk" 0x6F5F51 0xEAE6E1 $12-04-02-0016.Button - "Free" + StringFmt( $12-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -950,7 +950,7 @@ Matcha, & Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1163,7 +1163,7 @@ Cocoa, & Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1181,7 +1181,7 @@ Cocoa, & Milk" 0x6F5F51 0xEAE6E1 $12-04-02-0002.Button - "Free" + StringFmt( $12-04-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1199,7 +1199,7 @@ Cocoa, & Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1414,7 +1414,7 @@ Strawberry Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1432,7 +1432,7 @@ Strawberry Syrup" 0x6F5F51 0xEAE6E1 $12-04-02-0003.Button - "Free" + StringFmt( $12-04-02-0003.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1450,7 +1450,7 @@ Strawberry Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1665,7 +1665,7 @@ Strawberry Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1683,7 +1683,7 @@ Strawberry Syrup" 0x6F5F51 0xEAE6E1 $12-04-02-0013.Button - "Free" + StringFmt( $12-04-02-0013.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1701,7 +1701,7 @@ Strawberry Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1915,7 +1915,7 @@ Melon Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -1933,7 +1933,7 @@ Melon Syrup" 0x6F5F51 0xEAE6E1 $12-04-02-0018.Button - "Free" + StringFmt( $12-04-02-0018.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -1951,7 +1951,7 @@ Melon Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2164,7 +2164,7 @@ Melon Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2182,7 +2182,7 @@ Melon Syrup" 0x6F5F51 0xEAE6E1 $12-04-02-0004.Button - "Free" + StringFmt( $12-04-02-0004.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2200,7 +2200,7 @@ Melon Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2413,7 +2413,7 @@ Thai Tea, & Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2431,7 +2431,7 @@ Thai Tea, & Milk" 0x6F5F51 0xEAE6E1 $12-04-02-0005.Button - "Free" + StringFmt( $12-04-02-0005.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2449,7 +2449,7 @@ Thai Tea, & Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2662,7 +2662,7 @@ Thai Tea, & Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2680,7 +2680,7 @@ Thai Tea, & Milk" 0x6F5F51 0xEAE6E1 $12-04-02-0015.Button - "Free" + StringFmt( $12-04-02-0015.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2698,7 +2698,7 @@ Thai Tea, & Milk" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2913,7 +2913,7 @@ Kokuto syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -2931,7 +2931,7 @@ Kokuto syrup" 0x6F5F51 0xEAE6E1 $12-04-02-0006.Button - "Free" + StringFmt( $12-04-02-0006.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -2949,7 +2949,7 @@ Kokuto syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3164,7 +3164,7 @@ Taiwanese Tea, Sugar" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3182,7 +3182,7 @@ Taiwanese Tea, Sugar" 0x6F5F51 0xEAE6E1 $12-04-02-0008.Button - "Free" + StringFmt( $12-04-02-0008.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3200,7 +3200,7 @@ Taiwanese Tea, Sugar" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3415,7 +3415,7 @@ Taiwanese Tea, Sugar" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3433,7 +3433,7 @@ Taiwanese Tea, Sugar" 0x6F5F51 0xEAE6E1 $12-04-02-0017.Button - "Free" + StringFmt( $12-04-02-0017.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3451,7 +3451,7 @@ Taiwanese Tea, Sugar" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3665,7 +3665,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3683,7 +3683,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-04-02-0009.Button - "Free" + StringFmt( $12-04-02-0009.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3701,7 +3701,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3913,7 +3913,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -3931,7 +3931,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-04-02-0010.Button - "Free" + StringFmt( $12-04-02-0010.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -3949,7 +3949,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4161,7 +4161,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 @@ -4179,7 +4179,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 $12-04-02-0011.Button - "Free" + StringFmt( $12-04-02-0011.Price , DisplayFormat, PreScaleConvertShow) ; test 146 @@ -4197,7 +4197,7 @@ Caramel Syrup" 0x6F5F51 0xEAE6E1 "Invisible" - "Free" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test 81 diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index f0d402a0..614a687e 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -861,6 +861,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" DEBUGVAR "set default Powder Sugar" @@ -899,13 +900,26 @@ If TOPPING1 = "Sugar Premix 25" Then - Var BGSugar = "Enable" + + If RecipeTag2 = "Topping6Step" Then + Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" + Else + Var BGSugar = "Enable" + EndIf + Var ShiftSugarStep = 2 Var SugarState1 = "Disable" - Var SugarState2 = "Enable" + If RecipeTag2 = "Topping6Step" Then + Var SugarState2 = "Disable" + Else + Var SugarState2 = "Enable" + EndIf + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" If toppingID1index1 = toppingID1Default Then Var SugarState2 = "PressForever" @@ -934,13 +948,24 @@ EndIf If TOPPING1 = "Powder Sugar Premix 50" Then - Var BGSugar = "Enable" + + If RecipeTag2 = "Topping6Step" Then + Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" + Else + Var BGSugar = "Enable" + EndIf Var ShiftSugarStep = 3 Var SugarState1 = "Disable" Var SugarState2 = "Disable" - Var SugarState3 = "Enable" + If RecipeTag2 = "Topping6Step" Then + Var SugarState3 = "Disable" + Else + Var SugarState3 = "Enable" + EndIf Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" If toppingID1index1 = toppingID1Default Then Var SugarState3 = "PressForever" @@ -964,9 +989,21 @@ EndIf If TOPPING1 = "Powder Sugar Premix 25" Then - Var BGSugar = "Enable" + If RecipeTag2 = "Topping6Step" Then + Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" + Else + Var BGSugar = "Enable" + EndIf + Var ShiftSugarStep = 2 - Var SugarState2 = "Enable" + + If RecipeTag2 = "Topping6Step" Then + Var SugarState2 = "Disable" + Else + Var SugarState2 = "Enable" + EndIf + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -2023,7 +2060,6 @@ EndIf If ShiftSugarStep = 2 Then - Var SugarState2 = "Enable" Var SugarState3 = "PressForever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -2031,15 +2067,6 @@ Var topping1 = toppingID1index2 EndIf - If ShiftSugarStep = 3 Then - - Var SugarState3 = "PressForever" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - Var SugarState6 = "Enable" - Var topping1 = toppingID1index1 - - EndIf Var UserSeletedSugar = 1 EndIf @@ -2078,7 +2105,6 @@ EndIf If ShiftSugarStep = 2 Then - Var SugarState2 = "Enable" Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" @@ -2088,7 +2114,6 @@ If ShiftSugarStep = 3 Then - Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" Var SugarState6 = "Enable" @@ -2132,7 +2157,6 @@ EndIf If ShiftSugarStep = 2 Then - Var SugarState2 = "Enable" Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" @@ -2142,7 +2166,6 @@ If ShiftSugarStep = 3 Then - Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" Var SugarState6 = "Enable" @@ -2186,7 +2209,6 @@ EndIf If ShiftSugarStep = 2 Then - Var SugarState2 = "Enable" Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -2196,7 +2218,6 @@ If ShiftSugarStep = 3 Then - Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" Var SugarState6 = "PressForever" @@ -3785,7 +3806,7 @@ Var PriceDrinkTmp = 0 Var PriceDrinkTmpShow = "Free" - DEBUGVAR SelectDrink + DEBUGVAR SelectDrink2 DEBUGVAR PriceDrinkTmpShow EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 3ba00402..b8314e1e 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -106,8 +106,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.83" - Var XMLPageVersionInt = 683 + Var XMLPageVersion = "6.84" + Var XMLPageVersionInt = 684