diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv index abdb097b..10535203 100644 --- a/animation01/Menu Description - Sheet1.tsv +++ b/animation01/Menu Description - Sheet1.tsv @@ -145,6 +145,12 @@ HOT AMERICANO BLUE DADDY 12-01-01-0019 1 2 42 3 4 5 16 24 88 1:28 32 ICED AMERICANO BLUE DADDY 12-01-02-0019 1 2 42 3 4 5 23 16 24 133 2:13 32 ESPRESSO BLUE DADDY 12-01-01-0020 1 2 42 3 4 5 24 66 1:06 32 +MOZART ALMOST DIRTY 12-01-02-0022 1 7 43 2 3 4 5 24 100 22:40 32 +อเมริกาโนร้อน 12-01-01-0021 1 2 43 3 4 5 16 24 88 1:28 32 +อเมริกาโนเย็น 12-01-02-0021 1 2 43 3 4 5 23 16 24 133 2:13 32 +เอสเพรสโซ่ช็อต 12-01-01-0022 1 2 43 3 4 5 24 66 1:06 32 + + diff --git a/animation01/sync_0.file b/animation01/sync_0.file new file mode 100644 index 00000000..15de7a0d --- /dev/null +++ b/animation01/sync_0.file @@ -0,0 +1,43 @@ +total 253480 +-rw-r--r--@ 1 wanloprungsiyangkul staff 20682 Sep 30 15:05 Menu Description - Sheet1.tsv +-rw-r--r--@ 1 wanloprungsiyangkul staff 15623 Sep 22 20:35 Menu Description - Sheet1_.tsv +-rw-r--r--@ 1 wanloprungsiyangkul staff 948282 Nov 15 2020 TaoBin2_draft02_art1.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3603060 Nov 15 2020 TaoBin2_draft02_art10.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3166935 Nov 15 2020 TaoBin2_draft02_art11.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 2523981 Nov 15 2020 TaoBin2_draft02_art12.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3033922 Nov 15 2020 TaoBin2_draft02_art13.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1504005 Nov 15 2020 TaoBin2_draft02_art14.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3485911 Nov 15 2020 TaoBin2_draft02_art15.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3116323 Nov 15 2020 TaoBin2_draft02_art16.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3221745 Nov 15 2020 TaoBin2_draft02_art17.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1375111 Nov 15 2020 TaoBin2_draft02_art18.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1478218 Nov 15 2020 TaoBin2_draft02_art19.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 4333281 Nov 15 2020 TaoBin2_draft02_art2.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1416127 Nov 15 2020 TaoBin2_draft02_art20.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1495680 Nov 15 2020 TaoBin2_draft02_art21.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1469930 Nov 15 2020 TaoBin2_draft02_art22.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1920522 Nov 15 2020 TaoBin2_draft02_art23.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1425647 Nov 15 2020 TaoBin2_draft02_art24.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 2879806 Dec 5 2020 TaoBin2_draft02_art25.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3161811 Dec 5 2020 TaoBin2_draft02_art26.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 5410752 Dec 15 2020 TaoBin2_draft02_art27.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 6889815 Dec 15 2020 TaoBin2_draft02_art28.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1966646 Nov 15 2020 TaoBin2_draft02_art3.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1876379 Apr 21 21:02 TaoBin2_draft02_art31.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1796407 Apr 21 21:02 TaoBin2_draft02_art32.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1840993 Apr 21 21:02 TaoBin2_draft02_art33.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 4730836 Apr 21 21:02 TaoBin2_draft02_art34.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1375111 Nov 15 2020 TaoBin2_draft02_art35.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 10750801 Aug 25 10:14 TaoBin2_draft02_art36.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1504005 Nov 15 2020 TaoBin2_draft02_art37.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1595611 Nov 15 2020 TaoBin2_draft02_art4.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3055256 Sep 24 18:44 TaoBin2_draft02_art40.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3605634 Sep 24 18:44 TaoBin2_draft02_art41.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 9350285 Sep 24 18:44 TaoBin2_draft02_art42.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 9643046 Sep 24 18:44 TaoBin2_draft02_art43.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 2041924 Nov 16 2020 TaoBin2_draft02_art5.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3843048 Nov 15 2020 TaoBin2_draft02_art6.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3740266 Nov 15 2020 TaoBin2_draft02_art7.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3998856 Nov 15 2020 TaoBin2_draft02_art8.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3616423 Nov 15 2020 TaoBin2_draft02_art9.mp4 +-rw-r--r-- 1 wanloprungsiyangkul staff 0 Oct 11 00:29 sync_0.file diff --git a/image/topping2/bd_add_shot.png b/image/topping2/bd_add_shot.png new file mode 100644 index 00000000..b307f146 Binary files /dev/null and b/image/topping2/bd_add_shot.png differ diff --git a/image/topping2/bd_add_shot2.png b/image/topping2/bd_add_shot2.png new file mode 100644 index 00000000..5dc067fb Binary files /dev/null and b/image/topping2/bd_add_shot2.png differ diff --git a/image/topping2/bd_blended.png b/image/topping2/bd_blended.png new file mode 100644 index 00000000..bb71dcb0 Binary files /dev/null and b/image/topping2/bd_blended.png differ diff --git a/image/topping2/bd_lid.png b/image/topping2/bd_lid.png index bccf8589..0d8e9ed8 100644 Binary files a/image/topping2/bd_lid.png and b/image/topping2/bd_lid.png differ diff --git a/image/topping2/bd_straw.png b/image/topping2/bd_straw.png index b89bde0e..92802ef6 100644 Binary files a/image/topping2/bd_straw.png and b/image/topping2/bd_straw.png differ diff --git a/image/topping2/blender_icon.png b/image/topping2/blender_icon.png new file mode 100644 index 00000000..232074d7 Binary files /dev/null and b/image/topping2/blender_icon.png differ diff --git a/image/topping2/cb_checkdis.png b/image/topping2/cb_checkdis.png new file mode 100644 index 00000000..f5249c29 Binary files /dev/null and b/image/topping2/cb_checkdis.png differ diff --git a/image/topping2/cb_disable.png b/image/topping2/cb_disable.png new file mode 100644 index 00000000..3d6a0cfe Binary files /dev/null and b/image/topping2/cb_disable.png differ diff --git a/image/topping2/cb_disable_alway.png b/image/topping2/cb_disable_alway.png new file mode 100644 index 00000000..3d6a0cfe Binary files /dev/null and b/image/topping2/cb_disable_alway.png differ diff --git a/image/topping2/cb_force_checked.png b/image/topping2/cb_force_checked.png new file mode 100644 index 00000000..14b1387b Binary files /dev/null and b/image/topping2/cb_force_checked.png differ diff --git a/image/topping2/text20.png b/image/topping2/text20.png new file mode 100644 index 00000000..51cae1df Binary files /dev/null and b/image/topping2/text20.png differ diff --git a/image/topping2/text21.png b/image/topping2/text21.png new file mode 100644 index 00000000..0360c597 Binary files /dev/null and b/image/topping2/text21.png differ diff --git a/image/topping2/text4.png b/image/topping2/text4.png new file mode 100644 index 00000000..b9f68c40 Binary files /dev/null and b/image/topping2/text4.png differ diff --git a/image/topping2/text5.png b/image/topping2/text5.png new file mode 100644 index 00000000..788f6ae5 Binary files /dev/null and b/image/topping2/text5.png differ diff --git a/image/topping2/text7.png b/image/topping2/text7.png new file mode 100644 index 00000000..62456de9 Binary files /dev/null and b/image/topping2/text7.png differ diff --git a/image/topping2_en/bd_lid.png b/image/topping2_en/bd_lid.png index 3b83102b..0d8e9ed8 100644 Binary files a/image/topping2_en/bd_lid.png and b/image/topping2_en/bd_lid.png differ diff --git a/image/topping2_en/bd_straw.png b/image/topping2_en/bd_straw.png index 68c6f293..9f8f6924 100644 Binary files a/image/topping2_en/bd_straw.png and b/image/topping2_en/bd_straw.png differ diff --git a/image/topping2_en/cb_checkdis.png b/image/topping2_en/cb_checkdis.png new file mode 100644 index 00000000..f5249c29 Binary files /dev/null and b/image/topping2_en/cb_checkdis.png differ diff --git a/image/topping2_en/cb_checked.png b/image/topping2_en/cb_checked.png index b862146d..f5d42843 100644 Binary files a/image/topping2_en/cb_checked.png and b/image/topping2_en/cb_checked.png differ diff --git a/image/topping2_en/cb_force_checked.png b/image/topping2_en/cb_force_checked.png new file mode 100644 index 00000000..6b396d2b Binary files /dev/null and b/image/topping2_en/cb_force_checked.png differ diff --git a/image/topping2_en/cb_notcheck.png b/image/topping2_en/cb_notcheck.png index 116c2f7e..174df0da 100644 Binary files a/image/topping2_en/cb_notcheck.png and b/image/topping2_en/cb_notcheck.png differ diff --git a/image/topping2_en/text20.png b/image/topping2_en/text20.png new file mode 100644 index 00000000..89ca1af7 Binary files /dev/null and b/image/topping2_en/text20.png differ diff --git a/image/topping2_en/text21.png b/image/topping2_en/text21.png new file mode 100644 index 00000000..c76d17ee Binary files /dev/null and b/image/topping2_en/text21.png differ diff --git a/image/topping2_en/text4.png b/image/topping2_en/text4.png new file mode 100644 index 00000000..bf2f714a Binary files /dev/null and b/image/topping2_en/text4.png differ diff --git a/image/topping2_en/text5.png b/image/topping2_en/text5.png new file mode 100644 index 00000000..0fe9d506 Binary files /dev/null and b/image/topping2_en/text5.png differ diff --git a/image/topping2_en/text7.png b/image/topping2_en/text7.png new file mode 100644 index 00000000..514a3761 Binary files /dev/null and b/image/topping2_en/text7.png differ diff --git a/image/vending_error/img1.png b/image/vending_error/img1.png new file mode 100644 index 00000000..ceb099da Binary files /dev/null and b/image/vending_error/img1.png differ diff --git a/image/vending_error/text1.png b/image/vending_error/text1.png new file mode 100644 index 00000000..12679c96 Binary files /dev/null and b/image/vending_error/text1.png differ diff --git a/image/vending_error/text2.png b/image/vending_error/text2.png new file mode 100644 index 00000000..295a0b66 Binary files /dev/null and b/image/vending_error/text2.png differ diff --git a/image/vending_error_en/img1.png b/image/vending_error_en/img1.png new file mode 100644 index 00000000..c5114d1a Binary files /dev/null and b/image/vending_error_en/img1.png differ diff --git a/image/vending_error_en/text1.png b/image/vending_error_en/text1.png new file mode 100644 index 00000000..af64c06a Binary files /dev/null and b/image/vending_error_en/text1.png differ diff --git a/image/vending_error_en/text2.png b/image/vending_error_en/text2.png new file mode 100644 index 00000000..bd9c11c8 Binary files /dev/null and b/image/vending_error_en/text2.png differ diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv index a0653641..76e49c6e 100644 --- a/sheet/best_seller.tsv +++ b/sheet/best_seller.tsv @@ -4,6 +4,7 @@ 12-02-03-0004 12-05-03-0007 12-05-03-0019 +12-01-01-0021 12-01-01-0001 12-01-01-0004 12-01-02-0020 diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml index b2245f5e..66b55005 100644 --- a/xml/menu_catalog.xml +++ b/xml/menu_catalog.xml @@ -4,8 +4,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf diff --git a/xml/menu_gen.py b/xml/menu_gen.py index fc55808f..0f361ba6 100644 --- a/xml/menu_gen.py +++ b/xml/menu_gen.py @@ -40,8 +40,11 @@ #out_xml( '\t\tVar PriceShowValue = "Free"\r\n') out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n') + out_xml( '\t\tSTRCONTAIN "Smoothie" $' + product_code[i] + '.Button IsSmoRet\r\n') + out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_alter.xml"\r\n') - + + out_xml( '\t\r\n') out_xml( '\t\r\n') @@ -55,6 +58,7 @@ out_xml( '\t KanitTTF \r\n') out_xml( '\t 0xB78F24 \r\n') out_xml( '\t $' + product_code[i] + '.Price \r\n') + #out_xml( '\t eval( STRCONTAIN "Smoothie" $' + product_code[i] + '.Button SmoRet \n If SmoRet = "true" Then\n Var return = "Enable"\n Else\n Var return = "Invisible"\n EndIf\n) \r\n') out_xml( '\t\r\n') out_xml( '\t\r\n') @@ -115,6 +119,13 @@ out_xml( '\t $' + product_code[i] + '.descriptionE \r\n') out_xml( '\t\r\n') + out_xml( '\t\r\n') + out_xml( '\t 2 \r\n') + out_xml( '\t 2 \r\n') + out_xml( '\t eval( STRCONTAIN "Smoothie" $' + product_code[i] + '.Button SmoRet \n If SmoRet = "true" Then\n Var return = "Enable"\n Else\n Var return = "Invisible"\n EndIf\n) \r\n') + out_xml( '\t "ROOT/taobin_project/image/topping2/blender_icon.png" \r\n') + out_xml( '\t\r\n') + out_xml( '\r\n') diff --git a/xml/page_board.xml b/xml/page_board.xml index 01a36a23..d014d554 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -11,6 +11,7 @@ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml" Var FileNumber = 1 + DEBUGVAR SoundVolume Var GetFreeFromError = 0 Var taobin_version = "1.53" @@ -490,7 +491,7 @@ ShowButtonClick ; "0x00BDFF" "ROOT/taobin_project/image/main_page/bp_main_page_start.png" - "/mnt/sdcard/coffeevending/wav/click.wav" +; "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" @@ -626,7 +627,7 @@ Var countClick = 0 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_tel_number_mask.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_free.xml" TopView "show" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 9e0f0788..58a74b3a 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -262,10 +262,19 @@ Var Timeout = Timeout + 1 - If CountDownBrewing > 0 Then - Var CountDownBrewing = CountDownBrewing - 1 + If MOVE_CUP_TO_DOOR = "true" Then + Var MOVE_CUP_TO_DOOR = "false" 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 ;Open "ROOT/taobin_project/xml/page_drinkok.xml" diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 22197099..58562c37 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -18,7 +18,7 @@ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml" EndIf - Machine DoorLidClose + ;Machine DoorLidClose Var GetPayInfoFlag = 0 Var countDownRetrun = 30 @@ -51,7 +51,6 @@ Var StrawAutoRelease1 = "false" Var StrawAutoRelease2 = "false" - Machine DoorClose If NetworkStatus = "ACTIVATE" Then Var ShowButtonClick2 = "Enable" diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml index 55ce2469..fec98dfe 100644 --- a/xml/page_catalog_choose_drink.xml +++ b/xml/page_catalog_choose_drink.xml @@ -53,8 +53,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -287,6 +293,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_1.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -353,6 +360,18 @@ showengText $best_seller_1.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_1.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-01-01-0003 @@ -380,6 +399,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -446,6 +466,18 @@ showengText $12-01-01-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-01-01-0004 @@ -473,6 +505,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -539,6 +572,18 @@ showengText $12-01-01-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-01-02-0003 @@ -566,6 +611,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -632,6 +678,18 @@ showengText $12-01-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-03-02-0002 @@ -659,6 +717,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -725,6 +784,18 @@ showengText $12-03-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-03-02-0004 @@ -752,6 +823,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -818,6 +890,18 @@ showengText $12-03-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-02-02-0002 @@ -845,6 +929,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -911,6 +996,18 @@ showengText $12-02-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-02-02-0004 @@ -938,6 +1035,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1004,6 +1102,18 @@ showengText $12-02-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-02-02-0001 @@ -1031,6 +1141,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1097,6 +1208,18 @@ showengText $12-02-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-02-02-0007 @@ -1124,6 +1247,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1190,6 +1314,18 @@ showengText $12-02-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 12-02-02-0008 @@ -1217,6 +1353,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1283,6 +1420,18 @@ showengText $12-02-02-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0008.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 12-05-02-0007 @@ -1310,6 +1459,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1376,6 +1526,18 @@ showengText $12-05-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 12-05-02-0021 @@ -1403,6 +1565,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0021.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1469,6 +1632,18 @@ showengText $12-05-02-0021.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=14 12-05-02-0013 @@ -1496,6 +1671,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0013.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1562,6 +1738,18 @@ showengText $12-05-02-0013.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=15 12-05-02-0012 @@ -1589,6 +1777,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0012.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1655,6 +1844,18 @@ showengText $12-05-02-0012.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-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=16 12-05-02-0009 @@ -1682,6 +1883,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1748,6 +1950,18 @@ showengText $12-05-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index b4b534ff..5543510a 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -53,8 +53,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -287,6 +293,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_1.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -353,6 +360,18 @@ showengText $best_seller_1.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_1.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 best_seller_2 @@ -380,6 +399,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_2.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -446,6 +466,18 @@ showengText $best_seller_2.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_2.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 best_seller_3 @@ -473,6 +505,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_3.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -539,6 +572,18 @@ showengText $best_seller_3.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_3.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 best_seller_4 @@ -566,6 +611,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_4.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -632,6 +678,18 @@ showengText $best_seller_4.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_4.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 best_seller_5 @@ -659,6 +717,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_5.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -725,6 +784,18 @@ showengText $best_seller_5.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_5.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 best_seller_6 @@ -752,6 +823,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_6.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -818,6 +890,18 @@ showengText $best_seller_6.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_6.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 best_seller_7 @@ -845,6 +929,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_7.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -911,6 +996,18 @@ showengText $best_seller_7.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_7.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 best_seller_8 @@ -938,6 +1035,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_8.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1004,6 +1102,18 @@ showengText $best_seller_8.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_8.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 best_seller_9 @@ -1031,6 +1141,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_9.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1097,6 +1208,18 @@ showengText $best_seller_9.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_9.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 best_seller_10 @@ -1124,6 +1247,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_10.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1190,6 +1314,18 @@ showengText $best_seller_10.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_10.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 best_seller_11 @@ -1217,6 +1353,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_11.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1283,6 +1420,18 @@ showengText $best_seller_11.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_11.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 best_seller_12 @@ -1310,6 +1459,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_12.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1376,6 +1526,18 @@ showengText $best_seller_12.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_12.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 best_seller_13 @@ -1403,6 +1565,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_13.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1469,6 +1632,18 @@ showengText $best_seller_13.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_13.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=14 best_seller_14 @@ -1496,6 +1671,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_14.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1562,6 +1738,18 @@ showengText $best_seller_14.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_14.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=15 best_seller_15 @@ -1589,6 +1777,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_15.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1655,6 +1844,18 @@ showengText $best_seller_15.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_15.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=16 best_seller_16 @@ -1682,6 +1883,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_16.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1748,6 +1950,18 @@ showengText $best_seller_16.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_16.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml index 38c3d561..de4b9877 100644 --- a/xml/page_catalog_choose_drink2.pml +++ b/xml/page_catalog_choose_drink2.pml @@ -8,13 +8,17 @@ product_code = [] product_code.append('12-01-01-0001') + # esp product_code.append('12-01-01-0013') product_code.append('12-01-01-0020') + product_code.append('12-01-01-0022') product_code.append('12-11-01-0001') product_code.append('12-01-01-0003') + # hot ameri product_code.append('12-01-01-0014') product_code.append('12-01-01-0019') + product_code.append('12-01-01-0021') product_code.append('12-01-01-0004') @@ -28,14 +32,18 @@ product_code.append('12-01-01-0011') product_code.append('12-01-01-0012') product_code.append('12-01-01-0017') + # Dirty product_code.append('12-01-02-0018') product_code.append('12-01-02-0020') - + product_code.append('12-01-02-0022') product_code.append('12-11-02-0001') product_code.append('12-01-02-0001') + + # Ice ameri product_code.append('12-01-02-0011') product_code.append('12-01-02-0019') + product_code.append('12-01-02-0021') product_code.append('12-01-02-0002') product_code.append('12-11-02-0002') diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 7a3c3a65..2e988c76 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -56,8 +56,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -291,6 +297,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -357,6 +364,18 @@ showengText $12-01-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-01-01-0013 @@ -384,6 +403,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0013.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -450,6 +470,18 @@ showengText $12-01-01-0013.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-01-01-0020 @@ -477,6 +509,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0020.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -543,8 +576,126 @@ showengText $12-01-01-0020.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=4 12-11-01-0001 + ; button i=4 12-01-01-0022 + + 33 + 22 + 225 + 296 + $12-01-01-0022.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-01-0022.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-01-0022.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-01-0022.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-01-0022.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-01-0022.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + ; button i=5 12-11-01-0001 33 22 @@ -570,6 +721,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-11-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -636,8 +788,20 @@ showengText $12-11-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-11-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=5 12-01-01-0003 + ; button i=6 12-01-01-0003 33 22 @@ -663,6 +827,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -729,8 +894,20 @@ showengText $12-01-01-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=6 12-01-01-0014 + ; button i=7 12-01-01-0014 33 22 @@ -756,6 +933,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0014.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -822,8 +1000,20 @@ showengText $12-01-01-0014.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0014.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=7 12-01-01-0019 + ; button i=8 12-01-01-0019 33 22 @@ -849,6 +1039,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0019.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -915,8 +1106,126 @@ showengText $12-01-01-0019.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=8 12-01-01-0004 + ; button i=9 12-01-01-0021 + + 33 + 22 + 225 + 296 + $12-01-01-0021.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-01-0021.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-01-0021.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-01-0021.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-01-0021.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-01-0021.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + ; button i=10 12-01-01-0004 33 22 @@ -942,6 +1251,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1008,8 +1318,20 @@ showengText $12-01-01-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=9 12-01-01-0005 + ; button i=11 12-01-01-0005 33 22 @@ -1035,6 +1357,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1101,8 +1424,20 @@ showengText $12-01-01-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=10 12-01-01-0006 + ; button i=12 12-01-01-0006 33 22 @@ -1128,6 +1463,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1194,8 +1530,20 @@ showengText $12-01-01-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=11 12-01-01-0007 + ; button i=13 12-01-01-0007 33 22 @@ -1221,6 +1569,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1287,8 +1636,20 @@ showengText $12-01-01-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0007.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 12-01-01-0009 + ; button i=14 12-01-01-0009 33 22 @@ -1314,6 +1675,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1380,8 +1742,20 @@ showengText $12-01-01-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=13 12-01-01-0010 + ; button i=15 12-01-01-0010 33 22 @@ -1407,6 +1781,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1473,8 +1848,20 @@ showengText $12-01-01-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=14 12-01-01-0011 + ; button i=16 12-01-01-0011 33 22 @@ -1500,6 +1887,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1566,8 +1954,20 @@ showengText $12-01-01-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=15 12-01-01-0012 + ; button i=17 12-01-01-0012 33 22 @@ -1593,6 +1993,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0012.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1659,8 +2060,20 @@ showengText $12-01-01-0012.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-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=16 12-01-01-0017 + ; button i=18 12-01-01-0017 33 22 @@ -1686,6 +2099,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0017.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1752,8 +2166,20 @@ showengText $12-01-01-0017.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=17 12-01-02-0018 + ; button i=19 12-01-02-0018 33 22 @@ -1779,6 +2205,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0018.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1845,8 +2272,20 @@ showengText $12-01-02-0018.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0018.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=18 12-01-02-0020 + ; button i=20 12-01-02-0020 33 22 @@ -1872,6 +2311,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0020.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1938,8 +2378,126 @@ showengText $12-01-02-0020.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=19 12-11-02-0001 + ; button i=21 12-01-02-0022 + + 33 + 22 + 225 + 296 + $12-01-02-0022.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-02-0022.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-02-0022.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-02-0022.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-02-0022.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-02-0022.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + ; button i=22 12-11-02-0001 33 22 @@ -1965,6 +2523,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-11-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2031,8 +2590,20 @@ showengText $12-11-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-11-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=20 12-01-02-0001 + ; button i=23 12-01-02-0001 33 22 @@ -2058,6 +2629,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2124,8 +2696,20 @@ showengText $12-01-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=21 12-01-02-0011 + ; button i=24 12-01-02-0011 33 22 @@ -2151,6 +2735,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2217,8 +2802,20 @@ showengText $12-01-02-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=22 12-01-02-0019 + ; button i=25 12-01-02-0019 33 22 @@ -2244,6 +2841,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0019.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2310,8 +2908,126 @@ showengText $12-01-02-0019.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=23 12-01-02-0002 + ; button i=26 12-01-02-0021 + + 33 + 22 + 225 + 296 + $12-01-02-0021.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-02-0021.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-02-0021.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-02-0021.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-02-0021.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-02-0021.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + ; button i=27 12-01-02-0002 33 22 @@ -2337,6 +3053,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2403,8 +3120,20 @@ showengText $12-01-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=24 12-11-02-0002 + ; button i=28 12-11-02-0002 33 22 @@ -2430,6 +3159,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-11-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2496,8 +3226,20 @@ showengText $12-11-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-11-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=25 12-01-02-0003 + ; button i=29 12-01-02-0003 33 22 @@ -2523,6 +3265,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2589,8 +3332,20 @@ showengText $12-01-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=26 12-01-02-0004 + ; button i=30 12-01-02-0004 33 22 @@ -2616,6 +3371,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2682,8 +3438,20 @@ showengText $12-01-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=27 12-01-02-0005 + ; button i=31 12-01-02-0005 33 22 @@ -2709,6 +3477,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2775,8 +3544,20 @@ showengText $12-01-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=28 12-01-02-0007 + ; button i=32 12-01-02-0007 33 22 @@ -2802,6 +3583,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2868,8 +3650,20 @@ showengText $12-01-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=29 12-01-02-0008 + ; button i=33 12-01-02-0008 33 22 @@ -2895,6 +3689,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2961,8 +3756,20 @@ showengText $12-01-02-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=30 12-01-02-0009 + ; button i=34 12-01-02-0009 33 22 @@ -2988,6 +3795,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3054,8 +3862,20 @@ showengText $12-01-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=31 12-01-02-0017 + ; button i=35 12-01-02-0017 33 22 @@ -3081,6 +3901,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0017.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3147,8 +3968,20 @@ showengText $12-01-02-0017.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + - ; button i=32 11-01-02-0009 + ; button i=36 11-01-02-0009 33 22 @@ -3174,6 +4007,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-01-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3240,6 +4074,18 @@ showengText $11-01-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-01-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index 88eeccc2..39d2b590 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -1,6 +1,3 @@ - - - "Enable" 1080 @@ -42,31 +39,6 @@ EndIf Var Timeout = 0 - - Var showCart = "Invisible" - If MultiPayEnable = "true" Then - - If CART_COUNT = 1 Then - Var showCart = "Enable" - Var cart_image_bn = DirImageCart + "/bn_cart1.png" - Var cart_image_bp = DirImageCart + "/bp_cart1.png" - EndIf - - If CART_COUNT = 2 Then - Var showCart = "Enable" - Var cart_image_bn = DirImageCart + "/bn_cart2.png" - Var cart_image_bp = DirImageCart + "/bp_cart2.png" - EndIf - - - - If CART_COUNT = 3 Then - Open "ROOT/taobin_project/xml/page_payment_multi.xml" - EndIf - - EndIf - - @@ -77,8 +49,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -312,6 +290,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -378,6 +357,18 @@ showengText $12-02-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-02-01-0002 @@ -405,6 +396,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -471,6 +463,18 @@ showengText $12-02-01-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-02-01-0020 @@ -498,6 +502,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0020.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -564,6 +569,18 @@ showengText $12-02-01-0020.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-02-01-0003 @@ -591,6 +608,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -657,6 +675,18 @@ showengText $12-02-01-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-02-01-0004 @@ -684,6 +714,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -750,6 +781,18 @@ showengText $12-02-01-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-02-01-0006 @@ -777,6 +820,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -843,6 +887,18 @@ showengText $12-02-01-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-02-01-0021 @@ -870,6 +926,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0021.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -936,6 +993,18 @@ showengText $12-02-01-0021.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-02-01-0007 @@ -963,6 +1032,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1029,6 +1099,18 @@ showengText $12-02-01-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-02-01-0008 @@ -1056,6 +1138,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1122,6 +1205,18 @@ showengText $12-02-01-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-02-01-0019 @@ -1149,6 +1244,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0019.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1215,6 +1311,18 @@ showengText $12-02-01-0019.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 12-02-01-0009 @@ -1242,6 +1350,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1308,6 +1417,18 @@ showengText $12-02-01-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0009.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 12-02-01-0022 @@ -1335,6 +1456,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0022.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1401,6 +1523,18 @@ showengText $12-02-01-0022.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 12-02-01-0010 @@ -1428,6 +1562,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1494,6 +1629,18 @@ showengText $12-02-01-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=14 12-02-01-0011 @@ -1521,6 +1668,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1587,6 +1735,18 @@ showengText $12-02-01-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=15 12-02-01-0012 @@ -1614,6 +1774,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0012.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1680,6 +1841,18 @@ showengText $12-02-01-0012.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-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=16 12-02-01-0017 @@ -1707,6 +1880,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0017.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1773,6 +1947,18 @@ showengText $12-02-01-0017.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=17 12-02-02-0020 @@ -1800,6 +1986,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0020.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1866,6 +2053,18 @@ showengText $12-02-02-0020.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=18 12-02-02-0001 @@ -1893,6 +2092,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1959,6 +2159,18 @@ showengText $12-02-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=19 12-02-02-0002 @@ -1986,6 +2198,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2052,6 +2265,18 @@ showengText $12-02-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=20 12-02-02-0003 @@ -2079,6 +2304,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2145,6 +2371,18 @@ showengText $12-02-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=21 12-02-02-0004 @@ -2172,6 +2410,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2238,6 +2477,18 @@ showengText $12-02-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=22 12-02-02-0005 @@ -2265,6 +2516,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2331,6 +2583,18 @@ showengText $12-02-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=23 12-02-02-0006 @@ -2358,6 +2622,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2424,6 +2689,18 @@ showengText $12-02-02-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=24 12-02-02-0007 @@ -2451,6 +2728,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2517,6 +2795,18 @@ showengText $12-02-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=25 12-02-02-0008 @@ -2544,6 +2834,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2610,6 +2901,18 @@ showengText $12-02-02-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=26 12-02-02-0019 @@ -2637,6 +2940,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0019.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2703,6 +3007,18 @@ showengText $12-02-02-0019.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=27 12-02-02-0009 @@ -2730,6 +3046,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2796,6 +3113,18 @@ showengText $12-02-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=28 12-02-02-0022 @@ -2823,6 +3152,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0022.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2889,6 +3219,18 @@ showengText $12-02-02-0022.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=29 12-02-02-0010 @@ -2916,6 +3258,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2982,6 +3325,18 @@ showengText $12-02-02-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=30 12-02-02-0011 @@ -3009,6 +3364,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3075,6 +3431,18 @@ showengText $12-02-02-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=31 12-02-02-0012 @@ -3102,6 +3470,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0012.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3168,6 +3537,18 @@ showengText $12-02-02-0012.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-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=32 12-05-02-0027 @@ -3195,6 +3576,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0027.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3261,6 +3643,18 @@ showengText $12-05-02-0027.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0027.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index da1a229e..4fe6e190 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -52,8 +52,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -288,6 +294,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -354,6 +361,18 @@ showengText $12-03-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-03-01-0002 @@ -381,6 +400,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-01-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -447,6 +467,18 @@ showengText $12-03-01-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-01-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-03-01-0003 @@ -474,6 +506,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-01-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -540,6 +573,18 @@ showengText $12-03-01-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-03-01-0004 @@ -567,6 +612,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-01-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -633,6 +679,18 @@ showengText $12-03-01-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-03-01-0005 @@ -660,6 +718,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-01-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -726,6 +785,18 @@ showengText $12-03-01-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-01-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-03-02-0001 @@ -753,6 +824,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -819,6 +891,18 @@ showengText $12-03-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-03-02-0002 @@ -846,6 +930,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -912,6 +997,18 @@ showengText $12-03-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-03-02-0003 @@ -939,6 +1036,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1005,6 +1103,18 @@ showengText $12-03-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-03-02-0004 @@ -1032,6 +1142,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1098,6 +1209,18 @@ showengText $12-03-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-03-02-0006 @@ -1125,6 +1248,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1191,6 +1315,18 @@ showengText $12-03-02-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 12-03-02-0005 @@ -1218,6 +1354,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1284,6 +1421,18 @@ showengText $12-03-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0005.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 12-03-02-0007 @@ -1311,6 +1460,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1377,6 +1527,18 @@ showengText $12-03-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 12-03-03-0009 @@ -1404,6 +1566,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-03-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1470,6 +1633,18 @@ showengText $12-03-03-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-03-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index f645e540..fcd7e2c8 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -52,8 +52,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -288,6 +294,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -354,6 +361,18 @@ showengText $12-05-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-05-02-0001 @@ -381,6 +400,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -447,6 +467,18 @@ showengText $12-05-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-05-02-0002 @@ -474,6 +506,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -540,6 +573,18 @@ showengText $12-05-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-05-02-0003 @@ -567,6 +612,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -633,6 +679,18 @@ showengText $12-05-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-05-02-0004 @@ -660,6 +718,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -726,6 +785,18 @@ showengText $12-05-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-05-02-0005 @@ -753,6 +824,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -819,6 +891,18 @@ showengText $12-05-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-05-02-0040 @@ -846,6 +930,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0040.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -912,6 +997,18 @@ showengText $12-05-02-0040.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0040.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-05-02-0006 @@ -939,6 +1036,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1005,6 +1103,18 @@ showengText $12-05-02-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index 6008f394..64b7f94a 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -51,8 +51,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -289,6 +295,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -355,6 +362,18 @@ showengText $12-05-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-05-02-0019 @@ -382,6 +401,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0019.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -448,6 +468,18 @@ showengText $12-05-02-0019.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-05-02-0020 @@ -475,6 +507,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0020.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -541,6 +574,18 @@ showengText $12-05-02-0020.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-05-02-0021 @@ -568,6 +613,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0021.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -634,6 +680,18 @@ showengText $12-05-02-0021.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-05-02-0035 @@ -661,6 +719,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0035.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -727,6 +786,18 @@ showengText $12-05-02-0035.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0035.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-05-02-0010 @@ -754,6 +825,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -820,6 +892,18 @@ showengText $12-05-02-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-05-02-0011 @@ -847,6 +931,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -913,6 +998,18 @@ showengText $12-05-02-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-05-02-0033 @@ -940,6 +1037,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0033.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1006,6 +1104,18 @@ showengText $12-05-02-0033.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0033.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-05-02-0028 @@ -1033,6 +1143,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0028.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1099,6 +1210,18 @@ showengText $12-05-02-0028.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0028.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-05-02-0012 @@ -1126,6 +1249,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0012.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1192,6 +1316,18 @@ showengText $12-05-02-0012.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-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=11 12-05-02-0041 @@ -1219,6 +1355,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0041.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1285,6 +1422,18 @@ showengText $12-05-02-0041.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0041.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 12-05-02-0013 @@ -1312,6 +1461,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0013.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1378,6 +1528,18 @@ showengText $12-05-02-0013.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 12-05-02-0031 @@ -1405,6 +1567,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0031.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1471,6 +1634,18 @@ showengText $12-05-02-0031.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0031.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=14 12-05-02-0008 @@ -1498,6 +1673,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1564,6 +1740,18 @@ showengText $12-05-02-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=15 12-05-02-0009 @@ -1591,6 +1779,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1657,6 +1846,18 @@ showengText $12-05-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=16 12-05-02-0024 @@ -1684,6 +1885,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0024.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1750,6 +1952,18 @@ showengText $12-05-02-0024.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0024.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=17 12-05-02-0038 @@ -1777,6 +1991,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0038.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1843,6 +2058,18 @@ showengText $12-05-02-0038.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0038.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=18 12-05-02-0029 @@ -1870,6 +2097,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0029.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1936,6 +2164,18 @@ showengText $12-05-02-0029.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0029.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=19 12-05-02-0025 @@ -1963,6 +2203,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0025.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2029,6 +2270,18 @@ showengText $12-05-02-0025.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0025.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=20 12-05-02-0039 @@ -2056,6 +2309,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0039.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2122,6 +2376,18 @@ showengText $12-05-02-0039.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0039.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=21 12-05-02-0014 @@ -2149,6 +2415,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0014.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2215,6 +2482,18 @@ showengText $12-05-02-0014.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0014.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=22 12-05-02-0015 @@ -2242,6 +2521,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0015.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2308,6 +2588,18 @@ showengText $12-05-02-0015.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0015.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=23 12-05-01-0001 @@ -2335,6 +2627,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2401,6 +2694,18 @@ showengText $12-05-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=24 12-05-02-0001 @@ -2428,6 +2733,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2494,6 +2800,18 @@ showengText $12-05-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=25 12-05-02-0034 @@ -2521,6 +2839,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0034.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2587,6 +2906,18 @@ showengText $12-05-02-0034.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0034.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=26 12-05-02-0004 @@ -2614,6 +2945,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2680,6 +3012,18 @@ showengText $12-05-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=27 12-05-02-0032 @@ -2707,6 +3051,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0032.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2773,6 +3118,18 @@ showengText $12-05-02-0032.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0032.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=28 12-05-02-0005 @@ -2800,6 +3157,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2866,6 +3224,18 @@ showengText $12-05-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=29 12-05-02-0040 @@ -2893,6 +3263,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0040.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2959,6 +3330,18 @@ showengText $12-05-02-0040.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0040.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=30 12-05-02-0006 @@ -2986,6 +3369,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3052,6 +3436,18 @@ showengText $12-05-02-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=31 12-05-02-0026 @@ -3079,6 +3475,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0026.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3145,6 +3542,18 @@ showengText $12-05-02-0026.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0026.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=32 12-05-02-0030 @@ -3172,6 +3581,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0030.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3238,6 +3648,18 @@ showengText $12-05-02-0030.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0030.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=33 12-05-02-0002 @@ -3265,6 +3687,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3331,6 +3754,18 @@ showengText $12-05-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=34 12-05-02-0003 @@ -3358,6 +3793,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3424,6 +3860,18 @@ showengText $12-05-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=35 12-05-02-0016 @@ -3451,6 +3899,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0016.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3517,6 +3966,18 @@ showengText $12-05-02-0016.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0016.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=36 12-05-02-0017 @@ -3544,6 +4005,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0017.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3610,6 +4072,18 @@ showengText $12-05-02-0017.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=37 12-05-02-0018 @@ -3637,6 +4111,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0018.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3703,6 +4178,18 @@ showengText $12-05-02-0018.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0018.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=38 12-05-01-0002 @@ -3730,6 +4217,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-01-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3796,6 +4284,18 @@ showengText $12-05-01-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-01-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml index ba59c856..e9c4a2c9 100644 --- a/xml/page_catalog_choose_drink7.xml +++ b/xml/page_catalog_choose_drink7.xml @@ -50,8 +50,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -288,6 +294,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -354,6 +361,18 @@ showengText $12-04-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-04-02-0002 @@ -381,6 +400,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -447,6 +467,18 @@ showengText $12-04-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-04-02-0003 @@ -474,6 +506,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -540,6 +573,18 @@ showengText $12-04-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-04-02-0013 @@ -567,6 +612,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0013.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -633,6 +679,18 @@ showengText $12-04-02-0013.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-04-02-0004 @@ -660,6 +718,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -726,6 +785,18 @@ showengText $12-04-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-04-02-0005 @@ -753,6 +824,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -819,6 +891,18 @@ showengText $12-04-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-04-02-0006 @@ -846,6 +930,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -912,6 +997,18 @@ showengText $12-04-02-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-04-02-0007 @@ -939,6 +1036,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1005,6 +1103,18 @@ showengText $12-04-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-04-02-0008 @@ -1032,6 +1142,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1098,6 +1209,18 @@ showengText $12-04-02-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-04-02-0009 @@ -1125,6 +1248,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1191,6 +1315,18 @@ showengText $12-04-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 12-04-02-0010 @@ -1218,6 +1354,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1284,6 +1421,18 @@ showengText $12-04-02-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0010.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 12-04-02-0011 @@ -1311,6 +1460,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1377,6 +1527,18 @@ showengText $12-04-02-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index 484f5cf3..c26d8895 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -51,8 +51,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -289,6 +295,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -355,6 +362,18 @@ showengText $11-99-05-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 11-99-05-0002 @@ -382,6 +401,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -448,6 +468,18 @@ showengText $11-99-05-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 11-99-05-0003 @@ -475,6 +507,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -541,6 +574,18 @@ showengText $11-99-05-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 11-99-05-0004 @@ -568,6 +613,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -634,6 +680,18 @@ showengText $11-99-05-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 11-99-05-0005 @@ -661,6 +719,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -727,6 +786,18 @@ showengText $11-99-05-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 11-99-05-0006 @@ -754,6 +825,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -820,6 +892,18 @@ showengText $11-99-05-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 11-99-05-0007 @@ -847,6 +931,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -913,6 +998,18 @@ showengText $11-99-05-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 11-99-05-0008 @@ -940,6 +1037,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1006,6 +1104,18 @@ showengText $11-99-05-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 11-99-05-0009 @@ -1033,6 +1143,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1099,6 +1210,18 @@ showengText $11-99-05-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 11-99-05-0010 @@ -1126,6 +1249,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1192,6 +1316,18 @@ showengText $11-99-05-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index f0a367ca..9ed10616 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -34,6 +34,7 @@ ;Var PointDiff = 150 - CoffeePointRank + Var TaobinExpireDay = "" Var TaobinExpireMonth = "" Var TaobinExpireMonthX = "" diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 912dad79..651533e6 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -52,7 +52,7 @@ Var CountDownBrewing = CountDownBrewing - 1 - + ; run test; ;If CountDownBrewing = 40 Then ; Open "ROOT/taobin_project/xml/page_drinkok.xml" @@ -462,32 +462,34 @@ Var Timeout = 0 StrLen TelephoneNumber TelNumLen If TelNumLen < 10 Then - Var TelephoneNumber = TelephoneNumber + "0" - Trim TelephoneNumber 10 - StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" - EndIf - Var ShowTextNumber = "Invisible" + Var TelephoneNumber = TelephoneNumber + "0" + Trim TelephoneNumber 10 + StrLen TelephoneNumber TelNumLen + + If TelNumLen >= 10 Then + Var Tel_Confirm_State = "Enable" + EndIf + + Var ShowTextNumber = "Invisible" - TimerReset - Refresh - - If TelNumLen = 7 Then - Var number7 = "0" - EndIf + TimerReset + Refresh + + If TelNumLen = 7 Then + Var number7 = "0" + EndIf - If TelNumLen = 8 Then - Var number8 = "0" - EndIf + If TelNumLen = 8 Then + Var number8 = "0" + EndIf - If TelNumLen = 9 Then - Var number9 = "0" - EndIf + If TelNumLen = 9 Then + Var number9 = "0" + EndIf - If TelNumLen = 10 Then - Var number10 = "0" - EndIf + If TelNumLen = 10 Then + Var number10 = "0" + EndIf EndIf diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index cb75395e..e5112c13 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -6,6 +6,7 @@ SoundVolume PlaySoundLag + DEBUGVAR IsSmoRet Var countClick2 = 0 ;SAVELOG SelectDrink ;SAVELOG NameDrink @@ -305,6 +306,8 @@ EndIf EndIf + Machine DoorClose + @@ -747,6 +750,20 @@ + + 375 + 623 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + @@ -197,36 +190,7 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 - StrLen TelephoneNumber TelNumLen - If TelNumLen < 10 Then - Var TelephoneNumber = TelephoneNumber + "9" - Var ShowTextNumber = "Invisible" - Trim TelephoneNumber 10 - TimerReset - Refresh - StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" - EndIf - Var ShowErrorText = "Invisible" - - If TelNumLen = 7 Then - Var number7 = "9" - EndIf - - If TelNumLen = 8 Then - Var number8 = "9" - EndIf - - If TelNumLen = 9 Then - Var number9 = "9" - EndIf - - If TelNumLen = 10 Then - Var number10 = "9" - EndIf - EndIf + Cart "DeleteMenuID" 2 diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index ff4dab7b..f9e181a6 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -7,6 +7,12 @@ Var y_topping_bg = 912 + + If JXMLVersionInt > 356 Then + If ConfigNumer >= 380 Then + Open "ROOT/taobin_project/xml/page_topping_select3.xml" + EndIf + EndIf If ConfigNumer > 360 Then SAVELOG "Recipe have smoothies" Open "ROOT/taobin_project/xml/page_topping_select2.xml" diff --git a/xml/page_topping_select2.xml b/xml/page_topping_select2.xml index 0edf783d..a9cff3d1 100644 --- a/xml/page_topping_select2.xml +++ b/xml/page_topping_select2.xml @@ -7,6 +7,10 @@ Var y_topping_bg = 912 + + ;Machine DoorClose + Machine DoorLidClose + DEBUGVAR video_menu_0 DEBUGVAR SelectDrink @@ -86,8 +90,14 @@ Var bg_straw_only = DirImage + "/bg_straw_only.png" Var bg_lid_only = DirImage + "/bg_lid_only.png" - ; Move to catalog. - ;Machine DoorClose + + + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" + Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" + + Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" + Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" + ;Var blendedState = "Enable" @@ -99,12 +109,6 @@ Var ShiftSugarStep = 1 - - Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" - Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" - - Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" - Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" CRLFToSpace showname CRLFToSpace showdesc @@ -194,8 +198,19 @@ Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" + Var bg_strawlid = DirImage + "/bg_strawlid.png" + Var bg_straw_only = DirImage + "/bg_straw_only.png" + Var bg_lid_only = DirImage + "/bg_lid_only.png" + + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" + Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" + + Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" + Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" + + CRLFToSpace showname CRLFToSpace showdesc @@ -546,6 +561,14 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "shot coffee 1008" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + DEBUGVAR TOPPING2 Refresh EndIf diff --git a/xml/page_topping_select3.xml b/xml/page_topping_select3.xml new file mode 100644 index 00000000..66a0510f --- /dev/null +++ b/xml/page_topping_select3.xml @@ -0,0 +1,1618 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + Var y_topping_bg = 912 + + DEBUGVAR video_menu_0 + + DEBUGVAR SelectDrink + DEBUGVAR PictureDrink + + Var SaveProductCodeSelect = SelectDrink + Var UserSelectProductCode = SelectDrink + + Var showText4 = "Invisible" + Var showText7 = "Invisible" + + DEBUGVAR UserSelectProductCode + + Var blendedState = "Enable" + Var DisableUsingCode = "false" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowCollagenOnly = "Invisible" + + Var blendedStateShow = "Invisible" + Var ShotCoffeeBG = "Invisible" + Var showShotEnable = "Invisible" + Var ShowLidStraw = "Invisible" + Var ShowStrawOnly = "Invisible" + Var ShowLidOnly = "Invisible" + + ; On open + Var lidAndStrawOldPageIgnore = "true" + Var SugarState1 = "Invisible" + Var SugarState2 = "Invisible" + Var SugarState3 = "Invisible" + Var SugarState4 = "Invisible" + Var SugarState5 = "Invisible" + + Var AddShotEnable = "Invisible" + + Var BGSugar = "Invisible" + Var ShotCoffeeBG = "Invisible" + Var showShotEnable = "Enable" + Var ShotCoffeePremium = "Invisible" + + + ; On open + Var LidState = Lid1Status + + ;SAVELOG PreviseXMLFileName2 + + + Var topping1 = "1" + Var topping2 = "31" + Var topping3 = "31" + + + Var BugFlag = 0 + + If show_eng = "true" Then + + Var DirImage = "ROOT/taobin_project/image/topping2_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var showname = NameDrink + Var showdesc = DrinkDescription + + + + Else + + Var DirImage = "ROOT/taobin_project/image/topping2" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var showname = NameDrinkTH + Var showdesc = DrinkDescriptionTH + + + EndIf + + Var bg_strawlid = DirImage + "/bg_strawlid.png" + Var bg_straw_only = DirImage + "/bg_straw_only.png" + Var bg_lid_only = DirImage + "/bg_lid_only.png" + + + + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" + Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" + + Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" + Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" + + + + ;Var blendedState = "Enable" + ;Var ShotCoffeeBG = "Enable" + ;Var showShotEnable = "Enable" + ;Var ShowLidStraw = "Enable" + ;Var ShowStrawOnly = "Enable" + ;Var ShowLidOnly = "Enable" + + Var ShiftSugarStep = 1 + + + CRLFToSpace showname + CRLFToSpace showdesc + + ;- Begin + Var PriceDrinkNoTop = PriceDrink + Var PriceDrinkTmp = PriceDrink + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + Var Timeout = 0 + + SAVELOG PriceDrinkTmp + ;- End + + If RoadShow = "true" Then + Var PriceDrinkTmp = "Free" + EndIf + + If ShowPrice = "Invisible" Then + Var PriceDrinkTmpShow = "Free" + EndIf + + Var StateImgKeto = "Invisible" + + + Var ToppingGotoPayment = "true" + + DEBUGVAR backGroundAddExtra + DEBUGVAR backGroundAddShotPremium + + DEBUGVAR MultiPayEnable + DEBUGVAR CART_COUNT + Var btnAddCart = "Invisible" + If MultiPayEnable = "true" Then + Var btnAddCart = "Enable" + If CART_COUNT = 3 Then + Var btnAddCart = "Invisible" + EndIf + EndIf + + Var LidDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" + + Machine DoorClose + Machine DoorLidClose + + 2000 + + DEBUGVAR Timeout + Var Timeout = Timeout + 1 + + If Timeout > 20 Then + Var Timeout = 0 + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + TimerReset + + + + + + + +; back + + + + DEBUGVAR MAT_ID_9701 + DEBUGVAR MAT_ID_9601 + + + DEBUGVAR SubMenuProductCode1 + DEBUGVAR SubMenuName11 + DEBUGVAR SubMenuPrice1 + + DEBUGVAR SubMenuProductCode2 + DEBUGVAR SubMenuName12 + + DEBUGVAR TOPPING1 + DEBUGVAR TOPPING2 + DEBUGVAR TOPPING3 + DEBUGVAR TOPPING4 + DEBUGVAR toppingID1index1 + DEBUGVAR toppingID1index2 + DEBUGVAR toppingID1index3 + DEBUGVAR toppingID1index4 + DEBUGVAR toppingID1index5 + DEBUGVAR toppingID1index6 + DEBUGVAR toppingID1index7 + DEBUGVAR toppingID1index8 + DEBUGVAR toppingID1index9 + + DEBUGVAR toppingID2index1 + DEBUGVAR toppingID2index2 + DEBUGVAR toppingID2index3 + DEBUGVAR toppingID2index4 + DEBUGVAR toppingID2index5 + + If toppingID1index5 > 0 Then + SAVELOG "toppingID1index5 not set" + EndIf + + + + + DEBUGVAR MenuCodeName + DEBUGVAR toppingID1Default + DEBUGVAR toppingID2Default + DEBUGVAR toppingID3Default + + + DEBUGVAR toppingID2price2 + DEBUGVAR toppingID3price2 + + DEBUGVAR BrewParam + + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + + If BugFlag = 1 Then + + Else + STRCONTAIN "9701" BrewParam IgnoreLidStraw + + DEBUGVAR BrewParam + DEBUGVAR IgnoreLidStraw + + Var h_block_of_sugar = 210 + + + ;STRCONTAIN "Smoothie" SubMenuName11 HaveSmoothie + STRCONTAIN "Smoothie" MenuCodeName HaveSmoothie + If HaveSmoothie = "true" Then + Var blendedState = "Enable" + Var blendedStateShow = "Enable" + + Var PriceDiff = SubMenuPrice1 - PriceDrinkNoTop + + DEBUGVAR IsSmoRet + + If IsSmoRet = "true" Then + Var blendedState = "ForceSet" + Var blendedStateTxt = "Enable" + Topping "LoadSubMenu" SubMenuProductCode1 + Function 1 + Else + Var blendedStateTxt = "Invisible" + + EndIf + + EndIf + + If IgnoreLidStraw = "true" Then + Var IgnoreLidStraw = "false" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowStrawOnly = "Invisible" + + + Else + Var ShowLidStraw = "Enable" + + If MAT_ID_9701 = "Enable" Then + Var StrawState = MAT_ID_9701 + Else + Var StrawState = MAT_ID_9701 + EndIf + + If MAT_ID_9601 = "Enable" Then + Var LidState = MAT_ID_9601 + Else + Var LidState = MAT_ID_9601 + EndIf + + EndIf + + ; Override all + If Service_LidStraw = "Disable" Then + Var ShowLidStraw = "Enable" + ;Var ShowLidOnly = "Invisible" + ;Var ShowStawOnly = "Invisible" + + + Var StrawState = "Disable" + Var LidState = "Disable" + + EndIf + + If StrawState = "Enable" Then + Var StrawDeactiveButton = "Invisible" + Else + Var StrawDeactiveButton = "Enable" + EndIf + + + If LidState = "Enable" Then + Var LidDeactiveButton = "Invisible" + Else + Var LidDeactiveButton = "Enable" + EndIf + + + + + ;PressForever + If TOPPING1 = "Sugar" Then + + If sugarKeto = "true" Then + Var StateImgKeto = "Enable" + Var BGSugar = "Invisible" + Else + Var BGSugar = "Enable" + Endif + + Var ShiftSugarStep = 1 + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState1 = "PressForever" + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState2 = "PressForever" + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState3 = "PressForever" + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState4 = "PressForever" + EndIf + + If toppingID1index5 = toppingID1Default Then + Var SugarState5 = "PressForever" + EndIf + + EndIf + + If TOPPING1 = "Powder Sugar" Then + + If sugarKeto = "true" Then + Var StateImgKeto = "Enable" + Var BGSugar = "Enable" + Var h_block_of_sugar = 262 + Else + Var BGSugar = "Enable" + EndIf + ;Var BGSugar = "Enable" + Var ShiftSugarStep = 1 + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState1 = "PressForever" + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState2 = "PressForever" + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState3 = "PressForever" + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState4 = "PressForever" + EndIf + + If toppingID1index5 = toppingID1Default Then + Var SugarState5 = "PressForever" + EndIf + + EndIf + + + If TOPPING1 = "Sugar Premix 25" Then + Var BGSugar = "Enable" + Var ShiftSugarStep = 2 + Var SugarState1 = "Disable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState2 = "PressForever" + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState3 = "PressForever" + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState4 = "PressForever" + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState5 = "PressForever" + EndIf + + EndIf + + 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" + + If toppingID1index1 = toppingID1Default Then + Var SugarState3 = "PressForever" + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState4 = "PressForever" + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState5 = "PressForever" + EndIf + + EndIf + + If TOPPING1 = "Powder Sugar Premix 25" Then + Var BGSugar = "Enable" + Var ShiftSugarStep = 2 + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState2 = "PressForever" + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState3 = "PressForever" + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState4 = "PressForever" + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState5 = "PressForever" + EndIf + + EndIf + + + + Var ShowCollagenOnly = "Enable" + + Var BugFlag = 1 + + Var topping1 = toppingID1Default + + Var ToppingGotoPayment = "false" + + If BGSugar = "Enable" Then + If show_eng = "true" Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" + Else + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + EndIf + EndIf + Refresh + + Var collagenShow = "true" +;-BEGIN shot layout + + Var topping3 = toppingID3Default + Var shot_h_layout = 218 + + If TOPPING2 = "shot coffee" Then + + Var ShotCoffeeBG = "Enable" + Var showShotEnable = "Enable" + + + Refresh + EndIf + + + If TOPPING2 = "shot coffee termtem" Then + + Var ShotCoffeeBG = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "shot coffee 1003" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "shot coffee 1007" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "shot coffee 1008" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + +;-END + If TOPPING3 = "Collagen" Then + Var CollagenState = "Enable" + Else + Var CollagenState = "Invisible" + Var ShowCollagenOnly = "Invisible" + EndIf + + + + SAVELOG ToppingGotoPayment + If ToppingGotoPayment = "true" Then + Topping "Select" SelectDrink + ; Pack + Topping "Pack" ExtendData + Open "ROOT/taobin_project/xml/page_payment.xml" + EndIf + + + If RoadShow = "true" Then + Var PriceShowValue = "Free" + EndIf + + SAVELOG toppingID2price1 + SAVELOG toppingID2price2 + SAVELOG toppingID2price3 + EndIf + + + + + + ;Var BugFlag = 1 + If CartUpdate = "true" Then + Var CartUpdate = "-" + If CART_COUNT = 3 Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + EndIf + + + +; same + + 374 + 382 + 331 + 436 + PictureDrink + + + + + 374 + 399 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + +; same + + + 0 + 752 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + +; same + + 0 + 836 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + +; +; 0 +; 880 +; BGSugar +; 1080 +; Center +; 18 +; KanitTTF +; 0xEE8C62 +; "*ห้ามดื่มเกินวันละ 2 แก้ว เพราะหัวใจสั่น นอนไม่หลับ เด็กและสตรีมีครรภ์ไม่ควรดื่ม ผู้ป่วยควรปรึกษาแพทย์ก่อน" +; + + + + + + +; +; +; +; +; +; +; +; +; +; +; +; +;- FRAME SCORELLL + + 52 + 881 + 1080 + "auto-all" + "Vertical" + 1 + + + + + 986 + 160 + 20 + blendedStateShow + + + Var( DirImage + "/bg_blended.png" ) + + + + + + + + showText7 + 602 + 64 + Var( DirImage + "/text7.png" ) + + + + blendedStateTxt + 602 + 64 + Var( DirImage + "/text5.png" ) + + + + +;- Begin topping1 + + + 988 + 156 + 20 + BGSugar +; sugar layout + + BGSugar + Var( DirImage + "/bg_sugar.png" ) + + + +; + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + +;- END topping1 + +; +; +; +; +; +; +; +; +; + +;-END +; +; +; +; +; +; +; +; +; +;-BEGIN shot layout + + 986 + 164 + 20 + ShotCoffeePremium + + backGroundAddShotPremium + + +; + + +; + + + + +;-END +; +; +; +; +; +; +;; +; +; +; +; +; +; +; +; +;-BEGIN shot layout + + 986 + 157 + 20 + ShotCoffeeBG + + backGroundAddExtra + + +; + + +; + + + + showText4 + 602 + 64 + Var( DirImage + "/text4.png" ) + + +;-END +; +; +; +; +; +; +; +; +; +; +;-BEGIN Collagen +; +;-BEGIN Lid straw + + 986 + 240 + 20 + ShowLidStraw + + bg_strawlid + + +; straw left + + + + + + +; LID left + + + + + + StrawDeactiveButton + 602 + 64 + Var( DirImage + "/text20.png" ) + + + + + LidDeactiveButton + 602 + 150 + Var( DirImage + "/text21.png" ) + + + + + +; +; +; +; +; +; +; +; +; + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + +; back + + +; add cart + +; next + + + + + SAVELOG "FUNCTION1" + Var TOPPING_PRICE = 0 + DEBUGVAR PriceDrinkNoTop + DEBUGVAR PriceDiff + + DEBUGVAR showShotEnable + DEBUGVAR blendedState + + If blendedState = "ForceSet" Then + Var TOPPING_PRICE = PriceDiff + Var UserSelectProductCode = SubMenuProductCode1 + + Var showShotEnable = "Disable" + Var showText4 = "Enable" + Else + + If blendedState = "Press" Then + Var TOPPING_PRICE = PriceDiff + Var UserSelectProductCode = SubMenuProductCode1 + + Var showShotEnable = "Disable" + Var showText4 = "Enable" + Else + + Var UserSelectProductCode = SaveProductCodeSelect + If showShotEnable = "Disable" Then + Var showShotEnable = "Enable" + EndIf + + Var showText4 = "Invisible" + EndIf + EndIf + + DEBUGVAR UserSelectProductCode + + + If showShotEnable = "Press" Then + If blendedState = "Press" Then + Var PriceDrinkTmp = PriceDrinkNoTop + EndIf + + Var blendedState = "Disable" + + Var TOPPING_PRICE = 0 + + ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 + + Var topping2 = toppingID2index2 + Var DisableUsingCode = "true" + + Var showText7 = "Enable" + + SAVELOG "Select add normal shot" + Else + If blendedState = "Disable" Then + Var blendedState = "Enable" + EndIf + + + Var PriceDrinkTmp = PriceDrinkNoTop + Var topping2 = toppingID2index1 + Var DisableUsingCode = "false" + SAVELOG "Deselect add normal shot" + + Var showText7 = "Invisible" + + EndIf + + DEBUGVAR showShotEnable + DEBUGVAR blendedState + + Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + + SAVELOG PriceDrinkTmp + + Var Timeout = 0 + Refresh + + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + + + "OnValueChange" + + PriceDrinkTmpShow + + diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 4710e883..10c08baf 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,7 +95,7 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.62" + Var XMLPageVersion = "5.71"