diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv index e0d154e0..e8e1ae08 100644 --- a/animation01/Menu Description - Sheet1.tsv +++ b/animation01/Menu Description - Sheet1.tsv @@ -236,8 +236,8 @@ Bedroom Story 11-99-05-0006 1 23 27 28 24 49 7:01 23 Good Night Kiss 11-99-05-0009 1 23 27 28 24 49 8:01 23 Forever Love 11-99-05-0010 1 23 27 28 24 49 9:01 23 Long Night 11-99-05-0008 1 23 27 28 24 49 10:01 23 - - +Forever Love 11-99-05-0012 1 23 27 28 24 49 9:01 23 +Long Night 11-99-05-0013 1 23 27 28 24 49 10:01 23 diff --git a/xml/page_board.xml b/xml/page_board.xml index b629f4f9..11fd3769 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -111,7 +111,7 @@ If cock_tail_enable = "true" Then Var WheyShow = "false" Var CocktailShow = "true" - Var roadshow = "true" + Var RoadShow = "true" EndIf @@ -664,6 +664,7 @@ 778 632 +WebAppShow "ROOT/taobin_project/image/home/home/qr_bg.png" @@ -732,6 +733,7 @@ If countClick = 3 Then Var countClick = 0 + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_collect_point_1.xml" diff --git a/xml/page_catalog_choose_drink8.pml b/xml/page_catalog_choose_drink8.pml index b2db03b0..b1abef84 100644 --- a/xml/page_catalog_choose_drink8.pml +++ b/xml/page_catalog_choose_drink8.pml @@ -16,7 +16,9 @@ product_code.append('11-99-05-0008') product_code.append('11-99-05-0009') product_code.append('11-99-05-0010') - + product_code.append('11-99-05-0012') + product_code.append('11-99-05-0013') + menu_count = len( product_code) ?> diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index 106bb346..8a4c9e9b 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -1347,6 +1347,218 @@ ) "ROOT/taobin_project/image/topping2/blender_icon.png" + + ; button i=11 11-99-05-0012 + + 33 + 22 + 225 + 296 + $11-99-05-0012.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-05-0012.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-05-0012.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-05-0012.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-05-0012.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-05-0012.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + ; button i=12 11-99-05-0013 + + 33 + 22 + 225 + 296 + $11-99-05-0013.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-05-0013.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-05-0013.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-05-0013.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-05-0013.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-05-0013.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; Cart