diff --git a/inter/aus/xml/page_catalog_group_westfield_ignore.lxml b/inter/aus/xml/page_catalog_group_westfield_ignore.lxml
index 72913138..e5f3d269 100644
--- a/inter/aus/xml/page_catalog_group_westfield_ignore.lxml
+++ b/inter/aus/xml/page_catalog_group_westfield_ignore.lxml
@@ -1120,9 +1120,9 @@
22
225
296
- Flag( 51-05-02-0054.Button,$Sum5105020054)
+ Flag( 51-05-02-0077.Button,$Sum5105020077)
\r\n')
# if "v2" in param:
-
+
+
diff --git a/inter/mys/xml/page_catalog_group_coffee.lxml b/inter/mys/xml/page_catalog_group_coffee.lxml
index c39d1ce5..ae45afee 100644
--- a/inter/mys/xml/page_catalog_group_coffee.lxml
+++ b/inter/mys/xml/page_catalog_group_coffee.lxml
@@ -635,7 +635,7 @@
Var block_index_move = 0
;dummy_layout.inc
-; menu_new_list 60
+; menu_new_list 61
; ==================> Len = 3
; 12-01-01-0001 - -
@@ -20847,6 +20847,276 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-21-02-0068 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-21-02-0068.Button,$Sum1221020068)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut Americano
+ -
+ Coconut Americano
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Espresso, Coconut Syrup,\nSugar, Water
+ -
+ Espresso, Coconut Syrup,\nSugar, Water
+ -
+
+ -
+
+
+
+ 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-21-02-0068.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-21-02-0068.Button
+ StringFmt( $12-21-02-0068.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 $Sum1221020068 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-21-02-0068.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"
+ $Sum1221020068
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; 12-01-01-0057 12-01-02-0057 12-01-03-0057
diff --git a/inter/mys/xml/page_catalog_group_milk.lxml b/inter/mys/xml/page_catalog_group_milk.lxml
index f8d07724..b1f403e8 100644
--- a/inter/mys/xml/page_catalog_group_milk.lxml
+++ b/inter/mys/xml/page_catalog_group_milk.lxml
@@ -632,7 +632,7 @@
Var block_index_move = 0
;dummy_layout.inc
-; menu_new_list 21
+; menu_new_list 23
; ==================> Len = 3
; 12-03-01-0005 12-03-02-0005 12-03-03-0005
@@ -2272,6 +2272,276 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-03-02-0059 12-03-03-0059
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-03-02-0059.Button,12-03-03-0059.Button,$Sum12030200591203030059)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut\nChocolate milk
+ -
+ Coconut\nChocolate milk
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut syrup, Cocoa, Milk,\nWater
+ -
+ Coconut syrup, Cocoa, Milk,\nWater
+ -
+
+ -
+
+
+
+ 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-03-02-0059.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-03-02-0059.Button
+ StringFmt( $12-03-02-0059.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-03-03-0059.Button
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-03-03-0059.Button
+ StringFmt( $12-03-03-0059.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 $Sum12030200591203030059 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-03-02-0059.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-03-03-0059.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"
+ $Sum12030200591203030059
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; - - 12-03-03-0010
@@ -5262,6 +5532,276 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-03-02-0058 12-03-03-0058
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-03-02-0058.Button,12-03-03-0058.Button,$Sum12030200581203030058)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut milk
+ -
+ Coconut milk
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut syrup, Milk,\nWater
+ -
+ Coconut syrup, Milk,\nWater
+ -
+
+ -
+
+
+
+ 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-03-02-0058.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-03-02-0058.Button
+ StringFmt( $12-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-03-03-0058.Button
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-03-03-0058.Button
+ StringFmt( $12-03-03-0058.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 $Sum12030200581203030058 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-03-02-0058.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-03-03-0058.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"
+ $Sum12030200581203030058
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; - - 12-03-03-0034
diff --git a/inter/mys/xml/page_catalog_group_other.lxml b/inter/mys/xml/page_catalog_group_other.lxml
index ed867b63..21341cfa 100644
--- a/inter/mys/xml/page_catalog_group_other.lxml
+++ b/inter/mys/xml/page_catalog_group_other.lxml
@@ -1,627 +1,627 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- DEBUGVAR LanguageShow
- DEBUGVAR CountryName
-
- If LanguageShow = "ENG" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var ice_tab_text = "Ice will be ready at "
-
- EndIf
- If LanguageShow = "THAI" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var DirImage = "ROOT/taobin_project/image/page3"
- EndIf
-
- ;inter-image
- If CountryName = "Malaysia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var ice_tab_text = "Ice will be ready at "
- EndIf
-
-
- ;inter-image
- If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var ice_tab_text = "Ice will be ready at "
- 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
- ;
-
-
-
- ; soda and other
- Var Menu6Selected = "PressForever"
-
- SAVELOG PreviseXMLFileName2
-
- 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
-
- Var Timeout = Timeout + 1
- TimerReset
-
-
-
- DEBUGVAR LanguageShow
- If LanguageShow = "ENG" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
- EndIf
- If LanguageShow = "THAI" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- EndIf
- ;inter-image
- If CountryName = "Malaysia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
- Var DirImage = "ROOT/taobin_project/image/page3_en/"
- Var ice_tab_text = "Ice will be ready at "
- EndIf
-
- SAVELOG "EventLanguageOnChange menu -list"
-
- Var LanguageButtonEnable = "Enable"
- Var ButtonLanguageCurrentXPosition = 990
- Var ButtonLanguageCurrentYPosition = 400
-
- Var ButtonLanguageListXPosition = 970
- Var ButtonLanguageListYPosition = 430 - 38
- OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
-
- RefreshAll
-
-
-
-; 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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 940
- 462
- 22
- 170
- 30
- KanitMediumTTF
- 0x6F5F51
- PriceUnitText
-
-
-
-
- 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
-
-
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ DEBUGVAR LanguageShow
+ DEBUGVAR CountryName
+
+ If LanguageShow = "ENG" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+
+ EndIf
+ If LanguageShow = "THAI" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ EndIf
+
+ ;inter-image
+ If CountryName = "Malaysia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
+
+ ;inter-image
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ 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
+ ;
+
+
+
+ ; soda and other
+ Var Menu6Selected = "PressForever"
+
+ SAVELOG PreviseXMLFileName2
+
+ 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
+
+ Var Timeout = Timeout + 1
+ TimerReset
+
+
+
+ DEBUGVAR LanguageShow
+ If LanguageShow = "ENG" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ EndIf
+ If LanguageShow = "THAI" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+ ;inter-image
+ If CountryName = "Malaysia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en/"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
+ SAVELOG "EventLanguageOnChange menu -list"
+
+ Var LanguageButtonEnable = "Enable"
+ Var ButtonLanguageCurrentXPosition = 990
+ Var ButtonLanguageCurrentYPosition = 400
+
+ Var ButtonLanguageListXPosition = 970
+ Var ButtonLanguageListYPosition = 430 - 38
+ OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+
+ RefreshAll
+
+
+
+; 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 940
+ 462
+ 22
+ 170
+ 30
+ KanitMediumTTF
+ 0x6F5F51
+ PriceUnitText
+
+
+
+
+ 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
@@ -634,7 +634,7 @@
Var block_index_move = 0
;dummy_layout.inc
-; menu_new_list 53
+; menu_new_list 58
; ==================> Len = 3
; - 12-05-02-0007 12-05-03-0007
@@ -7114,6 +7114,546 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0091 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-02-0091.Button,$Sum1205020091)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ COCONUT PEPSI
+ -
+ COCONUT PEPSI
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup, Pepsi and Soda
+ -
+ Coconut Syrup, Pepsi and Soda
+ -
+
+ -
+
+
+
+ 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-0091.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0091.Button
+ StringFmt( $12-05-02-0091.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 $Sum1205020091 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0091.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"
+ $Sum1205020091
+
+ 000013
+
+ center-vertical-horizontal
+
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0117 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-02-0117.Button,$Sum1205020117)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ COCONUT PEPSI
+
+ COCONUT PEPSI
+
+
+
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup, Pepsi and Soda
+
+ Coconut Syrup, Pepsi and Soda
+
+
+
+
+
+
+ 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-0117.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0117.Button
+ StringFmt( $12-05-02-0117.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 $Sum1205020117 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0117.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"
+ $Sum1205020117
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; - 12-05-02-0038 12-05-03-0038
@@ -10624,6 +11164,546 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0093 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-02-0093.Button,$Sum1205020093)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut\nLychee Soda
+ -
+ Coconut\nLychee Soda
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup, Lychee Syrup and Soda
+ -
+ Coconut Syrup, Lychee Syrup and Soda
+ -
+
+ -
+
+
+
+ 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-0093.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0093.Button
+ StringFmt( $12-05-02-0093.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 $Sum1205020093 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0093.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"
+ $Sum1205020093
+
+ 000013
+
+ center-vertical-horizontal
+
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0090 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-02-0090.Button,$Sum1205020090)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut Soda
+ -
+ Coconut Soda
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup and Soda
+ -
+ Coconut Syrup and Soda
+ -
+
+ -
+
+
+
+ 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-0090.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0090.Button
+ StringFmt( $12-05-02-0090.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 $Sum1205020090 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0090.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"
+ $Sum1205020090
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; - 12-05-02-0014 -
@@ -13872,6 +14952,276 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - - 12-05-03-0092
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-03-0092.Button,$Sum1205030092)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut Smoothie
+ -
+ Coconut Smoothie
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup and Water
+ -
+ Coconut Syrup and Water
+ -
+
+ -
+
+
+
+ 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" )
+ "Invisible"
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-05-03-0092.Button
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-03-0092.Button
+ StringFmt( $12-05-03-0092.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 $Sum1205030092 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-05-03-0092.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"
+ $Sum1205030092
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; 12-06-01-0001 - -
@@ -14979,8 +16329,8 @@
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
-
+
+
+
+
+
diff --git a/inter/mys/xml/page_catalog_group_recommend_multi_pro.lxml b/inter/mys/xml/page_catalog_group_recommend_multi_pro.lxml
index 3f449d80..b9f3657e 100644
--- a/inter/mys/xml/page_catalog_group_recommend_multi_pro.lxml
+++ b/inter/mys/xml/page_catalog_group_recommend_multi_pro.lxml
@@ -1,174 +1,174 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- DEBUGVAR LanguageShow
- DEBUGVAR CountryName
-
- If LanguageShow = "ENG" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var ice_tab_text = "Ice will be ready at "
-
- EndIf
- If LanguageShow = "THAI" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var DirImage = "ROOT/taobin_project/image/page3"
- EndIf
-
- ;inter-image
- If CountryName = "Malaysia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var ice_tab_text = "Ice will be ready at "
- EndIf
-
-
- ;inter-image
- If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var ice_tab_text = "Ice will be ready at "
- 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 Menu1Selected = "PressForever"
-
- Var OreoBigButtonEnable = "Enable"
-
- If $12-01-01-0001.Button = "Invisible" Then
- Var esp102101001Enable = "Invisible"
- Var esp122101001Enable = "Enable"
-
- Else
- Var esp102101001Enable = "Enable"
- Var esp122101001Enable = "Invisible"
-
- EndIf
-
- SAVELOG PreviseXMLFileName2
-
- Var Timeout = 0
-
- If show_eng = "true" Then
-
- Var text_unavailable = "UNAVAILABLE###size=16"
- Else
- Var text_unavailable = "หมด###size=32"
-
- EndIf
-
-
- 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
-
-
-
-
-;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ DEBUGVAR LanguageShow
+ DEBUGVAR CountryName
+
+ If LanguageShow = "ENG" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+
+ EndIf
+ If LanguageShow = "THAI" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ EndIf
+
+ ;inter-image
+ If CountryName = "Malaysia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
+
+ ;inter-image
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ 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 Menu1Selected = "PressForever"
+
+ Var OreoBigButtonEnable = "Enable"
+
+ If $12-01-01-0001.Button = "Invisible" Then
+ Var esp102101001Enable = "Invisible"
+ Var esp122101001Enable = "Enable"
+
+ Else
+ Var esp102101001Enable = "Enable"
+ Var esp122101001Enable = "Invisible"
+
+ EndIf
+
+ SAVELOG PreviseXMLFileName2
+
+ Var Timeout = 0
+
+ If show_eng = "true" Then
+
+ Var text_unavailable = "UNAVAILABLE###size=16"
+ Else
+ Var text_unavailable = "หมด###size=32"
+
+ EndIf
+
+
+ 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
+
+
+
+
+;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
+
+
4
10
@@ -46160,27 +46160,27 @@
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
-;BigLogoLayout
-
-
-
-
-
-
+
+
+
+
+;BigLogoLayout
+
+
+
+
+
+
diff --git a/inter/mys/xml/page_catalog_group_tea.lxml b/inter/mys/xml/page_catalog_group_tea.lxml
index ed3ef8c3..f6467139 100644
--- a/inter/mys/xml/page_catalog_group_tea.lxml
+++ b/inter/mys/xml/page_catalog_group_tea.lxml
@@ -637,7 +637,7 @@
Var block_index_move = 0
;dummy_layout.inc
-; menu_new_list 46
+; menu_new_list 52
; ==================> Len = 3
; 12-02-01-0001 12-02-02-0001 12-02-03-0001
@@ -5295,6 +5295,276 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-02-02-0062 12-02-03-0062
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-02-0062.Button,12-02-03-0062.Button,$Sum12020200621202030062)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut\nThai Milk Tea
+ -
+ Coconut\nThai Milk Tea
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup, Thai Tea, Milk \nWater
+ -
+ Coconut Syrup, Thai Tea, Milk \nWater
+ -
+
+ -
+
+
+
+ 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-02-02-0062.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0062.Button
+ StringFmt( $12-02-02-0062.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0062.Button
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0062.Button
+ StringFmt( $12-02-03-0062.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 $Sum12020200621202030062 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0062.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0062.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"
+ $Sum12020200621202030062
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; 12-02-01-0011 12-02-02-0011 12-02-03-0011
@@ -6117,6 +6387,276 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-02-02-0065 12-02-03-0065
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-02-0065.Button,12-02-03-0065.Button,$Sum12020200651202030065)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut\nJasmine tea
+ -
+ Coconut\nJasmine tea
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup, Jasmine Tea and Water
+ -
+ Coconut Syrup, Jasmine Tea and Water
+ -
+
+ -
+
+
+
+ 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-02-02-0065.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0065.Button
+ StringFmt( $12-02-02-0065.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0065.Button
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0065.Button
+ StringFmt( $12-02-03-0065.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 $Sum12020200651202030065 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0065.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0065.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"
+ $Sum12020200651202030065
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; 12-02-01-0046 12-02-02-0046 -
@@ -6391,6 +6931,276 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-02-02-0064 12-02-03-0064
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-02-0064.Button,12-02-03-0064.Button,$Sum12020200641202030064)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut\nJasmine milk tea
+ -
+ Coconut\nJasmine milk tea
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup, Jasmine Tea, Milk
+ -
+ Coconut Syrup, Jasmine Tea, Milk
+ -
+
+ -
+
+
+
+ 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-02-02-0064.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0064.Button
+ StringFmt( $12-02-02-0064.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0064.Button
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0064.Button
+ StringFmt( $12-02-03-0064.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 $Sum12020200641202030064 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0064.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0064.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"
+ $Sum12020200641202030064
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; 12-02-01-0050 12-02-02-0050 12-02-03-0050
@@ -7487,6 +8297,276 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-02-02-0060 12-02-03-0060
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-02-0060.Button,12-02-03-0060.Button,$Sum12020200601202030060)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut\nMatcha latte
+ -
+ Coconut\nMatcha latte
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup, Matcha Milk \nWater
+ -
+ Coconut Syrup, Matcha Milk \nWater
+ -
+
+ -
+
+
+
+ 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-02-02-0060.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0060.Button
+ StringFmt( $12-02-02-0060.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0060.Button
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0060.Button
+ StringFmt( $12-02-03-0060.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 $Sum12020200601202030060 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0060.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0060.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"
+ $Sum12020200601202030060
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; 12-02-01-0037 12-02-02-0037 12-02-03-0037
@@ -8583,6 +9663,276 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-02-02-0061 12-02-03-0061
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-02-0061.Button,12-02-03-0061.Button,$Sum12020200611202030061)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut Matcha
+ -
+ Coconut Matcha
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup, Matcha and Water
+ -
+ Coconut Syrup, Matcha and Water
+ -
+
+ -
+
+
+
+ 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-02-02-0061.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0061.Button
+ StringFmt( $12-02-02-0061.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0061.Button
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0061.Button
+ StringFmt( $12-02-03-0061.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 $Sum12020200611202030061 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0061.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0061.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"
+ $Sum12020200611202030061
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; 12-02-01-0006 12-02-02-0006 12-02-03-0006
@@ -10501,6 +11851,276 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; - 12-02-02-0063 12-02-03-0063
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-02-0063.Button,12-02-03-0063.Button,$Sum12020200631202030063)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ Coconut\nThai Black Tea
+ -
+ Coconut\nThai Black Tea
+ -
+
+ -
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Coconut Syrup, Thai Tea and Water
+ -
+ Coconut Syrup, Thai Tea and Water
+ -
+
+ -
+
+
+
+ 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-02-02-0063.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0063.Button
+ StringFmt( $12-02-02-0063.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0063.Button
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0063.Button
+ StringFmt( $12-02-03-0063.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 $Sum12020200631202030063 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0063.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0063.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"
+ $Sum12020200631202030063
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; 12-02-01-0030 12-02-02-0030 -
diff --git a/inter/sgp/animation01/push.sh b/inter/sgp/animation01/push.sh
new file mode 100755
index 00000000..10904778
--- /dev/null
+++ b/inter/sgp/animation01/push.sh
@@ -0,0 +1,2 @@
+#!/bin/zsh
+adb push play_list.tsv /sdcard/coffeevending/taobin_project/animation01/
diff --git a/inter/sgp/xml/event/season_pass/season_pass.ev b/inter/sgp/xml/event/season_pass/season_pass.ev
index 1637851e..c825a096 100644
--- a/inter/sgp/xml/event/season_pass/season_pass.ev
+++ b/inter/sgp/xml/event/season_pass/season_pass.ev
@@ -8,22 +8,24 @@ Var SeasonTrick = CountryRootPath + "xml/event/season_pass/"
If SystemDateMonthInt = 7 Then
- If SystemDateDayInt >= 22 Then
+ If SystemDateDayInt >= 29 Then
Var Season1 = "true"
+ Else
+ Var Season1 = "false"
EndIf
EndIf
If SystemDateMonthInt = 8 Then
- If SystemDateDayInt <= 4 Then
+ If SystemDateDayInt <= 11 Then
Var Season1 = "true"
Else
Var Season1 = "false"
EndIf
- If SystemDateDayInt > 4 Then
- If SystemDateDayInt < 19 Then
+ If SystemDateDayInt > 11 Then
+ If SystemDateDayInt < 26 Then
Var Season2 = "true"
Else
Var Season2 = "false"
@@ -36,7 +38,7 @@ EndIf
If SystemDateMonthInt = 9 Then
- If SystemDateDayInt = 1 Then
+ If SystemDateDayInt < 9 Then
Var Season3 = "true"
EndIf
EndIf
@@ -68,5 +70,3 @@ Else
EndIf
EndIf
EndIf
-
-
diff --git a/inter/sgp/xml/event/tricker.ev b/inter/sgp/xml/event/tricker.ev
index e4eeaf05..db1a062f 100644
--- a/inter/sgp/xml/event/tricker.ev
+++ b/inter/sgp/xml/event/tricker.ev
@@ -1,4 +1,4 @@
-; Singapore
+; Singapore
;DEBUGVAR SystemDateMonthInt
@@ -10,7 +10,7 @@
Var SeasonPassMode = 0
If SystemDateMonthInt = 7 Then
- If SystemDateDayInt > 21 Then
+ If SystemDateDayInt > 28 Then
Var SeasonPassMode = 1
Else
Var SeasonPassMode = 0
@@ -23,7 +23,7 @@ EndIf
If SystemDateMonthInt = 9 Then
Var SeasonPassMode = 1
- If SystemDateDayInt > 1 Then
+ If SystemDateDayInt > 8 Then
Var SeasonPassMode = 0
EndIf
EndIf
@@ -36,4 +36,4 @@ EndIf
If SeasonPassMode = 1 Then
Var SeasonPassFile = CountryRootPath + "xml/event/season_pass/season_pass.ev"
TRY SeasonPassFile
-EndIf
\ No newline at end of file
+EndIf
diff --git a/inter/sgp/xml/page_brewing3.lxml b/inter/sgp/xml/page_brewing3.lxml
index f8d01252..50b3e1f4 100644
--- a/inter/sgp/xml/page_brewing3.lxml
+++ b/inter/sgp/xml/page_brewing3.lxml
@@ -589,6 +589,7 @@
If MOVE_CUP_TO_DOOR = "true" Then
Var MOVE_CUP_TO_DOOR = "false"
+ Var SetPercent100 = 1
EndIf
If BREW_COUNT_DOWN_FROM_APP = "on" Then
@@ -1478,7 +1479,7 @@
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
- Var SetPercent100 = 1
+ ;Var SetPercent100 = 1
EndIf
diff --git a/xml/page_member_topupCash.xml b/xml/page_member_topupCash.xml
index 9cf87ee0..6bc0361f 100644
--- a/xml/page_member_topupCash.xml
+++ b/xml/page_member_topupCash.xml
@@ -69,11 +69,11 @@
Var PayAmount = 0
Var RemainAmountStr !assigned StringFmt( PayAmount, DisplayFormat, PreScaleConvertShow )
If show_eng = "true" Then
- Var RemainAmountStr = "เติม " + RemainAmountStr
- Var RemainAmountStr = RemainAmountStr + "###size=90"
- Else
Var RemainAmountStr = "Top-up " + RemainAmountStr
Var RemainAmountStr = RemainAmountStr + "###size=110"
+ Else
+ Var RemainAmountStr = "เติม " + RemainAmountStr
+ Var RemainAmountStr = RemainAmountStr + "###size=90"
EndIf
diff --git a/xml/page_payment_credit3-1.xml b/xml/page_payment_credit3-1.xml
index 3a488b99..7e851e95 100644
--- a/xml/page_payment_credit3-1.xml
+++ b/xml/page_payment_credit3-1.xml
@@ -39,6 +39,7 @@
GenHashWithTimeStamp PointCrm
Var TopupWithCashState = "Enable"
+ Var NotEnoughPayment = 0
If SELLSTATUS = "SELLNOCASH" Then
Var TopupWithCashState = "Disable"
@@ -133,6 +134,9 @@
Var TopupFromPage = "payment"
+ If ShowNotEnoughText = "Enable" Then
+ Var NotEnoughPayment = 1
+ EndIf
Open "ROOT/taobin_project/xml/page_topup_credit3_cash_warning.xml"
diff --git a/xml/page_topup_credit3_cash_warning.xml b/xml/page_topup_credit3_cash_warning.xml
index 4389c1a3..8847445e 100644
--- a/xml/page_topup_credit3_cash_warning.xml
+++ b/xml/page_topup_credit3_cash_warning.xml
@@ -110,13 +110,17 @@
Open "ROOT/taobin_project/xml/page_member_topupCash.xml"
Else
If TopupFromPage = "payment" Then
- If ReqPayWithCash = 0 Then
- Var TelephoneNumber = Seeker.TNumberTaobinCredit
- Var useCreditAmount = SumCreditAmount
- Var BmiYear = useCreditAmount
- Var GetScore = "useCredit"
- AddData 22 TelephoneNumber BmiYear PointCrm GetScore
- Var ReqPayWithCash = 1
+ If NotEnoughPayment = 1 Then
+ If ReqPayWithCash = 0 Then
+ Var TelephoneNumber = Seeker.TNumberTaobinCredit
+ Var useCreditAmount = SumCreditAmount
+ Var BmiYear = useCreditAmount
+ Var GetScore = "useCredit"
+ AddData 22 TelephoneNumber BmiYear PointCrm GetScore
+ Var ReqPayWithCash = 1
+ EndIf
+ Else
+ Open "ROOT/taobin_project/xml/page_payment_credit3-TopupCash.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_topup_credit3-TopupCash.xml"