diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml
index 63e31a14..7182c2ff 100644
--- a/xml/menu_catalog_default_init.xml
+++ b/xml/menu_catalog_default_init.xml
@@ -89,6 +89,8 @@
Var MenuVSelected2 = "Invisible"
Var Menu11Selected2 = "Invisible"
+ Var Menu21Selected2 = "Invisible"
+
; init default
Var Menu1Selected = "Enable"
Var Menu2Selected = "Enable"
@@ -105,6 +107,7 @@
Var Menu7Selected = "Invisible"
Var Menu8Selected = "Enable"
EndIf
+
If AppFastEnable = "true" Then
Var Menu11Selected = "Enable"
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index f47958b6..9b3ff455 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -44,10 +44,15 @@
If show_eng = "true" Then
;Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
+
+ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+
Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
Else
;Var DirImage = "ROOT/taobin_project/image/collect_point1"
Play "ROOT/taobin_project/sound_thai/thankyou.mp3"
+
+ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
EndIf
Var waitAckPay = 0
@@ -1092,7 +1097,7 @@
751
413
- "ROOT/taobin_project/image/page_doing/img2.png"
+ IMG_CNT
;
diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml
index c12ed85d..9b1678a6 100644
--- a/xml/page_brewing3Conti.xml
+++ b/xml/page_brewing3Conti.xml
@@ -18,9 +18,11 @@
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
Else
Var DirImage = "ROOT/taobin_project/image/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2"
+ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
EndIf
Var next_pic_bn = DirImage + "/bn_add_order.png"
@@ -939,7 +941,7 @@
751
413
- "ROOT/taobin_project/image/page_doing/img2.png"
+ IMG_CNT
;
diff --git a/xml/page_camera.xml b/xml/page_camera.xml
index 01aa3285..b54acc98 100644
--- a/xml/page_camera.xml
+++ b/xml/page_camera.xml
@@ -43,6 +43,22 @@
;EndIf
+
+ 0
+ 381
+"usbfront"
+; 1280
+; 720
+ 700
+ 394
+
+
+
+ DEBUGVAR BugFlag
+ If BugFlag = 0 Then
+ Var BugFlag = 1
+ EndIf
+
+
+ ; - 12-05-02-0046 12-05-03-0046
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-02-0046.Button,12-05-03-0046.Button,Disable=Invisible,$Sum12050200461205030046)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "เป๊ปซี่บ๊วย"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา "
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "PEPSI PLUM"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Pepsi, Ume Syrup & Ice"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ 265
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ Var( "฿" + $-.Price )
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-05-02-0046.Button
+
+
+ 115
+ 265
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0046.Button
+ Var( "฿" + $12-05-02-0046.Price )
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-05-03-0046.Button
+
+
+ 183
+ 265
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-03-0046.Button
+ Var( "฿" + $12-05-03-0046.Price )
+
+
+ 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 $Sum12050200461205030046 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0046.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-05-03-0046.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_err.png"
+
+
+ 84
+ 266
+ 10
+ OpunMediumTTF
+ 0xDE794E
+ ice_tab_process_show
+ ice_show_open
+
; - 12-05-02-0035 12-05-03-0035
diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml
index 5007e14a..e7821158 100644
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@@ -99,6 +99,8 @@
Var MenuVSelected2 = "Invisible"
Var Menu11Selected2 = "Invisible"
+ Var Menu21Selected2 = "Invisible"
+
; init default
Var Menu1Selected = "Enable"
Var Menu2Selected = "Enable"
@@ -115,6 +117,7 @@
Var Menu7Selected = "Invisible"
Var Menu8Selected = "Enable"
EndIf
+
If AppFastEnable = "true" Then
Var Menu11Selected = "Enable"
diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml
index 424b5321..11b26497 100644
--- a/xml/page_catalog_group_whey.xml
+++ b/xml/page_catalog_group_whey.xml
@@ -99,6 +99,8 @@
Var MenuVSelected2 = "Invisible"
Var Menu11Selected2 = "Invisible"
+ Var Menu21Selected2 = "Invisible"
+
; init default
Var Menu1Selected = "Enable"
Var Menu2Selected = "Enable"
@@ -115,6 +117,7 @@
Var Menu7Selected = "Invisible"
Var Menu8Selected = "Enable"
EndIf
+
If AppFastEnable = "true" Then
Var Menu11Selected = "Enable"
diff --git a/xml/vending_info.xml b/xml/vending_info.xml
index e48dabf0..7972cc70 100644
--- a/xml/vending_info.xml
+++ b/xml/vending_info.xml
@@ -445,7 +445,7 @@
If CameraCount = 1 Then
- CameraSetting "usbfront" "default" "Rotate=270,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
+ CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
EndIf
Var GoToCamera = 3
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index f651ee80..dac3dcf2 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "6.59"
- Var XMLPageVersionInt = 659
+ Var XMLPageVersion = "6.62"
+ Var XMLPageVersionInt = 662