diff --git a/image/benefits/ad_main.png b/image/benefits/ad_main.png new file mode 100644 index 00000000..b09c8330 Binary files /dev/null and b/image/benefits/ad_main.png differ diff --git a/image/benefits/bn_accept.png b/image/benefits/bn_accept.png new file mode 100644 index 00000000..f00a07fb Binary files /dev/null and b/image/benefits/bn_accept.png differ diff --git a/image/benefits/bn_back.png b/image/benefits/bn_back.png new file mode 100644 index 00000000..527e38ba Binary files /dev/null and b/image/benefits/bn_back.png differ diff --git a/image/benefits/bp_accept.png b/image/benefits/bp_accept.png new file mode 100644 index 00000000..43668afa Binary files /dev/null and b/image/benefits/bp_accept.png differ diff --git a/image/benefits/bp_back.png b/image/benefits/bp_back.png new file mode 100644 index 00000000..c0ff09bb Binary files /dev/null and b/image/benefits/bp_back.png differ diff --git a/image/benefits/img1.png b/image/benefits/img1.png new file mode 100644 index 00000000..991681b9 Binary files /dev/null and b/image/benefits/img1.png differ diff --git a/image/benefits/img2.png b/image/benefits/img2.png new file mode 100644 index 00000000..4d204b1a Binary files /dev/null and b/image/benefits/img2.png differ diff --git a/image/benefits/img3.png b/image/benefits/img3.png new file mode 100644 index 00000000..4ab75edf Binary files /dev/null and b/image/benefits/img3.png differ diff --git a/image/collectiing/ad_main.png b/image/collectiing/ad_main.png new file mode 100644 index 00000000..d672b1dc Binary files /dev/null and b/image/collectiing/ad_main.png differ diff --git a/image/collectiing/bn_0.png b/image/collectiing/bn_0.png new file mode 100644 index 00000000..6ae9d5f6 Binary files /dev/null and b/image/collectiing/bn_0.png differ diff --git a/image/collectiing/bn_1.png b/image/collectiing/bn_1.png new file mode 100644 index 00000000..a22932b2 Binary files /dev/null and b/image/collectiing/bn_1.png differ diff --git a/image/collectiing/bn_2.png b/image/collectiing/bn_2.png new file mode 100644 index 00000000..e2d16d6a Binary files /dev/null and b/image/collectiing/bn_2.png differ diff --git a/image/collectiing/bn_3.png b/image/collectiing/bn_3.png new file mode 100644 index 00000000..c1935a29 Binary files /dev/null and b/image/collectiing/bn_3.png differ diff --git a/image/collectiing/bn_4.png b/image/collectiing/bn_4.png new file mode 100644 index 00000000..12ec47ae Binary files /dev/null and b/image/collectiing/bn_4.png differ diff --git a/image/collectiing/bn_5.png b/image/collectiing/bn_5.png new file mode 100644 index 00000000..39554313 Binary files /dev/null and b/image/collectiing/bn_5.png differ diff --git a/image/collectiing/bn_6.png b/image/collectiing/bn_6.png new file mode 100644 index 00000000..70b1afe7 Binary files /dev/null and b/image/collectiing/bn_6.png differ diff --git a/image/collectiing/bn_7.png b/image/collectiing/bn_7.png new file mode 100644 index 00000000..555ba801 Binary files /dev/null and b/image/collectiing/bn_7.png differ diff --git a/image/collectiing/bn_8.png b/image/collectiing/bn_8.png new file mode 100644 index 00000000..7508a86a Binary files /dev/null and b/image/collectiing/bn_8.png differ diff --git a/image/collectiing/bn_9.png b/image/collectiing/bn_9.png new file mode 100644 index 00000000..e45d6576 Binary files /dev/null and b/image/collectiing/bn_9.png differ diff --git a/image/collectiing/bn_back-1.png b/image/collectiing/bn_back-1.png new file mode 100644 index 00000000..894edea7 Binary files /dev/null and b/image/collectiing/bn_back-1.png differ diff --git a/image/collectiing/bn_back.png b/image/collectiing/bn_back.png new file mode 100644 index 00000000..527e38ba Binary files /dev/null and b/image/collectiing/bn_back.png differ diff --git a/image/collectiing/bn_ignore.png b/image/collectiing/bn_ignore.png new file mode 100644 index 00000000..69f3d2b2 Binary files /dev/null and b/image/collectiing/bn_ignore.png differ diff --git a/image/collectiing/bp_0.png b/image/collectiing/bp_0.png new file mode 100644 index 00000000..72ed9695 Binary files /dev/null and b/image/collectiing/bp_0.png differ diff --git a/image/collectiing/bp_1.png b/image/collectiing/bp_1.png new file mode 100644 index 00000000..47a9bb64 Binary files /dev/null and b/image/collectiing/bp_1.png differ diff --git a/image/collectiing/bp_2.png b/image/collectiing/bp_2.png new file mode 100644 index 00000000..97160740 Binary files /dev/null and b/image/collectiing/bp_2.png differ diff --git a/image/collectiing/bp_3.png b/image/collectiing/bp_3.png new file mode 100644 index 00000000..ff274c44 Binary files /dev/null and b/image/collectiing/bp_3.png differ diff --git a/image/collectiing/bp_4.png b/image/collectiing/bp_4.png new file mode 100644 index 00000000..ef0015d2 Binary files /dev/null and b/image/collectiing/bp_4.png differ diff --git a/image/collectiing/bp_5.png b/image/collectiing/bp_5.png new file mode 100644 index 00000000..da1167db Binary files /dev/null and b/image/collectiing/bp_5.png differ diff --git a/image/collectiing/bp_6.png b/image/collectiing/bp_6.png new file mode 100644 index 00000000..fd6f8e96 Binary files /dev/null and b/image/collectiing/bp_6.png differ diff --git a/image/collectiing/bp_7.png b/image/collectiing/bp_7.png new file mode 100644 index 00000000..a393eeb2 Binary files /dev/null and b/image/collectiing/bp_7.png differ diff --git a/image/collectiing/bp_8.png b/image/collectiing/bp_8.png new file mode 100644 index 00000000..10633d8c Binary files /dev/null and b/image/collectiing/bp_8.png differ diff --git a/image/collectiing/bp_9.png b/image/collectiing/bp_9.png new file mode 100644 index 00000000..fbd9ce96 Binary files /dev/null and b/image/collectiing/bp_9.png differ diff --git a/image/collectiing/bp_back-1.png b/image/collectiing/bp_back-1.png new file mode 100644 index 00000000..1b4681af Binary files /dev/null and b/image/collectiing/bp_back-1.png differ diff --git a/image/collectiing/bp_back.png b/image/collectiing/bp_back.png new file mode 100644 index 00000000..c0ff09bb Binary files /dev/null and b/image/collectiing/bp_back.png differ diff --git a/image/collectiing/bp_ignore.png b/image/collectiing/bp_ignore.png new file mode 100644 index 00000000..2d79755a Binary files /dev/null and b/image/collectiing/bp_ignore.png differ diff --git a/image/collectiing/img2.png b/image/collectiing/img2.png new file mode 100644 index 00000000..4d204b1a Binary files /dev/null and b/image/collectiing/img2.png differ diff --git a/image/collectiing/img3.png b/image/collectiing/img3.png new file mode 100644 index 00000000..267bf450 Binary files /dev/null and b/image/collectiing/img3.png differ diff --git a/image/collectiing/text1.png b/image/collectiing/text1.png new file mode 100644 index 00000000..c1a69b30 Binary files /dev/null and b/image/collectiing/text1.png differ diff --git a/image/collectiing/text2.png b/image/collectiing/text2.png new file mode 100644 index 00000000..4cb161cd Binary files /dev/null and b/image/collectiing/text2.png differ diff --git a/image/enter_point/ad_main.png b/image/enter_point/ad_main.png new file mode 100644 index 00000000..d672b1dc Binary files /dev/null and b/image/enter_point/ad_main.png differ diff --git a/image/enter_point/bn_back_arrow.png b/image/enter_point/bn_back_arrow.png new file mode 100644 index 00000000..7d4eb584 Binary files /dev/null and b/image/enter_point/bn_back_arrow.png differ diff --git a/image/enter_point/bn_cancel.png b/image/enter_point/bn_cancel.png new file mode 100644 index 00000000..6f5cbe8c Binary files /dev/null and b/image/enter_point/bn_cancel.png differ diff --git a/image/enter_point/bp_cancel.png b/image/enter_point/bp_cancel.png new file mode 100644 index 00000000..d9508b12 Binary files /dev/null and b/image/enter_point/bp_cancel.png differ diff --git a/image/enter_point/text1.png b/image/enter_point/text1.png new file mode 100644 index 00000000..c2aa53ae Binary files /dev/null and b/image/enter_point/text1.png differ diff --git a/image/page3/bn_bestseller.png b/image/page3/bn_bestseller.png index 3c29f0b2..879a5d42 100644 Binary files a/image/page3/bn_bestseller.png and b/image/page3/bn_bestseller.png differ diff --git a/image/page3/bn_cho_ca.png b/image/page3/bn_cho_ca.png index b42bc6d0..ce44c78b 100644 Binary files a/image/page3/bn_cho_ca.png and b/image/page3/bn_cho_ca.png differ diff --git a/image/page3/bn_coffee.png b/image/page3/bn_coffee.png index 261c1c0c..3f2631ff 100644 Binary files a/image/page3/bn_coffee.png and b/image/page3/bn_coffee.png differ diff --git a/image/page3/bn_fruit.png b/image/page3/bn_fruit.png index 4d815806..d73cc248 100644 Binary files a/image/page3/bn_fruit.png and b/image/page3/bn_fruit.png differ diff --git a/image/page3/bn_sodada.png b/image/page3/bn_sodada.png new file mode 100644 index 00000000..617b71a8 Binary files /dev/null and b/image/page3/bn_sodada.png differ diff --git a/image/page3/bn_tea.png b/image/page3/bn_tea.png index b8dd5ed9..18e360bd 100644 Binary files a/image/page3/bn_tea.png and b/image/page3/bn_tea.png differ diff --git a/image/page3/bp_bestseller.png b/image/page3/bp_bestseller.png index 34c2c61d..f2ff7c03 100644 Binary files a/image/page3/bp_bestseller.png and b/image/page3/bp_bestseller.png differ diff --git a/image/page3/bp_cho_ca.png b/image/page3/bp_cho_ca.png index 9eef4ec3..7df94c5a 100644 Binary files a/image/page3/bp_cho_ca.png and b/image/page3/bp_cho_ca.png differ diff --git a/image/page3/bp_coffee.png b/image/page3/bp_coffee.png index 752b2fb9..fd9fded8 100644 Binary files a/image/page3/bp_coffee.png and b/image/page3/bp_coffee.png differ diff --git a/image/page3/bp_fruit.png b/image/page3/bp_fruit.png index ec0c3358..21e06316 100644 Binary files a/image/page3/bp_fruit.png and b/image/page3/bp_fruit.png differ diff --git a/image/page3/bp_sodada.png b/image/page3/bp_sodada.png new file mode 100644 index 00000000..3c444c2e Binary files /dev/null and b/image/page3/bp_sodada.png differ diff --git a/image/page3/bp_tea.png b/image/page3/bp_tea.png index dde9546f..ba2fcfa3 100644 Binary files a/image/page3/bp_tea.png and b/image/page3/bp_tea.png differ diff --git a/image/page_doing/text2.png b/image/page_doing/text2.png new file mode 100644 index 00000000..83b9da50 Binary files /dev/null and b/image/page_doing/text2.png differ diff --git a/image/page_payment/img_popup1.png b/image/page_payment/img_popup1.png index 7bbe7c9e..21e04c32 100644 Binary files a/image/page_payment/img_popup1.png and b/image/page_payment/img_popup1.png differ diff --git a/xml/menu_back_to_main.xml b/xml/menu_back_to_main.xml index 58de2769..817d98aa 100644 --- a/xml/menu_back_to_main.xml +++ b/xml/menu_back_to_main.xml @@ -7,7 +7,7 @@ OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/menu_board.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/menu_list_original2.xml" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/menu_list.xml" 60000 diff --git a/xml/menu_board.xml b/xml/menu_board.xml index 3206528f..9c8bf030 100644 --- a/xml/menu_board.xml +++ b/xml/menu_board.xml @@ -9,7 +9,8 @@ TopView "hide" ; On open - + Var menu_back_to_main = "ROOT/taobin_project/xml/menu_back_to_main.xml" + Var charOfBaht = "฿" Var KanitTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf" Var KanitMediaTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf" diff --git a/xml/menu_brewing2.xml b/xml/menu_brewing2.xml new file mode 100644 index 00000000..3dbcbf6c --- /dev/null +++ b/xml/menu_brewing2.xml @@ -0,0 +1,141 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + Var LidState = "Enable" + Var StarwState = "Enable" + + + 800 + + + Var CountDownBrewing = CountDownBrewing - 1 + + ; run test; + ;If CountDownBrewing = 40 Then + ; Open "ROOT/taobin_project/xml/menu_drinkok.xml" + ;EndIf + If CountDownBrewing = 0 Then + Open "ROOT/taobin_project/xml/menu_drinkok.xml" + EndIf + + Var ShowCountDownBrewing = CountDownBrewing + + If MachineStage = "drink-success" Then + Open "ROOT/taobin_project/xml/menu_drinkok.xml" + EndIf + + + If MachineStage = "show-menu" Then + Open "ROOT/taobin_project/xml/menu_drinkok.xml" + EndIf + + If MachineStage = "close-maintenance" Then + Open "ROOT/taobin_project/xml/menu_back_to_main.xml" + EndIf + + If MachineStage = "drink-success" Then + Open "ROOT/taobin_project/xml/menu_drinkok.xml" + EndIf + + Refresh + TimerReset + + + + + + + If MachineStage = "drink-success" Then + Open "ROOT/taobin_project/xml/menu_drinkok.xml" + EndIf + If MachineStage = "drink-failed" Then + Open "ROOT/taobin_project/xml/menu_drinkfail.xml" + EndIf + + + + + + 0 + 380 + "ROOT/taobin_project/image/brewing.gif" + + + + 0 + 0 + "ROOT/taobin_project/image/ad_medium_2.png" + + + + + + 140 + 1124 + "ROOT/taobin_project/image/page_doing/text2.png" + + + + + 808 + 480 + 1080 + "Hurr" + 88 + "ROOT/taobin_project/font/Roboto/Roboto-Regular.ttf" + 0x513C2F + ShowCountDownBrewing + + + + + + 0 + 1880 + 30 + Center + 1080 + RobotoBlack + 0x513C2F + MachineStage + + + + + + + 0 + 1886 + 20 + 1080 + Center + RobotoBlack + 0x513C2F + countClick + + + diff --git a/xml/menu_catalog_choose_drink1.pml b/xml/menu_catalog_choose_drink1.pml index 8ce0de87..ab5b07fa 100644 --- a/xml/menu_catalog_choose_drink1.pml +++ b/xml/menu_catalog_choose_drink1.pml @@ -125,69 +125,85 @@ +; + ;bn_bestseller + + + + +; + ;bn_bestseller + + + + 0 diff --git a/xml/menu_catalog_choose_drink2.pml b/xml/menu_catalog_choose_drink2.pml index 205d59c5..e5595078 100644 --- a/xml/menu_catalog_choose_drink2.pml +++ b/xml/menu_catalog_choose_drink2.pml @@ -122,8 +122,8 @@ ;bn_bestseller + + + - 107 - 417 + 92 + 418 "ROOT/taobin_project/image/page3/bn_bestseller.png" "ROOT/taobin_project/image/page3/bp_bestseller.png" "/mnt/sdcard/coffeevending/wav/click.wav" @@ -85,8 +85,8 @@ + + + 0 diff --git a/xml/menu_catalog_choose_drink2_ext.pml b/xml/menu_catalog_choose_drink2_ext.pml index 6dd996c8..044a475e 100644 --- a/xml/menu_catalog_choose_drink2_ext.pml +++ b/xml/menu_catalog_choose_drink2_ext.pml @@ -219,68 +219,84 @@ + ;bn_bestseller + + + + + diff --git a/xml/menu_catalog_choose_drink2_ext.xml b/xml/menu_catalog_choose_drink2_ext.xml index 6b4131e9..d6a412ce 100644 --- a/xml/menu_catalog_choose_drink2_ext.xml +++ b/xml/menu_catalog_choose_drink2_ext.xml @@ -71,68 +71,84 @@ + ;bn_bestseller + + + + + 0 520 diff --git a/xml/menu_catalog_choose_drink3.pml b/xml/menu_catalog_choose_drink3.pml index e51e30ce..fa681491 100644 --- a/xml/menu_catalog_choose_drink3.pml +++ b/xml/menu_catalog_choose_drink3.pml @@ -97,10 +97,12 @@ + + ;bn_bestseller + + + + + + ;bn_bestseller + + + + 0 diff --git a/xml/menu_catalog_choose_drink4.pml b/xml/menu_catalog_choose_drink4.pml index e6e6625d..1bdb460f 100644 --- a/xml/menu_catalog_choose_drink4.pml +++ b/xml/menu_catalog_choose_drink4.pml @@ -91,10 +91,12 @@ + + ;bn_bestseller + + + + + + + ;bn_bestseller + + + + + 0 diff --git a/xml/menu_catalog_choose_drink5.pml b/xml/menu_catalog_choose_drink5.pml index 8a23ea08..ec21d41c 100644 --- a/xml/menu_catalog_choose_drink5.pml +++ b/xml/menu_catalog_choose_drink5.pml @@ -101,10 +101,12 @@ + + ;bn_bestseller + + + + + + + ;bn_bestseller + + + + + 0 diff --git a/xml/menu_catalog_choose_drink6.pml b/xml/menu_catalog_choose_drink6.pml index a2de3646..1e368ed4 100644 --- a/xml/menu_catalog_choose_drink6.pml +++ b/xml/menu_catalog_choose_drink6.pml @@ -93,10 +93,12 @@ + + ;bn_bestseller + + + + + diff --git a/xml/menu_catalog_choose_drink6.xml b/xml/menu_catalog_choose_drink6.xml index 3b325055..b431f883 100644 --- a/xml/menu_catalog_choose_drink6.xml +++ b/xml/menu_catalog_choose_drink6.xml @@ -69,10 +69,12 @@ + + ;bn_bestseller + + + + + diff --git a/xml/menu_payment_cash.xml b/xml/menu_payment_cash.xml index 3e7ff841..5528b82a 100644 --- a/xml/menu_payment_cash.xml +++ b/xml/menu_payment_cash.xml @@ -11,8 +11,14 @@ SAVELOG NameDrinkTH SAVELOG DrinkDescription SAVELOG PriceDrink + SAVELOG topping1 + SAVELOG topping2 + SAVELOG topping3 - + Var PayAmount = PriceDrink + Var showRemaining = charOfBaht + RemainAmountStr + + ; Below original ; On open Var alphaState = "Invisible" @@ -125,8 +131,8 @@ Topping "Pack" "Send" Var PayState1 = "PressForever" - Var PayState2 = "Enable" - Var PayState3 = "Enable" + Var PayState2 = "Enable" + Var PayState3 = "Enable" If GetPayInfoFlag = 0 Then @@ -138,7 +144,7 @@ PrepareDrink SelectDrink SelectSugarID Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + sugarID + Var SessionID2 = SessionID2 + "00" Var SessionID2 = SessionID2 + "000" Var CreditAmount1 = "" @@ -306,7 +312,9 @@ Var Timeout = 0 - Var RemainAmount + ;Var RemainAmount = 0 + Var showRemaining = charOfBaht + RemainAmountStr + EndIf @@ -333,7 +341,7 @@ Var MachineStage = "make-drink" Var BrewingTextThai = "เตรียมแก้ว" ;MakeDrinkV1 SelectDrink SelectSugarID - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Open "ROOT/taobin_project/xml/menu_thankyou.xml" @@ -376,7 +384,7 @@ + + + + + + + + + + + + + + + + + + + + + - If GetPayInfoFlag = 0 Then + + + + + + 217 + 833 + "ROOT/taobin_project/image/collectiing/img3.png" + + + + 361 + 873 + ShowTextNumber + "ROOT/taobin_project/image/collectiing/text1.png" + + + + + 0 + 873 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + TelephoneNumber + Telnum + + + + + + 112 + 593 + "ROOT/taobin_project/image/enter_point/text1.png" + 0 0 - "ROOT/taobin_project/image/page2/ad_blank1.png" + "ROOT/taobin_project/image/ad_medium_2.png" - - 166 - 501 - "ROOT/taobin_project/image/page_payment/text_1.png" - - - - - - - - 375 - 623 - 295 - 427 - PictureDrink - - - -; -; 375 -; 320 -; 30 -; fontType1 -; 0x000000 -; NameDrink -; - - - 0 - 938 - 1080 - Center - 72 - "ROOT/taobin_project/font/Roboto/Roboto-Regular.ttf" - 0xB78F24 - NameDrinkTH - - - - - - - - - - - - 466 - 1132 - "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf" - 72 - 0xDE794E - "฿25" - - Open "/media/bt/xml/security_alarm.xml" + + + diff --git a/xml/menu_topping_alter.xml b/xml/menu_topping_alter.xml index e8d04e76..995424a4 100644 --- a/xml/menu_topping_alter.xml +++ b/xml/menu_topping_alter.xml @@ -32,8 +32,7 @@ Var y2_topping_bg = y_topping_bg + y_block Var y2_topping = y_topping + y_block - - Var y_submenu_bg = 912 + Var BugFlag = 0 diff --git a/xml/menu_topping_with_barista.xml b/xml/menu_topping_with_barista.xml index 3ca48058..4d52a2e2 100644 --- a/xml/menu_topping_with_barista.xml +++ b/xml/menu_topping_with_barista.xml @@ -5,7 +5,12 @@ "0xeae6e1" SoundVolume - ; On open + ; Read me sarddd + ; This page show user select "normal or baristra" + ; Topping 1 is sugar type. + ; Topping 2 not have. + Var topping1 = toppingID1Default + Var SugarState1 = "Invisible" Var SugarState2 = "Invisible" Var SugarState3 = "Invisible" @@ -19,6 +24,7 @@ Var BGSubmenu = "Enable" Var BaristaMenu = "Enable" Var NormalMenu = "PressForever" + Var y_topping_bg = y2_topping_bg Var y_topping = y2_topping @@ -28,23 +34,20 @@ SAVELOG TOPPING2 SAVELOG PreviseXMLFileName2 - + ; Var y_sugar_block = 105 - Var y_block = 206 - + Var y_block = 175 Var y_topping_bg = 912 Var y_topping = 912 + y_sugar_block - Var y2_topping_bg = y_topping_bg + y_block Var y2_topping = y_topping + y_block - Var y_submenu_bg = 912 - - Var BugFlag = 0 - Var y_topping_bg = y2_topping_bg Var y_topping = y2_topping - Var BugFlag = 1 + + + Var BugFlag = 0 + SAVELOG y_topping_bg SAVELOG y_topping SAVELOG y2_topping_bg @@ -74,7 +77,6 @@ - 44 938 @@ -113,7 +115,8 @@ Var NormalMenu = "Enable" Var BaristaMenu = "PressForever" Var BugFlag = 1 - Topping "Load" SubMenuProductCode1 + + Topping "LoadSubMenu" SubMenuProductCode1 Refresh @@ -149,6 +152,8 @@ Var SugarState5 = "Enable" Var BGSugar = "Enable" Var PriceShowValue = charOfBaht + PriceDrink + ;SAVELOG PriceDrink + Var topping1 = toppingID1Default Refresh EndIf @@ -159,7 +164,9 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" Var BGSugar = "Enable" + ;SAVELOG SubMenuPrice1 Var PriceShowValue = charOfBaht + SubMenuPrice1 + Var topping1 = toppingID1Default Refresh EndIf @@ -227,13 +234,13 @@ SoundVolume - ;If BaristaMenu = "PressForever" Then - ; Var SelectDrink = SubMenuProductCode1 - ; Var NameDrink = SubMenuName11 - ; Var NameDrinkTH = SubMenuName21 - ; Var DrinkDescription = SubMenuDescript1 - ; Var PriceDrink = SubMenuPrice1 - ;EndIf + If BaristaMenu = "PressForever" Then + Var SelectDrink = SubMenuProductCode1 + Var NameDrink = SubMenuName11 + Var NameDrinkTH = SubMenuName21 + Var DrinkDescription = SubMenuDescript1 + Var PriceDrink = SubMenuPrice1 + EndIf Open "ROOT/taobin_project/xml/menu_payment_cash.xml" @@ -274,15 +281,16 @@ If TOPPING1 = "Powder Sugar Premix 25" Then Var SugarState1 = "Invisible" Var SugarState2 = "Invisible" + Var topping1 = "1" Else Var SugarState1 = "PressForever" Var SugarState2 = "Enable" + Var topping1 = "1" EndIf Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" - Var topping1 = "1" Refresh @@ -302,14 +310,15 @@ If TOPPING1 = "Powder Sugar Premix 25" Then Var SugarState1 = "Invisible" Var SugarState2 = "Invisible" + Var topping1 = "10" Else Var SugarState1 = "Enable" Var SugarState2 = "PressForever" + Var topping1 = "2" EndIf Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" - Var topping1 = "2" Refresh @@ -330,15 +339,17 @@ If TOPPING1 = "Powder Sugar Premix 25" Then Var SugarState1 = "Invisible" Var SugarState2 = "Invisible" + Var topping1 = "11" Else Var SugarState1 = "Enable" Var SugarState2 = "Enable" + Var topping1 = "3" EndIf Var SugarState3 = "PressForever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" - Var topping1 = "3" + Refresh @@ -357,15 +368,17 @@ If TOPPING1 = "Powder Sugar Premix 25" Then Var SugarState1 = "Invisible" Var SugarState2 = "Invisible" + Var topping1 = "12" Else Var SugarState1 = "Enable" Var SugarState2 = "Enable" + Var topping1 = "4" EndIf Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" - Var topping1 = "4" + Refresh @@ -384,15 +397,17 @@ If TOPPING1 = "Powder Sugar Premix 25" Then Var SugarState1 = "Invisible" Var SugarState2 = "Invisible" + Var topping1 = "13" Else Var SugarState1 = "Enable" Var SugarState2 = "Enable" + Var topping1 = "5" EndIf Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" - Var topping1 = "5" + Refresh