diff --git a/image/page_drink/bn_iced_cocoa_smoothie.png b/image/page_drink/bn_iced_cocoa_smoothie.png new file mode 100644 index 00000000..5e1eac00 Binary files /dev/null and b/image/page_drink/bn_iced_cocoa_smoothie.png differ diff --git a/image/page_drink/bn_iced_matcha_milk_tea_smoothie.png b/image/page_drink/bn_iced_matcha_milk_tea_smoothie.png new file mode 100644 index 00000000..658dc6ab Binary files /dev/null and b/image/page_drink/bn_iced_matcha_milk_tea_smoothie.png differ diff --git a/image/page_drink/bn_iced_slushie.png b/image/page_drink/bn_iced_slushie.png new file mode 100644 index 00000000..ea06ddc2 Binary files /dev/null and b/image/page_drink/bn_iced_slushie.png differ diff --git a/image/page_drink_disable/bn_iced_cocoa_smoothie.png b/image/page_drink_disable/bn_iced_cocoa_smoothie.png new file mode 100644 index 00000000..74c243ed Binary files /dev/null and b/image/page_drink_disable/bn_iced_cocoa_smoothie.png differ diff --git a/image/page_drink_disable/bn_iced_matcha_milk_tea_smoothie.png b/image/page_drink_disable/bn_iced_matcha_milk_tea_smoothie.png new file mode 100644 index 00000000..dc174de6 Binary files /dev/null and b/image/page_drink_disable/bn_iced_matcha_milk_tea_smoothie.png differ diff --git a/image/page_drink_disable/bn_iced_slushie.png b/image/page_drink_disable/bn_iced_slushie.png new file mode 100644 index 00000000..b7e35744 Binary files /dev/null and b/image/page_drink_disable/bn_iced_slushie.png differ diff --git a/image/page_drink_press/bn_iced_cocoa_smoothie.png b/image/page_drink_press/bn_iced_cocoa_smoothie.png new file mode 100644 index 00000000..9a25786d Binary files /dev/null and b/image/page_drink_press/bn_iced_cocoa_smoothie.png differ diff --git a/image/page_drink_press/bn_iced_matcha_milk_tea_smoothie.png b/image/page_drink_press/bn_iced_matcha_milk_tea_smoothie.png new file mode 100644 index 00000000..d5f70a6e Binary files /dev/null and b/image/page_drink_press/bn_iced_matcha_milk_tea_smoothie.png differ diff --git a/image/page_drink_select/bn_iced_cocoa_smoothie.png b/image/page_drink_select/bn_iced_cocoa_smoothie.png new file mode 100644 index 00000000..4f9bd2fb Binary files /dev/null and b/image/page_drink_select/bn_iced_cocoa_smoothie.png differ diff --git a/image/page_drink_select/bn_iced_matcha_milk_tea_smoothie.png b/image/page_drink_select/bn_iced_matcha_milk_tea_smoothie.png new file mode 100644 index 00000000..06750c53 Binary files /dev/null and b/image/page_drink_select/bn_iced_matcha_milk_tea_smoothie.png differ diff --git a/image/page_drink_select/bn_iced_slushie.png b/image/page_drink_select/bn_iced_slushie.png new file mode 100644 index 00000000..f721cd21 Binary files /dev/null and b/image/page_drink_select/bn_iced_slushie.png differ diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv index 5a611c1d..a0653641 100644 --- a/sheet/best_seller.tsv +++ b/sheet/best_seller.tsv @@ -13,16 +13,15 @@ 12-11-02-0001 12-03-02-0002 12-03-02-0003 +12-02-01-0017 12-02-02-0002 -12-02-02-0018 +12-05-02-0028 12-05-02-0010 12-05-02-0025 12-04-02-0002 +12-04-02-0003 12-05-02-0011 -12-05-02-0012 -12-05-02-0009 -12-05-02-0030 -14-05-02-0035 +12-03-02-0006 +12-02-02-0004 12-05-02-0007 12-04-02-0002 -Grand Total 1342 diff --git a/xml/page_board.xml b/xml/page_board.xml index 3f83cadf..c07961e9 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -13,7 +13,7 @@ Var GetFreeFromError = 0 - Var taobin_version = "1.51" + Var taobin_version = "1.53" ; On open Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/xml/page_topping_select2.xml b/xml/page_topping_select2.xml index b01b8ec9..76750a9d 100644 --- a/xml/page_topping_select2.xml +++ b/xml/page_topping_select2.xml @@ -134,6 +134,11 @@ DEBUGVAR backGroundAddExtra DEBUGVAR backGroundAddShotPremium + DEBUGVAR MultiPayEnable + Var btnAddCart = "Invisible" + If MultiPayEnable = "true" Then + Var btnAddCart = "Enable" + EndIf 2000 @@ -225,6 +230,7 @@ + DEBUGVAR SubMenuProductCode1 DEBUGVAR SubMenuName11 DEBUGVAR SubMenuPrice1 @@ -288,7 +294,9 @@ Var h_block_of_sugar = 210 - STRCONTAIN "Smoothie" SubMenuName11 HaveSmoothie + + ;STRCONTAIN "Smoothie" SubMenuName11 HaveSmoothie + STRCONTAIN "Smoothie" MenuCodeName HaveSmoothie If HaveSmoothie = "true" Then Var blendedState = "Enable" Var blendedStateShow = "Enable" @@ -430,6 +438,8 @@ If TOPPING1 = "Powder Sugar Premix 50" Then Var BGSugar = "Enable" Var ShiftSugarStep = 3 + Var SugarState1 = "Disable" + Var SugarState2 = "Disable" Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" @@ -1385,6 +1395,76 @@ +; add cart + + ; next