diff --git a/image/page_drink_disable_n2/bn_iced_pepsi_Black.png b/image/page_drink_disable_n2/bn_iced_pepsi_Black.png
new file mode 100644
index 00000000..09a1a11c
Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_pepsi_Black.png differ
diff --git a/image/page_drink_n/bn_iced_pepsi_Black.png b/image/page_drink_n/bn_iced_pepsi_Black.png
new file mode 100644
index 00000000..20943fd2
Binary files /dev/null and b/image/page_drink_n/bn_iced_pepsi_Black.png differ
diff --git a/image/page_drink_picture2_n/bn_iced_pepsi_Black.png b/image/page_drink_picture2_n/bn_iced_pepsi_Black.png
new file mode 100644
index 00000000..200f0644
Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_pepsi_Black.png differ
diff --git a/image/page_drink_press_n/bn_iced_pepsi_Black.png b/image/page_drink_press_n/bn_iced_pepsi_Black.png
new file mode 100644
index 00000000..309c3bac
Binary files /dev/null and b/image/page_drink_press_n/bn_iced_pepsi_Black.png differ
diff --git a/inter/mys/xml/event/promotion_2.xml b/inter/mys/xml/event/promotion_2.xml
index c9f250f7..f812b040 100644
--- a/inter/mys/xml/event/promotion_2.xml
+++ b/inter/mys/xml/event/promotion_2.xml
@@ -11412,6 +11412,268 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0062 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-02-0062.Button,Disable=Invisible,$Sum1205020062)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Pepsi, Ice
+ เป๊ปซี่
+ Pepsi, Ice
+ เป๊ปซี่
+ Pepsi, Ais
+ เป๊ปซี่
+
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ TextPriceMenuHotX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-05-02-0062.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0062.Button
+ StringFmt( $12-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ "Invisible"
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 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 $Sum1205020062 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0062.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
+ "disable-show"
+ $Sum1205020062
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; - 12-05-02-0046 12-05-03-0046
diff --git a/inter/mys/xml/event/promotion_3.xml b/inter/mys/xml/event/promotion_3.xml
index 5435ca8e..bb29b366 100644
--- a/inter/mys/xml/event/promotion_3.xml
+++ b/inter/mys/xml/event/promotion_3.xml
@@ -11412,6 +11412,268 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0062 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-02-0062.Button,Disable=Invisible,$Sum1205020062)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Pepsi, Ice
+ เป๊ปซี่
+ Pepsi, Ice
+ เป๊ปซี่
+ Pepsi, Ais
+ เป๊ปซี่
+
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ TextPriceMenuHotX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-05-02-0062.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0062.Button
+ StringFmt( $12-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ "Invisible"
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 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 $Sum1205020062 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0062.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
+ "disable-show"
+ $Sum1205020062
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; - 12-05-02-0046 12-05-03-0046
diff --git a/inter/mys/xml/event/promotion_pepsi_099.lxml b/inter/mys/xml/event/promotion_pepsi_099.lxml
index 9bd68f22..97281af0 100644
--- a/inter/mys/xml/event/promotion_pepsi_099.lxml
+++ b/inter/mys/xml/event/promotion_pepsi_099.lxml
@@ -11412,6 +11412,268 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0062 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-02-0062.Button,Disable=Invisible,$Sum1205020062)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Pepsi, Ice
+ เป๊ปซี่
+ Pepsi, Ice
+ เป๊ปซี่
+ Pepsi, Ais
+ เป๊ปซี่
+
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ TextPriceMenuHotX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-05-02-0062.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0062.Button
+ StringFmt( $12-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ "Invisible"
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 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 $Sum1205020062 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0062.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
+ "disable-show"
+ $Sum1205020062
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; - 12-05-02-0046 12-05-03-0046
diff --git a/inter/mys/xml/page_catalog_group_other.lxml b/inter/mys/xml/page_catalog_group_other.lxml
index 9e1bc66a..0c497aaa 100644
--- a/inter/mys/xml/page_catalog_group_other.lxml
+++ b/inter/mys/xml/page_catalog_group_other.lxml
@@ -872,6 +872,268 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0062 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-02-0062.Button,$Sum1205020062)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Pepsi, Ice
+ เป๊ปซี่
+ Pepsi, Ice
+ เป๊ปซี่
+ Pepsi, Ais
+ เป๊ปซี่
+
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ TextPriceMenuHotX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-05-02-0062.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0062.Button
+ StringFmt( $12-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ "Invisible"
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 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 $Sum1205020062 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0062.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
+ "disable-show"
+ $Sum1205020062
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; - 12-05-02-0035 12-05-03-0035
diff --git a/inter/mys/xml/page_catalog_group_recommend.lxml b/inter/mys/xml/page_catalog_group_recommend.lxml
index 11597c35..20df78bf 100644
--- a/inter/mys/xml/page_catalog_group_recommend.lxml
+++ b/inter/mys/xml/page_catalog_group_recommend.lxml
@@ -10701,6 +10701,268 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0062 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-02-0062.Button,Disable=Invisible,$Sum1205020062)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+ PEPSI
+ เป็ปซี่น้ำแข็ง
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Pepsi, Ice
+ เป๊ปซี่
+ Pepsi, Ice
+ เป๊ปซี่
+ Pepsi, Ais
+ เป๊ปซี่
+
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ TextPriceMenuHotX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-05-02-0062.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0062.Button
+ StringFmt( $12-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ "Invisible"
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 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 $Sum1205020062 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0062.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
+ "disable-show"
+ $Sum1205020062
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; - 12-05-02-0046 12-05-03-0046
diff --git a/inter/mys/xml/page_catalog_group_whey.lxml b/inter/mys/xml/page_catalog_group_whey.lxml
index 67e4a1ac..f2adc5a0 100644
--- a/inter/mys/xml/page_catalog_group_whey.lxml
+++ b/inter/mys/xml/page_catalog_group_whey.lxml
@@ -2496,16 +2496,16 @@
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
- Var NameLang[1][0] = ""
- Var NameLang[1][1] = ""
- Var NameLang[1][2] = ""
- Var NameLang[1][3] = ""
- Var NameLang[1][4] = ""
- Var DescLang[1][0] = ""
- Var DescLang[1][1] = ""
- Var DescLang[1][2] = ""
- Var DescLang[1][3] = ""
- Var DescLang[1][4] = ""
+ Var NameLang[1][0] = "ESPRESSO SHAKE"
+ Var NameLang[1][1] = "เอสเพรสโซ่โปรตีน"
+ Var NameLang[1][2] = "-"
+ Var NameLang[1][3] = "-"
+ Var NameLang[1][4] = "SHAKE ESPRESSO"
+ Var DescLang[1][0] = "Whey protein, Espresso\n& Milk"
+ Var DescLang[1][1] = "เวย์โปรตีน กาแฟ นม"
+ Var DescLang[1][2] = "-"
+ Var DescLang[1][3] = "-"
+ Var DescLang[1][4] = "Protein Whey, Espresso, Susu"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
@@ -2758,16 +2758,16 @@
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
- Var NameLang[1][0] = ""
- Var NameLang[1][1] = ""
- Var NameLang[1][2] = ""
- Var NameLang[1][3] = ""
- Var NameLang[1][4] = ""
- Var DescLang[1][0] = ""
- Var DescLang[1][1] = ""
- Var DescLang[1][2] = ""
- Var DescLang[1][3] = ""
- Var DescLang[1][4] = ""
+ Var NameLang[1][0] = "THAI TEA SHAKE"
+ Var NameLang[1][1] = "ชานมไทยโปรตีน"
+ Var NameLang[1][2] = "-"
+ Var NameLang[1][3] = "-"
+ Var NameLang[1][4] = "SHAKE TEH THAI"
+ Var DescLang[1][0] = "Whey protein,\nThai Tea, & Milk"
+ Var DescLang[1][1] = "เวย์โปรตีน ชาไทย นม"
+ Var DescLang[1][2] = "-"
+ Var DescLang[1][3] = "-"
+ Var DescLang[1][4] = "Protein Whey, Teh Thai, Susu"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
diff --git a/xml/page_catalog_group_pro_pepween.xml b/xml/page_catalog_group_pro_pepween.xml
new file mode 100644
index 00000000..7ed625fa
--- /dev/null
+++ b/xml/page_catalog_group_pro_pepween.xml
@@ -0,0 +1,556 @@
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+ Var ice_tab_text = "Ice will be ready at "
+ Var text_unavailable = "UNAVAILABLE###size=16"
+
+
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var text_unavailable = "หมด###size=32"
+ EndIf
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ ; SpiralOnline
+
+ Var MenuVSelected2 = "Invisible"
+
+ Var Menu1Selected2 = "Invisible"
+ Var Menu2Selected2 = "Invisible"
+ Var Menu3Selected2 = "Invisible"
+ Var Menu4Selected2 = "Invisible"
+
+ Var Menu6Selected2 = "Invisible"
+ Var Menu7Selected2 = "Invisible"
+ Var MenuVSelected2 = "Invisible"
+ Var Menu11Selected2 = "Invisible"
+
+ Var Menu21Selected2 = "Invisible"
+
+ Var MenuVSelected2 = "Invisible"
+ If SpiralOnline = "true" Then
+ If Seeker = "curr" Then
+ Var MenuVSelected2 = "Enable"
+ EndIf
+ EndIf
+
+ ; init default
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ ; 5 fruit
+ Var Menu5Selected = "Invisible"
+ Var Menu6Selected = "Enable"
+ Var Menu7Selected = "Enable"
+ ; 8 cocktail
+ Var Menu8Selected = "Invisible"
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Else
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
+ EndIf
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ EndIf
+
+ If RecipeTag1 = "HealthTurnOn" Then
+ Var Menu22Selected = "Enable"
+ Else
+ Var Menu22Selected = "Invisible"
+ EndIf
+ ;
+
+
+
+
+
+
+ Var Timeout = 0
+
+
+
+ If show_eng = "true" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ Else
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+
+
+
+
+
+; notice enable heathy menu
+
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+ 1000
+
+ ;DEBUGVAR ICE_PROCESS_STATUS
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ If NextPage = "-" Then
+
+ Else
+ If CupOnArm = "true" Then
+ If Timeout > 9 Then
+ SAVELOG "COA9"
+ Open NextPage
+ EndIf
+ Else
+ If Timeout > 30 Then
+ SAVELOG "COA30"
+ Open NextPage
+ EndIf
+ EndIf
+ EndIf
+
+ If Timeout > 60 Then
+ SAVELOG "Timeout"
+ If Seeker = "next" Then
+ Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+ Else
+ SAVELOG "Back"
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ EndIf
+ EndIf
+
+ If BrewCommand = "RefreshAll" Then
+ Var BrewCommand = "-"
+ Open CurrentXMLFileName2
+ EndIf
+
+ If Seeker = "curr" Then
+ If DoorCupPosition = "bottom" Then
+ ; It normal
+ Var EmergencyStop = "false"
+ Else
+ Var EmergencyStop = "true"
+
+ ;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+
+ EndIf
+ EndIf
+
+ If IgnoreNetCore = "true" Then
+
+ Else
+ ;stop_now
+ If NETCORE_LOST_CNT > 120 Then
+ Var stop_now = "true"
+ Var MachineErrorDetailAll = "???"
+ SAVELOG "NETCORE_LOST_CNT"
+
+ Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+ EndIf
+ EndIf
+
+
+ ; zone cup on arm
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ If buttonRemoveCup = "Enable" Then
+
+ Else
+ Refresh
+ EndIf
+
+ Var buttonRemoveCup = "Enable"
+
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ If buttonRemoveCup = "Enable" Then
+
+ Else
+ Refresh
+ EndIf
+
+ Var buttonRemoveCup = "Enable"
+
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ Refresh
+ EndIf
+ EndIf
+
+
+ Var Timeout = Timeout + 1
+ TimerReset
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+;
+
+ 1080
+ "auto"
+ 0
+ 395
+
+ "Enable"
+ 896
+ 102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUGVAR web_ready
+ If web_ready = "true" Then
+ If web_ref = QRCODE99x Then
+
+ Var web_readyOK = web_ready
+ Var web_telnumOK = web_telnum
+
+ Var web_app_prepar = "true"
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+ EndIf
+ Else
+ EndIf
+
+
+
+
+
+
+
+
+
+
+ 10
+ 497
+ 1080
+ "auto"
+ "Vertical"
+ 4
+
+; menu_new_list 0
+
+; Cart
+
+
+
+
+
+
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index e95ab9a1..ea0c117c 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "7.70"
- Var XMLPageVersionInt = 770
+ Var XMLPageVersion = "7.69"
+ Var XMLPageVersionInt = 769
;Oreo
Var OreoGuarantee = 0