From 48ea2c7bb3e9e6c680a39430357c8d6fd61283d4 Mon Sep 17 00:00:00 2001 From: Pakin Date: Thu, 14 Nov 2024 14:38:28 +0700 Subject: [PATCH] SGP: update grade file names, video, price --- ..._posi1.png => button_overlay_11_posi1.png} | Bin ..._posi2.png => button_overlay_11_posi2.png} | Bin ..._posi1.png => button_overlay_19_posi1.png} | Bin ..._posi2.png => button_overlay_19_posi2.png} | Bin ...4_posi1.png => button_overlay_4_posi1.png} | Bin ...4_posi2.png => button_overlay_4_posi2.png} | Bin ...ng => button_overlay_catalog_17_posi1.png} | Bin ...ng => button_overlay_catalog_17_posi2.png} | Bin ...ng => button_overlay_catalog_19_posi1.png} | Bin ...ng => button_overlay_catalog_19_posi2.png} | Bin ..._posi1.png => button_overlay_11_posi1.png} | Bin ..._posi2.png => button_overlay_11_posi2.png} | Bin ..._posi1.png => button_overlay_19_posi1.png} | Bin ..._posi2.png => button_overlay_19_posi2.png} | Bin ...4_posi1.png => button_overlay_4_posi1.png} | Bin ...4_posi2.png => button_overlay_4_posi2.png} | Bin ...ng => button_overlay_catalog_17_posi1.png} | Bin ...ng => button_overlay_catalog_17_posi2.png} | Bin ...ng => button_overlay_catalog_19_posi1.png} | Bin ...ng => button_overlay_catalog_19_posi2.png} | Bin ..._posi1.png => button_overlay_11_posi1.png} | Bin ..._posi2.png => button_overlay_11_posi2.png} | Bin ..._posi1.png => button_overlay_19_posi1.png} | Bin ..._posi2.png => button_overlay_19_posi2.png} | Bin ...4_posi1.png => button_overlay_4_posi1.png} | Bin ...4_posi2.png => button_overlay_4_posi2.png} | Bin ...ng => button_overlay_catalog_17_posi1.png} | Bin ...ng => button_overlay_catalog_17_posi2.png} | Bin ...ng => button_overlay_catalog_19_posi1.png} | Bin ...ng => button_overlay_catalog_19_posi2.png} | Bin ..._posi1.png => button_overlay_11_posi1.png} | Bin ..._posi2.png => button_overlay_11_posi2.png} | Bin ..._posi1.png => button_overlay_19_posi1.png} | Bin ..._posi2.png => button_overlay_19_posi2.png} | Bin ...4_posi1.png => button_overlay_4_posi1.png} | Bin ...4_posi2.png => button_overlay_4_posi2.png} | Bin ...ng => button_overlay_catalog_17_posi1.png} | Bin ...ng => button_overlay_catalog_17_posi2.png} | Bin ...ng => button_overlay_catalog_19_posi1.png} | Bin ...ng => button_overlay_catalog_19_posi2.png} | Bin inter/sgp/menu/lang.tsv | 18 +- inter/sgp/video/script_thank.ev | 12 +- inter/sgp/xml/page_catalog_group_coffee.lxml | 63 +- inter/sgp/xml/page_catalog_group_milk.lxml | 95 +- inter/sgp/xml/page_catalog_group_other.lxml | 60 +- .../sgp/xml/page_catalog_group_recommend.lxml | 2347 +++++++++++------ inter/sgp/xml/page_catalog_group_tea.lxml | 94 +- inter/sgp/xml/page_topping_select6.lxml | 727 ++--- .../sgp/xml/page_topping_select6_blue.lxml | 717 ++--- 49 files changed, 2636 insertions(+), 1497 deletions(-) rename inter/sgp/image/menu_overlay_set/gradeA/{button_overlay_A_11_posi1.png => button_overlay_11_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeA/{button_overlay_A_11_posi2.png => button_overlay_11_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeA/{button_overlay_A_19_posi1.png => button_overlay_19_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeA/{button_overlay_A_19_posi2.png => button_overlay_19_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeA/{button_overlay_A_4_posi1.png => button_overlay_4_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeA/{button_overlay_A_4_posi2.png => button_overlay_4_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeA/{button_overlay_catalog_A_17_posi1.png => button_overlay_catalog_17_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeA/{button_overlay_catalog_A_17_posi2.png => button_overlay_catalog_17_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeA/{button_overlay_catalog_A_19_posi1.png => button_overlay_catalog_19_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeA/{button_overlay_catalog_A_19_posi2.png => button_overlay_catalog_19_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeB/{button_overlay_A_11_posi1.png => button_overlay_11_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeB/{button_overlay_A_11_posi2.png => button_overlay_11_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeB/{button_overlay_A_19_posi1.png => button_overlay_19_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeB/{button_overlay_A_19_posi2.png => button_overlay_19_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeB/{button_overlay_A_4_posi1.png => button_overlay_4_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeB/{button_overlay_A_4_posi2.png => button_overlay_4_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeB/{button_overlay_catalog_A_17_posi1.png => button_overlay_catalog_17_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeB/{button_overlay_catalog_A_17_posi2.png => button_overlay_catalog_17_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeB/{button_overlay_catalog_A_19_posi1.png => button_overlay_catalog_19_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeB/{button_overlay_catalog_A_19_posi2.png => button_overlay_catalog_19_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeC/{button_overlay_A_11_posi1.png => button_overlay_11_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeC/{button_overlay_A_11_posi2.png => button_overlay_11_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeC/{button_overlay_A_19_posi1.png => button_overlay_19_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeC/{button_overlay_A_19_posi2.png => button_overlay_19_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeC/{button_overlay_A_4_posi1.png => button_overlay_4_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeC/{button_overlay_A_4_posi2.png => button_overlay_4_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeC/{button_overlay_catalog_A_17_posi1.png => button_overlay_catalog_17_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeC/{button_overlay_catalog_A_17_posi2.png => button_overlay_catalog_17_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeC/{button_overlay_catalog_A_19_posi1.png => button_overlay_catalog_19_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeC/{button_overlay_catalog_A_19_posi2.png => button_overlay_catalog_19_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeD/{button_overlay_A_11_posi1.png => button_overlay_11_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeD/{button_overlay_A_11_posi2.png => button_overlay_11_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeD/{button_overlay_A_19_posi1.png => button_overlay_19_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeD/{button_overlay_A_19_posi2.png => button_overlay_19_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeD/{button_overlay_A_4_posi1.png => button_overlay_4_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeD/{button_overlay_A_4_posi2.png => button_overlay_4_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeD/{button_overlay_catalog_A_17_posi1.png => button_overlay_catalog_17_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeD/{button_overlay_catalog_A_17_posi2.png => button_overlay_catalog_17_posi2.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeD/{button_overlay_catalog_A_19_posi1.png => button_overlay_catalog_19_posi1.png} (100%) rename inter/sgp/image/menu_overlay_set/gradeD/{button_overlay_catalog_A_19_posi2.png => button_overlay_catalog_19_posi2.png} (100%) diff --git a/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_11_posi1.png b/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_11_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_11_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeA/button_overlay_11_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_11_posi2.png b/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_11_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_11_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeA/button_overlay_11_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_19_posi1.png b/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_19_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_19_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeA/button_overlay_19_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_19_posi2.png b/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_19_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_19_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeA/button_overlay_19_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_4_posi1.png b/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_4_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_4_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeA/button_overlay_4_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_4_posi2.png b/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_4_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeA/button_overlay_A_4_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeA/button_overlay_4_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_A_17_posi1.png b/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_17_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_A_17_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_17_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_A_17_posi2.png b/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_17_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_A_17_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_17_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_A_19_posi1.png b/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_19_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_A_19_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_19_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_A_19_posi2.png b/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_19_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_A_19_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_19_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_11_posi1.png b/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_11_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_11_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeB/button_overlay_11_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_11_posi2.png b/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_11_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_11_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeB/button_overlay_11_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_19_posi1.png b/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_19_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_19_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeB/button_overlay_19_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_19_posi2.png b/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_19_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_19_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeB/button_overlay_19_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_4_posi1.png b/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_4_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_4_posi2.png b/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeB/button_overlay_A_4_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_A_17_posi1.png b/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_17_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_A_17_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_17_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_A_17_posi2.png b/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_17_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_A_17_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_17_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_A_19_posi1.png b/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_19_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_A_19_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_19_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_A_19_posi2.png b/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_19_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_A_19_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_19_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_11_posi1.png b/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_11_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_11_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeC/button_overlay_11_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_11_posi2.png b/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_11_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_11_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeC/button_overlay_11_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_19_posi1.png b/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_19_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_19_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeC/button_overlay_19_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_19_posi2.png b/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_19_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_19_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeC/button_overlay_19_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_4_posi1.png b/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_4_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_4_posi2.png b/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeC/button_overlay_A_4_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_A_17_posi1.png b/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_17_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_A_17_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_17_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_A_17_posi2.png b/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_17_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_A_17_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_17_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_A_19_posi1.png b/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_19_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_A_19_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_19_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_A_19_posi2.png b/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_19_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_A_19_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_19_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_11_posi1.png b/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_11_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_11_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeD/button_overlay_11_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_11_posi2.png b/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_11_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_11_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeD/button_overlay_11_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_19_posi1.png b/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_19_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_19_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeD/button_overlay_19_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_19_posi2.png b/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_19_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_19_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeD/button_overlay_19_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_4_posi1.png b/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_4_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_4_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeD/button_overlay_4_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_4_posi2.png b/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_4_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeD/button_overlay_A_4_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeD/button_overlay_4_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_A_17_posi1.png b/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_17_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_A_17_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_17_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_A_17_posi2.png b/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_17_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_A_17_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_17_posi2.png diff --git a/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_A_19_posi1.png b/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_19_posi1.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_A_19_posi1.png rename to inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_19_posi1.png diff --git a/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_A_19_posi2.png b/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_19_posi2.png similarity index 100% rename from inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_A_19_posi2.png rename to inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_19_posi2.png diff --git a/inter/sgp/menu/lang.tsv b/inter/sgp/menu/lang.tsv index b7c05585..047bf645 100644 --- a/inter/sgp/menu/lang.tsv +++ b/inter/sgp/menu/lang.tsv @@ -1018,7 +1018,7 @@ TextID Note English Thai 1200000 Cups & Arms แก้ว & แขน 1200001 Move & Pay หมุน & จ่าย 1200002 Set Arms ตั้งค่าแขน -1200003 Move arms & pay cups หมุนแขน & จ่ายแก้ว +1200003 Move arms หมุนแขน & จ่ายแก้ว 1200004 Move all arms หมุนทุกแขน 1200005 1. Select arm 1. เลือกแขน 1200006 2. Select cup slot 2. เลือกแก้ว @@ -1039,7 +1039,7 @@ TextID Note English Thai 1200021 Check Cup เช็คแก้ว 1200022 Clean ล้าง 1200023 Waste ทิ้ง -1200024 Arms operation ปิด-เปิดแขน +1200024 Operating arms ปิด-เปิดแขน 1200025 Close Arm ปิดแขน 1200026 Open Arm เปิดแขน 1200027 The selected arm will * operate \n แขนทีถูกเลือกจะ * ทำงาน \n @@ -1076,7 +1076,7 @@ TextID Note English Thai 1300028 time) aren't up to standard. เวลา) ตามมาตรฐานหรือไม่ 1300029 Set grind sizes กำหนดขนาดบด 1300030 Set as default ตั้งให้เป็นค่าเริ่มต้น -1300031 (Set as default when meet standard) (ตั้งเป็นค่าเริ่มต้นเมื่อเป็นไปตามมาตรฐาน) +1300031 (Set as default when value align with standard) (ตั้งเป็นค่าเริ่มต้นเมื่อเป็นไปตามมาตรฐาน) 1300032 Brew recipes สูตรชง 1300033 Brew order ลำดับการชง 1300034 Ingredient วัตถุดิบ @@ -1153,9 +1153,9 @@ TextID Note English Thai 1500022 Temperature อุณหภูมิ 1500023 Pressure ความดัน 1500024 P1 always more than P2 P1 ต้องมากกว่า P2 เสมอ -1500025 Standard value not more than 100 - 200 ค่ามาตรฐานต้องไม่มากกว่า 100 ถึง 200 -1500026 Module shutdown automatic when reaches 2 °C ชุดโซดาจะปิดการทำงานอัตโนมัติเมื่ออุณหภูมิถึง 2 °C -1500027 Standard value around 85 psi ค่ามาตรฐานควรอยู่ประมาณ 85 psi +1500025 Standard limits should stay within 100 - 200 ค่ามาตรฐานต้องไม่มากกว่า 100 ถึง 200 +1500026 Soda system automatically shuts down at a temperature of 2°C ชุดโซดาจะปิดการทำงานอัตโนมัติเมื่ออุณหภูมิถึง 2 °C +1500027 Standard value set close to 85 psi. ค่ามาตรฐานควรอยู่ประมาณ 85 psi 1500028 Defrost cooling tank ละลายถังทำความเย็น 1500029 More soda log detail - view factory config รายละเอียดบันทึกโซดาเพิ่มเติม - ดูการตั้งค่าโรงงาน 1500030 View ดู @@ -1166,7 +1166,7 @@ TextID Note English Thai 1600002 1. Select powder slot 1. เลือกสล็อตผง 1600003 2. Select position 2. เลือกตำแหน่ง 1600004 Pay จ่าย -1600005 Change เปลี่ยน +1600005 Move to front เปลี่ยน 1600006 Pay powder จ่ายผง 1600007 1700000 Water น้ำ @@ -1180,9 +1180,9 @@ TextID Note English Thai 1800000 Ice น้ำแข็ง 1800001 Move & Pay ย้าย & จ่าย 1800002 Set Ice ตั้งน้ำแข็ง -1800003 Moving Test +1800003 Movement test 1800004 Check bucket position ตรวจสอบตำแหน่งถัง -1800005 Check bucket shutter ตรวจสอบชัตเตอร์ถัง +1800005 Check ice shutter ตรวจสอบชัตเตอร์ถัง 1800006 Bucket move to fill ice success ถังน้ำแข็งเคลื่อนที่เพื่อเติมน้ำแข็งสำเร็จ 1800007 Weight scale motor move timeout มอเตอร์เครื่องชั่งน้ำหนักหมดเวลา 1800008 Bucket move to pay ice success ถังน้ำแข็งเคลื่อนที่เพื่อจ่ายน้ำแข็งสำเร็จ diff --git a/inter/sgp/video/script_thank.ev b/inter/sgp/video/script_thank.ev index 6910325e..9720d898 100644 --- a/inter/sgp/video/script_thank.ev +++ b/inter/sgp/video/script_thank.ev @@ -14,14 +14,10 @@ EndIf If UsePepsiTheme = 1 Then ; expect-wtc - If SaveTheWorldCount = 0 Then - GetFileSizeK "taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" MainfileSize - DEBUGVAR MainfileSize - If MainfileSize = 5184722 Then - Var video_file_name = "ROOT/taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" - EndIf - Else - + GetFileSizeK "taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" MainfileSize + DEBUGVAR MainfileSize + If MainfileSize = 5184722 Then + Var video_file_name = "ROOT/taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" EndIf EndIf diff --git a/inter/sgp/xml/page_catalog_group_coffee.lxml b/inter/sgp/xml/page_catalog_group_coffee.lxml index f97879c4..982645fe 100644 --- a/inter/sgp/xml/page_catalog_group_coffee.lxml +++ b/inter/sgp/xml/page_catalog_group_coffee.lxml @@ -21892,6 +21892,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Mint_cafe_Latte.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Mint_cafe_Latte.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Mint_cafe_Latte.png" + xmlpro( 52-21-02-0057, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_5_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -21988,7 +21989,34 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_1 = "Enable" Then + Var OverlayMenuFilter1 = "52-21-01-0057" + Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0057, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_11_posi1.png") + DEBUGVAR OverlayMenuFilter1 + DEBUGVAR OverlayMenuFilter1_Value + Else + Var OverlayMenuFilter = "" + EndIf + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-21-02-0057" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0057, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + + If PD_STAGE_3 = "Enable" Then + Var OverlayMenuFilter3 = "52-21-03-0057" + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-21-03-0057, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png") + DEBUGVAR OverlayMenuFilter3 + DEBUGVAR OverlayMenuFilter3_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0057, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -22171,6 +22199,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Mint_Americano.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Mint_Americano.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Mint_Americano.png" + xmlpro( 52-21-02-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_4_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -22267,7 +22296,25 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_1 = "Enable" Then + Var OverlayMenuFilter1 = "52-21-01-0058" + Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png") + DEBUGVAR OverlayMenuFilter1 + DEBUGVAR OverlayMenuFilter1_Value + Else + Var OverlayMenuFilter = "" + EndIf + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-21-02-0058" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -23293,6 +23340,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png" + xmlpro( 52-21-03-0078, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_9_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -23389,7 +23437,16 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_3 = "Enable" Then + Var OverlayMenuFilter3 = "52-21-03-0078" + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-21-03-0078, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png") + DEBUGVAR OverlayMenuFilter3 + DEBUGVAR OverlayMenuFilter3_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-03-0078, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" diff --git a/inter/sgp/xml/page_catalog_group_milk.lxml b/inter/sgp/xml/page_catalog_group_milk.lxml index b70a07cf..87849f8a 100644 --- a/inter/sgp/xml/page_catalog_group_milk.lxml +++ b/inter/sgp/xml/page_catalog_group_milk.lxml @@ -5991,7 +5991,7 @@ Var DescLang[1][3] = "" Var DescLang[1][4] = "" Var DescLang[1][5] = "" - Var NameLang[2][0] = "banana" + Var NameLang[2][0] = "TOKYO BANANA \nMILK SMOOTHIE" Var NameLang[2][1] = "" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -6850,6 +6850,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Mint_Oreo_smoothie.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Mint_Oreo_smoothie.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Mint_Oreo_smoothie.png" + xmlpro( 52-03-03-0034, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_14_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -6946,7 +6947,16 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_3 = "Enable" Then + Var OverlayMenuFilter3 = "52-03-03-0034" + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0034, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png") + DEBUGVAR OverlayMenuFilter3 + DEBUGVAR OverlayMenuFilter3_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-03-0034, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7125,6 +7135,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Mint_Cocoa.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Mint_Cocoa.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Mint_Cocoa.png" + xmlpro( 52-03-02-0035, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_9_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -7221,7 +7232,34 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_1 = "Enable" Then + Var OverlayMenuFilter1 = "52-03-01-0035" + Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0035, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png") + DEBUGVAR OverlayMenuFilter1 + DEBUGVAR OverlayMenuFilter1_Value + Else + Var OverlayMenuFilter = "" + EndIf + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-03-02-0035" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0035, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + + If PD_STAGE_3 = "Enable" Then + Var OverlayMenuFilter3 = "52-03-03-0035" + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0035, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_10_posi1.png") + DEBUGVAR OverlayMenuFilter3 + DEBUGVAR OverlayMenuFilter3_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0035, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7404,6 +7442,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Mint_Milk.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Mint_Milk.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Mint_Milk.png" + xmlpro( 52-03-02-0036, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_6_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -7500,7 +7539,34 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_1 = "Enable" Then + Var OverlayMenuFilter1 = "52-03-01-0036" + Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0036, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_13_posi1.png") + DEBUGVAR OverlayMenuFilter1 + DEBUGVAR OverlayMenuFilter1_Value + Else + Var OverlayMenuFilter = "" + EndIf + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-03-02-0036" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0036, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + + If PD_STAGE_3 = "Enable" Then + Var OverlayMenuFilter3 = "52-03-03-0036" + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0036, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_11_posi1.png") + DEBUGVAR OverlayMenuFilter3 + DEBUGVAR OverlayMenuFilter3_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0036, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7683,6 +7749,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Mint_Milk_Straw.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Mint_Milk_Straw.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Mint_Milk_Straw.png" + xmlpro( 52-03-02-0037, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_10_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -7779,7 +7846,25 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-03-02-0037" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0037, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_10_posi1.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + + If PD_STAGE_3 = "Enable" Then + Var OverlayMenuFilter3 = "52-03-03-0037" + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0037, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_16_posi1.png") + DEBUGVAR OverlayMenuFilter3 + DEBUGVAR OverlayMenuFilter3_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0037, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" diff --git a/inter/sgp/xml/page_catalog_group_other.lxml b/inter/sgp/xml/page_catalog_group_other.lxml index c21325d7..f3406c91 100644 --- a/inter/sgp/xml/page_catalog_group_other.lxml +++ b/inter/sgp/xml/page_catalog_group_other.lxml @@ -8988,6 +8988,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_mint_lime_soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_mint_lime_soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_mint_lime_soda.png" + xmlpro( 52-05-02-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_4_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -9084,7 +9085,16 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-05-02-0060" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9263,6 +9273,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Mint_Strawberry_Soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Mint_Strawberry_Soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Mint_Strawberry_Soda.png" + xmlpro( 52-05-02-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_13_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -9359,7 +9370,16 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-05-02-0063" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_13_posi1.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_13_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9538,6 +9558,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Mint_Yuzu_Soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Mint_Yuzu_Soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Mint_Yuzu_Soda.png" + xmlpro( 52-05-02-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_16_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -9634,7 +9655,16 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-05-02-0064" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_16_posi1.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_16_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9813,6 +9843,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Mint_Plum_limenade_Soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Mint_Plum_limenade_Soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Mint_Plum_limenade_Soda.png" + xmlpro( 52-05-02-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_10_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -9909,7 +9940,16 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-05-02-0065" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10088,6 +10128,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Mint_Lychee_lime_soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Mint_Lychee_lime_soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Mint_Lychee_lime_soda.png" + xmlpro( 52-05-02-0066, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_4_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -10184,7 +10225,16 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-05-02-0066" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0066, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0066, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" diff --git a/inter/sgp/xml/page_catalog_group_recommend.lxml b/inter/sgp/xml/page_catalog_group_recommend.lxml index b4af84c1..ae8c1202 100644 --- a/inter/sgp/xml/page_catalog_group_recommend.lxml +++ b/inter/sgp/xml/page_catalog_group_recommend.lxml @@ -1,697 +1,697 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - DEBUGVAR LanguageShow - DEBUGVAR CountryName - - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var DirImage = "ROOT/taobin_project/image/page3" - EndIf - - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - ;inter-image - If CountryName = "Australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - If UsePepsiTheme = 1 Then - Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImage2 = DirImage2 + "/image/drink_option_en/" - DEBUGVAR DirImage2 - - Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImageAlter = DirImageAlter + "/image/page3_2_en/" - DEBUGVAR DirImageAlter - - - Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImage = DirImage + "/image/page3_en/" - DEBUGVAR DirImage - - Var ice_tab_text = "Ice will be ready at " - - - - EndIf - - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu1Selected = "PressForever" - - Var OreoBigButtonEnable = "Enable" - - If $12-01-01-0001.Button = "Invisible" Then - Var esp102101001Enable = "Invisible" - Var esp122101001Enable = "Enable" - - Else - Var esp102101001Enable = "Enable" - Var esp122101001Enable = "Invisible" - - EndIf - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - If show_eng = "true" Then - - Var text_unavailable = "UNAVAILABLE###size=16" - Else - Var text_unavailable = "หมด###size=32" - - EndIf - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - If UsePepsiTheme = 1 Then - Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImage2 = DirImage2 + "/image/drink_option_en/" - - - Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImageAlter = DirImageAlter + "/image/page3_2_en/" - - - Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImage = DirImage + "/image/page3_en/" - - Var ice_tab_text = "Ice will be ready at " - - - - EndIf - - 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 - BackgroundColor - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - - DEBUGVAR LanguageShow - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Var ice_tab_text = "Ice will be ready at " - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - If UsePepsiTheme = 1 Then - Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImage2 = DirImage2 + "/image/drink_option_en/" - - Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImageAlter = DirImageAlter + "/image/page3_2_en/" - - - Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName - Var DirImage = DirImage + "/image/page3_en/" - Var ice_tab_text = "Ice will be ready at " - - - - EndIf - - SAVELOG "EventLanguageOnChange menu -list" - - Refresh - - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 - 38 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - - - - - -; under line - - 0 - 494 - "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - - - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 940 - 462 - 22 - 170 - 30 - KanitMediumTTF - WTCBlueColor - PriceUnitText - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + DEBUGVAR LanguageShow + DEBUGVAR CountryName + + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + + ;inter-image + If CountryName = "Australia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + If UsePepsiTheme = 1 Then + Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImage2 = DirImage2 + "/image/drink_option_en/" + DEBUGVAR DirImage2 + + Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImageAlter = DirImageAlter + "/image/page3_2_en/" + DEBUGVAR DirImageAlter + + + Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImage = DirImage + "/image/page3_en/" + DEBUGVAR DirImage + + Var ice_tab_text = "Ice will be ready at " + + + + EndIf + + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + Var Menu1Selected = "PressForever" + + Var OreoBigButtonEnable = "Enable" + + If $12-01-01-0001.Button = "Invisible" Then + Var esp102101001Enable = "Invisible" + Var esp122101001Enable = "Enable" + + Else + Var esp102101001Enable = "Enable" + Var esp122101001Enable = "Invisible" + + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + If show_eng = "true" Then + + Var text_unavailable = "UNAVAILABLE###size=16" + Else + Var text_unavailable = "หมด###size=32" + + EndIf + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + If UsePepsiTheme = 1 Then + Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImage2 = DirImage2 + "/image/drink_option_en/" + + + Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImageAlter = DirImageAlter + "/image/page3_2_en/" + + + Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImage = DirImage + "/image/page3_en/" + + Var ice_tab_text = "Ice will be ready at " + + + + EndIf + + 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 + BackgroundColor + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Var ice_tab_text = "Ice will be ready at " + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + If UsePepsiTheme = 1 Then + Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImage2 = DirImage2 + "/image/drink_option_en/" + + Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImageAlter = DirImageAlter + "/image/page3_2_en/" + + + Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImage = DirImage + "/image/page3_en/" + Var ice_tab_text = "Ice will be ready at " + + + + EndIf + + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + + + + +; under line + + 0 + 494 + "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + + + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 940 + 462 + 22 + 170 + 30 + KanitMediumTTF + WTCBlueColor + PriceUnitText + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + 16 10 @@ -705,7 +705,862 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 39 +; menu_new_list 42 + ; ==================> Len = 3 + ; - - 52-21-03-0078 + + 33 + 22 + 225 + 296 + Flag( 52-21-03-0078.Button,Disable=Invisible,$Sum5221030078) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM ESPRESSO\nCARAMEL OREO + + PREMIUM ESPRESSO\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coffee, Milk, Caramel Syrup, Oreo + + Coffee, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-21-03-0078.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-21-03-0078.Button + StringFmt( $52-21-03-0078.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5221030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-21-03-0078.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5221030078 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - - 52-02-03-0057 + + 33 + 22 + 225 + 296 + Flag( 52-02-03-0057.Button,Disable=Invisible,$Sum5202030057) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM GREEN TEA\nCARAMEL OREO + + PREMIUM GREEN TEA\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Matcha, Milk, Caramel Syrup, Oreo + + Matcha, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-02-03-0057.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-02-03-0057.Button + StringFmt( $52-02-03-0057.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5202030057 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-02-03-0057.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5202030057 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - - 52-02-03-0058 + + 33 + 22 + 225 + 296 + Flag( 52-02-03-0058.Button,Disable=Invisible,$Sum5202030058) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM THAI TEA\nCARAMEL OREO + + PREMIUM THAI TEA\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Thai Tea, Milk, Caramel Syrup, Oreo + + Thai Tea, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-02-03-0058.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-02-03-0058.Button + StringFmt( $52-02-03-0058.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5202030058 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-02-03-0058.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5202030058 + + 000013 + + center-vertical-horizontal + + ; ==================> Len = 3 ; 52-01-01-0001 - - @@ -1095,7 +1950,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-21-01-0001" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") @@ -1663,7 +2518,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-21-01-0003" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0003, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") @@ -1672,7 +2527,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-21-02-0001" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") @@ -8099,7 +8954,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-21-01-0004" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0004, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png") @@ -8108,7 +8963,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-21-02-0002" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") @@ -8117,7 +8972,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-21-03-0002" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-21-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png") @@ -8685,7 +9540,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-02-01-0026" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-02-01-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -8694,7 +9549,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0026" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") @@ -8703,7 +9558,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-02-03-0026" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -9271,7 +10126,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-03-01-0002" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -9280,7 +10135,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-03-02-0002" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png") @@ -9289,7 +10144,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0002" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -9578,7 +10433,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-03-01-0001" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png") @@ -9587,7 +10442,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-03-02-0001" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png") @@ -9596,7 +10451,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0001" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png") @@ -10160,7 +11015,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0011" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0011, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png") @@ -10445,7 +11300,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-03-01-0022" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0022, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_15_posi1.png") @@ -10454,7 +11309,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-03-02-0022" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0022, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png") @@ -10463,7 +11318,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0022" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0022, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_16_posi1.png") @@ -10752,7 +11607,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0009" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0009, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi2.png") @@ -11312,7 +12167,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0049" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png") @@ -11597,7 +12452,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0062" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") @@ -11882,7 +12737,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0076" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0076, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png") @@ -12167,7 +13022,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0035" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0035, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png") @@ -12452,7 +13307,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0025" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png") @@ -12461,7 +13316,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-05-03-0025" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_12_posi1.png") @@ -12650,28 +13505,28 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - -;BigLogoLayout - - - - + + + + + + + +;BigLogoLayout + + + + diff --git a/inter/sgp/xml/page_catalog_group_tea.lxml b/inter/sgp/xml/page_catalog_group_tea.lxml index 82850d37..1d1b7132 100644 --- a/inter/sgp/xml/page_catalog_group_tea.lxml +++ b/inter/sgp/xml/page_catalog_group_tea.lxml @@ -7632,27 +7632,28 @@ ; ==================> Len = 3 - ; - 52-02-02-0050 52-02-03-0050 + ; 52-02-01-0050 52-02-02-0050 52-02-03-0050 33 22 225 296 - Flag( 52-02-02-0050.Button,52-02-03-0050.Button,$Sum52020200505202030050) + Flag( 52-02-01-0050.Button,52-02-02-0050.Button,52-02-03-0050.Button,$Sum520201005052020200505202030050) @@ -486,7 +486,7 @@ show_btp "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; @@ -500,23 +500,23 @@ Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 Var text_show_blend_x = 872 - + If SugarSoundFlag = 1 Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" EndIf - + Endif If SelectDrinkType = 1 Then Var showname = NameLang[IndexDrinktType][LanguageShowByIndex] Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex] - + Else Var showname = aliasName[LanguageShowByIndex] Var showdesc = aliasName[LanguageShowByIndex] - + EndIf - + BackslashNToEnter showname BackslashNToEnter showdesc CRLFToSpace showname @@ -534,23 +534,23 @@ "ROOT/taobin_project/image/page2/bn_back_arrow.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - + Open OpenFromXML - - + + DEBUGVAR MAT_ID_STRAW_OFFER DEBUGVAR MAT_ID_LID_OFFER - + DEBUGVAR TOPPING1 DEBUGVAR TOPPING1_EXT_2 @@ -568,18 +568,18 @@ DEBUGVAR toppingID1index7 DEBUGVAR toppingID1index8 DEBUGVAR toppingID1index9 - + DEBUGVAR toppingID2index1 DEBUGVAR toppingID2index2 DEBUGVAR toppingID2index3 DEBUGVAR toppingID2index4 DEBUGVAR toppingID2index5 - + DEBUGVAR toppingID1Default DEBUGVAR toppingID2Default DEBUGVAR toppingID3Default - - + + DEBUGVAR MenuCodeName1 DEBUGVAR MenuCodeName1_State DEBUGVAR MenuCodeName2 @@ -599,21 +599,21 @@ If TOPPING6 = "Topping-Volcano" Then - - If toppingID6price2 > 0 Then + + If toppingID6price2 > 0 Then DEBUGVAR toppingID6price2 DEBUGVAR DisplayFormat Var toppingID6price2Conv !assigned StringFmt( toppingID6price2 , DisplayFormat, PreScaleConvertShow) - + DEBUGVAR toppingID6price2Conv Var text_price_6 = "" Var text_price_6 = toppingID6price2Conv + ")" Var text_price_6 = "(+" + text_price_6 - - + + DEBUGVAR text_price_6 Else @@ -624,7 +624,7 @@ If blend_button_state = "PressForever" Then Var showOreoAddEnable = "Enable" - Var showText8 = "Invisible" + Var showText8 = "Invisible" Else Var showOreoAddEnable = "Disable" Var showText8 = "Enable" @@ -638,7 +638,7 @@ If hot_button_state = "Disable2" Then If cold_button_state = "PressForever" Then Var showOreoAddEnable = "Enable" - Var showText8 = "Invisible" + Var showText8 = "Invisible" EndIf EndIf EndIf @@ -666,7 +666,7 @@ EndIf EndIf - + ; i f cold menu disable away If cold_button_state = "PressForever" Then If showOreoAddEnable = "Enable" Then @@ -688,21 +688,21 @@ EndIf EndIf - STRCONTAIN "9701" BrewParam IgnoreLidStraw + STRCONTAIN "9701" BrewParam IgnoreLidStraw DEBUGVAR BrewParam DEBUGVAR IgnoreLidStraw - + Var h_block_of_sugar = 210 - - + + If IgnoreLidStraw = "true" Then Var IgnoreLidStraw = "false" - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" Var ShowStrawOnly = "Invisible" - + Else DEBUGVAR MAT_ID_STRAW_OFFER @@ -710,7 +710,7 @@ DEBUGVAR StrawState - Var ShowLidStraw = "Enable" + Var ShowLidStraw = "Enable" If StrawState = "Enable" Then If MAT_ID_STRAW_OFFER = "Enable" Then Var StrawState = MAT_ID_STRAW_OFFER @@ -718,7 +718,7 @@ Var StrawState = MAT_ID_STRAW_OFFER EndIf EndIf - + If StrawState = "Press" Then Var Seeker.thankStrawFlag = 1 Else @@ -736,45 +736,45 @@ DEBUGVAR MAT_ID_STRAW_OFFER DEBUGVAR MAT_ID_LID_OFFER - + EndIf - + ; Override all If Service_LidStraw = "Disable" Then - Var ShowLidStraw = "Enable" - ;Var ShowLidOnly = "Invisible" + Var ShowLidStraw = "Enable" + ;Var ShowLidOnly = "Invisible" ;Var ShowStawOnly = "Invisible" - + Var StrawState = "Disable" Var LidState = "Disable" EndIf If StrawState = "Enable" Then - Var StrawDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" Else If StrawState = "Press" Then - Var StrawDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" Else - Var StrawDeactiveButton = "Enable" + Var StrawDeactiveButton = "Enable" EndIf EndIf - + If LidState = "Enable" Then - Var LidDeactiveButton = "Invisible" + Var LidDeactiveButton = "Invisible" Else If LidState = "Press" Then - Var LidDeactiveButton = "Invisible" + Var LidDeactiveButton = "Invisible" Else - Var LidDeactiveButton = "Enable" + Var LidDeactiveButton = "Enable" EndIf EndIf - - DEBUGVAR TOPPING1 - If UserSeletedSugar = 0 Then + + DEBUGVAR TOPPING1 + If UserSeletedSugar = 0 Then If SugarModeUpdateWhenChangeDrinkType = 1 Then Var SugarModeUpdateWhenChangeDrinkType = 0 RefreshAll @@ -788,11 +788,11 @@ EndIf Var sugar_default_flag = 0 - + ; Suger 4 step cold If TOPPING1 = "Suger 4 step cold" Then - - + + Var BGSugar = "Invisible" Var ShiftSugarStep = 1 @@ -811,18 +811,18 @@ Var SugarPressPicLv3 = "ROOT/taobin_project/image/topping2_en/bp_cold_sugar4lv_sg3.png" Var SugarPressPicLv4 = "ROOT/taobin_project/image/topping2_en/bp_cold_sugar4lv_sg4.png" - + If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 Var SugarZeroCalOption = "Invisible" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -841,8 +841,8 @@ ; Suger 4 step hot If TOPPING1 = "Suger 4 step hot" Then - - + + Var BGSugar = "Invisible" Var ShiftSugarStep = 1 @@ -862,18 +862,18 @@ Var SugarPressPicLv4 = "ROOT/taobin_project/image/topping2_en/bp_hot_sugar4lv_sg4.png" - + If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 Var SugarZeroCalOption = "Invisible" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -891,16 +891,16 @@ EndIf DEBUGVAR RecipeTag2 - ; + ; If TOPPING1 = "Sugar" Then - + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" Else Var BGSugar = "Enable" EndIf - + Var ShiftSugarStep = 1 Var SugarState1 = "Enable" Var SugarState2 = "Enable" @@ -908,18 +908,18 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" - + If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 Var SugarZeroCalOption = "Invisible" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -939,9 +939,9 @@ Var SugarState1 = "PressForever" Var SugarZeroCalOption = "Invisible" EndIf - + EndIf - + If TOPPING1 = "Powder Sugar" Then If RecipeTag2 = "Topping6Step" Then @@ -950,7 +950,7 @@ Else Var BGSugar = "Enable" EndIf - + Var ShiftSugarStep = 1 Var SugarState1 = "Enable" Var SugarState2 = "Enable" @@ -982,12 +982,12 @@ Var sugar_default_flag = 1 Var SugarZeroCalOption = "Invisible" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1010,22 +1010,22 @@ DEBUGVAR toppingID1Default DEBUGVAR SugarState1 - + DEBUGVAR toppingID1Default DEBUGVAR SugarState1 EndIf - + If TOPPING1 = "Sugar Premix 25" Then - + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" Else Var BGSugar = "Enable" EndIf - + Var ShiftSugarStep = 2 Var SugarState1 = "Disable" Var SugarState2 = "Enable" @@ -1050,12 +1050,12 @@ Var SugarPressPicLv5 = "ROOT/taobin_project/image/topping2_en/bp_sugar5level_sg5.png" Var SugarPressPicLv6 = "ROOT/taobin_project/image/topping2_en/bp_sugar5level_sg6.png" - + If toppingID1index1 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1070,7 +1070,7 @@ Var SugarState5 = "PressForever" Var sugar_default_flag = 1 EndIf - + If sugar_default_flag = 0 Then Var SugarState2 = "PressForever" EndIf @@ -1079,7 +1079,7 @@ EndIf If TOPPING1 = "Powder Sugar Premix 50" Then - + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" @@ -1108,7 +1108,7 @@ Else Var SugarState3 = "Enable" - + Var SugarNormalPicLv1 = "" Var SugarNormalPicLv2 = "" Var SugarNormalPicLv3 = "ROOT/taobin_project/image/topping2_en/bn_sugar4level_sg3.png" @@ -1145,7 +1145,7 @@ If sugar_default_flag = 0 Then Var SugarState3 = "PressForever" EndIf - + EndIf If TOPPING1 = "Powder Sugar Premix 25" Then @@ -1157,19 +1157,19 @@ EndIf Var ShiftSugarStep = 2 - + Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" - + If toppingID1index1 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1184,11 +1184,11 @@ Var SugarState5 = "PressForever" Var sugar_default_flag = 1 EndIf - + If sugar_default_flag = 0 Then Var SugarState2 = "PressForever" EndIf - + EndIf Var SugarModeUpdateWhenChangeDrinkType = 0 @@ -1200,7 +1200,7 @@ Var ShiftSugarStep = 1 Var SugarModeUpdateWhenChangeDrinkType = 1 EndIf - + If TOPPING1 = "Suger 4 step hot" Then Var BGSugarHotHealthy = "Enable" Var BGSugarColdHealthy = "Invisible" @@ -1208,17 +1208,17 @@ Var ShiftSugarStep = 1 Var SugarModeUpdateWhenChangeDrinkType = 1 EndIf - + Var ShowCollagenOnly = "Enable" Var BugFlag = 1 - + Var topping1 = toppingID1Default Var ToppingGotoPayment = "false" - + Var SugarSoundFlag = 0 If BGSugarColdHealthy = "Enable" Then Var SugarSoundFlag = 1 @@ -1230,29 +1230,29 @@ If BGSugarNew = "Enable" Then Var SugarSoundFlag = 1 - + EndIf If BGSugar = "Enable" Then Var SugarSoundFlag = 1 - + EndIf DEBUGVAR SugarSoundFlag - + If SugarSoundFlag = 1 Then If SelectDrinkType = 1 Then - If show_eng = "true" Then + If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" - + ; Play Sound #zone Play PlaySoundLag EndIf EndIf EndIf - + DEBUGVAR SelectDrinkType @@ -1263,17 +1263,17 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" EndIf - + Else - EndIf - ; End of UserSeletedSugar = 0 + EndIf + ; End of UserSeletedSugar = 0 Refresh - + Var collagenShow = "true" ;-BEGIN shot layout - + If topping_price_refresh = 1 Then Var topping_price_refresh = 0 @@ -1281,133 +1281,133 @@ Var shot_h_layout = 218 If TOPPING2 = "shot coffee" Then - + Var ShotCoffeeBG = "Enable" Var showShotEnable = "Enable" Var ExtraTopping = "Enable" Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) - + DEBUGVAR toppingID2price2Conv Var text_shot_normal_add = toppingID2price2Conv + ")" - Var text_shot_normal_add = "(+" + text_shot_normal_add - + Var text_shot_normal_add = "(+" + text_shot_normal_add + Refresh EndIf - + If TOPPING2 = "shot coffee termtem" Then - + Var ShotCoffeeBG = "Enable" Var showShotEnable = "Enable" - + Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "shot coffee 1003" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "shot coffee 1007" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "shot coffee 1008" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1009" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1101" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1102" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf - + If TOPPING2 = "add-show-1103" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1104" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf - + If TOPPING2 = "add-show-1105" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1106" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If ShotCoffeePremium = "Enable" Then Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) - + DEBUGVAR toppingID2price2Conv Var text_price_topping = toppingID2price2Conv + ")" - Var text_price_topping = "(+" + text_price_topping + Var text_price_topping = "(+" + text_price_topping EndIf @@ -1419,19 +1419,19 @@ Var ShowCollagenOnly = "Invisible" EndIf - EndIf + EndIf ;topping_price_refresh = 0 If MenuCodeName1 = "OatMilk" Then Var OatMilkToppingEnable = "Enable" - + DEBUGVAR OatMilkOnTopPrice Var OatMilkOnTopPriceStr !assigned StringFmt( OatMilkOnTopPrice , DisplayFormat, PreScaleConvertShow) - + Var text_price_oat_milk = OatMilkOnTopPriceStr + ")" - Var text_price_oat_milk = "(+" + text_price_oat_milk + Var text_price_oat_milk = "(+" + text_price_oat_milk Var OatMilkAddAmount = OatMilkOnTopPrice @@ -1444,21 +1444,21 @@ Var OatMilkEnable = "Enable" EndIf EndIf - - + + SAVELOG ToppingGotoPayment If ToppingGotoPayment = "true" Then Topping "Select" SelectDrink ; Pack - + Topping "Pack" ExtendDataCurr Var Seeker.ExtendDataCurr = ExtendDataCurr OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment.xml" EndIf - - + + If RoadShow = "true" Then Var PriceShowValue = "Free" EndIf @@ -1485,12 +1485,19 @@ EndIf EndIf EndIf - + + + + DEBUGVAR OverlayMenuFilter DEBUGVAR OverlayMenuFilter1_Value DEBUGVAR OverlayMenuFilter2_Value DEBUGVAR OverlayMenuFilter3_Value + DEBUGVAR hot_button_state + DEBUGVAR cold_button_state + DEBUGVAR blend_button_state + DEBUGVAR SugarNormalPicLv1 DEBUGVAR SugarNormalPicLv2 DEBUGVAR SugarNormalPicLv3 @@ -1508,8 +1515,8 @@ ;Var BugFlag = 1 If CartUpdate = "true" Then Var CartUpdate = "-" - - + + If CART_COUNT = 3 Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment_multi.xml" @@ -1519,7 +1526,7 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" Else OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf EndIf EndIf @@ -1544,14 +1551,14 @@ 374 399 - eval( + eval( If IsSmoRet = "true" Then Var return = "Enable" Else Var return = "Invisible" EndIf -) - +) + "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1597,7 +1604,7 @@ ; ; ;- FRAME SCORELLL - + 52 881 1080 @@ -1607,12 +1614,12 @@ 1 - + ; show_select_type 988 162 20 - show_select_type + show_select_type "ROOT/taobin_project/image/topping_inter/drink_select_type.png" @@ -1643,9 +1650,9 @@ "ROOT/taobin_project/image/topping_inter/bt_hot_selected.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var SelectDrinkType = 1 - + SAVELOG "Press hot" Var hot_button_state = "PressForever" @@ -1679,7 +1686,7 @@ Var high_light_drink_type = "Invisible" Var IndexDrinktType = 0 - + Var OverlayMenuFilter = OverlayMenuFilter1_Value @@ -1708,9 +1715,9 @@ "ROOT/taobin_project/image/topping_inter/bt_cold_selected_no.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var SelectDrinkType = 1 - + SAVELOG "Press cold" Var cold_button_state = "PressForever" @@ -1734,7 +1741,7 @@ Var blend_button_state = "Enable" EndIf EndIf - + Var BugFlag = 0 Var topping_price_refresh = 0 Topping "Load" PD_CODE2 @@ -1765,9 +1772,9 @@ "ROOT/taobin_project/image/topping_inter/bt_cold_selected_no.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var SelectDrinkType = 1 - + SAVELOG "Press cold" Var normal_button_state = "PressForever" @@ -1791,7 +1798,7 @@ Var blend_button_state = "Enable" EndIf EndIf - + Var BugFlag = 0 Var topping_price_refresh = 0 Topping "Load" PD_CODE2 @@ -1822,8 +1829,8 @@ "ROOT/taobin_project/image/topping_inter/bt_smoothie_selected_no.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - + + SAVELOG "Press blend" Var SelectDrinkType = 1 @@ -1855,8 +1862,13 @@ Var IndexDrinktType = 2 + + DEBUGVAR OverlayMenuFilter + Var OverlayMenuFilter = OverlayMenuFilter3_Value + DEBUGVAR OverlayMenuFilter + 26 @@ -1918,7 +1930,7 @@ 988 156 20 - BGSugarNew + BGSugarNew ; sugar layout "Enable" @@ -1948,7 +1960,7 @@ "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg1.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -1958,7 +1970,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -1987,7 +1999,7 @@ "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSeletedSugar @@ -2036,7 +2048,7 @@ "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg3.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -2056,7 +2068,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "PressForever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -2083,7 +2095,7 @@ "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg4.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -2103,7 +2115,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" @@ -2137,7 +2149,7 @@ "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg5.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR5" If SelectDrinkType = 0 Then @@ -2157,7 +2169,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" @@ -2191,7 +2203,7 @@ "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg6.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR6" If SelectDrinkType = 0 Then @@ -2211,7 +2223,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -2258,7 +2270,7 @@ 988 156 20 - BGSugarHotHealthy + BGSugarHotHealthy ; sugar layout BGSugarHotHealthy @@ -2287,7 +2299,7 @@ SugarPressPicLv1 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -2297,7 +2309,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -2324,7 +2336,7 @@ SugarPressPicLv2 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSeletedSugar @@ -2362,7 +2374,7 @@ SugarPressPicLv3 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -2397,7 +2409,7 @@ SugarPressPicLv4 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -2446,7 +2458,7 @@ 988 156 20 - BGSugarColdHealthy + BGSugarColdHealthy ; sugar layout BGSugarColdHealthy @@ -2474,7 +2486,7 @@ SugarPressPicLv1 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -2484,7 +2496,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -2512,7 +2524,7 @@ SugarPressPicLv2 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSeletedSugar @@ -2550,7 +2562,7 @@ SugarPressPicLv3 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -2585,7 +2597,7 @@ SugarPressPicLv4 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -2663,9 +2675,9 @@ "ROOT/taobin_project/image/topping2/bp_cereal.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG " OatMilkEnable " - + If OatMilkEnable = "Press" Then Var OatMilkEnable = "Enable" @@ -2680,7 +2692,7 @@ -; +; -; +; -; +; -; +; @@ -3439,7 +3451,7 @@ ; "0x00BDFF" 500 Var( DirImage + "/new_multi.png" ) - + @@ -3452,17 +3464,17 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;Var Seeker = "curr" - + DEBUGVAR PriceDrinkTmp - + ;Var Seeker.PriceDrink = PriceDrinkTmp - + Var PriceDrink = PriceDrinkTmp - + SAVELOG "USER press next ( topping ) - new" If SugarState1 = "PressForever" Then @@ -3556,38 +3568,38 @@ If StrawState = "Press" Then - Machine StrawOrder + Machine StrawOrder Var LedLidBlink = "true" EndIf If LidState = "Press" Then - Machine LidOrder + Machine LidOrder Var LedLidBlink = "true" - Var bg_lidProblem_ST = "Enable" + Var bg_lidProblem_ST = "Enable" Else Var bg_lidProblem_ST = "Invisible" EndIf - + If SelectDrinkType = 0 Then - + Else Var StrawState = "Enable" Var LidState = "Enable" EndIf - ; - - + ; + + Var SelectDrink = UserSelectProductCode - + Var Seeker.selected_a_drink = UserSelectProductCode DEBUGVAR Seeker.selected_a_drink - ; Set drink + ; Set drink If Seeker = "curr" Then Topping "Select" UserSelectProductCode - ; Set option toppinng and pack + ; Set option toppinng and pack Topping "Select1-ID" topping1 Topping "Select2-ID" topping2 Topping "Select3-ID" topping3 @@ -3601,7 +3613,7 @@ Topping "__select" UserSelectProductCode - ; Set option toppinng and pack + ; Set option toppinng and pack Topping "__select1-id" topping1 Topping "__select2-id" topping2 Topping "__select3-id" topping3 @@ -3619,7 +3631,7 @@ EndIf DEBUGVAR Seeker - DEBUGVAR Seeker.ExtendData + DEBUGVAR Seeker.ExtendData Var Seeker.PictureDrink = PictureDrink Var Seeker.showname = showname @@ -3645,7 +3657,7 @@ Else If SelectDrinkType = 1 Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_payment.xml" + Open "ROOT/taobin_project/xml/page_payment.xml" EndIf EndIf @@ -3653,7 +3665,7 @@ Var high_light_drink_type = "Enable" EndIf Else - + If CART1_STATUS = "EMPTY" Then Cart "AddMenuID" 1 Else @@ -3723,7 +3735,7 @@ Var img_cold_dis = "/bt_cold_disable.png" Var img_cold_dis2 = "/bt_cold_disable2.png" EndIf - + If img_smth_no_flag = 1 Then SAVELOG "Smoothies change img. 1" Var img_smth = "/bt_smoothie_no.png" @@ -3758,12 +3770,12 @@ DEBUGVAR menu_name_thai_cold SAVELOG "FUNCTION2" - + Var TOPPING_PRICE = 0 Var SelectDrinkType = 0 - + ; Set default If SelectCountDrinkType = 1 Then If DefaultDrinkType = 1 Then @@ -3784,7 +3796,7 @@ Var normal_button_state = "PressForever" Var SelectDrinkType = 1 EndIf - + Var IndexDrinktType = 1 EndIf If DefaultDrinkType = 3 Then @@ -3815,7 +3827,7 @@ Machine PreparCup EndIf - + If cold_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD2 Var UserSelectProductCode = PD_CODE2 @@ -3836,7 +3848,7 @@ Machine PreparCup EndIf - + If blend_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD3 Var UserSelectProductCode = PD_CODE3 @@ -3864,7 +3876,7 @@ BackslashNToEnter showdesc CRLFToSpace showname CRLFToSpace showdesc - + DEBUGVAR PriceDrinkNoTop DEBUGVAR PriceDiff @@ -3880,18 +3892,18 @@ Var TOPPING_PRICE = 0 Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - + Var topping2 = toppingID2index2 - + Var DisableUsingCode = "true" - + Var showText7 = "Enable" SAVELOG "Select premi normal shot" Else - If showShotEnable = "Press" Then + If showShotEnable = "Press" Then If blendedState = "Press" Then Var PriceDrinkTmp = PriceDrinkNoTop EndIf @@ -3902,11 +3914,11 @@ ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - + Var topping2 = toppingID2index2 - + Var DisableUsingCode = "true" - + Var showText7 = "Enable" SAVELOG "Select add normal shot" @@ -3914,7 +3926,7 @@ If blendedState = "Disable" Then Var blendedState = "Enable" EndIf - + Var PriceDrinkTmp = PriceDrinkNoTop Var topping2 = toppingID2index1 @@ -3942,9 +3954,9 @@ Var topping6 = toppingID6index1 Var DisableUsingCode = "false" - + EndIf - + DEBUGVAR OatMilkEnable DEBUGVAR MenuCodeName1 DEBUGVAR MenuCodeName1_State @@ -3957,7 +3969,7 @@ EndIf EndIf EndIf - + DEBUGVAR SelectDrinkType @@ -3975,7 +3987,7 @@ SAVELOG PriceDrinkTmp If RoadShow = "true" Then - + Var PriceDrinkTmpShow = "Free" DEBUGVAR SelectDrink2 @@ -3989,7 +4001,22 @@ Var Timeout = 0 - + + If hot_button_state = "PressForever" Then + DEBUGVAR "Change OverlayMenuFilter --> 1" + Var OverlayMenuFilter = OverlayMenuFilter1_Value + Else + If cold_button_state = "PressForever" Then + DEBUGVAR "Change OverlayMenuFilter --> 2" + Var OverlayMenuFilter = OverlayMenuFilter2_Value + Else + If blend_button_state = "PressForever" Then + DEBUGVAR "Change OverlayMenuFilter --> 3" + Var OverlayMenuFilter = OverlayMenuFilter3_Value + EndIf + EndIf + EndIf + RefreshAll @@ -4022,7 +4049,7 @@ diff --git a/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml b/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml index a8e461ea..3efe6a6c 100644 --- a/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml +++ b/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml @@ -6,13 +6,13 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - + Var UserSeletedSugar = 0 SAVELOG "Event Open Select 6 SGP" Var y_topping_bg = 912 - + Var CHECK_EventOpen_Double = CHECK_EventOpen_Double + 1 If CHECK_EventOpen_Double > 1 Then WRITE_FILE "/mnt/sdcard/xml_alert_bug" "double called" @@ -30,7 +30,7 @@ Var SaveProductCodeSelect = "-" Var UserSelectProductCode = "-" - + Var showText4 = "Invisible" Var showText7 = "Invisible" @@ -38,8 +38,8 @@ Var blendedState = "Enable" Var DisableUsingCode = "false" - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" Var ShowCollagenOnly = "Invisible" Var blendedStateShow = "Invisible" @@ -48,7 +48,7 @@ Var ShowLidStraw = "Invisible" Var ShowStrawOnly = "Invisible" Var ShowLidOnly = "Invisible" - + ; On open Var lidAndStrawOldPageIgnore = "true" Var SugarState1 = "Invisible" @@ -57,9 +57,9 @@ Var SugarState4 = "Invisible" Var SugarState5 = "Invisible" Var SugarState6 = "Invisible" - + Var AddShotEnable = "Invisible" - + Var BGSugar = "Invisible" Var ShotCoffeeBG = "Invisible" @@ -80,7 +80,7 @@ ; On open Var LidState = Lid1Status - + ;SAVELOG PreviseXMLFileName2 @@ -91,8 +91,8 @@ Var BugFlag = 0 - If show_eng = "true" Then - + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" @@ -106,7 +106,7 @@ Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 Else - + Var DirImage = "ROOT/taobin_project/image/topping2" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" @@ -119,23 +119,23 @@ Var topping_shot_price_x = 600 Var text_x_add_oreo_price = 490 Var text_show_normal_x = 386 - + EndIf Var bg_strawlid = DirImage + "/bg_strawlid.png" Var bg_straw_only = DirImage + "/bg_straw_only.png" Var bg_lid_only = DirImage + "/bg_lid_only.png" - + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" - + Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" - - + + ;Var blendedState = "Enable" ;Var ShotCoffeeBG = "Enable" ;Var showShotEnable = "Enable" @@ -145,16 +145,16 @@ Var ShiftSugarStep = 1 - + CRLFToSpace showname CRLFToSpace showdesc - + ;- Begin Var PriceDrinkNoTop = PriceDrink Var PriceDrinkTmp = PriceDrink Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp Var Timeout = 0 - + ;SAVELOG PriceDrinkTmp ;- End @@ -176,19 +176,19 @@ DEBUGVAR backGroundAddExtra DEBUGVAR backGroundAddShotPremium - + DEBUGVAR MultiPayEnable DEBUGVAR CART_COUNT Var btnAddCart = "Invisible" - If MultiPayEnable = "true" Then + If MultiPayEnable = "true" Then Var btnAddCart = "Enable" If CART_COUNT = 3 Then - Var btnAddCart = "Invisible" + Var btnAddCart = "Invisible" EndIf EndIf - Var LidDeactiveButton = "Invisible" - Var StrawDeactiveButton = "Invisible" + Var LidDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" Machine DoorClose Machine DoorLidClose @@ -198,7 +198,7 @@ Var NEW_MULTI = "Invisible" Var high_light_drink_type = "Invisible" - + Var text_hot_color = WTCBlueColor Var text_cold_color = WTCBlueColor Var text_blender_color = WTCBlueColor @@ -239,20 +239,20 @@ If hot_button_state = "Disable2" Then Var text_price_d1 = "" Else - Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormatFull, PreScaleConvertShow) + Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormatFull, PreScaleConvertShow) EndIf If cold_button_state = "Disable2" Then Var text_price_d2 = "" Else - Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormatFull, PreScaleConvertShow) + Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormatFull, PreScaleConvertShow) EndIf - + If blend_button_state = "Disable2" Then Var text_price_d3 = "" Else - Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormatFull, PreScaleConvertShow) + Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormatFull, PreScaleConvertShow) EndIf If RoadShow = "true" Then @@ -335,25 +335,25 @@ 1000 - + DEBUGVAR Timeout Var Timeout = Timeout + 1 - + If Timeout > 40 Then Var Timeout = 0 - If Seeker = "next" Then + If Seeker = "next" Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf - + EndIf - If MultiPayEnable = "true" Then + If MultiPayEnable = "true" Then If NEW_MULTI = "Invisible" Then Var NEW_MULTI = "Enable" Else @@ -363,18 +363,18 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - + EndIf EndIf Refresh TimerReset - + 0 @@ -396,17 +396,17 @@ show_btp "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; eng SAVELOG "Lang change!" - If show_eng = "true" Then + If show_eng = "true" Then Var show_eng = "false" Else Var show_eng = "true" EndIf - If show_eng = "true" Then - + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" @@ -420,7 +420,7 @@ Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 Else - + Var DirImage = "ROOT/taobin_project/image/topping2" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" @@ -433,31 +433,31 @@ Var topping_shot_price_x = 600 Var text_x_add_oreo_price = 490 Var text_show_normal_x = 386 - + EndIf Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" - + Var bg_strawlid = DirImage + "/bg_strawlid.png" Var bg_straw_only = DirImage + "/bg_straw_only.png" Var bg_lid_only = DirImage + "/bg_lid_only.png" - + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" - + Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" - + CRLFToSpace showname CRLFToSpace showdesc - + If SugarSoundFlag = 1 Then If SelectDrinkType = 1 Then - If show_eng = "true" Then + If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" @@ -468,8 +468,8 @@ Function 2 - - + + RefreshAll @@ -482,7 +482,7 @@ show_btp "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; @@ -496,23 +496,23 @@ Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 Var text_show_blend_x = 882 - + If SugarSoundFlag = 1 Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" EndIf - + Endif If SelectDrinkType = 1 Then Var showname = NameLang[IndexDrinktType][LanguageShowByIndex] Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex] - + Else Var showname = aliasName[LanguageShowByIndex] Var showdesc = aliasName[LanguageShowByIndex] - + EndIf - + BackslashNToEnter showname BackslashNToEnter showdesc CRLFToSpace showname @@ -530,23 +530,23 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - + Open OpenFromXML - - + + DEBUGVAR MAT_ID_STRAW_OFFER DEBUGVAR MAT_ID_LID_OFFER - + DEBUGVAR TOPPING1 DEBUGVAR TOPPING1_EXT_2 @@ -564,18 +564,18 @@ DEBUGVAR toppingID1index7 DEBUGVAR toppingID1index8 DEBUGVAR toppingID1index9 - + DEBUGVAR toppingID2index1 DEBUGVAR toppingID2index2 DEBUGVAR toppingID2index3 DEBUGVAR toppingID2index4 DEBUGVAR toppingID2index5 - + DEBUGVAR toppingID1Default DEBUGVAR toppingID2Default DEBUGVAR toppingID3Default - - + + DEBUGVAR MenuCodeName1 DEBUGVAR MenuCodeName1_State DEBUGVAR MenuCodeName2 @@ -595,21 +595,21 @@ If TOPPING6 = "Topping-Volcano" Then - - If toppingID6price2 > 0 Then + + If toppingID6price2 > 0 Then DEBUGVAR toppingID6price2 DEBUGVAR DisplayFormat Var toppingID6price2Conv !assigned StringFmt( toppingID6price2 , DisplayFormat, PreScaleConvertShow) - + DEBUGVAR toppingID6price2Conv Var text_price_6 = "" Var text_price_6 = toppingID6price2Conv + ")" Var text_price_6 = "(+" + text_price_6 - - + + DEBUGVAR text_price_6 Else @@ -620,7 +620,7 @@ If blend_button_state = "PressForever" Then Var showOreoAddEnable = "Enable" - Var showText8 = "Invisible" + Var showText8 = "Invisible" Else Var showOreoAddEnable = "Disable" Var showText8 = "Enable" @@ -634,7 +634,7 @@ If hot_button_state = "Disable2" Then If cold_button_state = "PressForever" Then Var showOreoAddEnable = "Enable" - Var showText8 = "Invisible" + Var showText8 = "Invisible" EndIf EndIf EndIf @@ -662,7 +662,7 @@ EndIf EndIf - + ; i f cold menu disable away If cold_button_state = "PressForever" Then If showOreoAddEnable = "Enable" Then @@ -684,21 +684,21 @@ EndIf EndIf - STRCONTAIN "9701" BrewParam IgnoreLidStraw + STRCONTAIN "9701" BrewParam IgnoreLidStraw DEBUGVAR BrewParam DEBUGVAR IgnoreLidStraw - + Var h_block_of_sugar = 210 - - + + If IgnoreLidStraw = "true" Then Var IgnoreLidStraw = "false" - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" Var ShowStrawOnly = "Invisible" - + Else DEBUGVAR MAT_ID_STRAW_OFFER @@ -706,7 +706,7 @@ DEBUGVAR StrawState - Var ShowLidStraw = "Enable" + Var ShowLidStraw = "Enable" If StrawState = "Enable" Then If MAT_ID_STRAW_OFFER = "Enable" Then Var StrawState = MAT_ID_STRAW_OFFER @@ -714,7 +714,7 @@ Var StrawState = MAT_ID_STRAW_OFFER EndIf EndIf - + If StrawState = "Press" Then Var Seeker.thankStrawFlag = 1 Else @@ -732,45 +732,45 @@ DEBUGVAR MAT_ID_STRAW_OFFER DEBUGVAR MAT_ID_LID_OFFER - + EndIf - + ; Override all If Service_LidStraw = "Disable" Then - Var ShowLidStraw = "Enable" - ;Var ShowLidOnly = "Invisible" + Var ShowLidStraw = "Enable" + ;Var ShowLidOnly = "Invisible" ;Var ShowStawOnly = "Invisible" - + Var StrawState = "Disable" Var LidState = "Disable" EndIf If StrawState = "Enable" Then - Var StrawDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" Else If StrawState = "Press" Then - Var StrawDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" Else - Var StrawDeactiveButton = "Enable" + Var StrawDeactiveButton = "Enable" EndIf EndIf - + If LidState = "Enable" Then - Var LidDeactiveButton = "Invisible" + Var LidDeactiveButton = "Invisible" Else If LidState = "Press" Then - Var LidDeactiveButton = "Invisible" + Var LidDeactiveButton = "Invisible" Else - Var LidDeactiveButton = "Enable" + Var LidDeactiveButton = "Enable" EndIf EndIf - - DEBUGVAR TOPPING1 - If UserSeletedSugar = 0 Then + + DEBUGVAR TOPPING1 + If UserSeletedSugar = 0 Then If SugarModeUpdateWhenChangeDrinkType = 1 Then Var SugarModeUpdateWhenChangeDrinkType = 0 RefreshAll @@ -784,11 +784,11 @@ EndIf Var sugar_default_flag = 0 - + ; Suger 4 step cold If TOPPING1 = "Suger 4 step cold" Then - - + + Var BGSugar = "Invisible" Var ShiftSugarStep = 1 @@ -807,18 +807,18 @@ Var SugarPressPicLv3 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_cold_sugar4lv_sg3.png" Var SugarPressPicLv4 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_cold_sugar4lv_sg4.png" - + If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 Var SugarZeroCalOption = "Invisible" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -837,8 +837,8 @@ ; Suger 4 step hot If TOPPING1 = "Suger 4 step hot" Then - - + + Var BGSugar = "Invisible" Var ShiftSugarStep = 1 @@ -858,18 +858,18 @@ Var SugarPressPicLv4 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_hot_sugar4lv_sg4.png" - + If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 Var SugarZeroCalOption = "Invisible" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -887,16 +887,16 @@ EndIf DEBUGVAR RecipeTag2 - ; + ; If TOPPING1 = "Sugar" Then - + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" Else Var BGSugar = "Enable" EndIf - + Var ShiftSugarStep = 1 Var SugarState1 = "Enable" Var SugarState2 = "Enable" @@ -904,18 +904,18 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" - + If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" Var sugar_default_flag = 1 Var SugarZeroCalOption = "Invisible" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -935,9 +935,9 @@ Var SugarState1 = "PressForever" Var SugarZeroCalOption = "Invisible" EndIf - + EndIf - + If TOPPING1 = "Powder Sugar" Then If RecipeTag2 = "Topping6Step" Then @@ -946,7 +946,7 @@ Else Var BGSugar = "Enable" EndIf - + Var ShiftSugarStep = 1 Var SugarState1 = "Enable" Var SugarState2 = "Enable" @@ -978,12 +978,12 @@ Var sugar_default_flag = 1 Var SugarZeroCalOption = "Invisible" EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1006,22 +1006,22 @@ DEBUGVAR toppingID1Default DEBUGVAR SugarState1 - + DEBUGVAR toppingID1Default DEBUGVAR SugarState1 EndIf - + If TOPPING1 = "Sugar Premix 25" Then - + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" Else Var BGSugar = "Enable" EndIf - + Var ShiftSugarStep = 2 Var SugarState1 = "Disable" Var SugarState2 = "Enable" @@ -1046,12 +1046,12 @@ Var SugarPressPicLv5 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_sugar5level_sg5.png" Var SugarPressPicLv6 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_sugar5level_sg6.png" - + If toppingID1index1 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1066,7 +1066,7 @@ Var SugarState5 = "PressForever" Var sugar_default_flag = 1 EndIf - + If sugar_default_flag = 0 Then Var SugarState2 = "PressForever" EndIf @@ -1075,7 +1075,7 @@ EndIf If TOPPING1 = "Powder Sugar Premix 50" Then - + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" Var BGSugarNew = "Enable" @@ -1104,7 +1104,7 @@ Else Var SugarState3 = "Enable" - + Var SugarNormalPicLv1 = "" Var SugarNormalPicLv2 = "" Var SugarNormalPicLv3 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bn_sugar4level_sg3.png" @@ -1141,7 +1141,7 @@ If sugar_default_flag = 0 Then Var SugarState3 = "PressForever" EndIf - + EndIf If TOPPING1 = "Powder Sugar Premix 25" Then @@ -1153,19 +1153,19 @@ EndIf Var ShiftSugarStep = 2 - + Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" - + If toppingID1index1 = toppingID1Default Then Var SugarState2 = "PressForever" Var sugar_default_flag = 1 EndIf - + If toppingID1index2 = toppingID1Default Then Var SugarState3 = "PressForever" Var sugar_default_flag = 1 @@ -1180,11 +1180,11 @@ Var SugarState5 = "PressForever" Var sugar_default_flag = 1 EndIf - + If sugar_default_flag = 0 Then Var SugarState2 = "PressForever" EndIf - + EndIf Var SugarModeUpdateWhenChangeDrinkType = 0 @@ -1196,7 +1196,7 @@ Var ShiftSugarStep = 1 Var SugarModeUpdateWhenChangeDrinkType = 1 EndIf - + If TOPPING1 = "Suger 4 step hot" Then Var BGSugarHotHealthy = "Enable" Var BGSugarColdHealthy = "Invisible" @@ -1204,17 +1204,17 @@ Var ShiftSugarStep = 1 Var SugarModeUpdateWhenChangeDrinkType = 1 EndIf - + Var ShowCollagenOnly = "Enable" Var BugFlag = 1 - + Var topping1 = toppingID1Default Var ToppingGotoPayment = "false" - + Var SugarSoundFlag = 0 If BGSugarColdHealthy = "Enable" Then Var SugarSoundFlag = 1 @@ -1226,29 +1226,29 @@ If BGSugarNew = "Enable" Then Var SugarSoundFlag = 1 - + EndIf If BGSugar = "Enable" Then Var SugarSoundFlag = 1 - + EndIf DEBUGVAR SugarSoundFlag - + If SugarSoundFlag = 1 Then If SelectDrinkType = 1 Then - If show_eng = "true" Then + If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" - + ; Play Sound #zone Play PlaySoundLag EndIf EndIf EndIf - + DEBUGVAR SelectDrinkType @@ -1259,17 +1259,17 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" EndIf - + Else - EndIf - ; End of UserSeletedSugar = 0 + EndIf + ; End of UserSeletedSugar = 0 Refresh - + Var collagenShow = "true" ;-BEGIN shot layout - + If topping_price_refresh = 1 Then Var topping_price_refresh = 0 @@ -1277,133 +1277,133 @@ Var shot_h_layout = 218 If TOPPING2 = "shot coffee" Then - + Var ShotCoffeeBG = "Enable" Var showShotEnable = "Enable" Var ExtraTopping = "Enable" Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) - + DEBUGVAR toppingID2price2Conv Var text_shot_normal_add = toppingID2price2Conv + ")" - Var text_shot_normal_add = "(+" + text_shot_normal_add - + Var text_shot_normal_add = "(+" + text_shot_normal_add + Refresh EndIf - + If TOPPING2 = "shot coffee termtem" Then - + Var ShotCoffeeBG = "Enable" Var showShotEnable = "Enable" - + Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "shot coffee 1003" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "shot coffee 1007" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "shot coffee 1008" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1009" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1101" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1102" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf - + If TOPPING2 = "add-show-1103" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1104" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf - + If TOPPING2 = "add-show-1105" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If TOPPING2 = "add-show-1106" Then - + Var ShotCoffeePremium = "Enable" Var showShotEnable = "Invisible" Var ExtraTopping = "Enable" - + DEBUGVAR TOPPING2 Refresh EndIf If ShotCoffeePremium = "Enable" Then Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) - + DEBUGVAR toppingID2price2Conv Var text_price_topping = toppingID2price2Conv + ")" - Var text_price_topping = "(+" + text_price_topping + Var text_price_topping = "(+" + text_price_topping EndIf @@ -1415,19 +1415,19 @@ Var ShowCollagenOnly = "Invisible" EndIf - EndIf + EndIf ;topping_price_refresh = 0 If MenuCodeName1 = "OatMilk" Then Var OatMilkToppingEnable = "Enable" - + DEBUGVAR OatMilkOnTopPrice Var OatMilkOnTopPriceStr !assigned StringFmt( OatMilkOnTopPrice , DisplayFormat, PreScaleConvertShow) - + Var text_price_oat_milk = OatMilkOnTopPriceStr + ")" - Var text_price_oat_milk = "(+" + text_price_oat_milk + Var text_price_oat_milk = "(+" + text_price_oat_milk Var OatMilkAddAmount = OatMilkOnTopPrice @@ -1440,21 +1440,21 @@ Var OatMilkEnable = "Enable" EndIf EndIf - - + + SAVELOG ToppingGotoPayment If ToppingGotoPayment = "true" Then Topping "Select" SelectDrink ; Pack - + Topping "Pack" ExtendDataCurr Var Seeker.ExtendDataCurr = ExtendDataCurr OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment.xml" EndIf - - + + If RoadShow = "true" Then Var PriceShowValue = "Free" EndIf @@ -1481,7 +1481,7 @@ EndIf EndIf EndIf - + DEBUGVAR OverlayMenuFilter DEBUGVAR OverlayMenuFilter1_Value DEBUGVAR OverlayMenuFilter2_Value @@ -1497,6 +1497,8 @@ DEBUGVAR SugarPressPicLv3 DEBUGVAR SugarPressPicLv4 + RefreshAll + @@ -1504,8 +1506,8 @@ ;Var BugFlag = 1 If CartUpdate = "true" Then Var CartUpdate = "-" - - + + If CART_COUNT = 3 Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment_multi.xml" @@ -1515,7 +1517,7 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" Else OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf EndIf EndIf @@ -1540,14 +1542,14 @@ 374 399 - eval( + eval( If IsSmoRet = "true" Then Var return = "Enable" Else Var return = "Invisible" EndIf -) - +) + "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_enblender_icon.png" @@ -1593,7 +1595,7 @@ ; ; ;- FRAME SCORELLL - + 52 881 1080 @@ -1603,12 +1605,12 @@ 1 - + ; show_select_type 988 162 20 - show_select_type + show_select_type "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/drink_select_type.png" @@ -1639,9 +1641,9 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bt_hot_selected.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var SelectDrinkType = 1 - + SAVELOG "Press hot" Var hot_button_state = "PressForever" @@ -1675,7 +1677,7 @@ Var high_light_drink_type = "Invisible" Var IndexDrinktType = 0 - + Var OverlayMenuFilter = OverlayMenuFilter1_Value @@ -1704,9 +1706,9 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bt_cold_selected.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var SelectDrinkType = 1 - + SAVELOG "Press cold" Var cold_button_state = "PressForever" @@ -1730,7 +1732,7 @@ Var blend_button_state = "Enable" EndIf EndIf - + Var BugFlag = 0 Var topping_price_refresh = 0 Topping "Load" PD_CODE2 @@ -1761,9 +1763,9 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bt_cold_selected.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var SelectDrinkType = 1 - + SAVELOG "Press cold" Var normal_button_state = "PressForever" @@ -1787,7 +1789,7 @@ Var blend_button_state = "Enable" EndIf EndIf - + Var BugFlag = 0 Var topping_price_refresh = 0 Topping "Load" PD_CODE2 @@ -1818,8 +1820,8 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bt_smoothie_selected.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - + + SAVELOG "Press blend" Var SelectDrinkType = 1 @@ -1914,7 +1916,7 @@ 988 156 20 - BGSugarNew + BGSugarNew ; sugar layout "Enable" @@ -1944,7 +1946,7 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bu_sugarlevel_sg1.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -1954,7 +1956,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -1983,7 +1985,7 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bu_sugarlevel_sg2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSeletedSugar @@ -2032,7 +2034,7 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bu_sugarlevel_sg3.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -2052,7 +2054,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "PressForever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -2079,7 +2081,7 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bu_sugarlevel_sg4.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -2099,7 +2101,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" @@ -2133,7 +2135,7 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bu_sugarlevel_sg5.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR5" If SelectDrinkType = 0 Then @@ -2153,7 +2155,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" @@ -2187,7 +2189,7 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bu_sugarlevel_sg6.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR6" If SelectDrinkType = 0 Then @@ -2207,7 +2209,7 @@ If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" - + Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -2254,7 +2256,7 @@ 988 156 20 - BGSugarHotHealthy + BGSugarHotHealthy ; sugar layout BGSugarHotHealthy @@ -2283,7 +2285,7 @@ SugarPressPicLv1 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -2293,7 +2295,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -2320,7 +2322,7 @@ SugarPressPicLv2 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSeletedSugar @@ -2358,7 +2360,7 @@ SugarPressPicLv3 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -2393,7 +2395,7 @@ SugarPressPicLv4 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -2442,7 +2444,7 @@ 988 156 20 - BGSugarColdHealthy + BGSugarColdHealthy ; sugar layout BGSugarColdHealthy @@ -2470,7 +2472,7 @@ SugarPressPicLv1 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + DEBUGVAR SugarState1 SAVELOG "SUGAR1" @@ -2480,7 +2482,7 @@ Else If ShiftSugarStep = 1 Then - + Var SugarState1 = "PressForever" Var SugarState2 = "Enable" Var SugarState3 = "Enable" @@ -2508,7 +2510,7 @@ SugarPressPicLv2 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR2" DEBUGVAR SelectDrinkType DEBUGVAR UserSeletedSugar @@ -2546,7 +2548,7 @@ SugarPressPicLv3 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR3" If SelectDrinkType = 0 Then @@ -2581,7 +2583,7 @@ SugarPressPicLv4 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG "SUGAR4" If SelectDrinkType = 0 Then @@ -2659,9 +2661,9 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_cereal.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + SAVELOG " OatMilkEnable " - + If OatMilkEnable = "Press" Then Var OatMilkEnable = "Enable" @@ -2676,7 +2678,7 @@ -; +; -; +; -; +; -; +; @@ -3435,7 +3437,7 @@ ; "0x00BDFF" 500 Var( DirImage + "/new_multi.png" ) - + @@ -3448,17 +3450,17 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;Var Seeker = "curr" - + DEBUGVAR PriceDrinkTmp - + ;Var Seeker.PriceDrink = PriceDrinkTmp - + Var PriceDrink = PriceDrinkTmp - + SAVELOG "USER press next ( topping ) - new" If SugarState1 = "PressForever" Then @@ -3552,38 +3554,38 @@ If StrawState = "Press" Then - Machine StrawOrder + Machine StrawOrder Var LedLidBlink = "true" EndIf If LidState = "Press" Then - Machine LidOrder + Machine LidOrder Var LedLidBlink = "true" - Var bg_lidProblem_ST = "Enable" + Var bg_lidProblem_ST = "Enable" Else Var bg_lidProblem_ST = "Invisible" EndIf - + If SelectDrinkType = 0 Then - + Else Var StrawState = "Enable" Var LidState = "Enable" EndIf - ; - - + ; + + Var SelectDrink = UserSelectProductCode - + Var Seeker.selected_a_drink = UserSelectProductCode DEBUGVAR Seeker.selected_a_drink - ; Set drink + ; Set drink If Seeker = "curr" Then Topping "Select" UserSelectProductCode - ; Set option toppinng and pack + ; Set option toppinng and pack Topping "Select1-ID" topping1 Topping "Select2-ID" topping2 Topping "Select3-ID" topping3 @@ -3597,7 +3599,7 @@ Topping "__select" UserSelectProductCode - ; Set option toppinng and pack + ; Set option toppinng and pack Topping "__select1-id" topping1 Topping "__select2-id" topping2 Topping "__select3-id" topping3 @@ -3615,7 +3617,7 @@ EndIf DEBUGVAR Seeker - DEBUGVAR Seeker.ExtendData + DEBUGVAR Seeker.ExtendData Var Seeker.PictureDrink = PictureDrink Var Seeker.showname = showname @@ -3641,7 +3643,7 @@ Else If SelectDrinkType = 1 Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_payment.xml" + Open "ROOT/taobin_project/xml/page_payment.xml" EndIf EndIf @@ -3649,7 +3651,7 @@ Var high_light_drink_type = "Enable" EndIf Else - + If CART1_STATUS = "EMPTY" Then Cart "AddMenuID" 1 Else @@ -3719,7 +3721,7 @@ Var img_cold_dis = "/bt_cold_disable.png" Var img_cold_dis2 = "/bt_cold_disable2.png" EndIf - + If img_smth_no_flag = 1 Then SAVELOG "Smoothies change img. 1" Var img_smth = "/bt_smoothie_no.png" @@ -3754,12 +3756,12 @@ DEBUGVAR menu_name_thai_cold SAVELOG "FUNCTION2" - + Var TOPPING_PRICE = 0 Var SelectDrinkType = 0 - + ; Set default If SelectCountDrinkType = 1 Then If DefaultDrinkType = 1 Then @@ -3780,7 +3782,7 @@ Var normal_button_state = "PressForever" Var SelectDrinkType = 1 EndIf - + Var IndexDrinktType = 1 EndIf If DefaultDrinkType = 3 Then @@ -3811,7 +3813,7 @@ Machine PreparCup EndIf - + If cold_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD2 Var UserSelectProductCode = PD_CODE2 @@ -3832,7 +3834,7 @@ Machine PreparCup EndIf - + If blend_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD3 Var UserSelectProductCode = PD_CODE3 @@ -3860,7 +3862,7 @@ BackslashNToEnter showdesc CRLFToSpace showname CRLFToSpace showdesc - + DEBUGVAR PriceDrinkNoTop DEBUGVAR PriceDiff @@ -3876,18 +3878,18 @@ Var TOPPING_PRICE = 0 Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - + Var topping2 = toppingID2index2 - + Var DisableUsingCode = "true" - + Var showText7 = "Enable" SAVELOG "Select premi normal shot" Else - If showShotEnable = "Press" Then + If showShotEnable = "Press" Then If blendedState = "Press" Then Var PriceDrinkTmp = PriceDrinkNoTop EndIf @@ -3898,11 +3900,11 @@ ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - + Var topping2 = toppingID2index2 - + Var DisableUsingCode = "true" - + Var showText7 = "Enable" SAVELOG "Select add normal shot" @@ -3910,7 +3912,7 @@ If blendedState = "Disable" Then Var blendedState = "Enable" EndIf - + Var PriceDrinkTmp = PriceDrinkNoTop Var topping2 = toppingID2index1 @@ -3938,9 +3940,9 @@ Var topping6 = toppingID6index1 Var DisableUsingCode = "false" - + EndIf - + DEBUGVAR OatMilkEnable DEBUGVAR MenuCodeName1 DEBUGVAR MenuCodeName1_State @@ -3953,7 +3955,7 @@ EndIf EndIf EndIf - + DEBUGVAR SelectDrinkType @@ -3971,7 +3973,7 @@ SAVELOG PriceDrinkTmp If RoadShow = "true" Then - + Var PriceDrinkTmpShow = "Free" DEBUGVAR SelectDrink2 @@ -3985,7 +3987,22 @@ Var Timeout = 0 - + + If hot_button_state = "PressForever" Then + DEBUGVAR "Change OverlayMenuFilter --> 1" + Var OverlayMenuFilter = OverlayMenuFilter1_Value + Else + If cold_button_state = "PressForever" Then + DEBUGVAR "Change OverlayMenuFilter --> 2" + Var OverlayMenuFilter = OverlayMenuFilter2_Value + Else + If blend_button_state = "PressForever" Then + DEBUGVAR "Change OverlayMenuFilter --> 3" + Var OverlayMenuFilter = OverlayMenuFilter3_Value + EndIf + EndIf + EndIf + RefreshAll @@ -4018,7 +4035,7 @@