From db96998de76de772765078f767f32d6d13b22551 Mon Sep 17 00:00:00 2001 From: kong Date: Mon, 15 Nov 2021 15:48:46 +0700 Subject: [PATCH 1/2] Add button --- sheet/best_seller.tsv | 1 - xml/page_brewing3Multi.xml | 11 ++++++++--- xml/page_drinkok.xml | 32 +++++++++++++++++++++++++++++--- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv index 76e49c6e..a1c61d02 100644 --- a/sheet/best_seller.tsv +++ b/sheet/best_seller.tsv @@ -25,4 +25,3 @@ 12-03-02-0006 12-02-02-0004 12-05-02-0007 -12-04-02-0002 diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml index 9a4756ee..d38482f7 100644 --- a/xml/page_brewing3Multi.xml +++ b/xml/page_brewing3Multi.xml @@ -296,9 +296,14 @@ Var Timeout = Timeout + 1 - If CountDownBrewing > 0 Then - Var CountDownBrewing = CountDownBrewing - 1 - EndIf + If BREW_COUNT_DOWN_FROM_APP = "on" Then + Var CountDownBrewing = BREW_CNT + Else + + If CountDownBrewing > 0 Then + Var CountDownBrewing = CountDownBrewing - 1 + EndIf + Endif If Simulation = "true" Then If CountDownBrewing = 0 Then diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 7f67c873..94111633 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -158,7 +158,10 @@ 500 - SAVELOG MachineStage + DEBUGVAR MachineStage + DEBUGVAR CupOnArm + DEBUGVAR buttonRemoveCup + DEBUGVAR CART_COUNT If HaveCup = "false" Then @@ -183,7 +186,12 @@ EndIf EndIf - + Else + If CupOnArm = "true" Then + Var buttonRemoveCup = "Enable" + Else + Var buttonRemoveCup = "Invisible" + EndIf EndIf @@ -192,6 +200,9 @@ If CART_COUNT = 0 Then Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" Else + + Var buttonRemoveCup = "Enable" + Var Timeout2 = Timeout2 + 1 @@ -215,6 +226,7 @@ Var Timeout = Timeout + 1 TimerReset + Refresh @@ -253,7 +265,6 @@ ; - + From 86babb61a6968f5f1c8ecef11634da007e83ab43 Mon Sep 17 00:00:00 2001 From: kong Date: Mon, 15 Nov 2021 17:39:19 +0700 Subject: [PATCH 2/2] Add button --- xml/menu_gen.py | 17 +++++++++++++++++ xml/page_catalog_choose_drink.xml | 13 +++++++++++++ xml/page_catalog_choose_drink1.xml | 13 +++++++++++++ xml/page_catalog_choose_drink2.xml | 13 +++++++++++++ xml/page_catalog_choose_drink3.xml | 13 +++++++++++++ xml/page_catalog_choose_drink4.xml | 13 +++++++++++++ xml/page_catalog_choose_drink5.xml | 13 +++++++++++++ xml/page_catalog_choose_drink6.xml | 13 +++++++++++++ xml/page_catalog_choose_drink7.xml | 13 +++++++++++++ xml/page_catalog_choose_drink8.xml | 13 +++++++++++++ xml/page_drinkfail2Multi.xml | 5 +++++ xml/page_drinkok.xml | 2 +- 12 files changed, 140 insertions(+), 1 deletion(-) diff --git a/xml/menu_gen.py b/xml/menu_gen.py index 0f361ba6..18555523 100644 --- a/xml/menu_gen.py +++ b/xml/menu_gen.py @@ -130,3 +130,20 @@ out_xml('\r\n') + + + out_xml('; Cart\r\n') + out_xml('\r\n') + + diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml index fec98dfe..8e15cbb9 100644 --- a/xml/page_catalog_choose_drink.xml +++ b/xml/page_catalog_choose_drink.xml @@ -1964,6 +1964,19 @@ +; Cart + diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index 5543510a..91a45c1e 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -1964,6 +1964,19 @@ +; Cart + diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 2e988c76..df586bc1 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -4088,6 +4088,19 @@ +; Cart + diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index ae51ca32..4214ceff 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -3660,6 +3660,19 @@ +; Cart + diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index 4fe6e190..644b545c 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -1647,6 +1647,19 @@ +; Cart + diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index fcd7e2c8..8cc1d7ec 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -1117,6 +1117,19 @@ +; Cart + diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index 64b7f94a..3d2d21f4 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -4298,6 +4298,19 @@ +; Cart + diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml index e9c4a2c9..c21ac533 100644 --- a/xml/page_catalog_choose_drink7.xml +++ b/xml/page_catalog_choose_drink7.xml @@ -1541,6 +1541,19 @@ +; Cart + diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index c26d8895..144da306 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -1330,6 +1330,19 @@ +; Cart + diff --git a/xml/page_drinkfail2Multi.xml b/xml/page_drinkfail2Multi.xml index 535bfaba..b54aee3d 100644 --- a/xml/page_drinkfail2Multi.xml +++ b/xml/page_drinkfail2Multi.xml @@ -36,6 +36,11 @@ Var next_ready = "true" Var cart_next = 0 + DEBUGVAR CART1_READY + DEBUGVAR CART2_READY + DEBUGVAR CART3_READY + + If show_eng = "true" Then If CART_COUNT > 0 Then If CART_INDEX < CART_COUNT Then diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 94111633..a56746f5 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -338,7 +338,7 @@