diff --git a/image/page_drink/bn_iced_strawberrycocoa_smoothie.png b/image/page_drink/bn_iced_strawberrycocoa_smoothie.png index 5d097b91..6120cd34 100644 Binary files a/image/page_drink/bn_iced_strawberrycocoa_smoothie.png and b/image/page_drink/bn_iced_strawberrycocoa_smoothie.png differ diff --git a/image/page_drink/bn_strawberry_milk_smoothie.png b/image/page_drink/bn_strawberry_milk_smoothie.png new file mode 100644 index 00000000..2d652235 Binary files /dev/null and b/image/page_drink/bn_strawberry_milk_smoothie.png differ diff --git a/image/page_drink_disable/bn_strawberry_milk_smoothie.png b/image/page_drink_disable/bn_strawberry_milk_smoothie.png new file mode 100644 index 00000000..3e20368c Binary files /dev/null and b/image/page_drink_disable/bn_strawberry_milk_smoothie.png differ diff --git a/image/page_drink_press/bn_strawberry_milk_smoothie.png b/image/page_drink_press/bn_strawberry_milk_smoothie.png new file mode 100644 index 00000000..500825b2 Binary files /dev/null and b/image/page_drink_press/bn_strawberry_milk_smoothie.png differ diff --git a/image/page_drink_select/bn_strawberry_milk_smoothie.png b/image/page_drink_select/bn_strawberry_milk_smoothie.png new file mode 100644 index 00000000..1b46ae58 Binary files /dev/null and b/image/page_drink_select/bn_strawberry_milk_smoothie.png differ diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv index 7f9b55a4..04721f89 100644 --- a/sheet/best_seller.tsv +++ b/sheet/best_seller.tsv @@ -1,4 +1,7 @@ 17/1/21 +12-03-03-0011 +12-03-03-0010 +12-04-02-0014 12-03-03-0009 12-03-03-0002 12-02-03-0004 diff --git a/xml/page_board.xml b/xml/page_board.xml index 79e59017..6bd91bbb 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -28,7 +28,9 @@ Cart "DeleteMenuID" "ALL" Var MultiPayEnable = "true" - Var ShoppyPayEnable = "true" + Var ShoppyPayEnable = "false" + Var WebAppEnable = "true" + Var WebAppShow = "Enable" Var PayType = "" ; On open @@ -548,9 +550,9 @@ If CocktailShow = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" Else - If TaobinOnline = "true" Then + ;If TaobinOnline = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" - EndIf + ;EndIf If TermTemOnline = "true" Then @@ -609,9 +611,9 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - If TaobinOnline = "true" Then + ;If TaobinOnline = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" - EndIf + ;EndIf If TermTemOnline = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt_catalog.xml" EndIf @@ -662,7 +664,7 @@ 1110 178 178 - "Enable" + WebAppShow testservice diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 2b753d0a..b4ad55f8 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -397,7 +397,7 @@ QRCODE99_Y 178 178 - "Enable" + WebAppShow testservice diff --git a/xml/page_tel_number_mask.xml b/xml/page_tel_number_mask.xml index 7eaf81be..43c04434 100644 --- a/xml/page_tel_number_mask.xml +++ b/xml/page_tel_number_mask.xml @@ -30,6 +30,51 @@ DEBUGVAR CART2_PRICE DEBUGVAR CART3_PRICE + + Var $next.productCode = "xx-xx-nn-next" + Var $prev.productCode = "xx-xx-nn-prev" + Var $curr.productCode = "xx-xx-nn-curr" + + Var $next.productPrice = 10 + Var $prev.productPrice = 20 + Var $curr.productPrice = 30 + + DEBUGVAR $next.productCode + DEBUGVAR $prev.productCode + DEBUGVAR $curr.productCode + + DEBUGVAR $next.productPrice + DEBUGVAR $prev.productPrice + DEBUGVAR $curr.productPrice + + + + Var seeker = "next" + DEBUGVAR seeker + DEBUGVAR seeker.productCode + DEBUGVAR seeker.productPrice + + Var seeker.productCode = "nn-nn-nn-setn" + DEBUGVAR seeker.productCode + DEBUGVAR seeker.productPrice + + Var TelephoneNumber = seeker.productCode + + Var seeker = "prev" + DEBUGVAR seeker + DEBUGVAR seeker.productCode + Var seeker.productPrice = 100 + Var seeker.productCode = "-------------" + DEBUGVAR seeker.productCode + DEBUGVAR seeker.productPrice + + ; again + Var seeker = "next" + DEBUGVAR seeker + DEBUGVAR seeker.productCode + DEBUGVAR seeker.productPrice + + 1000 @@ -178,9 +223,23 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - DEBUGVAR CART1_READY - DEBUGVAR CART2_READY - DEBUGVAR CART3_READY + + + Var seeker = "prev" + DEBUGVAR seeker + DEBUGVAR seeker.productCode + DEBUGVAR seeker.productPrice + + TransferVar "prev" "next" + + DEBUGVAR seeker + DEBUGVAR seeker.productCode + DEBUGVAR seeker.productPrice + + Var seeker = "prev" + DEBUGVAR seeker + DEBUGVAR seeker.productCode + DEBUGVAR seeker.productPrice @@ -271,7 +330,6 @@ 0x513C2F "Enable" TelephoneNumber - Telnum-mask-1 diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 83f7ee16..9e161849 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.77" - Var XMLPageVersionInt = 577 + Var XMLPageVersion = "5.78" + Var XMLPageVersionInt = 578