diff --git a/image/ad_medium_2.png b/image/ad_medium_2.png index d672b1dc..f4cb6f94 100644 Binary files a/image/ad_medium_2.png and b/image/ad_medium_2.png differ diff --git a/image/ad_medium_3.png b/image/ad_medium_3.png new file mode 100644 index 00000000..d672b1dc Binary files /dev/null and b/image/ad_medium_3.png differ diff --git a/image/close_th/ad_main2.png b/image/close_th/ad_main2.png new file mode 100644 index 00000000..71cb3754 Binary files /dev/null and b/image/close_th/ad_main2.png differ diff --git a/image/close_th/img1.png b/image/close_th/img1.png new file mode 100644 index 00000000..27ef0170 Binary files /dev/null and b/image/close_th/img1.png differ diff --git a/image/enter_point/bn_cancel.png b/image/enter_point/bn_cancel.png index 6f5cbe8c..26fcebe9 100644 Binary files a/image/enter_point/bn_cancel.png and b/image/enter_point/bn_cancel.png differ diff --git a/image/enter_point/bn_confirm.png b/image/enter_point/bn_confirm.png new file mode 100644 index 00000000..49897905 Binary files /dev/null and b/image/enter_point/bn_confirm.png differ diff --git a/image/enter_point/bp_cancel.png b/image/enter_point/bp_cancel.png index d9508b12..cf7fd8b6 100644 Binary files a/image/enter_point/bp_cancel.png and b/image/enter_point/bp_cancel.png differ diff --git a/image/enter_point/img3.png b/image/enter_point/img3.png new file mode 100644 index 00000000..d69897c8 Binary files /dev/null and b/image/enter_point/img3.png differ diff --git a/image/enter_point/text1.png b/image/enter_point/text1.png index c2aa53ae..dc60f177 100644 Binary files a/image/enter_point/text1.png and b/image/enter_point/text1.png differ diff --git a/image/enter_point/text2.png b/image/enter_point/text2.png new file mode 100644 index 00000000..c618bc21 Binary files /dev/null and b/image/enter_point/text2.png differ diff --git a/image/enter_point/text3.png b/image/enter_point/text3.png new file mode 100644 index 00000000..5cc17aba Binary files /dev/null and b/image/enter_point/text3.png differ diff --git a/image/page3/bn_cho_ca.png b/image/page3/bn_cho_ca.png index ce44c78b..27665d2f 100644 Binary files a/image/page3/bn_cho_ca.png and b/image/page3/bn_cho_ca.png differ diff --git a/image/page3/bn_fruit.png b/image/page3/bn_fruit.png index d73cc248..14c8ef72 100644 Binary files a/image/page3/bn_fruit.png and b/image/page3/bn_fruit.png differ diff --git a/image/page3/bn_sodada.png b/image/page3/bn_sodada.png index 617b71a8..f435ed23 100644 Binary files a/image/page3/bn_sodada.png and b/image/page3/bn_sodada.png differ diff --git a/image/page3/bp_cho_ca.png b/image/page3/bp_cho_ca.png index 7df94c5a..b043942b 100644 Binary files a/image/page3/bp_cho_ca.png and b/image/page3/bp_cho_ca.png differ diff --git a/image/page3/bp_fruit.png b/image/page3/bp_fruit.png index 21e06316..b0870cf0 100644 Binary files a/image/page3/bp_fruit.png and b/image/page3/bp_fruit.png differ diff --git a/image/page3/bp_sodada.png b/image/page3/bp_sodada.png index 3c444c2e..94446a80 100644 Binary files a/image/page3/bp_sodada.png and b/image/page3/bp_sodada.png differ diff --git a/image/page_doing/img2.png b/image/page_doing/img2.png index 4d204b1a..fe02407e 100644 Binary files a/image/page_doing/img2.png and b/image/page_doing/img2.png differ diff --git a/image/page_doing/text2.png b/image/page_doing/text2.png index 83b9da50..6e9442dd 100644 Binary files a/image/page_doing/text2.png and b/image/page_doing/text2.png differ diff --git a/image/page_lid_straw/img2.png b/image/page_lid_straw/img2.png index 4d204b1a..fe02407e 100644 Binary files a/image/page_lid_straw/img2.png and b/image/page_lid_straw/img2.png differ diff --git a/video/main_page.mp4 b/video/main_page.mp4 new file mode 100644 index 00000000..83417206 Binary files /dev/null and b/video/main_page.mp4 differ diff --git a/xml/menu_board.xml b/xml/menu_board.xml index 1673db85..7319fc8c 100644 --- a/xml/menu_board.xml +++ b/xml/menu_board.xml @@ -28,23 +28,88 @@ Var countClick = 0 Var RoadShow = "false" + Var IgnorePoint = "true" + + Var CountDownShowButton = 30 + + Var ShowButtonClick = "Enable" + Var ShowButtonClickFull = "Invisible" - 1000 - + + 800 + + + Var CountDownShowButton = CountDownShowButton - 1 + + + SAVELOG CountDownShowButton + + If CountDownShowButton = 28 Then + Var ShowButtonClickFull = "Enable" + Var ShowButtonClick = "Invisible" + Refresh + EndIf + + If CountDownShowButton = 10 Then + + Var ShowButtonClick = "Enable" + Var ShowButtonClickFull = "Invisible" + Refresh + EndIf + + TimerReset - Refresh -; -; 299 -; 800 -; "ROOT/taobin_project/image/main_page/ad_main_2.jpg" -; + + SAVELOG ShowButtonClick + Var CountDownShowButton = 30 + Refresh + + + + + Open "/mnt/sdcard/coffeevending/xml/main.xml" + + + Open "/mnt/sdcard/coffeevending/xml/main.xml" + + + + + + + + + - - 127 - 607 - "ROOT/taobin_project/image/drink_main.gif" - - - - Open "/mnt/sdcard/coffeevending/xml/main.xml" - - - Open "/mnt/sdcard/coffeevending/xml/main.xml" - - diff --git a/xml/menu_board_0.xml b/xml/menu_board_0.xml new file mode 100644 index 00000000..0e206f80 --- /dev/null +++ b/xml/menu_board_0.xml @@ -0,0 +1,135 @@ + + 0 + 608 + "Enable" + 1080 + 1312 + "0xEFEDEA" + SoundVolume + + TopView "hide" + ; On open + Var menu_back_to_main = "ROOT/taobin_project/xml/menu_back_to_main.xml" + + Var charOfBaht = "฿" + Var KanitTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf" + Var KanitMediaTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf" + + Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf" + Var RobotoBlack = "ROOT/taobin_project/font/Roboto/Roboto-Black.ttf" + + Var KanitMediumTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf" + Var KanitRegularTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf" + Var KanitThinTTF = "ROOT/taobin_project/font/Kanit/Kanit-Thin.ttf" + Var KanitLightTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf" + + Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf" + + Var countClick = 0 + + Var RoadShow = "false" + Var IgnorePoint = "true" + + 1000 + + TimerReset + Refresh + + + + + Open "/mnt/sdcard/coffeevending/xml/main.xml" + + + Open "/mnt/sdcard/coffeevending/xml/main.xml" + + +; +; 299 +; 800 +; "ROOT/taobin_project/image/main_page/ad_main_2.jpg" +; + + + + + + + + + 127 + 607 + "ROOT/taobin_project/image/drink_main.gif" + + + + + + + 0 + 1886 + 20 + 1080 + Center + RobotoBlack + 0x513C2F + countClick + + + + + diff --git a/xml/menu_board_1.xml b/xml/menu_board_1.xml new file mode 100644 index 00000000..682af05f --- /dev/null +++ b/xml/menu_board_1.xml @@ -0,0 +1,105 @@ + + 0 + 608 + "Enable" + 1080 + 1312 + "0xEFEDEA" + SoundVolume + + TopView "hide" + ; On open + Var menu_back_to_main = "ROOT/taobin_project/xml/menu_back_to_main.xml" + + Var charOfBaht = "฿" + Var KanitTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf" + Var KanitMediaTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf" + + Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf" + Var RobotoBlack = "ROOT/taobin_project/font/Roboto/Roboto-Black.ttf" + + Var KanitMediumTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf" + Var KanitRegularTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf" + Var KanitThinTTF = "ROOT/taobin_project/font/Kanit/Kanit-Thin.ttf" + Var KanitLightTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf" + + Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf" + + Var countClick = 0 + + Var RoadShow = "false" + Var IgnorePoint = "true" + + 1000 + + TimerReset + Refresh + + + + + Open "/mnt/sdcard/coffeevending/xml/main.xml" + + + Open "/mnt/sdcard/coffeevending/xml/main.xml" + + + + + + + + + + + + + 0 + 1886 + 20 + 1080 + Center + RobotoBlack + 0x513C2F + countClick + + + + + diff --git a/xml/menu_brewing2.xml b/xml/menu_brewing2.xml index 24104e59..7767540c 100644 --- a/xml/menu_brewing2.xml +++ b/xml/menu_brewing2.xml @@ -25,11 +25,91 @@ EndIf Var ShowCountDownBrewing = CountDownBrewing - - If MachineStage = "drink-success" Then + + If ChangeOK = 2 Then + If ActionOKCase = 0 Then + Var TelephoneNumber = "0899999999" + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + ;Open "ROOT/xml/menu_closeMaintenance.xml" + Var ActionOKCase = 1 + EndIf + EndIf + + If MachineState_Result = 1 Then + Var Timeout = 0 + Var ProcessText = "" + + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + + If PayWithQR = 0 Then + If CodeChannel = 1 Then + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + VendingCode + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + "/" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf + EndIf + + Var ServiceSuccess = "yes" Open "ROOT/taobin_project/xml/menu_drinkok.xml" EndIf - + + If MachineState_Result = 2 Then + If ErrTimeout = 0 Then + Var ErrTimeout = 1 + + If PayWithQR = 0 Then + If CodeChannel = 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Change ServiceAmount2 + Var ChangeOK = 0 + EndIf + Else + If CoinAmount > 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign + Change ServiceAmount2 + Var ChangeOK = 0 + EndIf + Else + Var ChangeOK = 4 + EndIf + EndIf + Else + Var ChangeOK = 3 + EndIf + + OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/menu_drinkfail.xml" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/menu_list.xml" + + EndIf + EndIf + If MachineStage = "show-menu" Then Open "ROOT/taobin_project/xml/menu_drinkok.xml" @@ -40,9 +120,13 @@ EndIf If MachineStage = "drink-success" Then - Open "ROOT/taobin_project/xml/menu_drinkok.xml" + Var MachineState_Result = 1 EndIf - + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + Refresh TimerReset @@ -50,24 +134,35 @@ + ;If MachineStage = "drink-success" Then + ; Open "ROOT/taobin_project/xml/menu_drinkok.xml" + ;EndIf + ;If MachineStage = "drink-failed" Then + ; Open "ROOT/taobin_project/xml/menu_drinkfail.xml" + ;EndIf If MachineStage = "drink-success" Then - Open "ROOT/taobin_project/xml/menu_drinkok.xml" - EndIf - If MachineStage = "drink-failed" Then - Open "ROOT/taobin_project/xml/menu_drinkfail.xml" + Var MachineState_Result = 1 EndIf + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf - - Open "ROOT/taobin_project/xml/menu_brewing2.xml" - +; this copy in file menu_brew2.xml and menu_lid_straw.xml + + If ChangeStatus = "payout-end" Then + Var ChangeOK = 2 + EndIf + diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml index 99f84f9c..9453149b 100644 --- a/xml/menu_catalog.xml +++ b/xml/menu_catalog.xml @@ -11,15 +11,45 @@ Var GetPayInfoFlag = 0 + Var countDownRetrun = 30 + CoinVending OFF + - 30000 + 1000 + If countDownRetrun > 0 Then + Var countDownRetrun = countDownRetrun - 1 + EndIf + If countDownRetrun = 0 Then + Open "ROOT/taobin_project/xml/menu_back_to_main.xml" + EndIf + + + + If CancelFlag = 1 Then + If ChangeOK = 1 Then + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Var ChangeOK = 0 + Var CancelFlag = 0 + EndIf + EndIf + + Refresh TimerReset - Open "ROOT/taobin_project/xml/menu_back_to_main.xml" + + If ChangeStatus = "payout-end" Then + Var ChangeOK = 1 + EndIf + 0 @@ -146,5 +176,16 @@ + + 0 + 1886 + 20 + 1080 + Center + RobotoBlack + 0x513C2F + countDownRetrun + + diff --git a/xml/menu_catalog_choose_drink1.xml b/xml/menu_catalog_choose_drink1.xml index 1d076914..d96471bc 100644 --- a/xml/menu_catalog_choose_drink1.xml +++ b/xml/menu_catalog_choose_drink1.xml @@ -388,15 +388,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0006.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -417,15 +426,24 @@ $11-99-02-0006.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0001.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -446,15 +464,24 @@ $11-99-02-0001.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0003.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -475,15 +502,24 @@ $11-99-02-0003.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0007.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -504,15 +540,24 @@ $11-99-02-0007.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0002.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -533,15 +578,24 @@ $11-99-02-0002.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0004.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 @@ -562,15 +616,24 @@ $11-99-01-0004.description - 722 + 740 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0020.Price + 722 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 596 @@ -591,15 +654,24 @@ $11-99-02-0020.description - 979 + 997 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0017.Price + 979 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 596 @@ -620,15 +692,24 @@ $11-99-02-0017.description - 208 + 226 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0017.Price + 208 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 924 @@ -649,15 +730,24 @@ $11-99-01-0017.description - 465 + 483 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0018.Price + 465 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 924 diff --git a/xml/menu_catalog_choose_drink2.xml b/xml/menu_catalog_choose_drink2.xml index da4dabde..d0b624e2 100644 --- a/xml/menu_catalog_choose_drink2.xml +++ b/xml/menu_catalog_choose_drink2.xml @@ -478,15 +478,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0010.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -507,15 +516,24 @@ $11-99-01-0010.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0001.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -536,15 +554,24 @@ $11-99-01-0001.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0002.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -565,15 +592,24 @@ $11-99-01-0002.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0004.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -594,15 +630,24 @@ $11-99-01-0004.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0007.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -623,15 +668,24 @@ $11-99-01-0007.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0017.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 @@ -652,15 +706,24 @@ $11-99-01-0017.description - 722 + 740 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0003.Price + 722 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 596 @@ -681,15 +744,24 @@ $11-99-01-0003.description - 979 + 997 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0006.Price + 979 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 596 @@ -710,15 +782,24 @@ $11-99-02-0006.description - 208 + 226 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0024.Price + 208 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 924 @@ -739,15 +820,24 @@ $11-99-02-0024.description - 465 + 483 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0001.Price + 465 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 924 @@ -768,15 +858,24 @@ $11-99-02-0001.description - 722 + 740 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0003.Price + 722 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 924 @@ -797,15 +896,24 @@ $11-99-02-0003.description - 979 + 997 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0007.Price + 979 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 924 @@ -826,15 +934,24 @@ $11-99-02-0007.description - 208 + 226 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0030.Price + 208 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 1252 @@ -855,15 +972,24 @@ $11-99-02-0030.description - 465 + 483 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0002.Price + 465 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 1252 diff --git a/xml/menu_catalog_choose_drink2_ext.xml b/xml/menu_catalog_choose_drink2_ext.xml index c0b9ff50..ccc5d181 100644 --- a/xml/menu_catalog_choose_drink2_ext.xml +++ b/xml/menu_catalog_choose_drink2_ext.xml @@ -571,15 +571,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0010.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -600,15 +609,24 @@ $11-99-01-0010.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0001.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -629,15 +647,24 @@ $11-99-01-0001.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0002.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -658,15 +685,24 @@ $11-99-01-0002.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0004.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -687,15 +723,24 @@ $11-99-01-0004.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0007.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -716,15 +761,24 @@ $11-99-01-0007.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0017.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 @@ -745,15 +799,24 @@ $11-99-01-0017.description - 722 + 740 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0003.Price + 722 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 596 @@ -774,15 +837,24 @@ $11-99-01-0003.description - 979 + 997 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0006.Price + 979 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 596 @@ -803,15 +875,24 @@ $11-99-02-0006.description - 208 + 226 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0024.Price + 208 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 924 @@ -832,15 +913,24 @@ $11-99-02-0024.description - 465 + 483 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0001.Price + 465 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 924 @@ -861,15 +951,24 @@ $11-99-02-0001.description - 722 + 740 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0003.Price + 722 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 924 @@ -890,15 +989,24 @@ $11-99-02-0003.description - 979 + 997 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0006.Price + 979 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 924 @@ -919,15 +1027,24 @@ $11-99-02-0006.description - 208 + 226 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0024.Price + 208 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 1252 @@ -948,15 +1065,24 @@ $11-99-02-0024.description - 465 + 483 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0001.Price + 465 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 1252 @@ -977,15 +1103,24 @@ $11-99-02-0001.description - 722 + 740 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0003.Price + 722 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 1252 @@ -1006,15 +1141,24 @@ $11-99-02-0003.description - 979 + 997 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0007.Price + 979 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 1252 @@ -1035,15 +1179,24 @@ $11-99-02-0007.description - 208 + 226 1378 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0030.Price + 208 + 1378 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 1580 @@ -1064,15 +1217,24 @@ $11-99-02-0030.description - 465 + 483 1378 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0002.Price + 465 + 1378 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 1580 diff --git a/xml/menu_catalog_choose_drink3.xml b/xml/menu_catalog_choose_drink3.xml index 70fb3c5a..b301ce5c 100644 --- a/xml/menu_catalog_choose_drink3.xml +++ b/xml/menu_catalog_choose_drink3.xml @@ -296,15 +296,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0014.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -325,15 +334,24 @@ $11-99-01-0014.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0012.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -354,15 +372,24 @@ $11-99-01-0012.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0011.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -383,15 +410,24 @@ $11-99-01-0011.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0004.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -412,15 +448,24 @@ $11-99-02-0004.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0014.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -441,15 +486,24 @@ $11-99-02-0014.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0010.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 diff --git a/xml/menu_catalog_choose_drink4.xml b/xml/menu_catalog_choose_drink4.xml index 2b876fb9..8c57d911 100644 --- a/xml/menu_catalog_choose_drink4.xml +++ b/xml/menu_catalog_choose_drink4.xml @@ -252,15 +252,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0006.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -281,15 +290,24 @@ $11-99-01-0006.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0017.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -310,15 +328,24 @@ $11-99-01-0017.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0005.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -339,15 +366,24 @@ $11-99-02-0005.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0031.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 diff --git a/xml/menu_catalog_choose_drink5.xml b/xml/menu_catalog_choose_drink5.xml index 14466251..1adc596d 100644 --- a/xml/menu_catalog_choose_drink5.xml +++ b/xml/menu_catalog_choose_drink5.xml @@ -344,15 +344,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-01-0009.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -373,15 +382,24 @@ $11-99-01-0009.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0016.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -402,15 +420,24 @@ $11-99-02-0016.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0017.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -431,15 +458,24 @@ $11-99-02-0017.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0020.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -460,15 +496,24 @@ $11-99-02-0020.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0021.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -489,15 +534,24 @@ $11-99-02-0021.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0023.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 @@ -518,15 +572,24 @@ $11-99-02-0023.description - 722 + 740 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0022.Price + 722 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 596 @@ -547,15 +610,24 @@ $11-99-02-0022.description - 979 + 997 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0011.Price + 979 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 596 diff --git a/xml/menu_catalog_choose_drink6.pml b/xml/menu_catalog_choose_drink6.pml index 1e368ed4..90e9cb66 100644 --- a/xml/menu_catalog_choose_drink6.pml +++ b/xml/menu_catalog_choose_drink6.pml @@ -11,6 +11,7 @@ bt_pic.append('b#_iced_sprite.png') bt_pic.append('b#_soda.png') bt_pic.append('b#_iced_soda.png') + bt_pic.append('b#_iced.png') product_code = [] @@ -19,6 +20,7 @@ product_code.append('11-99-02-0025') product_code.append('11-99-02-0032') product_code.append('11-99-02-0026') + product_code.append('11-99-02-0009') menu_count = len( bt_pic) diff --git a/xml/menu_catalog_choose_drink6.xml b/xml/menu_catalog_choose_drink6.xml index 41032c1c..ced3b65a 100644 --- a/xml/menu_catalog_choose_drink6.xml +++ b/xml/menu_catalog_choose_drink6.xml @@ -274,16 +274,48 @@ Open "ROOT/taobin_project/xml/menu_topping_alter.xml" + ; button i=6 11-99-02-0009 + - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0018.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -304,16 +336,25 @@ $11-99-02-0018.description + 483 + 66 + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0018.Price + + 465 66 - 200 + 20 27 KanitTTF 0xB78F24 - "Free" + "฿"" - 317 268 26 @@ -333,15 +374,24 @@ $11-99-02-0018.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0025.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -362,15 +412,24 @@ $11-99-02-0025.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0032.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -391,15 +450,24 @@ $11-99-02-0032.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free" + $11-99-02-0026.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -419,6 +487,44 @@ 0x6F5F51 $11-99-02-0026.description + + 483 + 394 + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0009.Price + + + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 317 + 596 + 26 + 220 + "bound" + KanitMediumTTF + 0x322B26 + $11-99-02-0009.Name2 + + + 317 + 628 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + $11-99-02-0009.description + diff --git a/xml/menu_drinkfail.xml b/xml/menu_drinkfail.xml index d1266eaa..d9e8a8a5 100644 --- a/xml/menu_drinkfail.xml +++ b/xml/menu_drinkfail.xml @@ -1,7 +1,9 @@ - + + 0 + 608 "Enable" 1080 - 1920 + 1312 "0xeae6e1" SoundVolume @@ -10,38 +12,80 @@ Var StarwState = "Enable" - 5000 + 800 - Open "ROOT/taobin_project/xml/menu_back_to_main.xml" + + If ChangeOK = 2 Then + If ActionOKCase = 0 Then + Var TelephoneNumber = "0899999999" + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + ;Open "ROOT/xml/menu_closeMaintenance.xml" + Var ActionOKCase = 1 + EndIf + EndIf + + If ChangeOK = 3 Then + Var Change3Timeout = Change3Timeout + 1 + If Change3Timeout > 3 Then + Open "ROOT/xml/menu_closeMaintenance.xml" + EndIf + EndIf + + If ChangeOK = 4 Then + If ActionOKCase = 0 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + sugarID + Var SessionID2 = SessionID2 + "000" + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C00" + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C" + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + Var ActionOKCase = 2 + EndIf + EndIf + + If ChangeStatus = "payout-end" Then + Var ChangeOK = 2 + EndIf + 0 0 - "ROOT/taobin_project/image/page2/ad_blank1.png" + "ROOT/taobin_project/image/page2/img1.png" - - 182 - 700 - GIFShowProcess - - - - - - - + diff --git a/xml/menu_drinkok.xml b/xml/menu_drinkok.xml index aa00ec2d..845bbabd 100644 --- a/xml/menu_drinkok.xml +++ b/xml/menu_drinkok.xml @@ -33,7 +33,7 @@ ; Old - - 182 - 700 - GIFShowProcess - +; +; 182 +; 700 +; GIFShowProcess +; + + + If MachineStage = "drink-failed" Then + Open "ROOT/taobin_project/xml/menu_brewing2.xml" + EndIf + + + + + If ChangeStatus = "payout-end" Then + Var ChangeOK = 2 + EndIf + diff --git a/xml/menu_payment.xml b/xml/menu_payment.xml index f9b2c1fd..98807b1a 100644 --- a/xml/menu_payment.xml +++ b/xml/menu_payment.xml @@ -1,51 +1,95 @@ - - + + "Enable" 1080 - 1288 - "ROOT/ui/bg_main_menu.png" + 1920 + "0xeae6e1" ; On open - Var payment = "cash" + Var GetPayInfoFlag = 0 + Var SessionID2 = "" + Var testservice = "kbank" + Var QRCODE99 = "" + Var QRCODETMP = "" + + Var QRChannel = 0 + Var MachineStage = "-" + Var HaveCup = "true" + + ;Var PriceDrink = 5 + + Var DiscountDrink = 0 + Var SelectSlot = "1" + + Var QRCODE1 = "A000000677010112" + Var QRCODE2 = "010755600066301" + Var QRCODE3 = "VDGN" + Var QRCODE4 = BoxID + Var QRCODE5 = SelectSlot + Var QRCODE6 = ServiceCredit + Var QRCODE7 = ServiceAmount2 + Var QRCODE8 = "" + + If GetPayInfoFlag = 0 Then + + Var RemainAmount = 0 + + ;PrepareDrink SelectDrink SelectSugarID + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + "00" + Var SessionID2 = SessionID2 + "000" + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "KBA" + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var Timeout = 0 + Var GetPayInfoFlag = 1 + Var ReqPayInfoFlag = 1 + + EndIf + + ; Reset + Var MachineState_Result = 0 + + Open "ROOT/taobin_project/xml/menu_payment_cash.xml" - - 10000 + 2000 - Open "ROOT/xml/menu_board.xml" + Open "ROOT/taobin_project/xml/menu_payment_cash.xml" + TimerReset + Refresh + + Var CreditAmount = 0 + Var QRCODE99 = SessionID + Var QRCODE99 = QRCODE99 + Ext1a + SAVELOG QRCODE99 + Var QRCODE99 = QRCODE99 + Ext21 + Var QRCODETMP = QRCODE99 + Open "ROOT/taobin_project/xml/menu_payment_cash.xml" + - - - - 265 - 130 - 550 - Center - 40 - 0xFFFFFF - "Payment QR" - - - - - 405 - 200 - "ROOT/ui/page_04_make_a_payment/make_payment.gif" - - - - Open "/media/bt/xml/security_alarm.xml" - - - - + diff --git a/xml/menu_payment_cash.xml b/xml/menu_payment_cash.xml index b8fe3223..b64cb750 100644 --- a/xml/menu_payment_cash.xml +++ b/xml/menu_payment_cash.xml @@ -6,17 +6,17 @@ SoundVolume "ROOT/sounds/selectPayment.wav" - SAVELOG SelectDrink - SAVELOG NameDrink - SAVELOG NameDrinkTH - SAVELOG DrinkDescription + ;SAVELOG SelectDrink + ;SAVELOG NameDrink + ;SAVELOG NameDrinkTH + ;SAVELOG DrinkDescription SAVELOG PriceDrink - SAVELOG topping1 - SAVELOG topping2 - SAVELOG topping3 + ;SAVELOG topping1 + ;SAVELOG topping2 + ;SAVELOG topping3 + Var PayAmount = PriceDrink - Var showRemaining = charOfBaht + RemainAmountStr ; Below original ; On open @@ -36,6 +36,8 @@ Var ChangeOK = 0 Var CoinInOK = 0 + Var showRemaining = charOfBaht + RemainAmountStr + Var VendingREFID = "" Var TelephoneNumber = "0899999999" @@ -51,58 +53,19 @@ Var VendingDiscount = DiscountDrink Var VendingCampaign = 0 - Var QRCODE1 = "A000000677010112" - Var QRCODE2 = "010755600066301" - Var QRCODE3 = "VDGN" - Var QRCODE4 = BoxID - Var QRCODE5 = SelectSlot - Var QRCODE6 = ServiceCredit - Var QRCODE7 = ServiceAmount2 - Var QRCODE8 = "" - Var CashTextWarning = "" Var QRErrorState = "Invisible" + + SAVELOG QRChannel + SAVELOG QRCODE99 + If QRChannel = 0 Then ;Var VendingQRCode = "ERROR" VendingQR ON CoinVending ON - Var QRCODE99 = "" + ;Var QRCODE99 = "" - Var TextBill = "" - Var BillFlag = 0 - - If Bill20 = "true" Then - Var TextBill = TextBill + " 20 " - Var BillFlag = BillFlag + 1 - EndIf - If Bill50 = "true" Then - Var TextBill = TextBill + " 50 " - Var BillFlag = BillFlag + 1 - EndIf - If Bill100 = "true" Then - Var TextBill = TextBill + " 100 " - Var BillFlag = BillFlag + 1 - EndIf - - If BillFlag = 3 Then - Var CashTextWarning = "" - Else - If BillFlag = 0 Then - Var TextBill = "ไม่รับแบงค์" - Var CashTextWarning = "จำนวนเงินไม่พอทอน! กรุณาใส่เงินให้พอดี " + TextBill - Else - Var TextBill = "รับเฉพาะแบงค์ " + TextBill - Var CashTextWarning = "จำนวนเงินไม่พอทอน! กรุณาใส่เงินให้พอดี " + TextBill - EndIf - EndIf - - - - - - - Else ;Var VendingQRCode = "OK" @@ -143,75 +106,64 @@ Var showRemaining = charOfBaht + RemainAmountStr EndIf - If GetPayInfoFlag = 0 Then - Var BG_Menu_Page4 = "ROOT/image/BG_Cash_Page4.bmp" - ;Var PayState1 = "PressForever" - ;Var PayState2 = "Enable" - ;Var PayState3 = "Enable" - Var RemainAmount = 0 - PrepareDrink SelectDrink SelectSugarID - - Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + "00" - Var SessionID2 = SessionID2 + "000" - - Var CreditAmount1 = "" - Var ServiceAmountFlow = "" - Var TelephoneNumber = "0899999999" - Var ServiceType = "coffee" - Var ECommerce = "" - Var ECommerce = ECommerce + PriceDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + DiscountDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SessionID2 - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SelectDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + "KBA" - Var ServiceParameter = "max" - Var ServiceCharge = 0 - Var AccountType = "new" - Var testservice = "kbank" - Var tc = "" - Var GetScore = "" - Var OperatorName = "" - Var SessionID = "" - - - GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc - Var Timeout = 0 - Var GetPayInfoFlag = 1 - EndIf + PrepareDrink SelectDrink SelectSugarID + - Var ProcessText = "กำลังดำเนินการ..." - ;Var GIFShowProcess ="ROOT/ui/page_05_loading/pic_loading_cup.gif" Var PayWithQR = 0 + Var NoGotoMenupage = "false" - + If VendingREFID = "" Then + SAVELOG "menu_page4-QR.xml > ActOK_REFID" + Refresh + Else + SAVELOG "menu_page4-QR.xml > ActOK_make" + ;Var VendingQRCode = "ERROR" + ;Coin STANDBY + VendingQR OFF + + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Var PayWithQR = 1 + ;Open "/media/bt/xml/menu_page4-1.xml" + + Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + Var BrewingTextThai = "เตรียมแก้ว" + Open "ROOT/taobin_project/xml/menu_thankyou.xml" + + EndIf + + If ReqPayInfoFlag = 1 Then + Var QRCODE99 = SessionID + Var QRCODE99 = QRCODE99 + Ext1a + SAVELOG QRCODE99 + Var QRCODE99 = QRCODE99 + Ext21 + Var QRCODETMP = QRCODE99 + Var ReqPayInfoFlag = 0 + + EndIf + 1000 Var Timeout = Timeout + 1 If Timeout > 120 Then + ; If PayOK = 1 Then If ChangeOK = 1 Then - ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/menu_thankyou.xml" Else If Timeout > 180 Then - ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/menu_thankyou.xml" EndIf @@ -250,6 +202,7 @@ EndIf EndIf + ; This copy in file menu_catalog.xml If CancelFlag = 1 Then If ChangeOK = 1 Then Var VendingDiscount = 0 @@ -258,13 +211,17 @@ Var SessionID2 = SelectDrink Var ServiceCredit = "coffee" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - Open "ROOT/taobin_project/xml/menu_catalog.xml" + If NoGotoMenupage = "false" Then + + Open "ROOT/taobin_project/xml/menu_catalog.xml" + EndIf + EndIf EndIf Var CoinInCounter = CoinInCounter + 1 If CoinInOK = 1 Then - If CoinInCounter = 3 Then + If CoinInCounter = 1 Then Var RemainAmount = PayAmount - CoinAmount If CoinAmount >= PayAmount Then @@ -278,6 +235,10 @@ Var Timeout = 118 Var PayOK = 1 + MakeDrinkV1 SelectDrink SelectSugarID + + Open "ROOT/taobin_project/xml/menu_thankyou.xml" + EndIf EndIf EndIf @@ -288,17 +249,13 @@ If ChangeStatus = "payout-end" Then - Var ChangeOK = 1 + Var ChangeOK = 1 EndIf TimerReset - If CoinInFlag = 0 Then - VendingQR OFF - EndIf - Var CoinInFlag = 1 If CoinInOK = 0 Then @@ -308,13 +265,20 @@ ;Var VendingQRCode = "ERROR" CoinVending OFF Var Canout = CoinAmount - PayAmount - Var RemainAmountStr = "ทอน " + Canout + If Canout = 0 Then + + Var RemainAmountStr = 0 + Else + Var RemainAmountStr = "ทอน " + Canout + EndIf Var CancleState = "Disable" Var CoinInOK = 1 Var CoinInCounter = 0 + + Else Var RemainAmountStr = "" + RemainAmount EndIf @@ -335,6 +299,9 @@ CoinVending OFF Var CancelFlag = 1 Var CancelCounter = 0 + Var showRemaining = "คืนเงิน" + Open "ROOT/taobin_project/xml/menu_catalog.xml" + EndIf EndIf VendingQR OFF @@ -350,7 +317,6 @@ Var MachineStage = "make-drink" Var BrewingTextThai = "เตรียมแก้ว" ;MakeDrinkV1 SelectDrink SelectSugarID - ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Open "ROOT/taobin_project/xml/menu_thankyou.xml" @@ -394,8 +360,8 @@ 287 1282 PayState1 - "ROOT/taobin_project/image/page_payment/bn_cash_2.png" - "ROOT/taobin_project/image/page_payment/bp_cash_2.png" + "ROOT/taobin_project/image/page_payment/bn_cash.png" + "ROOT/taobin_project/image/page_payment/bp_cash.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -409,8 +375,9 @@ Var MachineStage = "make-drink" Var BrewingTextThai = "เตรียมแก้ว" MakeDrinkV1 SelectDrink SelectSugarID - ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Open "ROOT/taobin_project/xml/menu_thankyou.xml" + ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf @@ -418,7 +385,7 @@ @@ -549,8 +535,10 @@ 399 912 + 185 + 185 alphaState - "Herr" + testservice @@ -561,7 +549,7 @@ 0 1880 - 30 + 14 "Left" 1080 KanitThinTTF diff --git a/xml/menu_payment_code.xml b/xml/menu_payment_code.xml index 61961737..12856853 100644 --- a/xml/menu_payment_code.xml +++ b/xml/menu_payment_code.xml @@ -261,21 +261,6 @@ - - + + + + diff --git a/xml/menu_topping_with_barista.xml b/xml/menu_topping_with_barista.xml index 4d52a2e2..1996c3fd 100644 --- a/xml/menu_topping_with_barista.xml +++ b/xml/menu_topping_with_barista.xml @@ -22,8 +22,8 @@ Var BaristaMenu = "Invisible" Var BGSubmenu = "Enable" - Var BaristaMenu = "Enable" - Var NormalMenu = "PressForever" + Var BaristaMenu = "PressForever" + Var NormalMenu = "Enable" Var y_topping_bg = y2_topping_bg Var y_topping = y2_topping @@ -61,8 +61,20 @@ Var SugarState5 = "Enable" Var BGSugar = "Enable" EndIf - + If TOPPING1 = "Powder Sugar Premix 25" Then + Var SugarState1 = "Invisible" + Var SugarState2 = "Invisible" + Var SugarState3 = "PressForever" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + Var BGSugar = "Enable" + ;SAVELOG SubMenuPrice1 + Var PriceShowValue = charOfBaht + SubMenuPrice1 + Var topping1 = toppingID1Default + Refresh + EndIf + 30000 @@ -87,7 +99,7 @@ diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml new file mode 100644 index 00000000..a3991365 --- /dev/null +++ b/xml/page_collect_point_1.xml @@ -0,0 +1,358 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open + TopView "hide" + + Var Timeout = 0 + Var TelephoneNumber = "" + + + 1000 + + + + + + Var Timeout = Timeout + 1 + If Timeout > 20 Then + Open "ROOT/taobin_project/xml/menu_lid_straw.xml" + EndIf + + TimerReset + Refresh + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +; + +; +; 310 +; 380 +; 474 +; Center +; 50 +; fontType1 +; 0xF0E000 +; TelephoneNumber +; Telnum +; + + + 0 + 873 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + TelephoneNumber + Telnum + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 1 + EndIf + + + + + + diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml new file mode 100644 index 00000000..39e06371 --- /dev/null +++ b/xml/page_collect_point_2.xml @@ -0,0 +1,119 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open + TopView "hide" + + Var Timeout = 0 + Var TelephoneNumber = "" + + + 1000 + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + ;Var CoffeePoint = 1 + ;Open "/media/bt/xml/page_collect_point_3.xml" + If StepGetPoint = 0 Then + Open "ROOT/taobin_project/xml/page_show_consent.xml" + Else + Var CoffeePoint = 1 + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + EndIf + + EndIf + + TimerReset + Refresh + + + + + 310 + 380 + 474 + Center + 50 + fontType1 + 0xF0E000 + TelephoneNumber + Telnum + + + + 310 + 550 + 474 + Center + 50 + fontType1 + 0xF0E000 + "กรุณารอซักครู่..." + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + If StepGetPoint = 0 Then + If PdpaAsk = 0 Then + Open "ROOT/taobin_project/xml/page_show_consent.xml" + Else + Var StepGetPoint = 1 + GETACCEXT TelephoneNumber 5 + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + EndIf + Else + If Ext1a = "" Then + Var CoffeePoint = 1 + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + + Else + + Var CoffeePoint1 = Ext21 + INT CoffeePoint1 + + Var CoffeePoint = 1 + CoffeePoint1 + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + + EndIf + EndIf + + + + + + + If StepGetPoint = 0 Then + Open "ROOT/taobin_project/xml/page_show_consent.xml" + Else + Var CoffeePoint = 1 + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + EndIf + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 1 + EndIf + + + + + \ No newline at end of file diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml new file mode 100644 index 00000000..e69de29b diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml new file mode 100644 index 00000000..2bb1b001 --- /dev/null +++ b/xml/page_show_consent.xml @@ -0,0 +1,77 @@ + + + 1080 + 1312 + "ROOT/image/BG_Consent.bmp" + + + + ; On open + + + Var Timeout = 0 + + + + + 1000 + + ;Open "ROOT/xml/menu_board.xml" + + Var Timeout = Timeout + 1 + If Timeout > 20 Then + Open "ROOT/xml/menu_page5.xml" + EndIf + + TimerReset + Refresh + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 1 + EndIf + + + + + + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + diff --git a/xml/test_video_loop.xml b/xml/test_video_loop.xml index f3874b35..370ecb8b 100644 --- a/xml/test_video_loop.xml +++ b/xml/test_video_loop.xml @@ -2,22 +2,9 @@ "ALL" HeadScreenWidth HeadScreenHeight - + - Var Count = Count + 1 - If VendingClass = "coffeeInthanin01" Then - If Count > 1 Then - Var Count = 1 - EndIf - Else - If Count > 3 Then - Var Count = 1 - EndIf - EndIf - Var AdvFilename = "/mnt/sdcard/coffeevending/video/adv_main_0" - Var AdvFilename = AdvFilename + Count - Var AdvFilename = AdvFilename + ".mp4" @@ -26,7 +13,7 @@ Open "/mnt/sdcard/coffeevending/xml/startup_head.xml" - Open "/mnt/sdcard/coffeevending/xml/test_video_loop.xml" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"