diff --git a/image/page_drink_disable_n2/bn_Yuzu_americano.png b/image/page_drink_disable_n2/bn_Yuzu_americano.png
index b7c3741b..ab267088 100644
Binary files a/image/page_drink_disable_n2/bn_Yuzu_americano.png and b/image/page_drink_disable_n2/bn_Yuzu_americano.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_america_no.png b/image/page_drink_disable_n2/bn_hot_america_no.png
index 424ca52c..47898ffe 100644
Binary files a/image/page_drink_disable_n2/bn_hot_america_no.png and b/image/page_drink_disable_n2/bn_hot_america_no.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_americano_Coconut.png b/image/page_drink_disable_n2/bn_hot_americano_Coconut.png
index c93fb9ad..faaae21a 100644
Binary files a/image/page_drink_disable_n2/bn_hot_americano_Coconut.png and b/image/page_drink_disable_n2/bn_hot_americano_Coconut.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_blackcoffee.png b/image/page_drink_disable_n2/bn_hot_blackcoffee.png
index 2e2139c7..9c39d1ee 100644
Binary files a/image/page_drink_disable_n2/bn_hot_blackcoffee.png and b/image/page_drink_disable_n2/bn_hot_blackcoffee.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_cappuccino.png b/image/page_drink_disable_n2/bn_hot_cappuccino.png
index eb07c6ed..ec5e56f7 100644
Binary files a/image/page_drink_disable_n2/bn_hot_cappuccino.png and b/image/page_drink_disable_n2/bn_hot_cappuccino.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_caramel_latte.png b/image/page_drink_disable_n2/bn_hot_caramel_latte.png
index a7b74ad6..894693f8 100644
Binary files a/image/page_drink_disable_n2/bn_hot_caramel_latte.png and b/image/page_drink_disable_n2/bn_hot_caramel_latte.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea.png b/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea.png
index 2161f7fd..2957e0e6 100644
Binary files a/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea.png and b/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_double_espresso.png b/image/page_drink_disable_n2/bn_hot_double_espresso.png
index 46ab90d4..6169441f 100644
Binary files a/image/page_drink_disable_n2/bn_hot_double_espresso.png and b/image/page_drink_disable_n2/bn_hot_double_espresso.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_espresso.png b/image/page_drink_disable_n2/bn_hot_espresso.png
index 035ffa3a..d033fd49 100644
Binary files a/image/page_drink_disable_n2/bn_hot_espresso.png and b/image/page_drink_disable_n2/bn_hot_espresso.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_latte.png b/image/page_drink_disable_n2/bn_hot_latte.png
index 47c8ef5f..16c30c8a 100644
Binary files a/image/page_drink_disable_n2/bn_hot_latte.png and b/image/page_drink_disable_n2/bn_hot_latte.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_lychee_espresso.png b/image/page_drink_disable_n2/bn_hot_lychee_espresso.png
index b927a6a2..b72c41de 100644
Binary files a/image/page_drink_disable_n2/bn_hot_lychee_espresso.png and b/image/page_drink_disable_n2/bn_hot_lychee_espresso.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_mocha.png b/image/page_drink_disable_n2/bn_hot_mocha.png
index 69139a26..c40a07a0 100644
Binary files a/image/page_drink_disable_n2/bn_hot_mocha.png and b/image/page_drink_disable_n2/bn_hot_mocha.png differ
diff --git a/image/page_drink_disable_n2/bn_iced_americano_soda.png b/image/page_drink_disable_n2/bn_iced_americano_soda.png
index 5bc95876..00ec1a74 100644
Binary files a/image/page_drink_disable_n2/bn_iced_americano_soda.png and b/image/page_drink_disable_n2/bn_iced_americano_soda.png differ
diff --git a/image/page_drink_disable_n2/bn_iced_epsresso.png b/image/page_drink_disable_n2/bn_iced_epsresso.png
index 69185d57..147af2ab 100644
Binary files a/image/page_drink_disable_n2/bn_iced_epsresso.png and b/image/page_drink_disable_n2/bn_iced_epsresso.png differ
diff --git a/image/page_drink_n/bn_Yuzu_americano.png b/image/page_drink_n/bn_Yuzu_americano.png
index 0a6145ee..6769198d 100644
Binary files a/image/page_drink_n/bn_Yuzu_americano.png and b/image/page_drink_n/bn_Yuzu_americano.png differ
diff --git a/image/page_drink_n/bn_hot_america_no.png b/image/page_drink_n/bn_hot_america_no.png
index 3ecde2bf..480f8004 100644
Binary files a/image/page_drink_n/bn_hot_america_no.png and b/image/page_drink_n/bn_hot_america_no.png differ
diff --git a/image/page_drink_n/bn_hot_americano_Coconut.png b/image/page_drink_n/bn_hot_americano_Coconut.png
index e677b9d5..3eb38393 100644
Binary files a/image/page_drink_n/bn_hot_americano_Coconut.png and b/image/page_drink_n/bn_hot_americano_Coconut.png differ
diff --git a/image/page_drink_n/bn_hot_blackcoffee.png b/image/page_drink_n/bn_hot_blackcoffee.png
index 217e48ae..8b6458a5 100644
Binary files a/image/page_drink_n/bn_hot_blackcoffee.png and b/image/page_drink_n/bn_hot_blackcoffee.png differ
diff --git a/image/page_drink_n/bn_hot_cappuccino.png b/image/page_drink_n/bn_hot_cappuccino.png
index deb72747..baa8352d 100644
Binary files a/image/page_drink_n/bn_hot_cappuccino.png and b/image/page_drink_n/bn_hot_cappuccino.png differ
diff --git a/image/page_drink_n/bn_hot_caramel_latte.png b/image/page_drink_n/bn_hot_caramel_latte.png
index 86e0d820..faa1beba 100644
Binary files a/image/page_drink_n/bn_hot_caramel_latte.png and b/image/page_drink_n/bn_hot_caramel_latte.png differ
diff --git a/image/page_drink_n/bn_hot_coffee_thai_milk_tea.png b/image/page_drink_n/bn_hot_coffee_thai_milk_tea.png
index ba887ffe..dfb28d71 100644
Binary files a/image/page_drink_n/bn_hot_coffee_thai_milk_tea.png and b/image/page_drink_n/bn_hot_coffee_thai_milk_tea.png differ
diff --git a/image/page_drink_n/bn_hot_double_espresso.png b/image/page_drink_n/bn_hot_double_espresso.png
index b87c8c0e..a99a7f54 100644
Binary files a/image/page_drink_n/bn_hot_double_espresso.png and b/image/page_drink_n/bn_hot_double_espresso.png differ
diff --git a/image/page_drink_n/bn_hot_espresso.png b/image/page_drink_n/bn_hot_espresso.png
index df7f2a6c..3ac768e6 100644
Binary files a/image/page_drink_n/bn_hot_espresso.png and b/image/page_drink_n/bn_hot_espresso.png differ
diff --git a/image/page_drink_n/bn_hot_latte.png b/image/page_drink_n/bn_hot_latte.png
index 21a2bc12..61363853 100644
Binary files a/image/page_drink_n/bn_hot_latte.png and b/image/page_drink_n/bn_hot_latte.png differ
diff --git a/image/page_drink_n/bn_hot_lychee_espresso.png b/image/page_drink_n/bn_hot_lychee_espresso.png
index 9c1c5739..0c7905c4 100644
Binary files a/image/page_drink_n/bn_hot_lychee_espresso.png and b/image/page_drink_n/bn_hot_lychee_espresso.png differ
diff --git a/image/page_drink_n/bn_hot_mocha.png b/image/page_drink_n/bn_hot_mocha.png
index 5b6ad597..f0e7c163 100644
Binary files a/image/page_drink_n/bn_hot_mocha.png and b/image/page_drink_n/bn_hot_mocha.png differ
diff --git a/image/page_drink_n/bn_iced_americano_soda.png b/image/page_drink_n/bn_iced_americano_soda.png
index f72b4854..64113cdc 100644
Binary files a/image/page_drink_n/bn_iced_americano_soda.png and b/image/page_drink_n/bn_iced_americano_soda.png differ
diff --git a/image/page_drink_n/bn_iced_epsresso.png b/image/page_drink_n/bn_iced_epsresso.png
index 05660880..cf776f9a 100644
Binary files a/image/page_drink_n/bn_iced_epsresso.png and b/image/page_drink_n/bn_iced_epsresso.png differ
diff --git a/image/page_drink_picture2_n/bn_Yuzu_americano.png b/image/page_drink_picture2_n/bn_Yuzu_americano.png
index 0fe81be0..3e13bed8 100644
Binary files a/image/page_drink_picture2_n/bn_Yuzu_americano.png and b/image/page_drink_picture2_n/bn_Yuzu_americano.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_america_no.png b/image/page_drink_picture2_n/bn_hot_america_no.png
index ac6312a4..1d793110 100644
Binary files a/image/page_drink_picture2_n/bn_hot_america_no.png and b/image/page_drink_picture2_n/bn_hot_america_no.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_americano_Coconut.png b/image/page_drink_picture2_n/bn_hot_americano_Coconut.png
index 890ae270..c5c55193 100644
Binary files a/image/page_drink_picture2_n/bn_hot_americano_Coconut.png and b/image/page_drink_picture2_n/bn_hot_americano_Coconut.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_blackcoffee.png b/image/page_drink_picture2_n/bn_hot_blackcoffee.png
index 7b6f3f31..8802fc67 100644
Binary files a/image/page_drink_picture2_n/bn_hot_blackcoffee.png and b/image/page_drink_picture2_n/bn_hot_blackcoffee.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_cappuccino.png b/image/page_drink_picture2_n/bn_hot_cappuccino.png
index c20a253f..a9aa1ea8 100644
Binary files a/image/page_drink_picture2_n/bn_hot_cappuccino.png and b/image/page_drink_picture2_n/bn_hot_cappuccino.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_caramel_latte.png b/image/page_drink_picture2_n/bn_hot_caramel_latte.png
index c97b3975..37ef0796 100644
Binary files a/image/page_drink_picture2_n/bn_hot_caramel_latte.png and b/image/page_drink_picture2_n/bn_hot_caramel_latte.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_coffee_thai_milk_tea.png b/image/page_drink_picture2_n/bn_hot_coffee_thai_milk_tea.png
index 14e010ad..a658d62b 100644
Binary files a/image/page_drink_picture2_n/bn_hot_coffee_thai_milk_tea.png and b/image/page_drink_picture2_n/bn_hot_coffee_thai_milk_tea.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_double_espresso.png b/image/page_drink_picture2_n/bn_hot_double_espresso.png
index d3a6db94..620179fb 100644
Binary files a/image/page_drink_picture2_n/bn_hot_double_espresso.png and b/image/page_drink_picture2_n/bn_hot_double_espresso.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_espresso.png b/image/page_drink_picture2_n/bn_hot_espresso.png
index 90a23f74..bd81c0c6 100644
Binary files a/image/page_drink_picture2_n/bn_hot_espresso.png and b/image/page_drink_picture2_n/bn_hot_espresso.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_latte.png b/image/page_drink_picture2_n/bn_hot_latte.png
index 157a810b..7b496a62 100644
Binary files a/image/page_drink_picture2_n/bn_hot_latte.png and b/image/page_drink_picture2_n/bn_hot_latte.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_lychee_espresso.png b/image/page_drink_picture2_n/bn_hot_lychee_espresso.png
index 45f911fa..fa3e7ee0 100644
Binary files a/image/page_drink_picture2_n/bn_hot_lychee_espresso.png and b/image/page_drink_picture2_n/bn_hot_lychee_espresso.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_mocha.png b/image/page_drink_picture2_n/bn_hot_mocha.png
index d22e8f24..7bf91f7d 100644
Binary files a/image/page_drink_picture2_n/bn_hot_mocha.png and b/image/page_drink_picture2_n/bn_hot_mocha.png differ
diff --git a/image/page_drink_picture2_n/bn_iced_americano_soda.png b/image/page_drink_picture2_n/bn_iced_americano_soda.png
index 229d2f43..446f849e 100644
Binary files a/image/page_drink_picture2_n/bn_iced_americano_soda.png and b/image/page_drink_picture2_n/bn_iced_americano_soda.png differ
diff --git a/image/page_drink_picture2_n/bn_iced_epsresso.png b/image/page_drink_picture2_n/bn_iced_epsresso.png
index e5ab29a5..29c59ebe 100644
Binary files a/image/page_drink_picture2_n/bn_iced_epsresso.png and b/image/page_drink_picture2_n/bn_iced_epsresso.png differ
diff --git a/image/page_drink_press_n/bn_Yuzu_americano.png b/image/page_drink_press_n/bn_Yuzu_americano.png
index 5bdf489a..b546ac54 100644
Binary files a/image/page_drink_press_n/bn_Yuzu_americano.png and b/image/page_drink_press_n/bn_Yuzu_americano.png differ
diff --git a/image/page_drink_press_n/bn_hot_america_no.png b/image/page_drink_press_n/bn_hot_america_no.png
index 175aacc0..f3c70246 100644
Binary files a/image/page_drink_press_n/bn_hot_america_no.png and b/image/page_drink_press_n/bn_hot_america_no.png differ
diff --git a/image/page_drink_press_n/bn_hot_americano_Coconut.png b/image/page_drink_press_n/bn_hot_americano_Coconut.png
index 96bbb3d2..668ec4da 100644
Binary files a/image/page_drink_press_n/bn_hot_americano_Coconut.png and b/image/page_drink_press_n/bn_hot_americano_Coconut.png differ
diff --git a/image/page_drink_press_n/bn_hot_blackcoffee.png b/image/page_drink_press_n/bn_hot_blackcoffee.png
index 4490a032..d0a22afc 100644
Binary files a/image/page_drink_press_n/bn_hot_blackcoffee.png and b/image/page_drink_press_n/bn_hot_blackcoffee.png differ
diff --git a/image/page_drink_press_n/bn_hot_cappuccino.png b/image/page_drink_press_n/bn_hot_cappuccino.png
index 3ba40c6e..a8f7ef04 100644
Binary files a/image/page_drink_press_n/bn_hot_cappuccino.png and b/image/page_drink_press_n/bn_hot_cappuccino.png differ
diff --git a/image/page_drink_press_n/bn_hot_caramel_latte.png b/image/page_drink_press_n/bn_hot_caramel_latte.png
index 98bd1142..de142e67 100644
Binary files a/image/page_drink_press_n/bn_hot_caramel_latte.png and b/image/page_drink_press_n/bn_hot_caramel_latte.png differ
diff --git a/image/page_drink_press_n/bn_hot_coffee_thai_milk_tea.png b/image/page_drink_press_n/bn_hot_coffee_thai_milk_tea.png
index 1fc5f8e7..cde4ad90 100644
Binary files a/image/page_drink_press_n/bn_hot_coffee_thai_milk_tea.png and b/image/page_drink_press_n/bn_hot_coffee_thai_milk_tea.png differ
diff --git a/image/page_drink_press_n/bn_hot_double_espresso.png b/image/page_drink_press_n/bn_hot_double_espresso.png
index eddf0b3a..08c9c608 100644
Binary files a/image/page_drink_press_n/bn_hot_double_espresso.png and b/image/page_drink_press_n/bn_hot_double_espresso.png differ
diff --git a/image/page_drink_press_n/bn_hot_espresso.png b/image/page_drink_press_n/bn_hot_espresso.png
index fb482c59..cbd1ad84 100644
Binary files a/image/page_drink_press_n/bn_hot_espresso.png and b/image/page_drink_press_n/bn_hot_espresso.png differ
diff --git a/image/page_drink_press_n/bn_hot_latte.png b/image/page_drink_press_n/bn_hot_latte.png
index bf4b3c8b..65341182 100644
Binary files a/image/page_drink_press_n/bn_hot_latte.png and b/image/page_drink_press_n/bn_hot_latte.png differ
diff --git a/image/page_drink_press_n/bn_hot_lychee_espresso.png b/image/page_drink_press_n/bn_hot_lychee_espresso.png
index bb211043..e51fc25d 100644
Binary files a/image/page_drink_press_n/bn_hot_lychee_espresso.png and b/image/page_drink_press_n/bn_hot_lychee_espresso.png differ
diff --git a/image/page_drink_press_n/bn_hot_mocha.png b/image/page_drink_press_n/bn_hot_mocha.png
index b64ecf33..5903ba5a 100644
Binary files a/image/page_drink_press_n/bn_hot_mocha.png and b/image/page_drink_press_n/bn_hot_mocha.png differ
diff --git a/image/page_drink_press_n/bn_iced_americano_soda.png b/image/page_drink_press_n/bn_iced_americano_soda.png
index 37af3bf3..9ae9a438 100644
Binary files a/image/page_drink_press_n/bn_iced_americano_soda.png and b/image/page_drink_press_n/bn_iced_americano_soda.png differ
diff --git a/image/page_drink_press_n/bn_iced_epsresso.png b/image/page_drink_press_n/bn_iced_epsresso.png
index d221c510..629867ed 100644
Binary files a/image/page_drink_press_n/bn_iced_epsresso.png and b/image/page_drink_press_n/bn_iced_epsresso.png differ
diff --git a/inter/aus/xml/menu_catalog_new.lxml b/inter/aus/xml/menu_catalog_new.lxml
index 19cfc616..360b5835 100644
--- a/inter/aus/xml/menu_catalog_new.lxml
+++ b/inter/aus/xml/menu_catalog_new.lxml
@@ -153,7 +153,7 @@
; under line
0
- 358
+ 380
"ROOT/taobin_project/image/page3/bg1.png"
diff --git a/xml/v3/event/dummy_layout_promotion.py b/inter/tha/xml/multi/v3/event/dummy_layout_promotion.py
similarity index 92%
rename from xml/v3/event/dummy_layout_promotion.py
rename to inter/tha/xml/multi/v3/event/dummy_layout_promotion.py
index f7a87159..eabed56d 100644
--- a/xml/v3/event/dummy_layout_promotion.py
+++ b/inter/tha/xml/multi/v3/event/dummy_layout_promotion.py
@@ -1,6 +1,7 @@
if "v3" in param and "promotion" in param:
- file_template = open(directory_to_process + "/page_catalog_group_recommend.xml", 'r')
+ print("Kenta", directory_to_process)
+ file_template = open(directory_to_process + "/page_catalog_group_recommend.lxml", 'r')
template_content = file_template.read()
file_template.close()
@@ -26,6 +27,6 @@ if "v3" in param and "promotion" in param:
pro_content = pro_content.replace("#EventClick", pro_json["event_click"])
all_active_pro += pro_content + "\n\t"
- pro_output_file = open(directory_to_process + "/event/event_v3/active_promotions.xml", 'w')
+ pro_output_file = open(directory_to_process + "/event/event_v3/active_promotions.lxml", 'w')
pro_output_file.write(template_content.replace(";banners", all_active_pro))
pro_output_file.close()
\ No newline at end of file
diff --git a/inter/tha/xml/multi/v3/event/event_v3/1_promotion_kingdom_thai_tea.json b/inter/tha/xml/multi/v3/event/event_v3/1_promotion_kingdom_thai_tea.json
new file mode 100644
index 00000000..7e3d0743
--- /dev/null
+++ b/inter/tha/xml/multi/v3/event/event_v3/1_promotion_kingdom_thai_tea.json
@@ -0,0 +1,9 @@
+{
+ "start": "2025-04-01T00:00:00",
+ "end": "2025-04-30T00:00:00",
+ "state": "KingdomThaiTeaProState",
+ "type": "IMAGE",
+ "media_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
+ "media_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
+ "event_click": "Open \"ROOT/taobin_project/xml/v3/page_catalog_group_pro_kingdom_thai_tea.xml\""
+}
\ No newline at end of file
diff --git a/xml/v3/event/event_v3/2_promotion_pepsi_x_taobin.json b/inter/tha/xml/multi/v3/event/event_v3/2_promotion_pepsi_x_taobin.json
similarity index 100%
rename from xml/v3/event/event_v3/2_promotion_pepsi_x_taobin.json
rename to inter/tha/xml/multi/v3/event/event_v3/2_promotion_pepsi_x_taobin.json
diff --git a/xml/v3/event/event_v3/3_promotion_matcha_every_day.json b/inter/tha/xml/multi/v3/event/event_v3/3_promotion_matcha_every_day.json
similarity index 100%
rename from xml/v3/event/event_v3/3_promotion_matcha_every_day.json
rename to inter/tha/xml/multi/v3/event/event_v3/3_promotion_matcha_every_day.json
diff --git a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.xml b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.xml
new file mode 100644
index 00000000..7dc95844
--- /dev/null
+++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.xml
@@ -0,0 +1,14220 @@
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+
+
+ Var Timeout = 0
+
+
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+ SetInstanceIgnoreTouch
+
+
+ 1000
+
+
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc"
+
+
+ TimerReset
+
+
+;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
+
+
+
+
+ 0
+ 497
+ 1080
+ 1423
+
+
+ KanitMediumTTF
+ 0x322B26
+ 0xEAE6E1
+
+ 16
+ 22
+ 1
+
+
+
+ KanitMediumTTF
+ 0x322B26
+ 0xEAE6E1
+
+ 10
+ 14
+ 1
+
+
+
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+
+ 4
+ 20
+ 1
+
+
+ "Hot"
+ "Ice"
+ "Blend"
+ 000013
+
+
+
+ KingdomThaiTeaProState
+ IMAGE
+
+ eval(
+ If show_eng = "true" Then
+ Var return = "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png"
+ Else
+ Var return = "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png"
+ EndIf
+ )
+
+
+ Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_kingdom_thai_tea.xml"
+
+
+
+ PepsiXTaobinProState
+ VIDEO
+
+ eval(
+ If show_eng = "true" Then
+ Var return = "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4"
+ Else
+ Var return = "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4"
+ EndIf
+ )
+
+
+ Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_pepsi_x_taobin.xml"
+
+
+
+ ; ==================> Len = 3
+ ; - 12-02-02-0099 -
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0103
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0106
+
+
+ ; ==================> Len = 3
+ ; - 12-01-02-0090 -
+
+
+ ; ==================> Len = 3
+ ; - 12-21-02-0090 -
+
+
+ ; ==================> Len = 3
+ ; - - 12-02-03-0057
+
+
+ ; ==================> Len = 3
+ ; - - 12-02-03-0058
+
+
+ ; ==================> Len = 3
+ ; - - 12-01-03-0078
+
+
+ ; ==================> Len = 3
+ ; - - 12-21-03-0078
+
+
+ ; ==================> Len = 3
+ ; - 12-01-02-0090 -
+
+
+ ; ==================> Len = 3
+ ; - 12-21-02-0090 -
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0009
+
+
+ ; ==================> Len = 3
+ ; 12-02-01-0103 12-02-02-0103 12-02-03-0103
+
+
+ ; ==================> Len = 3
+ ; 12-02-01-0104 12-02-02-0104 12-02-03-0104
+
+
+ ; ==================> Len = 3
+ ; 12-02-01-0026 12-02-02-0026 12-02-03-0026
+
+
+ ; ==================> Len = 3
+ ; - 12-03-02-0067 12-03-03-0067
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0094
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0003 12-01-02-0001 -
+
+
+ ; ==================> Len = 3
+ ; 12-21-01-0003 12-21-02-0001 -
+
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0143 12-05-03-0143
+
+
+ ; ==================> Len = 3
+ ; - - 12-05-03-0092
+
+
+ ; ==================> Len = 3
+ ; - 12-03-02-0058 12-03-03-0058
+
+
+ ; ==================> Len = 3
+ ; - 12-99-02-0003 -
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0029
+
+
+ ; ==================> Len = 3
+ ; 12-03-01-0024 12-03-02-0024 12-03-03-0024
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0041
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0042
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0043
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0061
+
+
+ ; ==================> Len = 3
+ ; - 12-02-62-0026 12-02-63-0026
+
+
+ ; ==================> Len = 3
+ ; - 12-02-62-0039 12-02-63-0039
+
+
+ ; ==================> Len = 3
+ ; - 12-02-62-0047 12-02-63-0047
+
+
+ ; ==================> Len = 3
+ ; - 12-02-62-0025 12-02-63-0025
+
+
+ ; ==================> Len = 3
+ ; TAOTIM - 12-41-03-0028
+
+
+ ; ==================> Len = 3
+ ; - 12-03-82-0011 12-03-83-0011
+
+
+ ; ==================> Len = 3
+ ; - 12-03-82-0041 12-03-83-0041
+
+
+ ; ==================> Len = 3
+ ; - 12-03-82-0042 12-03-83-0042
+
+
+ ; ==================> Len = 3
+ ; - 12-03-82-0043 12-03-83-0043
+
+
+ ; ==================> Len = 3
+ ; 12-02-01-0037 12-02-02-0037 12-02-03-0037
+
+
+ ; ==================> Len = 3
+ ; 12-03-01-0022 12-03-02-0022 12-03-03-0022
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0081 12-01-02-0081 -
+
+
+ ; ==================> Len = 3
+ ; 12-21-01-0081 12-21-02-0081 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0014 12-01-02-0011 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0019 12-01-02-0019 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0021 12-01-02-0021 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0025 12-01-02-0025 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0023 12-01-02-0023 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0027 12-01-02-0027 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0032 12-01-02-0032 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0035 12-01-02-0035 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0038 12-01-02-0038 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0044 12-01-02-0044 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0047 12-01-02-0047 -
+
+
+ ; ==================> Len = 3
+ ; 12-01-01-0050 12-01-02-0050 -
+
+
+ ; ==================> Len = 3
+ ; 12-02-01-0045 12-02-02-0045 12-02-03-0046
+
+
+ ; ==================> Len = 3
+ ; 12-02-01-0046 12-02-02-0046 12-02-03-0047
+
+
+ ; ==================> Len = 3
+ ; 12-03-01-0001 12-03-02-0001 12-03-03-0001
+
+
+ ; ==================> Len = 3
+ ; - 12-03-02-0006 12-03-03-0006
+
+
+ ; ==================> Len = 3
+ ; - - 12-03-03-0011
+
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0007 12-05-03-0007
+
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0046 12-05-03-0046
+
+
+ ; ==================> Len = 3
+ ; - 12-05-02-0025 12-05-03-0025
+
+
+
+
+
+
+
+
+
+
diff --git a/xml/v3/event/event_v3/promotion_template.inc b/inter/tha/xml/multi/v3/event/event_v3/promotion_template.inc
similarity index 100%
rename from xml/v3/event/event_v3/promotion_template.inc
rename to inter/tha/xml/multi/v3/event/event_v3/promotion_template.inc
diff --git a/xml/v3/event/script_open_promotion_v3.ev b/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev
similarity index 62%
rename from xml/v3/event/script_open_promotion_v3.ev
rename to inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev
index 6d7a5f5e..290a1fa8 100644
--- a/xml/v3/event/script_open_promotion_v3.ev
+++ b/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev
@@ -1,17 +1,12 @@
-Var FileRecommendToOpen = "ROOT/taobin_project/xml/v3/event/event_v3/active_promotions.xml"
+Var FileRecommendToOpen = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
Var MatchaEveryDayProState = "Invisible"
-Var CoconutMilkProState = "Invisible"
Var KingdomThaiTeaProState = "Invisible"
Var PepsiXTaobinProState = "Invisible"
-If CoconutMilkPro = 1 Then
- Var CoconutMilkProState = "Enable"
-EndIf
-
If MatchaEveryDayPro = 1 Then
Var MatchaEveryDayProState = "Enable"
EndIf
diff --git a/inter/tha/xml/multi/v3/page_catalog_group_milk.lxml b/inter/tha/xml/multi/v3/page_catalog_group_milk.lxml
index f5555bcb..60317742 100644
--- a/inter/tha/xml/multi/v3/page_catalog_group_milk.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_milk.lxml
@@ -17,7 +17,7 @@
- ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu4Selected = "PressForever"
RootLayoutVisible 12 "show"
@@ -49,14 +49,14 @@
EndIf
-
+
GetVisible inst_show_milk_cupe
-
+
If inst_show_milk_cupe = 1 Then
If inst_show_milk_cupe_counter > 0 Then
DEBUGVAR inst_show_milk_cupe_counter
-
+
Var inst_show_milk_cupe_counter = inst_show_milk_cupe_counter - 1
If inst_show_milk_cupe_counter = 0 Then
@@ -12435,6 +12435,7 @@
+
RefreshAll
diff --git a/inter/tha/xml/multi/v3/page_catalog_group_milk.skt b/inter/tha/xml/multi/v3/page_catalog_group_milk.skt
index cd447819..a9815425 100644
--- a/inter/tha/xml/multi/v3/page_catalog_group_milk.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_milk.skt
@@ -1,5 +1,5 @@
-
@@ -19,7 +19,7 @@
- ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu4Selected = "PressForever"
RootLayoutVisible 12 "show"
@@ -51,14 +51,14 @@
EndIf
-
+
GetVisible inst_show_milk_cupe
-
+
If inst_show_milk_cupe = 1 Then
If inst_show_milk_cupe_counter > 0 Then
DEBUGVAR inst_show_milk_cupe_counter
-
+
Var inst_show_milk_cupe_counter = inst_show_milk_cupe_counter - 1
If inst_show_milk_cupe_counter = 0 Then
@@ -76,10 +76,13 @@
-
+
RefreshAll
diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev
index 3c634d70..1b1d66a8 100644
--- a/xml/event/script_common_for_open_promotion_xml.ev
+++ b/xml/event/script_common_for_open_promotion_xml.ev
@@ -31,7 +31,7 @@ Else
Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If taobin_nopro = "true" Then
-
+
Else
If CoconutMilkPro = 1 Then
@@ -74,7 +74,7 @@ Else
EndIf
If CatalogLayoutV3 = 1 Then
- TRY "/mnt/sdcard/coffeevending/taobin_project/xml/v3/event/script_open_promotion_v3.ev"
+ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
EndIf
diff --git a/xml/v3/dummy_layout.py b/xml/v3/dummy_layout.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/xml/v3/event/event_v3/1_promotion_kingdom_thai_tea.json b/xml/v3/event/event_v3/1_promotion_kingdom_thai_tea.json
deleted file mode 100644
index 14ee0047..00000000
--- a/xml/v3/event/event_v3/1_promotion_kingdom_thai_tea.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "start": "2025-04-01T00:00:00",
- "end": "2025-04-30T00:00:00",
- "state": "KingdomThaiTeaProState",
- "type": "IMAGE",
- "media_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
- "media_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
- "event_click": "Open \"ROOT/taobin_project/xml/v3/page_catalog_group_pro_kingdom_thai_tea.xml\""
-}
\ No newline at end of file
diff --git a/xml/v3/event/event_v3/4_promotion_coconut_milk.json b/xml/v3/event/event_v3/4_promotion_coconut_milk.json
deleted file mode 100644
index a2c69a8c..00000000
--- a/xml/v3/event/event_v3/4_promotion_coconut_milk.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "start": "2025-03-1T00:00:00",
- "end": "2025-03-31T00:00:00",
- "state": "CoconutMilkProState",
- "type": "VIDEO",
- "media_thai": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.mp4",
- "media_eng": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.mp4",
- "event_click": "Open \"ROOT/taobin_project/xml/v3/page_catalog_group_pro_coconut_milk.xml\""
-}
\ No newline at end of file
diff --git a/xml/v3/event/event_v3/active_promotions.xml b/xml/v3/event/event_v3/active_promotions.xml
deleted file mode 100644
index 95dc2133..00000000
--- a/xml/v3/event/event_v3/active_promotions.xml
+++ /dev/null
@@ -1,7013 +0,0 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- ;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
-
- 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
-
- ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
-
-
-
-
-;include="ROOT/taobin_project/xml/v3/menu_catalog_new.xml"
-
-
-
-
- 0
- 497
- 1080
- 1423
-
-
- KanitMediumTTF
- 0x322B26
- 0xEAE6E1
-
- 16
- 22
- 1
-
-
-
- KanitMediumTTF
- 0x322B26
- 0xEAE6E1
-
- 10
- 14
- 1
-
-
-
- KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
-
- 4
- 20
- 1
-
-
-
- eval(
- If show_eng = "true" Then
- Var return = "Hot"
- Else
- Var return = "ร้อน"
- EndIf
- )
-
-
- eval(
- If show_eng = "true" Then
- Var return = "Ice"
- Else
- Var return = "เย็น"
- EndIf
- )
-
-
- eval(
- If show_eng = "true" Then
- Var return ="Blend"
- Else
- Var return = "ปั่น"
- EndIf
- )
-
-
- eval(
- If show_eng = "true" Then
- Var return ="UNAVAILABLE"
- Else
- Var return = "หมด"
- EndIf
- )
-
-
-
-
- KingdomThaiTeaProState
- IMAGE
-
- eval(
- If show_eng = "true" Then
- Var return = "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png"
- Else
- Var return = "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png"
- EndIf
- )
-
-
- Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_kingdom_thai_tea.xml"
-
-
-
- CoconutMilkProState
- VIDEO
-
- eval(
- If show_eng = "true" Then
- Var return = "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.mp4"
- Else
- Var return = "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.mp4"
- EndIf
- )
-
-
- Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_coconut_milk.xml"
-
-
-
- PepsiXTaobinProState
- VIDEO
-
- eval(
- If show_eng = "true" Then
- Var return = "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4"
- Else
- Var return = "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4"
- EndIf
- )
-
-
- Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_pepsi_x_taobin.xml"
-
-
-
- MatchaEveryDayProState
- IMAGE
-
- eval(
- If show_eng = "true" Then
- Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png"
- Else
- Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png"
- EndIf
- )
-
-
- Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_matcha_every_day.xml"
-
-
-
- ; menu_new_list 58
- ; ==================> Len = 15
- ; - 12-02-02-0099 -
-
-
- ; ==================> Len = 15
- ; - - 12-03-03-0103
-
-
- ; ==================> Len = 15
- ; - - 12-03-03-0106
-
-
- ; ==================> Len = 15
- ; - 12-01-02-0090 -
-
-
- ; - 12-21-02-0090 -
-
-
- ; ==================> Len = 15
- ; - - 12-02-03-0057
-
-
- ; ==================> Len = 15
- ; - - 12-02-03-0058
-
-
- ; ==================> Len = 15
- ; - - 12-01-03-0078
-
-
- ; - - 12-21-03-0078
-
-
- ; ==================> Len = 15
- ; - 12-01-02-0090 -
-
-
- ; - 12-21-02-0090 -
-
-
- ; ==================> Len = 20
- ; - - 12-03-03-0009
-
-
- ; ==================> Len = 20
- ; 12-02-01-0026 12-02-02-0026 12-02-03-0026
-
-
- ; ==================> Len = 20
- ; 12-02-01-0039 12-02-02-0039 12-02-03-0039
-
-
- ; ==================> Len = 15
- ; - 12-05-02-0143 12-05-03-0143
-
-
- ; ==================> Len = 15
- ; - 12-03-02-0067 12-03-03-0067
-
-
- ; ==================> Len = 15
- ; - - 12-03-03-0094
-
-
- ; ==================> Len = 20
- ; 12-01-01-0003 12-01-02-0001 -
-
-
- ; 12-21-01-0003 12-21-02-0001 -
-
-
- ; ==================> Len = 15
- ; - 12-05-02-0133 -
-
-
- ; ==================> Len = 15
- ; - - 12-05-03-0092
-
-
- ; ==================> Len = 15
- ; - 12-03-02-0058 12-03-03-0058
-
-
- ; ==================> Len = 15
- ; - - 12-99-03-0066
-
-
- ; ==================> Len = 15
- ; - 12-99-02-0003 -
-
-
- ; ==================> Len = 19
- ; - - 12-03-03-0029
-
-
- ; ==================> Len = 15
- ; 12-03-01-0024 12-03-02-0024 12-03-03-0024
-
-
- ; ==================> Len = 15
- ; - - 12-03-03-0041
-
-
- ; ==================> Len = 15
- ; - - 12-03-03-0042
-
-
- ; ==================> Len = 15
- ; - - 12-03-03-0043
-
-
- ; ==================> Len = 15
- ; - - 12-03-03-0061
-
-
- ; ==================> Len = 15
- ; - 12-02-62-0026 12-02-63-0026
-
-
- ; ==================> Len = 15
- ; - 12-02-62-0039 12-02-63-0039
-
-
- ; ==================> Len = 15
- ; - 12-02-62-0047 12-02-63-0047
-
-
- ; ==================> Len = 15
- ; - 12-02-62-0025 12-02-63-0025
-
-
- ; ==================> Len = 15
- ; TAOTIM - 12-41-03-0028
-
-
- ; ==================> Len = 15
- ; - 12-03-82-0011 12-03-83-0011
-
-
- ; ==================> Len = 15
- ; - 12-03-82-0041 12-03-83-0041
-
-
- ; ==================> Len = 15
- ; - 12-03-82-0042 12-03-83-0042
-
-
- ; ==================> Len = 15
- ; - 12-03-82-0043 12-03-83-0043
-
-
- ; ==================> Len = 20
- ; 12-02-01-0037 12-02-02-0037 12-02-03-0037
-
-
- ; ==================> Len = 20
- ; 12-03-01-0022 12-03-02-0022 12-03-03-0022
-
-
- ; ==================> Len = 15
- ; 12-01-01-0081 12-01-02-0081 -
-
-
- ; 12-21-01-0081 12-21-02-0081 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0014 12-01-02-0011 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0019 12-01-02-0019 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0021 12-01-02-0021 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0025 12-01-02-0025 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0023 12-01-02-0023 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0027 12-01-02-0027 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0032 12-01-02-0032 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0035 12-01-02-0035 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0038 12-01-02-0038 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0044 12-01-02-0044 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0047 12-01-02-0047 -
-
-
- ; ==================> Len = 20
- ; 12-01-01-0050 12-01-02-0050 -
-
-
- ; ==================> Len = 15
- ; 12-02-01-0045 12-02-02-0045 12-02-03-0046
-
-
- ; ==================> Len = 15
- ; 12-02-01-0046 12-02-02-0046 12-02-03-0047
-
-
- ; ==================> Len = 20
- ; 12-03-01-0001 12-03-02-0001 12-03-03-0001
-
-
- ; ==================> Len = 20
- ; - 12-03-02-0006 12-03-03-0006
-
-
- ; ==================> Len = 20
- ; - - 12-03-03-0011
-
-
- ; ==================> Len = 20
- ; - 12-05-02-0007 12-05-03-0007
-
-
- ; ==================> Len = 20
- ; - 12-05-02-0046 12-05-03-0046
-
-
- ; ==================> Len = 20
- ; - 12-05-02-0025 12-05-03-0025
-
-
-
-
-
-
-
-
-
-;BigLogoLayout
-
-
-
-
-
diff --git a/xml/v3/menu_catalog_default_init.xml b/xml/v3/menu_catalog_default_init.xml
deleted file mode 100644
index 7cd5fff9..00000000
--- a/xml/v3/menu_catalog_default_init.xml
+++ /dev/null
@@ -1,122 +0,0 @@
- 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 Menu6Selected = "Invisible"
- Var Menu61Selected = "Enable"
- Var Menu62Selected = "Enable"
-
- ;
-
-
-
-
- RootLayoutVisible 3 "hide"
- RootLayoutVisible 13 "hide"
-
-
-
-
-
-
-
diff --git a/xml/v3/menu_catalog_new.xml b/xml/v3/menu_catalog_new.xml
deleted file mode 100644
index 431da7f2..00000000
--- a/xml/v3/menu_catalog_new.xml
+++ /dev/null
@@ -1,458 +0,0 @@
-
-; 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
-
- EndIf
-
-
- ; zone cup on arm
- If Seeker = "curr" Then
- 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
- Else
- Var buttonRemoveCup = "Invisible"
- EndIf
-
- Var Timeout = Timeout + 1
- TimerReset
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 380
- "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"
-
- ; Handle penetrator
-
- If Only18 = "true" Then
-
- Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
- Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
diff --git a/xml/v3/menu_catalog_new_menu.xml b/xml/v3/menu_catalog_new_menu.xml
deleted file mode 100644
index 06beafe7..00000000
--- a/xml/v3/menu_catalog_new_menu.xml
+++ /dev/null
@@ -1,9 +0,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
\ No newline at end of file
diff --git a/xml/v3/menu_head.py b/xml/v3/menu_head.py
deleted file mode 100644
index a380f198..00000000
--- a/xml/v3/menu_head.py
+++ /dev/null
@@ -1,106 +0,0 @@
-
- RoadShow = False
-
- default_dir = 'ROOT/taobin_project/image/page_drink/'
- default_dir2 = 'ROOT/taobin_project/image/page_drink_select/'
- default_dir_press = 'ROOT/taobin_project/image/page_drink_press/'
- default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable/'
-
- new_default_dir = 'ROOT/taobin_project/image/page_drink_n/'
- new_default_dir2 = 'ROOT/taobin_project/image/page_drink_picture2_n/'
- new_default_dir_press = 'ROOT/taobin_project/image/page_drink_press_n/'
- new_default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable_n2/'
-
- menu_count = 0
-
- x1 = 44
- x2 = 301
- x3 = 558
- x4 = 815
-
- ystep = 899 - 571
- y1 = 20
- y2 = y1 + ystep*1
- y3 = y1 + ystep*2
- y4 = y1 + ystep*3
- y5 = y1 + ystep*4
- y6 = y1 + ystep*5
- y7 = y1 + ystep*6
-
-
-
- x_button = [
- x1,
- x2,
- x3,
- x4,
-
- x1,
- x2,
- x3,
- x4,
-
- x1,
- x2,
- x3,
- x4,
-
- x1,
- x2,
- x3,
- x4,
-
- x1,
- x2,
- x3,
- x4,
-
- x1,
- x2,
- x3,
- x4,
-
- x1,
- x2,
- x3,
- x4
-
- ]
- y_button = [
- y1,
- y1,
- y1,
- y1,
-
- y2,
- y2,
- y2,
- y2,
-
- y3,
- y3,
- y3,
- y3,
-
- y4,
- y4,
- y4,
- y4,
-
- y5,
- y5,
- y5,
- y5,
-
- y6,
- y6,
- y6,
- y6,
-
- y7,
- y7,
- y7,
- y7
-
- ]
-
\ No newline at end of file
diff --git a/xml/v3/menu_new_layout_gen_v3.py b/xml/v3/menu_new_layout_gen_v3.py
deleted file mode 100644
index 213248fc..00000000
--- a/xml/v3/menu_new_layout_gen_v3.py
+++ /dev/null
@@ -1,545 +0,0 @@
- if "v3" in param:
-
- if current_file_name == "page_catalog_group_recommend.skt":
- recommend_page = True
- button_add_string = "Var OpenFromInstMenuTab = 0"
- else:
- recommend_page = False
- button_add_string = ""
-
- out_xml('\n')
- out_xml('\t 0 \n')
- out_xml('\t 497 \n')
- out_xml('\t 1080 \n')
- out_xml('\t 1423 \n')
- out_xml('\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\t KanitMediumTTF \n')
- out_xml('\t\t\t 0x322B26 \n')
- out_xml('\t\t\t 0xEAE6E1 \n')
- out_xml('\t\t\t\n')
- out_xml('\t\t\t\t 16 \n')
- out_xml('\t\t\t\t 22 \n')
- out_xml('\t\t\t\t 1 \n')
- out_xml('\t\t\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\t KanitMediumTTF \n')
- out_xml('\t\t\t 0x322B26 \n')
- out_xml('\t\t\t 0xEAE6E1 \n')
- out_xml('\t\t\t\n')
- out_xml('\t\t\t\t 10 \n')
- out_xml('\t\t\t\t 14 \n')
- out_xml('\t\t\t\t 1 \n')
- out_xml('\t\t\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\t KanitRegularTTF \n')
- out_xml('\t\t\t 0x6F5F51 \n')
- out_xml('\t\t\t 0xEAE6E1 \n')
- out_xml('\t\t\t\n')
- out_xml('\t\t\t\t 4 \n')
- out_xml('\t\t\t\t 20 \n')
- out_xml('\t\t\t\t 1 \n')
- out_xml('\t\t\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\teval(\n')
- out_xml('\t\t\t\tIf show_eng = "true" Then\n')
- out_xml('\t\t\t\t\tVar return = "Hot"\n')
- out_xml('\t\t\t\tElse\n')
- out_xml('\t\t\t\t\tVar return = "ร้อน"\n')
- out_xml('\t\t\t\tEndIf\n')
- out_xml('\t\t\t)\n')
- out_xml('\t\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\teval(\n')
- out_xml('\t\t\t\tIf show_eng = "true" Then\n')
- out_xml('\t\t\t\t\tVar return = "Ice"\n')
- out_xml('\t\t\t\tElse\n')
- out_xml('\t\t\t\t\tVar return = "เย็น"\n')
- out_xml('\t\t\t\tEndIf\n')
- out_xml('\t\t\t)\n')
- out_xml('\t\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\teval(\n')
- out_xml('\t\t\t\tIf show_eng = "true" Then\n')
- out_xml('\t\t\t\t\tVar return ="Blend"\n')
- out_xml('\t\t\t\tElse\n')
- out_xml('\t\t\t\t\tVar return = "ปั่น"\n')
- out_xml('\t\t\t\tEndIf\n')
- out_xml('\t\t\t)\n')
- out_xml('\t\t\n')
- out_xml('\t\t\n')
- out_xml('\t\t\teval(\n')
- out_xml('\t\t\t\tIf show_eng = "true" Then\n')
- out_xml('\t\t\t\t\tVar return ="UNAVAILABLE"\n')
- out_xml('\t\t\t\tElse\n')
- out_xml('\t\t\t\t\tVar return = "หมด"\n')
- out_xml('\t\t\t\tEndIf\n')
- out_xml('\t\t\t)\n')
- out_xml('\t\t\n')
- out_xml('\t\n')
- out_xml('\t\n')
- out_xml(';banners\n')
-
- count_test = 0
- count = 0
- pd_code_available = '##-##-##-####'
-
- def GenMenuV3(spl):
- out_xml( '\t\t; ==================> Len = ' + str(len(spl)) + '\n')
- menu_img = spl[7]
- out_xml( '\t\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \n')
- str_con = ""
- str_con_var = ""
- if spl[4] != '-':
- str_con += spl[4] + '.Button,'
- if spl[5] != '-':
- str_con += spl[5] + '.Button,'
- if spl[6] != '-':
- str_con += spl[6] + '.Button,'
-
- if spl[4] != '-':
- str_con_var += spl[4] + '-'
- if spl[5] != '-':
- str_con_var += spl[5] + '-'
- if spl[6] != '-':
- str_con_var += spl[6] + '-'
-
- str_con_var = str_con_var.replace("-", "")
-
- if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[12].strip()):
- str_con += f'DateTimeStart="{spl[12].strip()}",'
- if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[13].strip()):
- str_con += f'DateTimeEnd="{spl[13].strip()}",'
-
- if re.match(r'^\w.*', spl[14].strip()):
- str_con += f'Var={spl[14].strip()},'
-
- if recommend_page:
- str_con += "Disable=Invisible,"
-
- str_con += "$Sum" + str_con_var
-
- out_xml('\t\t\n\n')
-
- if spl[8] != '-' or spl[9] != '-' or spl[10] != '-':
- menu_img = spl[7]
- out_xml( '\t\t; '+ spl[8] + ' ' + spl[9] + ' ' + spl[10]+ ' \n')
- str_con = ""
- str_con_var = ""
- if spl[8] != '-':
- str_con += spl[8] + '.Button,'
- if spl[9] != '-':
- str_con += spl[9] + '.Button,'
- if spl[10] != '-':
- str_con += spl[10] + '.Button,'
-
- if spl[8] != '-':
- str_con_var += spl[8] + '-'
- if spl[9] != '-':
- str_con_var += spl[9] + '-'
- if spl[10] != '-':
- str_con_var += spl[10] + '-'
-
- str_con_var = str_con_var.replace("-", "")
-
- if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[12].strip()):
- str_con += f'DateTimeStart="{spl[12].strip()}",'
- if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[13].strip()):
- str_con += f'DateTimeEnd="{spl[13].strip()}",'
-
- if re.match(r'^\w.*', spl[14].strip()):
- str_con += f'Var={spl[14].strip()},'
-
- if recommend_page:
- str_con += "Disable=Invisible,"
-
- str_con += "$Sum" + str_con_var
-
- out_xml('\t\t\n\n')
-
- def GenBanner(spl):
-
- if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[12].strip()):
- str_con += f'DateTimeStart="{spl[12].strip()}",'
- if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', spl[13].strip()):
- str_con += f'DateTimeEnd="{spl[13].strip()}",'
-
- if re.match(r'^\w.*', spl[14].strip()):
- str_con += f'Var={spl[14].strip()},'
-
- out_xml('\t\t\n')
- out_xml('\t\t\t Flag( '+ str_con + ') \n')
- out_xml('\t\t\t ' + spl[4] + '\n')
- out_xml('\t\t\t\n')
- out_xml('\t\t\t\teval(\n')
- out_xml('\t\t\t\t\tIf show_eng = "true" Then')
- out_xml('\t\t\t\t\t\tVar return = ' + spl[5] + '\n')
- out_xml('\t\t\t\t\tElse\n')
- out_xml('\t\t\t\t\t\tVar return = ' + spl[6] + '\n')
- out_xml('\t\t\t\t\tEndIf\n')
- out_xml('\t\t\t\t)\n')
- out_xml('\t\t\t\n')
- out_xml('\t\t\t\n')
- out_xml('\t\t\t\t' + spl[7] + '\n')
- out_xml('\t\t\t\n')
- out_xml('\t\t\n')
-
- def GenListMenu():
- for spl in menu_new_list:
- #product_code = s
- if spl[0] == "IGNORE":
- continue
-
- if spl[0].startswith("TAG"):
- out_xml( '\t;' + spl[0] + '\r\n')
- continue
-
- if spl[0].startswith("BANNER"):
- GenBanner(spl)
- else:
- GenMenuV3(spl)
-
- out_xml('\t\t; menu_new_list '+ str(len(menu_new_list))+'\n')
- GenListMenu()
-
- out_xml('\t\n')
- out_xml('\n')
diff --git a/xml/v3/open_catalog.ev b/xml/v3/open_catalog.ev
deleted file mode 100644
index 6ca28af5..00000000
--- a/xml/v3/open_catalog.ev
+++ /dev/null
@@ -1,14 +0,0 @@
-If SpiralOnline = "true" Then
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/v3/page_catalog_with_vending.xml"
-
- If Seeker = "next" Then
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/v3/page_catalog3.xml"
- Else
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/v3/page_catalog_with_vending.xml"
- EndIf
-Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/v3/page_catalog3.xml"
-
-EndIf
\ No newline at end of file
diff --git a/xml/v3/page_catalog3.xml b/xml/v3/page_catalog3.xml
deleted file mode 100644
index 096498b9..00000000
--- a/xml/v3/page_catalog3.xml
+++ /dev/null
@@ -1,744 +0,0 @@
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-
- OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
-
- ; page_catalog3 split menu group _other.skt to _pepsi_7up.skt and _other_other.skt
-
- TopView "show"
- ; On open
-
- Var IgnoreCollectPointByMe = 0
-
- Var ChildrenFree = 0
- Var NightTime = 0
-
- Machine WakeUp
- Machine OrderCheck
-
- DEBUGVAR ToppingNewShow
-
- Var NextPage = "-"
-
- Var Seeker.thankLidFlag = 0
- Var Seeker.thankStrawFlag = 0
-
- WEB "DISABLE"
-
- Var web_readyOK = "false"
- Var web_telnumOK = ""
-
- Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
-
- If CocktailShow = "true" Then
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
- EndIf
-
- If TermTemOnline = "true" Then
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
- EndIf
-
- If Seeker = "curr" Then
- Machine DoorLidClose
- EndIf
-
- Var GetPayInfoFlag = 0
- Var countDownRetrun = 30
-
- CoinVending OFF
-
-
- Var text_price_6 = ""
-
- ; zone sound
-
- ; Clear value
- Topping "clear" "-"
-
- If show_eng = "true" Then
- Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
- Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
- Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
- Play PlaySoundLag
-
- Var DirImageCart = "ROOT/taobin_project/image/cart_en"
-
- Var text_unavailable = "UNAVAILABLE###size=16"
-
- Else
- Var DirImage = "ROOT/taobin_project/image/page2"
- Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
- Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
-
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
-
- If SongkranSoundCampaign = 1 Then
- Var PlaySoundLag = GreetingSound[SoundCampaignIndex]
- EndIf
-
- Play PlaySoundLag
-
- Var DirImageCart = "ROOT/taobin_project/image/cart_th"
-
- Var text_unavailable = "หมด###size=32"
- EndIf
-
-
- Var StrawAutoRelease1 = "false"
- Var StrawAutoRelease2 = "false"
-
-
- Var SELLONLINE = 0
- If SELLSTATUS = "SELLONLINE" Then
- Var SELLONLINE = 1
- EndIf
- If SELLSTATUS = "SELLNOCASH" Then
- Var SELLONLINE = 1
- Var ButtontoTopupMenu = "Invisible"
- EndIf
-
- If SELLSTATUS = "DEACTIVE" Then
- SAVELOG "DEACTIVE in catalog2.xml"
-
- ;include="ROOT/taobin_project/inc/return_condition.ev"
-
- EndIf
-
-
- If SELLONLINE = 1 Then
- Var ShowButtonClick2 = "Enable"
- Else
- Var ShowButtonClick2 = "Invisible"
- Var ButtontoTopupMenu = "Invisible"
- EndIf
-
- If SELLONLINE = 1 Then
- Var ShowNetworkProblem = "Invisible"
- Var ShowNetworkProblemText = ""
-
- ;GenHashWithTimeStamp QRCODE99x
- WEB "ENABLE"
-
- Else
- Var ShowNetworkProblem = "Enable"
- Var ShowButtonClick2 = "Invisible"
- Var ButtontoTopupMenu = "Invisible"
- Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
-
- Var QRCODE99 = ""
- WEB "DISABLE"
-
- EndIf
-
- ; 1035 is Coke.
- STRCONTAIN "1035" MaterialAvailable CokeUI
-
- Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
- Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
-
-
- Var countClick = 0
-
-
- DEBUGVAR CART_COUNT
-
-
- Var QRCODE99_Y = 1718
-
- Var showCart = "Invisible"
- If MultiPayEnable = "true" Then
-
- If CART_COUNT = 1 Then
- Var showCart = "Enable"
- Var cart_image_bn = DirImageCart + "/bn_cart1.png"
- Var cart_image_bp = DirImageCart + "/bp_cart1.png"
-
- Var QRCODE99_Y = 1580
-
- EndIf
-
- If CART_COUNT = 2 Then
- Var showCart = "Enable"
- Var cart_image_bn = DirImageCart + "/bn_cart2.png"
- Var cart_image_bp = DirImageCart + "/bp_cart2.png"
-
- Var QRCODE99_Y = 1580
-
- EndIf
-
-
-
- If CART_COUNT = 3 Then
- Open "ROOT/taobin_project/xml/page_payment_multi.xml"
- EndIf
-
- EndIf
-
- If Seeker = "next" Then
- Var ShowButtonClick2 = "Invisible"
- Var ButtontoTopupMenu = "Invisible"
- EndIf
-
-
- If XMLProfile = "taobin_notopup" Then
- Var ButtontoTopupMenu = "Invisible"
-
- EndIf
-
-
- Var menu_name_eng_hot = ""
- Var menu_desc_eng_hot = ""
- Var menu_name_thai_hot = ""
- Var menu_desc_thai_hot = ""
-
- Var menu_name_eng_cold = ""
- Var menu_desc_eng_cold = ""
- Var menu_name_thai_cold = ""
- Var menu_desc_thai_cold = ""
-
-
- Var menu_name_eng_blender = ""
- Var menu_desc_eng_blender = ""
- Var menu_name_thai_blender = ""
- Var menu_desc_thai_blender = ""
-
-
-
-
- If BoxID = 0 Then
- RebootWithCause "BoxID was zero"
- EndIf
-
-
- TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
-
- TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
-
- ; zone cup on arm
- If Seeker = "curr" Then
- If CupOnArm = "true" Then
-
- If CheckCupStateDoorCupClose = "" Then
- Var buttonRemoveCup = "Enable"
- EndIf
-
- If CheckCupStateDoorCupClose = "done" Then
- Var buttonRemoveCup = "Enable"
- EndIf
- Else
- If buttonRemoveCup = "Enable" Then
- Var buttonRemoveCup = "Invisible"
- EndIf
- EndIf
-
-
- Else
- Var buttonRemoveCup = "Invisible"
- EndIf
-
-
- If CounterEnable = 1 Then
- If OnTaobinVending = 1 Then
- Open "ROOT/taobin_project/xml/counter/taobinvd/page_wait_order.xml"
- EndIf
- EndIf
-
- If EnableMultiInstance = "true" Then
- Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
- EndIf
-
-
- Var Price5Active = 0
-
-
- ;
- DEBUGVAR LangEng
- If LangEng = "true" Then
-
- EndIf
-
- DEBUGVAR LangThai
- If LangThai = "true" Then
-
- EndIf
-
-
- 1000
-
-
- ;SAVELOG SoundPlaying
-
- If countDownRetrun > 0 Then
- Var countDownRetrun = countDownRetrun - 1
- EndIf
-
- If countDownRetrun = 0 Then
-
-
- If Seeker = "next" Then
- Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
- Else
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
- EndIf
- EndIf
-
- ; zone cup on arm
- If Seeker = "curr" Then
- If CupOnArm = "true" Then
-
- If CheckCupStateDoorCupClose = "" Then
- Var buttonRemoveCup = "Enable"
- EndIf
-
- If CheckCupStateDoorCupClose = "done" Then
- Var buttonRemoveCup = "Enable"
- EndIf
- Else
- If buttonRemoveCup = "Enable" Then
- Var buttonRemoveCup = "Invisible"
- EndIf
- EndIf
- Else
- Var buttonRemoveCup = "Invisible"
- EndIf
-
-
-
-
- Refresh
- TimerReset
-
-
-
- ;If ChangeStatus = "payout-end" Then
- ; Var ChangeOK = 1
- ;EndIf
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99 Then
- Cart "DeleteMenuID" "ALL"
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
-
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- Else
- EndIf
-
-
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-; back
-
-
-
-
-
-
-
-
- 70
- 583
- Var(DirImage + "/text1.png")
-
-
-
-
-; menu row 1
-
-
-
-
-; menu row 2
-
-
-
-
-
-
-
-
-;=============================================================================
-
-
-
-
-
-
-
-
-
-
-;=============================================================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 5
- 1880
- 24
- Center
- 1080
- RobotoRegular
- 0xFFFFFF
- ShowNetworkProblemText
-
-
-
-
-;
-; 895
-; QRCODE99_Y
-; 178
-; 178
-; "Enable"
-; testservice
-;
-
-
-
-
-
-
-
-
-; Cart
-
-
-
-
- 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
-
-
-
- SAVELOG "MENU TAB ENTRY"
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog.xml"
-
-
- Open "ROOT/taobin_project/xml/page_before_check_member.xml"
-
-
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/v3/page_catalog_group_soft_serve.xml"
-
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog.xml"
-
-
-
-
diff --git a/xml/v3/page_catalog_with_vending.xml b/xml/v3/page_catalog_with_vending.xml
deleted file mode 100644
index 48f55fb3..00000000
--- a/xml/v3/page_catalog_with_vending.xml
+++ /dev/null
@@ -1,576 +0,0 @@
-
- "Enable"
- 1080
- 1920
- "0xeae6e1"
- SoundVolume
-
- TopView "show"
- ; On open
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var MenuHealthyEnable = "Enable"
- Else
- Var MenuHealthyEnable = "Disable"
- EndIf
-
- If Seeker = "next" Then
- ;Open "ROOT/taobin_project/xml/page_catalog.xml"
- EndIf
-
- Var NextPage = "-"
-
- Var Seeker.thankLidFlag = 0
- Var Seeker.thankStrawFlag = 0
-
- WEB "DISABLE"
-
- Var web_readyOK = "false"
- Var web_telnumOK = ""
-
- Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
-
- If CocktailShow = "true" Then
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
- EndIf
-
- If TermTemOnline = "true" Then
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
- EndIf
-
- ;Machine DoorLidClose
-
- Var GetPayInfoFlag = 0
- Var countDownRetrun = 30
-
- CoinVending OFF
-
- ; Clear value
- Topping "clear" "-"
-
- If show_eng = "true" Then
- Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
- Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
- Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
- Play PlaySoundLag
-
- Var DirImageCart = "ROOT/taobin_project/image/cart_en"
-
- Else
- Var DirImage = "ROOT/taobin_project/image/page2"
- Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
- Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
-
- If SongkranSoundCampaign = 1 Then
- Var PlaySoundLag = GreetingSound[SoundCampaignIndex]
- EndIf
-
- Play PlaySoundLag
-
- Var DirImageCart = "ROOT/taobin_project/image/cart_th"
- EndIf
-
-
- Var StrawAutoRelease1 = "false"
- Var StrawAutoRelease2 = "false"
-
- Var SELLONLINE = 0
- If SELLSTATUS = "SELLONLINE" Then
- Var SELLONLINE = 1
- EndIf
- If SELLSTATUS = "SELLNOCASH" Then
- Var SELLONLINE = 1
- Var ButtontoTopupMenu = "Invisible"
- EndIf
-
- If SELLONLINE = 1 Then
- Var ShowButtonClick2 = "Enable"
- Else
- Var ShowButtonClick2 = "Invisible"
- Var ButtontoTopupMenu = "Invisible"
- EndIf
-
- If SELLONLINE = 1 Then
- Var ShowNetworkProblem = "Invisible"
- Var ShowNetworkProblemText = ""
-
- ;GenHashWithTimeStamp QRCODE99x
- WEB "ENABLE"
-
- Else
- Var ShowNetworkProblem = "Enable"
- Var ShowButtonClick2 = "Invisible"
- Var ButtontoTopupMenu = "Invisible"
- Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
-
- Var QRCODE99 = ""
- WEB "DISABLE"
-
- EndIf
-
-
- TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
-
-
-
- ; 1035 is Coke.
- STRCONTAIN "1035" MaterialAvailable CokeUI
-
- Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
- Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
-
-
- Var countClick = 0
-
-
- DEBUGVAR CART_COUNT
-
-
- Var QRCODE99_Y = 1718
-
- Var showCart = "Invisible"
- If MultiPayEnable = "true" Then
-
- If CART_COUNT = 1 Then
- Var showCart = "Enable"
- Var cart_image_bn = DirImageCart + "/bn_cart1.png"
- Var cart_image_bp = DirImageCart + "/bp_cart1.png"
-
- Var QRCODE99_Y = 1580
-
- EndIf
-
- If CART_COUNT = 2 Then
- Var showCart = "Enable"
- Var cart_image_bn = DirImageCart + "/bn_cart2.png"
- Var cart_image_bp = DirImageCart + "/bp_cart2.png"
-
- Var QRCODE99_Y = 1580
-
- EndIf
-
-
-
- If CART_COUNT = 3 Then
- Open "ROOT/taobin_project/xml/page_payment_multi.xml"
- EndIf
-
- EndIf
-
- If Seeker = "next" Then
- Var ShowButtonClick2 = "Invisible"
- Var ButtontoTopupMenu = "Invisible"
- EndIf
-
-
- If XMLProfile = "taobin_notopup" Then
- Var ButtontoTopupMenu = "Invisible"
-
- EndIf
-
- 1000
-
-
- ;SAVELOG SoundPlaying
-
- If countDownRetrun > 0 Then
- Var countDownRetrun = countDownRetrun - 1
- EndIf
-
- If countDownRetrun = 0 Then
- If Seeker = "next" Then
- Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
- Else
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
- EndIf
- EndIf
-
-
-
- Refresh
- TimerReset
-
-
-
- ;If ChangeStatus = "payout-end" Then
- ; Var ChangeOK = 1
- ;EndIf
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99 Then
- Cart "DeleteMenuID" "ALL"
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
-
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- Else
- EndIf
-
-
-
-
-;include="ROOT/taobin_project/inc/video.inc"
-
-
-
-
-
-
-
-
-
-
-
-; back
-
-
-
-
-
-
-
-
- 70
- 583
- Var(DirImage + "/text1.png")
-
-
-
-
-; menu row 1
-
-
-
-
-; menu row 2
-
-
-
-
-
-
-
-
-; row 3
-;-------------------------------------------------------------
-
-
-
-
-
-
-;-------------------------------------------------------------
-
-
-
-
-
-
-; top menu
-
-
-
-
-
-
-
-
- 5
- 1880
- 24
- Center
- 1080
- RobotoRegular
- 0xFFFFFF
- ShowNetworkProblemText
-
-
-
-
-;
-; 895
-; QRCODE99_Y
-; 178
-; 178
-; "Enable"
-; testservice
-;
-
-
-
-; Cart
-
-
-
-
- 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
-
-
-
-
-
-
\ No newline at end of file