diff --git a/image/page_drink_disable_n2/bn_cursed_coffee.png b/image/page_drink_disable_n2/bn_cursed_coffee.png
new file mode 100644
index 00000000..7d9c7cc6
Binary files /dev/null and b/image/page_drink_disable_n2/bn_cursed_coffee.png differ
diff --git a/image/page_drink_disable_n2/bn_haunted_harvert.png b/image/page_drink_disable_n2/bn_haunted_harvert.png
new file mode 100644
index 00000000..85335ad1
Binary files /dev/null and b/image/page_drink_disable_n2/bn_haunted_harvert.png differ
diff --git a/image/page_drink_disable_n2/bn_haunted_haza.png b/image/page_drink_disable_n2/bn_haunted_haza.png
new file mode 100644
index 00000000..4265154f
Binary files /dev/null and b/image/page_drink_disable_n2/bn_haunted_haza.png differ
diff --git a/image/page_drink_disable_n2/bn_haunted_woods.png b/image/page_drink_disable_n2/bn_haunted_woods.png
new file mode 100644
index 00000000..7f4ff485
Binary files /dev/null and b/image/page_drink_disable_n2/bn_haunted_woods.png differ
diff --git a/image/page_drink_disable_n2/bn_haunted_woods50.png b/image/page_drink_disable_n2/bn_haunted_woods50.png
new file mode 100644
index 00000000..9141423f
Binary files /dev/null and b/image/page_drink_disable_n2/bn_haunted_woods50.png differ
diff --git a/image/page_drink_disable_n2/bn_haunting_hag_of_village.png b/image/page_drink_disable_n2/bn_haunting_hag_of_village.png
new file mode 100644
index 00000000..f16f490f
Binary files /dev/null and b/image/page_drink_disable_n2/bn_haunting_hag_of_village.png differ
diff --git a/image/page_drink_disable_n2/bn_haunting_of_the_past.png b/image/page_drink_disable_n2/bn_haunting_of_the_past.png
new file mode 100644
index 00000000..04fbfb8a
Binary files /dev/null and b/image/page_drink_disable_n2/bn_haunting_of_the_past.png differ
diff --git a/image/page_drink_disable_n2/bn_midnight_enigma.png b/image/page_drink_disable_n2/bn_midnight_enigma.png
new file mode 100644
index 00000000..2e12c8c8
Binary files /dev/null and b/image/page_drink_disable_n2/bn_midnight_enigma.png differ
diff --git a/image/page_drink_disable_n2/bn_mysterious_music_box.png b/image/page_drink_disable_n2/bn_mysterious_music_box.png
new file mode 100644
index 00000000..6fe62a6a
Binary files /dev/null and b/image/page_drink_disable_n2/bn_mysterious_music_box.png differ
diff --git a/image/page_drink_disable_n2/bn_redmoon.png b/image/page_drink_disable_n2/bn_redmoon.png
new file mode 100644
index 00000000..1d92901e
Binary files /dev/null and b/image/page_drink_disable_n2/bn_redmoon.png differ
diff --git a/image/page_drink_disable_n2/bn_room_no_13.png b/image/page_drink_disable_n2/bn_room_no_13.png
new file mode 100644
index 00000000..84552b9f
Binary files /dev/null and b/image/page_drink_disable_n2/bn_room_no_13.png differ
diff --git a/image/page_drink_disable_n2/bn_the_dark_lord.png b/image/page_drink_disable_n2/bn_the_dark_lord.png
new file mode 100644
index 00000000..eef2e9f1
Binary files /dev/null and b/image/page_drink_disable_n2/bn_the_dark_lord.png differ
diff --git a/image/page_drink_disable_n2/bn_unbelievers_demise.png b/image/page_drink_disable_n2/bn_unbelievers_demise.png
new file mode 100644
index 00000000..18cfc435
Binary files /dev/null and b/image/page_drink_disable_n2/bn_unbelievers_demise.png differ
diff --git a/image/page_drink_disable_n2/bn_white_lady.png b/image/page_drink_disable_n2/bn_white_lady.png
new file mode 100644
index 00000000..dcac22ad
Binary files /dev/null and b/image/page_drink_disable_n2/bn_white_lady.png differ
diff --git a/image/page_drink_n/bn_cursed_coffee.png b/image/page_drink_n/bn_cursed_coffee.png
new file mode 100644
index 00000000..7d9c7cc6
Binary files /dev/null and b/image/page_drink_n/bn_cursed_coffee.png differ
diff --git a/image/page_drink_n/bn_haunted_harvert.png b/image/page_drink_n/bn_haunted_harvert.png
new file mode 100644
index 00000000..85335ad1
Binary files /dev/null and b/image/page_drink_n/bn_haunted_harvert.png differ
diff --git a/image/page_drink_n/bn_haunted_haza.png b/image/page_drink_n/bn_haunted_haza.png
new file mode 100644
index 00000000..4265154f
Binary files /dev/null and b/image/page_drink_n/bn_haunted_haza.png differ
diff --git a/image/page_drink_n/bn_haunted_woods.png b/image/page_drink_n/bn_haunted_woods.png
new file mode 100644
index 00000000..7f4ff485
Binary files /dev/null and b/image/page_drink_n/bn_haunted_woods.png differ
diff --git a/image/page_drink_n/bn_haunted_woods50.png b/image/page_drink_n/bn_haunted_woods50.png
new file mode 100644
index 00000000..9141423f
Binary files /dev/null and b/image/page_drink_n/bn_haunted_woods50.png differ
diff --git a/image/page_drink_n/bn_haunting_hag_of_village.png b/image/page_drink_n/bn_haunting_hag_of_village.png
new file mode 100644
index 00000000..f16f490f
Binary files /dev/null and b/image/page_drink_n/bn_haunting_hag_of_village.png differ
diff --git a/image/page_drink_n/bn_haunting_of_the_past.png b/image/page_drink_n/bn_haunting_of_the_past.png
new file mode 100644
index 00000000..04fbfb8a
Binary files /dev/null and b/image/page_drink_n/bn_haunting_of_the_past.png differ
diff --git a/image/page_drink_n/bn_midnight_enigma.png b/image/page_drink_n/bn_midnight_enigma.png
new file mode 100644
index 00000000..2e12c8c8
Binary files /dev/null and b/image/page_drink_n/bn_midnight_enigma.png differ
diff --git a/image/page_drink_n/bn_mysterious_music_box.png b/image/page_drink_n/bn_mysterious_music_box.png
new file mode 100644
index 00000000..6fe62a6a
Binary files /dev/null and b/image/page_drink_n/bn_mysterious_music_box.png differ
diff --git a/image/page_drink_n/bn_redmoon.png b/image/page_drink_n/bn_redmoon.png
new file mode 100644
index 00000000..1d92901e
Binary files /dev/null and b/image/page_drink_n/bn_redmoon.png differ
diff --git a/image/page_drink_n/bn_room_no_13.png b/image/page_drink_n/bn_room_no_13.png
new file mode 100644
index 00000000..84552b9f
Binary files /dev/null and b/image/page_drink_n/bn_room_no_13.png differ
diff --git a/image/page_drink_n/bn_the_dark_lord.png b/image/page_drink_n/bn_the_dark_lord.png
new file mode 100644
index 00000000..eef2e9f1
Binary files /dev/null and b/image/page_drink_n/bn_the_dark_lord.png differ
diff --git a/image/page_drink_n/bn_unbelievers_demise.png b/image/page_drink_n/bn_unbelievers_demise.png
new file mode 100644
index 00000000..18cfc435
Binary files /dev/null and b/image/page_drink_n/bn_unbelievers_demise.png differ
diff --git a/image/page_drink_n/bn_white_lady.png b/image/page_drink_n/bn_white_lady.png
new file mode 100644
index 00000000..dcac22ad
Binary files /dev/null and b/image/page_drink_n/bn_white_lady.png differ
diff --git a/image/page_drink_press_n/bn_cursed_coffee.png b/image/page_drink_press_n/bn_cursed_coffee.png
new file mode 100644
index 00000000..7d9c7cc6
Binary files /dev/null and b/image/page_drink_press_n/bn_cursed_coffee.png differ
diff --git a/image/page_drink_press_n/bn_haunted_harvert.png b/image/page_drink_press_n/bn_haunted_harvert.png
new file mode 100644
index 00000000..85335ad1
Binary files /dev/null and b/image/page_drink_press_n/bn_haunted_harvert.png differ
diff --git a/image/page_drink_press_n/bn_haunted_haza.png b/image/page_drink_press_n/bn_haunted_haza.png
new file mode 100644
index 00000000..4265154f
Binary files /dev/null and b/image/page_drink_press_n/bn_haunted_haza.png differ
diff --git a/image/page_drink_press_n/bn_haunted_woods.png b/image/page_drink_press_n/bn_haunted_woods.png
new file mode 100644
index 00000000..7f4ff485
Binary files /dev/null and b/image/page_drink_press_n/bn_haunted_woods.png differ
diff --git a/image/page_drink_press_n/bn_haunted_woods50.png b/image/page_drink_press_n/bn_haunted_woods50.png
new file mode 100644
index 00000000..9141423f
Binary files /dev/null and b/image/page_drink_press_n/bn_haunted_woods50.png differ
diff --git a/image/page_drink_press_n/bn_haunting_hag_of_village.png b/image/page_drink_press_n/bn_haunting_hag_of_village.png
new file mode 100644
index 00000000..f16f490f
Binary files /dev/null and b/image/page_drink_press_n/bn_haunting_hag_of_village.png differ
diff --git a/image/page_drink_press_n/bn_haunting_of_the_past.png b/image/page_drink_press_n/bn_haunting_of_the_past.png
new file mode 100644
index 00000000..04fbfb8a
Binary files /dev/null and b/image/page_drink_press_n/bn_haunting_of_the_past.png differ
diff --git a/image/page_drink_press_n/bn_midnight_enigma.png b/image/page_drink_press_n/bn_midnight_enigma.png
new file mode 100644
index 00000000..2e12c8c8
Binary files /dev/null and b/image/page_drink_press_n/bn_midnight_enigma.png differ
diff --git a/image/page_drink_press_n/bn_mysterious_music_box.png b/image/page_drink_press_n/bn_mysterious_music_box.png
new file mode 100644
index 00000000..6fe62a6a
Binary files /dev/null and b/image/page_drink_press_n/bn_mysterious_music_box.png differ
diff --git a/image/page_drink_press_n/bn_redmoon.png b/image/page_drink_press_n/bn_redmoon.png
new file mode 100644
index 00000000..1d92901e
Binary files /dev/null and b/image/page_drink_press_n/bn_redmoon.png differ
diff --git a/image/page_drink_press_n/bn_room_no_13.png b/image/page_drink_press_n/bn_room_no_13.png
new file mode 100644
index 00000000..84552b9f
Binary files /dev/null and b/image/page_drink_press_n/bn_room_no_13.png differ
diff --git a/image/page_drink_press_n/bn_the_dark_lord.png b/image/page_drink_press_n/bn_the_dark_lord.png
new file mode 100644
index 00000000..eef2e9f1
Binary files /dev/null and b/image/page_drink_press_n/bn_the_dark_lord.png differ
diff --git a/image/page_drink_press_n/bn_unbelievers_demise.png b/image/page_drink_press_n/bn_unbelievers_demise.png
new file mode 100644
index 00000000..18cfc435
Binary files /dev/null and b/image/page_drink_press_n/bn_unbelievers_demise.png differ
diff --git a/image/page_drink_press_n/bn_white_lady.png b/image/page_drink_press_n/bn_white_lady.png
new file mode 100644
index 00000000..dcac22ad
Binary files /dev/null and b/image/page_drink_press_n/bn_white_lady.png differ
diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv
index 1271fcef..530475b7 100644
--- a/menu/new-layout.tsv
+++ b/menu/new-layout.tsv
@@ -104,7 +104,8 @@ Name=Coffee,file=page_catalog_group_coffee.skt
ยูซุกาโน่ YUZUCANO กาแฟ น้ำ และ ยูซุ Espresso, Yuzu,\nSugar, Water 12-01-01-0040 12-01-02-0040 - bn_Yuzu_americano.png 12-21-01-0040 12-21-02-0040 - ฿30.00 ฿35.00 - TRUE NN
ลาเต้โตเกียวบานาน่า TOKYO BANANA \nLATTE กาแฟ น้ำ นม และ กล้วย Espresso, Tokyo Banana Syrup,\nSugar, Water 12-01-01-0042 12-01-02-0042 12-01-03-0042 bn_hot_Banana_cafe_latte.png 12-21-01-0042 12-21-02-0042 12-21-03-0042 ฿40.00 ฿45.00 ฿50.00 TRUE TRUE
-
+ กาแฟมิ้นท์ MINT CAFE LATTE กาแฟ น้ำ นม และ มิ้นท์ Espresso, Mint Syrup,\nSugar, Water 12-01-01-0057 12-01-02-0057 12-01-03-0057
+ มิ้นท์กาโน่ MINTCANO กาแฟ น้ำ และ มิ้นท์ Espresso, Mint ,\nSugar, Water 12-01-01-0058 12-01-02-0058 -
Name=Milk,file=page_catalog_group_oreo.skt
โอริโอ้ปั่นภูเขาไฟ OREO SMOOTHIE \nVOLCANO นม น้ำตาล โอริโอ้ \n Milk, Sugar, Oreo, Ice - - 12-03-03-0009 bn_smoothie_oreo.png - - - - - ฿55.00 NN NN
@@ -118,6 +119,8 @@ Name=Milk,file=page_catalog_group_oreo.skt
ลาเต้ปั่น\n โอริโอ้ภูเขาไฟ CAFE LATTE OREO VOLCANO กาแฟ นม น้ำตาล \n Oero Coffee, Milk, \nSugar, Oreo - - 12-01-03-0043 bn_Cafe_Latte_Oreo_smoothie.png - - - - - #REF! NN #REF!
นมชมพูปั่น\nโอริโอ้ภูเขาไฟ PINK MILK\nOREO VOLCANO น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo Salak Syrup, Milk,\nSugar Oreo - - 12-03-03-0026 bn_PinkOreo_smoothie.png - - - - - ฿50.00 NN NN
ชานมไทย\nโอริโอ้ภูเขาไฟ THAI MILK TEA OREO VOLCANO ชาไทย นม น้ำตาล \n Oreo Thai Tea, Milk,\nSugar, Oreo - - 12-02-03-0045 bn_ThaiTeaOreo_smoothie.png - - - - - #REF! NN #REF!
+ มิ้นท์โอริโอ้ภูเขาไฟ MINT OREO VOLCANO น้ำเชื่อมมิ้นท์ นม น้ำตาล \n Oreo Mint Syrup, Milk,\nSugar, Oreo - - 12-03-03-0034
+
Name=Milk,file=page_catalog_group_milk.skt
นม MILK นม Milk 12-03-01-0005 12-03-02-0005 12-03-03-0005 bn_iced_milk.png - - - ฿25.00 ฿30.00 ฿35.00 TRUE TRUE
นมคาราเมล CARAMEL MILK นม น้ำเชื่อมคาราเมล Milk, Caramel Syrup, Ice 12-03-01-0001 12-03-02-0001 12-03-03-0001 bn_iced_caramel.png - - - ฿35.00 ฿40.00 ฿45.00 TRUE TRUE
@@ -141,6 +144,10 @@ Name=Milk,file=page_catalog_group_milk.skt
นมชมพูปั่น\nโอริโอ้ภูเขาไฟ PINK MILK\nOREO VOLCANO น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo Salak Syrup, Milk,\nSugar Oreo - - 12-03-03-0026 bn_PinkOreo_smoothie.png - - - - - ฿50.00 NN NN
นมโตเกียวบานาน่า TOKYO\nBANANA MILK น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล Tokyo Banana Syrup, Milk, Sugar 12-03-01-0023 12-03-02-0023 12-03-03-0023 bn_Banana_milk.png - - -
นมช็อกโกโตเกียว\nบานาน่า CHOCO TOKYO\nBANANA MILK โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล Tokyo Banana Syrup, Milk, Sugar 12-03-01-0024 12-03-02-0024 12-03-03-0024 bn_ChocoBanana_milk.png - - -
+ มิ้นท์โอริโอ้ภูเขาไฟ MINT OREO VOLCANO น้ำเชื่อมมิ้นท์ นม น้ำตาล \n Oreo Mint Syrup, Milk,\nSugar, Oreo - - 12-03-03-0034
+ โกโก้มิ้นท์ COCOA MINT น้ำเชื่อมมิ้นท์ นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nSugar, Cocoa 12-03-01-0035 12-03-02-0035 12-03-03-0035
+ นมมิ้นท์ MINT MILK น้ำเชื่อมมิ้นท์ และนม Mint Syrup and Milk 12-03-01-0036 12-03-02-0036 12-03-03-0036
+ นมสตรอร์เบอร์รี่มิ้นท์ STRAWBERRY MINT MILK น้ำเชื่อมมิ้นท์ นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nStrawberry Syrup - 12-03-02-0037 12-03-03-0037
Name=Tea,file=page_catalog_group_tea.skt
เก็กฮวย CHRYSANTHS TEA น้ำเก๊กฮวย น้ำตาล Chrysanthemum & Water 12-02-01-0001 12-02-02-0001 12-02-03-0001 bn_hot_chrysanthemum_tea.png - - -
@@ -165,7 +172,9 @@ Name=Tea,file=page_catalog_group_tea.skt
ชาเขียวญี่ปุ่นมะนาว\n MATCHA \nLIMENADE ชาเชียว น้ำ มะนาว Matcha, Limenade, Water 12-02-01-0012 12-02-02-0012 12-02-03-0012 bn_hot_lime_Matcha.png - - - ฿25.00 ฿30.00 ฿35.00 TRUE TRUE
ชามะลิ JASMINE TEA ชามะลิ น้ำ Jasmine Tea ,Water 12-02-01-0045 12-02-02-0045 12-02-03-0046 bn_jasmine_tea.png - - -
ชามะลิลาเต้ JASMINE MILK TEA ชามะลิ และนม Jasmine & Milk 12-02-01-0046 12-02-02-0046 12-02-03-0047 bn_jasmine_milk_tea.png - - -
- - - -
+ มัทฉะลาเต้มิ้นท์ MATCHA LATTE MINT ชาเขียวมัทฉะ น้ำเชื่อมมิ้นท์และ นมอุ่น Matcha, Mint Syrup &Milk 12-02-01-0050 12-02-02-0050 12-02-03-0050 - - - #N/A #N/A #REF! #N/A #N/A
+
+
ชาบราวน์ชูการ์ BROWN SUGAR \nTEA ชาไทย น้ำเชื่อมน้ำตาลแดง\n นม Thai tea, Milk, Kokuto syrup 12-02-01-0006 12-02-02-0006 12-02-03-0006 bn_hot_Black_Sugar_Milk_Tea.png - - - ฿35.00 ฿40.00 ฿45.00 TRUE TRUE
ชาลิ้นจี่ LYCHEE TEA ชาไทย น้ำเชื่อมลิ้นจี่ Thai tea, Lychee, Sugar, Water 12-02-01-0008 12-02-02-0008 12-02-03-0008 bn_lychee_tea.png - - - ฿20.00 ฿25.00 ฿30.00 TRUE TRUE
ชาลิ้นจี่ LYCHEE TEA ชาไทย น้ำเชื่อมลิ้นจี่ Thai tea, Lychee, Sugar, Water 12-02-01-0019 12-02-02-0019 12-02-03-0019 bn_hot_lychee_tea.png - - - ฿25.00 ฿30.00 ฿35.00 TRUE TRUE
@@ -220,6 +229,13 @@ Name=Other,file=page_catalog_group_other.skt
ขิงมะนาวโซดา GINGER LIME \nSODA ขิง มะนาว โซดา Ginger, Lime, Soda & Ice - 12-05-02-0039 12-05-03-0039 bn_iced_Gingerlime_soda.png - - - - ฿25.00 ฿30.00 NN TRUE
ขิงโซดา GINGER SODA ขิง โซดา Ginger, Soda & Ice - 12-05-02-0051 - bn_iced_Ginger_soda_Doikum.png - - - - ฿25.00 - NN NN
ขิงมะนาวโซดา GINGER LIME \nSODA ขิง มะนาว โซดา Ginger, Lime, Soda & Ice - 12-05-02-0052 - bn_iced_Gingerlime_soda_Doikum.png - - - - ฿30.00 - NN NN
+ มิ้นท์มะนาวโซดา MINT LIME SODA น้ำเชื่อมมิ้นท์ มะนาว และโซดา Mint Syrup, Lime, Soda & Ice - 12-05-02-0060 -
+ สตรอเบอร์รี่มิ้นท์โซดา STRAWBERRY MINT SODA น้ำเชื่อมมิ้นท์ น้ำเชื่อมสตรอเบอร์รี่ มะนาว และโซดา Mint Syrup, Strawberry Syrup, Lime, Soda & Ice - 12-05-02-0063 -
+ ยูซุมิ้นท์โซดา YUZU MINT SODA น้ำเชื่อมมิ้นท์ น้ำเชื่อมยูซุ และโซดา Mint Syrup, Yuzu Syrup Soda & Ice - 12-05-02-0064 -
+ บ๊วยมะนาวมิ้นท์โซดา PLUM LIMENADE MINT SODA น้ำเชื่อมมิ้นท์ น้ำเชื่อมบ๊วย มะนาว และโซดา Mint Syrup, Ume Syrup, Lime, Soda & Ice - 12-05-02-0065 -
+ มิ้นท์ชามะนาวโซดา MINT THAI LEMON TEA SODA น้ำเชื่อมมิ้นท์ ผงชาไทย มะนาว และโซดา Mint Syrup, Thai Tea, Lime, Soda & Ice - 12-05-02-0066 -
+ เป๊ปซี่มิ้นท์ PEPSI MINT เป๊ปซี่ น้ำเชื่อมมิ้นท์ และโซดา Pepsi, Mint Syrup& Ice - 12-05-02-0067 -
+
โซดา SODA โซดา Soda - 12-05-02-0014 - bn_soda.png - - - - ฿10.00 - NN NN
โซดาน้ำแข็ง ICE & SODA โซดา Soda & Ice - 12-05-02-0015 - bn_iced_soda.png - - - - ฿10.00 - NN NN
@@ -241,6 +257,8 @@ Name=Other,file=page_catalog_group_other.skt
น้ำสตอเบอร์รี่ STRAWBERRY DRINK น้ำเชื่อมสตอเบอร์รี่ น้ำ Strawberry Syrup,\nWater, Ice - - 12-05-03-0040 bn_iced_strawberry.png - - - - - ฿35.00 NN NN
- - -
- - -
+
+
โจ๊กใส่โปรตีนจากพืช CONGEE WITH \nPLANT PROTEIN ข้าว ผัก โปรตีนจากพืช น้ำ Rice, Plant-based protein, Water 12-06-01-0001 - - bn_Congee.png - - - #N/A - - #N/A NN
โจ๊กผักฮ้องกง HONGKONG CONGEE ข้าว ผัก โปรตีนจากพืช น้ำ Rice, Plant-based protein, Water 12-06-01-0002 - - - - - #N/A - - #N/A NN
น้ำแข็ง ICE น้ำแข็ง Ice - 12-05-02-0017 - bn_iced.png - - - - ฿10.00 - NN NN
diff --git a/xml/event/promotion_pepween.xml b/xml/event/promotion_pepween.xml
index 8c6a7fa4..c81216f5 100644
--- a/xml/event/promotion_pepween.xml
+++ b/xml/event/promotion_pepween.xml
@@ -9223,10 +9223,10 @@ LIMENADE SODA"
- ;Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepween.xml"
+ Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepween.xml"
; test random page
- Open "ROOT/taobin_project/xml/event/pepween/page_pepween_random.xml"
+ ;Open "ROOT/taobin_project/xml/event/pepween/page_pepween_random.xml"
diff --git a/xml/page_catalog_group_pro_pepween.xml b/xml/page_catalog_group_pro_pepween.xml
index d88681e1..f89bb721 100644
--- a/xml/page_catalog_group_pro_pepween.xml
+++ b/xml/page_catalog_group_pro_pepween.xml
@@ -1,528 +1,528 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- If show_eng = "true" Then
- Var showthaiText = "Invisible"
- Var showengText = "Enable"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
-
- Var ice_tab_text = "Ice will be ready at "
- Var text_unavailable = "UNAVAILABLE###size=16"
-
-
- Else
- Var showengText = "Invisible"
- Var showthaiText = "Enable"
-
- Var DirImage = "ROOT/taobin_project/image/page3"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var text_unavailable = "หมด###size=32"
- EndIf
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- ; SpiralOnline
-
- Var MenuVSelected2 = "Invisible"
-
- Var Menu1Selected2 = "Invisible"
- Var Menu2Selected2 = "Invisible"
- Var Menu3Selected2 = "Invisible"
- Var Menu4Selected2 = "Invisible"
-
- Var Menu6Selected2 = "Invisible"
- Var Menu7Selected2 = "Invisible"
- Var MenuVSelected2 = "Invisible"
- Var Menu11Selected2 = "Invisible"
-
- Var Menu21Selected2 = "Invisible"
-
- Var MenuVSelected2 = "Invisible"
- If SpiralOnline = "true" Then
- If Seeker = "curr" Then
- Var MenuVSelected2 = "Enable"
- EndIf
- EndIf
-
- ; init default
- Var Menu1Selected = "Enable"
- Var Menu2Selected = "Enable"
- Var Menu3Selected = "Enable"
- Var Menu4Selected = "Enable"
- ; 5 fruit
- Var Menu5Selected = "Invisible"
- Var Menu6Selected = "Enable"
- Var Menu7Selected = "Enable"
- ; 8 cocktail
- Var Menu8Selected = "Invisible"
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- Var Menu8Selected = "Enable"
- EndIf
-
-
- If AppFastEnable = "true" Then
- Var Menu11Selected = "Enable"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Invisible"
- Else
- If MenuKidEnable = "true" Then
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Enable"
- Var Menu7Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Enable"
- EndIf
- EndIf
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- EndIf
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var Menu22Selected = "Enable"
- Else
- Var Menu22Selected = "Invisible"
- EndIf
- ;
-
-
-
-
-
-
- Var Timeout = 0
-
-
-
- If show_eng = "true" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
- Else
- Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- EndIf
-
-
-
-
-
-; notice enable heathy menu
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
- 1000
-
- ;DEBUGVAR ICE_PROCESS_STATUS
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- If NextPage = "-" Then
-
- Else
- If CupOnArm = "true" Then
- If Timeout > 9 Then
- SAVELOG "COA9"
- Open NextPage
- EndIf
- Else
- If Timeout > 30 Then
- SAVELOG "COA30"
- Open NextPage
- EndIf
- EndIf
- EndIf
-
- If Timeout > 60 Then
- SAVELOG "Timeout"
- If Seeker = "next" Then
- Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
- Else
- SAVELOG "Back"
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
- EndIf
- EndIf
-
- If BrewCommand = "RefreshAll" Then
- Var BrewCommand = "-"
- Open CurrentXMLFileName2
- EndIf
-
- If Seeker = "curr" Then
- If DoorCupPosition = "bottom" Then
- ; It normal
- Var EmergencyStop = "false"
- Else
- Var EmergencyStop = "true"
-
- ;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
-
- EndIf
- EndIf
-
- If IgnoreNetCore = "true" Then
-
- Else
- ;stop_now
- If NETCORE_LOST_CNT > 120 Then
- Var stop_now = "true"
- Var MachineErrorDetailAll = "???"
- SAVELOG "NETCORE_LOST_CNT"
-
- Open "ROOT/taobin_project/xml/page_back_to_error.xml"
- EndIf
- EndIf
-
-
- ; zone cup on arm
- If CupOnArm = "true" Then
-
- If CheckCupStateDoorCupClose = "" Then
- If buttonRemoveCup = "Enable" Then
-
- Else
- Refresh
- EndIf
-
- Var buttonRemoveCup = "Enable"
-
- EndIf
-
- If CheckCupStateDoorCupClose = "done" Then
- If buttonRemoveCup = "Enable" Then
-
- Else
- Refresh
- EndIf
-
- Var buttonRemoveCup = "Enable"
-
- EndIf
- Else
- If buttonRemoveCup = "Enable" Then
- Var buttonRemoveCup = "Invisible"
- Refresh
- EndIf
- EndIf
-
-
- Var Timeout = Timeout + 1
- TimerReset
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-;
-
- 1080
- "auto"
- 0
- 395
-
- "Enable"
- 896
- 102
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99x Then
-
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
- Var web_app_prepar = "true"
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+ Var ice_tab_text = "Ice will be ready at "
+ Var text_unavailable = "UNAVAILABLE###size=16"
+
+
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var text_unavailable = "หมด###size=32"
+ EndIf
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ ; SpiralOnline
+
+ Var MenuVSelected2 = "Invisible"
+
+ Var Menu1Selected2 = "Invisible"
+ Var Menu2Selected2 = "Invisible"
+ Var Menu3Selected2 = "Invisible"
+ Var Menu4Selected2 = "Invisible"
+
+ Var Menu6Selected2 = "Invisible"
+ Var Menu7Selected2 = "Invisible"
+ Var MenuVSelected2 = "Invisible"
+ Var Menu11Selected2 = "Invisible"
+
+ Var Menu21Selected2 = "Invisible"
+
+ Var MenuVSelected2 = "Invisible"
+ If SpiralOnline = "true" Then
+ If Seeker = "curr" Then
+ Var MenuVSelected2 = "Enable"
+ EndIf
+ EndIf
+
+ ; init default
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ ; 5 fruit
+ Var Menu5Selected = "Invisible"
+ Var Menu6Selected = "Enable"
+ Var Menu7Selected = "Enable"
+ ; 8 cocktail
+ Var Menu8Selected = "Invisible"
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Else
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
+ EndIf
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ EndIf
+
+ If RecipeTag1 = "HealthTurnOn" Then
+ Var Menu22Selected = "Enable"
+ Else
+ Var Menu22Selected = "Invisible"
+ EndIf
+ ;
+
+
+
+
+
+
+ Var Timeout = 0
+
+
+
+ If show_eng = "true" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ Else
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+
+
+
+
+
+; notice enable heathy menu
+
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+ 1000
+
+ ;DEBUGVAR ICE_PROCESS_STATUS
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ If NextPage = "-" Then
+
+ Else
+ If CupOnArm = "true" Then
+ If Timeout > 9 Then
+ SAVELOG "COA9"
+ Open NextPage
+ EndIf
+ Else
+ If Timeout > 30 Then
+ SAVELOG "COA30"
+ Open NextPage
+ EndIf
+ EndIf
+ EndIf
+
+ If Timeout > 60 Then
+ SAVELOG "Timeout"
+ If Seeker = "next" Then
+ Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+ Else
+ SAVELOG "Back"
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ EndIf
+ EndIf
+
+ If BrewCommand = "RefreshAll" Then
+ Var BrewCommand = "-"
+ Open CurrentXMLFileName2
+ EndIf
+
+ If Seeker = "curr" Then
+ If DoorCupPosition = "bottom" Then
+ ; It normal
+ Var EmergencyStop = "false"
+ Else
+ Var EmergencyStop = "true"
+
+ ;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+
+ EndIf
+ EndIf
+
+ If IgnoreNetCore = "true" Then
+
+ Else
+ ;stop_now
+ If NETCORE_LOST_CNT > 120 Then
+ Var stop_now = "true"
+ Var MachineErrorDetailAll = "???"
+ SAVELOG "NETCORE_LOST_CNT"
+
+ Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+ EndIf
+ EndIf
+
+
+ ; zone cup on arm
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ If buttonRemoveCup = "Enable" Then
+
+ Else
+ Refresh
+ EndIf
+
+ Var buttonRemoveCup = "Enable"
+
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ If buttonRemoveCup = "Enable" Then
+
+ Else
+ Refresh
+ EndIf
+
+ Var buttonRemoveCup = "Enable"
+
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ Refresh
+ EndIf
+ EndIf
+
+
+ Var Timeout = Timeout + 1
+ TimerReset
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+;
+
+ 1080
+ "auto"
+ 0
+ 395
+
+ "Enable"
+ 896
+ 102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUGVAR web_ready
+ If web_ready = "true" Then
+ If web_ref = QRCODE99x Then
+
+ Var web_readyOK = web_ready
+ Var web_telnumOK = web_telnum
+
+ Var web_app_prepar = "true"
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+ EndIf
+ Else
+ EndIf
+
+
+
+
+
+
+
+
+
10
497
@@ -1785,9 +1785,9 @@
Flag( 12-99-05-0058.Button,$Sum1299050058)
+
+
+
+
+
diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml
index d4c992fe..22d35d96 100644
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@@ -541,7 +541,7 @@
Var block_index_override = 0
Var block_index_move = 0
-; menu_new_list 33
+; menu_new_list 34
; ==================> Len = 11
; 12-02-01-0001 12-02-02-0001 12-02-03-0001
@@ -6090,6 +6090,258 @@ LIMENADE"
text_unavailable
center-vertical-horizontal
+
+ ; - - -
+ ; ==================> Len = 16
+ ; 12-02-01-0050 12-02-02-0050 12-02-03-0050
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-02-01-0050.Button,12-02-02-0050.Button,12-02-03-0050.Button,$Sum120201005012020200501202030050)
+
+ $Sum120201005012020200501202030050
+ "ROOT/taobin_project/image/page_drink_n//"
+ "ROOT/taobin_project/image/page_drink_press_n//"
+ "ROOT/taobin_project/image/page_drink_disable_n2//"
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NameDrink = " MATCHA LATTE MINT"
+ Var NameDrinkTH = "มัทฉะลาเต้มิ้นท์"
+ Var DrinkDescriptionTH = "ชาเขียวมัทฉะ น้ำเชื่อมมิ้นท์และ นมอุ่น"
+ Var DrinkDescription = "Matcha, Mint Syrup &Milk"
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + ""
+ Var OpenFromXML = CurrentXMLFileName2
+ Var PriceD1 = $12-02-01-0050.Price
+ Var PriceD2 = $12-02-02-0050.Price
+ Var PriceD3 = $12-02-03-0050.Price
+ Var PD_CODE1 = "12-02-01-0050"
+ Var PD_CODE2 = "12-02-02-0050"
+ Var PD_CODE3 = "12-02-03-0050"
+ Var PD_STAGE_1 = $12-02-01-0050.Button
+ Var PD_STAGE_2 = $12-02-02-0050.Button
+ Var PD_STAGE_3 = $12-02-03-0050.Button
+ Var SelectCountDrinkType = 0
+ Var DefaultDrinkType = 0
+ If PD_STAGE_1 = "Enable" Then
+ Var SelectCountDrinkType = SelectCountDrinkType + 1
+ Var DefaultDrinkType = 1
+ EndIf
+ If PD_STAGE_2 = "Enable" Then
+ Var SelectCountDrinkType = SelectCountDrinkType + 1
+ Var DefaultDrinkType = 2
+ EndIf
+ If PD_STAGE_3 = "Enable" Then
+ Var SelectCountDrinkType = SelectCountDrinkType + 1
+ Var DefaultDrinkType = 3
+ EndIf
+ If PD_STAGE_2 = "Enable" Then
+ Topping "Load" "12-02-02-0050"
+ Else
+ If PD_STAGE_1 = "Enable" Then
+ Topping "Load" "12-02-01-0050"
+ Else
+ Topping "Load" "12-02-03-0050"
+ EndIf
+ EndIf
+ Var menu_name_eng_hot = $12-02-01-0050.NameE
+ Var menu_desc_eng_hot = $12-02-01-0050.descriptionE
+ Var menu_name_thai_hot = $12-02-01-0050.Name
+ Var menu_desc_thai_hot = $12-02-01-0050.description
+
+ Var menu_name_eng_cold = $12-02-02-0050.NameE
+ Var menu_desc_eng_cold = $12-02-02-0050.descriptionE
+ Var menu_name_thai_cold = $12-02-02-0050.Name
+ Var menu_desc_thai_cold = $12-02-02-0050.description
+
+ Var menu_name_eng_blender = $12-02-03-0050.NameE
+ Var menu_desc_eng_blender = $12-02-03-0050.descriptionE
+ Var menu_name_thai_blender = $12-02-03-0050.Name
+ Var menu_desc_thai_blender = $12-02-03-0050.description
+
+ DEBUGVAR PD_STAGE_1
+ DEBUGVAR PD_STAGE_2
+ DEBUGVAR PD_STAGE_3
+ Var SelectDrinkType = 0
+
+
+ Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+
+
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "มัทฉะลาเต้มิ้นท์"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "ชาเขียวมัทฉะ น้ำเชื่อมมิ้นท์และ นมอุ่น"
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ " MATCHA LATTE MINT"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Matcha, Mint Syrup &Milk"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ $12-02-01-0050.Button
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-01-0050.Button
+ StringFmt( $12-02-01-0050.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-02-02-0050.Button
+
+
+ 115
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-02-0050.Button
+ StringFmt( $12-02-02-0050.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-02-03-0050.Button
+
+
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-02-03-0050.Button
+ StringFmt( $12-02-03-0050.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+
+ eval(
+ If ICE_PROCESS_STATUS = 2 Then
+
+ If $Sum120201005012020200501202030050 = "Disable" Then
+ Var ice_tab_process_show = "Disable"
+ Else
+ Var ice_tab_process_show = "Enable"
+ EndIf
+
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+ Var return = ice_tab_process_show
+ )
+
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png"
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png"
+
+
+ 49
+ 117
+
+ eval(
+ If $Sum120201005012020200501202030050 = "Disable" Then
+ STRCONTAIN "ERR" $12-02-01-0050.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-02-02-0050.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-02-03-0050.TAG tag3_is_disable
+ Var return = "Invisible"
+ If tag1_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag2_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag3_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ Else
+ Var return = "Invisible"
+ EndIf
+ )
+
+ "ROOT/taobin_project/image//img_menu_err2.png"
+
+
+ 84
+ 266
+ 10
+ OpunMediumTTF
+ 0xDE794E
+ ice_tab_process_show
+ ice_show_open
+
+
+ 48
+ 116
+ 32
+ 128
+ 64
+ MITRegularTTF
+ 0x5A5A5A
+ "disable-show"
+ $Sum120201005012020200501202030050
+ text_unavailable
+ center-vertical-horizontal
+
; - - -
; ==================> Len = 16