diff --git a/image/event/pepsi_banner.png b/image/event/pepsi_banner.png
new file mode 100644
index 00000000..28f56846
Binary files /dev/null and b/image/event/pepsi_banner.png differ
diff --git a/image/page2/bn_Dessert.png b/image/page2/bn_Dessert.png
new file mode 100644
index 00000000..74dea624
Binary files /dev/null and b/image/page2/bn_Dessert.png differ
diff --git a/image/page2/bp_Dessert.png b/image/page2/bp_Dessert.png
new file mode 100644
index 00000000..d32c9bca
Binary files /dev/null and b/image/page2/bp_Dessert.png differ
diff --git a/image/page2_en/page2/bn_Dessert.png b/image/page2_en/page2/bn_Dessert.png
new file mode 100644
index 00000000..bc95d8e3
Binary files /dev/null and b/image/page2_en/page2/bn_Dessert.png differ
diff --git a/image/page2_en/page2/bp_Dessert.png b/image/page2_en/page2/bp_Dessert.png
new file mode 100644
index 00000000..1fe3da8b
Binary files /dev/null and b/image/page2_en/page2/bp_Dessert.png differ
diff --git a/image/page2_inter/bn_Dessert.png b/image/page2_inter/bn_Dessert.png
new file mode 100644
index 00000000..35412438
Binary files /dev/null and b/image/page2_inter/bn_Dessert.png differ
diff --git a/image/page2_inter/bp_Dessert.png b/image/page2_inter/bp_Dessert.png
new file mode 100644
index 00000000..e504d84a
Binary files /dev/null and b/image/page2_inter/bp_Dessert.png differ
diff --git a/image/page3_2_v2/bn_dessert.png b/image/page3_2_v2/bn_dessert.png
new file mode 100644
index 00000000..0c98cd89
Binary files /dev/null and b/image/page3_2_v2/bn_dessert.png differ
diff --git a/image/page3_2_v2/bp_dessert.png b/image/page3_2_v2/bp_dessert.png
new file mode 100644
index 00000000..0016b7a5
Binary files /dev/null and b/image/page3_2_v2/bp_dessert.png differ
diff --git a/image/page3_2_v2_en/bn_dessert.png b/image/page3_2_v2_en/bn_dessert.png
new file mode 100644
index 00000000..5bd83353
Binary files /dev/null and b/image/page3_2_v2_en/bn_dessert.png differ
diff --git a/image/page3_2_v2_en/bp_dessert.png b/image/page3_2_v2_en/bp_dessert.png
new file mode 100644
index 00000000..0250f4db
Binary files /dev/null and b/image/page3_2_v2_en/bp_dessert.png differ
diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv
index 60f5673d..11806bea 100644
--- a/inter/tha/menu/lang.tsv
+++ b/inter/tha/menu/lang.tsv
@@ -15,7 +15,7 @@
000008 Protein\nShake โปรตีนเชค 蛋白奶昔 プロテインシェイク Protein\nShake ပရိုတင်း\nShake
000009 Soda & others โซดา และ อื่นๆ 汽水 ソーダ、その他 Soda & others ဆိုဒါနှင့် အခြားအရာများ
000010 Healthier\nChoice ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center] 更健康的选择 - Healthier\nChoice ကျန်းမာရေး\nရွေးချယ်မှု
-000011 Kid Menu เมนูเด็ก 儿童菜单 - Kid Menu ကလေးမီနူး
+000011 Dessert ขนมหวาน 甜品 デザート Pencuci mulut အချိုပွဲ
000012 App Fast แอพ ฟาสท์ 应用快速 - App Fast အက်ပ် အမြန်
000025 Pepsi & 7up เป๊ปซี่ และ\nเซเว่นอัพ Pepsi & 7up - - Pepsi & 7up
000026 Tao Pun เต่าปั่น Tao Pun Tao Pun Tao Pun Tao Pun
diff --git a/inter/tha/xml/multi/control_and_lang_swith.ev b/inter/tha/xml/multi/control_and_lang_swith.ev
index dc1183dd..f47eac44 100644
--- a/inter/tha/xml/multi/control_and_lang_swith.ev
+++ b/inter/tha/xml/multi/control_and_lang_swith.ev
@@ -53,11 +53,11 @@ If WheyButtonState = "Enable" Then
Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_whey.lxml"
Else
- OpenRedirect "/taobin_project/xml/page_catalog_group_forkid.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
- OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
- OpenRedirect "/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
+ OpenRedirect "/taobin_project/xml/page_catalog_group_dessert.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
+ OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
+ OpenRedirect "/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_dessert.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
- Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_forkid.lxml"
+ Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_dessert.lxml"
EndIf
If MenuKidButtonState = "Enable" Then
diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml
index 97230ec3..462bea59 100644
--- a/inter/tha/xml/multi/page_catalog.lxml
+++ b/inter/tha/xml/multi/page_catalog.lxml
@@ -283,7 +283,7 @@
Var PepsiCatalogStage = "Invisible"
Var Menu20BahtStage = "Enable"
Else
- Var PepsiCatalogStage = "Enable"
+ Var PepsiCatalogStage = "Invisible"
Var Menu20BahtStage = "Invisible"
EndIf
@@ -942,11 +942,12 @@
296
344
42
+ 50
MenuKidButtonState
-
+
+ ;