diff --git a/inter/mys/menu/lang.tsv b/inter/mys/menu/lang.tsv
index 65a5b07a..0dc3b380 100644
--- a/inter/mys/menu/lang.tsv
+++ b/inter/mys/menu/lang.tsv
@@ -52,11 +52,11 @@ TextID Note English Thai China Japan Malaysia
Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center
Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center
000046 0% 0% 0%
-000047 20% 20% 20%
-000048 40% 40% 40%
-000049 60% 60% 60%
-000050 80% 80% 80%
-000051 100% 100% 100%
+000047 30% 30% 20%
+000048 60% 60% 40%
+000049 100% 100% 60%
+000050 120% 120% 80%
+000051 140% 140% 100%
Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center
000052 No added sugar ไม่ใส่น้ำตาล No added sugar
diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv
index 53ebd1ed..d5fd05f2 100644
--- a/menu/new-layout.tsv
+++ b/menu/new-layout.tsv
@@ -2,9 +2,10 @@
Name=recommend,file=page_catalog_group_recommend.skt
TAGESP
- ซูเปอร์โอริภูเขาไฟ SUPER OREO \nVOLCANO นม น้ำตาล โอริโอ้ Milk, Sugar, Oreo - - 12-03-03-0032 bn_super_oreo_volcano.png - - - - - ฿60.00 NN NN
+ ชานมไทย THAI MILK TEA ชาไทย และ นม Thai tea, Sugar, milk 12-02-01-0039 12-02-02-0039 12-02-03-0039 bn_thai_milk_tea_SingPark.png - - - ฿35.00 ฿40.00 ฿45.00 TRUE TRUE
TAGESP
โอริโอ้ปั่นภูเขาไฟ OREO SMOOTHIE \nVOLCANO นม น้ำตาล โอริโอ้ \n Milk, Sugar, Oreo - - 12-03-03-0009 bn_smoothie_oreo.png - - - - - ฿55.00 NN NN
+
โอวัลตินปั่นภูเขาไฟ OVALTINE SMOOTHIE \nVOLCANO โอวัลติน น้ำตาล และ นม Ovaltine, Sugar, milk - - 12-03-03-0020 bn_smoothie_ovaltine.png - - - - - ฿55.00 NN NN
โฮจิฉะลาเต้ HOJICHA LATTE ชาเขียวคั่ว และ นม Hojicha and milk 12-02-01-0037 12-02-02-0037 12-02-03-0037 bn_hot_hojicha_milk_tea_sing.png - - - ฿40.00 ฿45.00 ฿50.00 TRUE TRUE
โกโก้ COCOA โกโก้ นมและน้ำตาล Milk, Cocoa, Sugar 12-03-01-0002 12-03-02-0002 12-03-03-0002 bn_iced_cocoa.png - - - ฿30.00 ฿35.00 ฿40.00 TRUE TRUE
@@ -25,7 +26,8 @@ TAGESP
อเมริกาโน \nCHOPIN CHOPIN \nAMERICANO Raisin Honey process \nหอมสตรอว์เบอร์รี กุหลาบ มะลิ Raisin Honey process \nNote: Strawberry & Floral 12-01-01-0044 12-01-02-0044 - bn_hot_americano_light_chopin.png - - - #N/A #N/A - #N/A #N/A
อเมริกาโน \nMANDARINE MANDARINE \nAMERICANO กาแฟคั่วอ่อน โน๊ต: ดอกส้ม น้ำผึ้ง คาราเมล ช็อกโกแล็ต Light Roast. Note: Orange Blossom, Honey, Caramel, Chocolate Bar. 12-01-01-0047 12-01-02-0047 - bn_hot_americano_light_Mandarine.png - - - #N/A #N/A - #N/A #N/A
อเมริกาโน \nOPUS ONE OPUS ONE \nAMERICANO กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint. 12-01-01-0050 12-01-02-0050 - bn_hot_americano_light_opus_one.png - - - #N/A #N/A - #N/A #N/A
- ลาเต้ LATTE กาแฟ นม และ นม Espresso, Milk,\n milk 12-01-01-0004 12-01-02-0002 12-01-03-0002 bn_hot_latte.png - - - ฿35.00 ฿40.00 ฿45.00 TRUE TRUE
+ ชามะลิ JASMINE TEA ชามะลิ น้ำ Jasmine Tea ,Water 12-02-01-0045 12-02-02-0045 12-02-03-0046 bn_jasmine_tea.png - - -
+ ชามะลิลาเต้ JASMINE MILK TEA ชามะลิ และนม Jasmine & Milk 12-02-01-0046 12-02-02-0046 12-02-03-0047 bn_jasmine_milk_tea.png - - -
นมคาราเมล CARAMEL MILK นม น้ำเชื่อมคาราเมล Milk, Caramel Syrup 12-03-01-0001 12-03-02-0001 12-03-03-0001 bn_iced_caramel.png - - - ฿35.00 ฿40.00 ฿45.00 TRUE TRUE
นมชมพู PINK MILK น้ำแดงกลิ่นสละ นม \nน้ำตาล Salak Syrup, Milk,\nSugar - 12-03-02-0006 12-03-03-0006 bn_pink_milk.png - - - - ฿35.00 ฿40.00 NN TRUE
นมสตอเบอร์รี่ปั่น STRAWMILK \nSMOOTHIE นม น้ำเชื่อมสตอเบอร์รี่ \nและน้ำแข็ง Milk, Strawberry Syrup - - 12-03-03-0011 bn_iced_strawberrymilk_smoothie.png - - - - - ฿45.00 NN NN
diff --git a/xml/dummy_layout.inc b/xml/dummy_layout.inc
index 7c052ef4..b25b2476 100644
--- a/xml/dummy_layout.inc
+++ b/xml/dummy_layout.inc
@@ -488,37 +488,36 @@
center-vertical-horizontal
-
+
+
33
22
225
296
- Flag( 12-03-03-0032.Button, ,$Sum1203030032)
+ Flag( 12-02-01-0039.Button,12-02-02-0039.Button,12-02-03-0039.Button,$Sum120201003912020200391202030039)
+
+
+
; - - -
; ==================> Len = 16
; - - 12-03-03-0026
diff --git a/xml/event/promotion_Tamatian.xml b/xml/event/promotion_Tamatian.xml
index 95c86e7f..bda66011 100644
--- a/xml/event/promotion_Tamatian.xml
+++ b/xml/event/promotion_Tamatian.xml
@@ -1079,37 +1079,36 @@
center-vertical-horizontal
-
+
+
33
22
225
296
- Flag( 12-03-03-0032.Button, ,$Sum1203030032)
+ Flag( 12-02-01-0039.Button,12-02-02-0039.Button,12-02-03-0039.Button,$Sum120201003912020200391202030039)
+
+
+
; - - -
; ==================> Len = 16
; - - 12-03-03-0026
@@ -6899,37 +6903,37 @@ AMERICANO"
; - - -
- ; ==================> Len = 16
- ; 12-01-01-0004 12-01-02-0002 12-01-03-0002
+ ; ==================> Len = 11
+ ; 12-02-01-0045 12-02-02-0045 12-02-03-0046
33
22
225
296
- Flag( 12-01-01-0004.Button,12-01-02-0002.Button,12-01-03-0002.Button,Disable=Invisible,$Sum120101000412010200021201030002)
+ Flag( 12-02-01-0045.Button,12-02-02-0045.Button,12-02-03-0046.Button,Disable=Invisible,$Sum120201004512020200451202030046)
+ ; - - -
+ ; ==================> Len = 11
+ ; 12-02-01-0046 12-02-02-0046 12-02-03-0047
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-01-0046.Button,12-02-02-0046.Button,12-02-03-0047.Button,Disable=Invisible,$Sum120201004612020200461202030047)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "ชามะลิลาเต้"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "ชามะลิ และนม"
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "JASMINE MILK TEA"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Jasmine & Milk"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ $12-02-01-0046.Button
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-01-0046.Button
+ StringFmt( $12-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-02-02-0046.Button
+
+
+ 115
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0046.Button
+ StringFmt( $12-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0047.Button
+
+
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0047.Button
+ StringFmt( $12-02-03-0047.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+
+ eval(
+ If ICE_PROCESS_STATUS = 2 Then
+
+ If $Sum120201004612020200461202030047 = "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 $Sum120201004612020200461202030047 = "Disable" Then
+ STRCONTAIN "ERR" $12-02-01-0046.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0046.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0047.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"
+ $Sum120201004612020200461202030047
text_unavailable
center-vertical-horizontal
diff --git a/xml/event/promotion_mystery_cup_35.xml b/xml/event/promotion_mystery_cup_35.xml
index 65dd12dc..37908c47 100644
--- a/xml/event/promotion_mystery_cup_35.xml
+++ b/xml/event/promotion_mystery_cup_35.xml
@@ -1079,37 +1079,36 @@
center-vertical-horizontal
-
+
+
33
22
225
296
- Flag( 12-03-03-0032.Button, ,$Sum1203030032)
+ Flag( 12-02-01-0039.Button,12-02-02-0039.Button,12-02-03-0039.Button,$Sum120201003912020200391202030039)
+
+
+
; - - -
; ==================> Len = 16
; - - 12-03-03-0026
@@ -6899,37 +6903,37 @@ AMERICANO"
; - - -
- ; ==================> Len = 16
- ; 12-01-01-0004 12-01-02-0002 12-01-03-0002
+ ; ==================> Len = 11
+ ; 12-02-01-0045 12-02-02-0045 12-02-03-0046
33
22
225
296
- Flag( 12-01-01-0004.Button,12-01-02-0002.Button,12-01-03-0002.Button,Disable=Invisible,$Sum120101000412010200021201030002)
+ Flag( 12-02-01-0045.Button,12-02-02-0045.Button,12-02-03-0046.Button,Disable=Invisible,$Sum120201004512020200451202030046)
+ ; - - -
+ ; ==================> Len = 11
+ ; 12-02-01-0046 12-02-02-0046 12-02-03-0047
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-01-0046.Button,12-02-02-0046.Button,12-02-03-0047.Button,Disable=Invisible,$Sum120201004612020200461202030047)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "ชามะลิลาเต้"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "ชามะลิ และนม"
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "JASMINE MILK TEA"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Jasmine & Milk"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ $12-02-01-0046.Button
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-01-0046.Button
+ StringFmt( $12-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-02-02-0046.Button
+
+
+ 115
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0046.Button
+ StringFmt( $12-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0047.Button
+
+
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0047.Button
+ StringFmt( $12-02-03-0047.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+
+ eval(
+ If ICE_PROCESS_STATUS = 2 Then
+
+ If $Sum120201004612020200461202030047 = "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 $Sum120201004612020200461202030047 = "Disable" Then
+ STRCONTAIN "ERR" $12-02-01-0046.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0046.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0047.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"
+ $Sum120201004612020200461202030047
text_unavailable
center-vertical-horizontal
diff --git a/xml/event/promotion_oreo_welcome_drink.xml b/xml/event/promotion_oreo_welcome_drink.xml
index ff98df60..ef7795d0 100644
--- a/xml/event/promotion_oreo_welcome_drink.xml
+++ b/xml/event/promotion_oreo_welcome_drink.xml
@@ -1079,37 +1079,36 @@
center-vertical-horizontal
-
+
+
33
22
225
296
- Flag( 12-03-03-0032.Button, ,$Sum1203030032)
+ Flag( 12-02-01-0039.Button,12-02-02-0039.Button,12-02-03-0039.Button,$Sum120201003912020200391202030039)
+
+
+
; - - -
; ==================> Len = 16
; - - 12-03-03-0026
@@ -6899,37 +6903,37 @@ AMERICANO"
; - - -
- ; ==================> Len = 16
- ; 12-01-01-0004 12-01-02-0002 12-01-03-0002
+ ; ==================> Len = 11
+ ; 12-02-01-0045 12-02-02-0045 12-02-03-0046
33
22
225
296
- Flag( 12-01-01-0004.Button,12-01-02-0002.Button,12-01-03-0002.Button,Disable=Invisible,$Sum120101000412010200021201030002)
+ Flag( 12-02-01-0045.Button,12-02-02-0045.Button,12-02-03-0046.Button,Disable=Invisible,$Sum120201004512020200451202030046)
+ ; - - -
+ ; ==================> Len = 11
+ ; 12-02-01-0046 12-02-02-0046 12-02-03-0047
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-01-0046.Button,12-02-02-0046.Button,12-02-03-0047.Button,Disable=Invisible,$Sum120201004612020200461202030047)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "ชามะลิลาเต้"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "ชามะลิ และนม"
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "JASMINE MILK TEA"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Jasmine & Milk"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ $12-02-01-0046.Button
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-01-0046.Button
+ StringFmt( $12-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-02-02-0046.Button
+
+
+ 115
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0046.Button
+ StringFmt( $12-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0047.Button
+
+
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0047.Button
+ StringFmt( $12-02-03-0047.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+
+ eval(
+ If ICE_PROCESS_STATUS = 2 Then
+
+ If $Sum120201004612020200461202030047 = "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 $Sum120201004612020200461202030047 = "Disable" Then
+ STRCONTAIN "ERR" $12-02-01-0046.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0046.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0047.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"
+ $Sum120201004612020200461202030047
text_unavailable
center-vertical-horizontal
diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py
index 3eb0ee3d..bfaa27bf 100644
--- a/xml/menu_new_layout_gen.py
+++ b/xml/menu_new_layout_gen.py
@@ -704,9 +704,7 @@
out_xml( '\t\t\r\n')
out_xml( '\t\t\r\n')
if "inter" in param:
- out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select6.xml"\r\n')
- else:
- out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select4.xml"\r\n')
+ out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')
out_xml( '\t\t\r\n')
diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml
index 89c9821c..62fe5374 100644
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@@ -865,7 +865,7 @@
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -1367,7 +1367,7 @@ ESPRESSO"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -1869,7 +1869,7 @@ ESPRESSO"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -5429,7 +5429,7 @@ Pink Rose & Berry"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -12005,7 +12005,7 @@ ICED ESPRESSO"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -12503,7 +12503,7 @@ ICED ESPRESSO"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -13004,7 +13004,7 @@ ICED ESPRESSO"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -13505,7 +13505,7 @@ ICED ESPRESSO"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -14008,7 +14008,7 @@ Caramel Syrup"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -14513,7 +14513,7 @@ CAFÉ LATTE"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -15018,7 +15018,7 @@ CAFÉ LATTE"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -15524,7 +15524,7 @@ Kokuto syrup"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -16030,7 +16030,7 @@ CAFÉ LATTE"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -16536,7 +16536,7 @@ Milk, Sugar"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -17041,7 +17041,7 @@ CAFÉ LATTE"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -17544,7 +17544,7 @@ CAFÉ LATTE"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -18049,7 +18049,7 @@ Milk, Sugar"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -18554,7 +18554,7 @@ Sugar, Water"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -19057,7 +19057,7 @@ Sugar, Water"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -19561,7 +19561,7 @@ Sugar, Water"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml
index 2ceb449a..cb3397e4 100644
--- a/xml/page_catalog_group_health.xml
+++ b/xml/page_catalog_group_health.xml
@@ -864,7 +864,7 @@
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -1368,7 +1368,7 @@ Foamed milk"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -1872,7 +1872,7 @@ Milk, Sugar"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@@ -2376,7 +2376,7 @@ Foamed milk"
Var SelectDrinkType = 0
- Open "ROOT/taobin_project/xml/page_topping_select6.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index b3b94707..bf39bc79 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -590,39 +590,39 @@
;dummy_layout.inc
-; menu_new_list 31
+; menu_new_list 32
;TAGESP
; ==================> Len = 16
- ; - - 12-03-03-0032
+ ; 12-02-01-0039 12-02-02-0039 12-02-03-0039
33
22
225
296
- Flag( 12-03-03-0032.Button,Disable=Invisible,$Sum1203030032)
+ Flag( 12-02-01-0039.Button,12-02-02-0039.Button,12-02-03-0039.Button,Disable=Invisible,$Sum120201003912020200391202030039)
; - - -
- ; ==================> Len = 16
- ; 12-01-01-0004 12-01-02-0002 12-01-03-0002
+ ; ==================> Len = 11
+ ; 12-02-01-0045 12-02-02-0045 12-02-03-0046
33
22
225
296
- Flag( 12-01-01-0004.Button,12-01-02-0002.Button,12-01-03-0002.Button,Disable=Invisible,$Sum120101000412010200021201030002)
+ Flag( 12-02-01-0045.Button,12-02-02-0045.Button,12-02-03-0046.Button,Disable=Invisible,$Sum120201004512020200451202030046)
+ ; - - -
+ ; ==================> Len = 11
+ ; 12-02-01-0046 12-02-02-0046 12-02-03-0047
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-01-0046.Button,12-02-02-0046.Button,12-02-03-0047.Button,Disable=Invisible,$Sum120201004612020200461202030047)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "ชามะลิลาเต้"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "ชามะลิ และนม"
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "JASMINE MILK TEA"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Jasmine & Milk"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ $12-02-01-0046.Button
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-01-0046.Button
+ StringFmt( $12-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-02-02-0046.Button
+
+
+ 115
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0046.Button
+ StringFmt( $12-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0047.Button
+
+
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0047.Button
+ StringFmt( $12-02-03-0047.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+
+ eval(
+ If ICE_PROCESS_STATUS = 2 Then
+
+ If $Sum120201004612020200461202030047 = "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 $Sum120201004612020200461202030047 = "Disable" Then
+ STRCONTAIN "ERR" $12-02-01-0046.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0046.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0047.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"
+ $Sum120201004612020200461202030047
text_unavailable
center-vertical-horizontal
diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index 6dacd5b0..1b294b58 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -353,6 +353,8 @@
Var CerealMilkX = 270
EndIf
+ TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
+
1000
@@ -588,15 +590,7 @@
EndIf
EndIf
- If PromotionOreoToppingFreeEnable = 1 Then
- Var toppingID6price2 = 0
- If show_eng = "true" Then
-
- Var text_price_6 = "(Free)"
- Else
- Var text_price_6 = "(ฟรี)"
- EndIf
- EndIf
+ TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
If show_eng = "true" Then
Var CerealMilkX = 400
@@ -728,6 +722,8 @@
If TOPPING6 = "Topping-Volcano" Then
+ Var text_color_6 = "0x84776F"
+
If toppingID6price2 > 0 Then
DEBUGVAR toppingID6price2
DEBUGVAR DisplayFormat
@@ -744,6 +740,7 @@
DEBUGVAR text_price_6
+ DEBUGVAR text_color_6
Else
Var text_price_6 = ""
@@ -1515,10 +1512,14 @@
DEBUGVAR toppingID2price1
DEBUGVAR toppingID2price2
DEBUGVAR toppingID2price3
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
+
Function 2
EndIf
+
@@ -3177,7 +3178,7 @@
KanitRegularTTF
"Enable"
36
- 0x84776F
+ text_color_6
text_price_6
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 3a917db5..1dea2098 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "7.60"
- Var XMLPageVersionInt = 760
+ Var XMLPageVersion = "7.62"
+ Var XMLPageVersionInt = 762
;Oreo
Var OreoGuarantee = 0