diff --git a/image/page2/Boonterm.png b/image/page2/Boonterm.png index 5ec61ddd..da1e5faf 100644 Binary files a/image/page2/Boonterm.png and b/image/page2/Boonterm.png differ diff --git a/image/page2/bn_cho_caramel.png b/image/page2/bn_cho_caramel.png index 5c378118..e77095fb 100644 Binary files a/image/page2/bn_cho_caramel.png and b/image/page2/bn_cho_caramel.png differ diff --git a/image/page2/bn_coffee.png b/image/page2/bn_coffee.png index bb569fc9..d9ba467e 100644 Binary files a/image/page2/bn_coffee.png and b/image/page2/bn_coffee.png differ diff --git a/image/page2/bn_diy.png b/image/page2/bn_diy.png index 26c37785..4e46021c 100644 Binary files a/image/page2/bn_diy.png and b/image/page2/bn_diy.png differ diff --git a/image/page2/bn_fruit.png b/image/page2/bn_fruit.png index 14a09eca..a46419c5 100644 Binary files a/image/page2/bn_fruit.png and b/image/page2/bn_fruit.png differ diff --git a/image/page2/bn_iced_cola.png b/image/page2/bn_iced_cola.png index 0ade0fcf..b9fb34f2 100644 Binary files a/image/page2/bn_iced_cola.png and b/image/page2/bn_iced_cola.png differ diff --git a/image/page2/bn_main_page_member.png b/image/page2/bn_main_page_member.png index 4242e310..bd9327dd 100644 Binary files a/image/page2/bn_main_page_member.png and b/image/page2/bn_main_page_member.png differ diff --git a/image/page2/bn_main_page_topup.png b/image/page2/bn_main_page_topup.png index dc7b693a..8913a900 100644 Binary files a/image/page2/bn_main_page_topup.png and b/image/page2/bn_main_page_topup.png differ diff --git a/image/page2/bn_soda.png b/image/page2/bn_soda.png index c2bc0d57..6591b20a 100644 Binary files a/image/page2/bn_soda.png and b/image/page2/bn_soda.png differ diff --git a/image/page2/bn_tea.png b/image/page2/bn_tea.png index 651a4899..a705337f 100644 Binary files a/image/page2/bn_tea.png and b/image/page2/bn_tea.png differ diff --git a/image/page2/bp_cho_caramel.png b/image/page2/bp_cho_caramel.png index 5d067621..f82adc64 100644 Binary files a/image/page2/bp_cho_caramel.png and b/image/page2/bp_cho_caramel.png differ diff --git a/image/page2/bp_coffee.png b/image/page2/bp_coffee.png index ba5400c7..3e935cec 100644 Binary files a/image/page2/bp_coffee.png and b/image/page2/bp_coffee.png differ diff --git a/image/page2/bp_diy.png b/image/page2/bp_diy.png index 493a7bf7..73ba1765 100644 Binary files a/image/page2/bp_diy.png and b/image/page2/bp_diy.png differ diff --git a/image/page2/bp_fruit.png b/image/page2/bp_fruit.png index 8e41b176..7e76b1a4 100644 Binary files a/image/page2/bp_fruit.png and b/image/page2/bp_fruit.png differ diff --git a/image/page2/bp_main_page_member.png b/image/page2/bp_main_page_member.png new file mode 100644 index 00000000..f1719ea0 Binary files /dev/null and b/image/page2/bp_main_page_member.png differ diff --git a/image/page2/bp_main_page_topup.png b/image/page2/bp_main_page_topup.png new file mode 100644 index 00000000..23307cbb Binary files /dev/null and b/image/page2/bp_main_page_topup.png differ diff --git a/image/page2/bp_soda.png b/image/page2/bp_soda.png index c5da9ab7..a46829ba 100644 Binary files a/image/page2/bp_soda.png and b/image/page2/bp_soda.png differ diff --git a/image/page2/bp_tea.png b/image/page2/bp_tea.png index 3175aa4c..cf185438 100644 Binary files a/image/page2/bp_tea.png and b/image/page2/bp_tea.png differ diff --git a/image/page2/text1.png b/image/page2/text1.png index 71e3f5f6..15f707fd 100644 Binary files a/image/page2/text1.png and b/image/page2/text1.png differ diff --git a/image/page2_en/page2/bn_fruit.png b/image/page2_en/page2/bn_fruit.png index 8138361e..f6f32844 100644 Binary files a/image/page2_en/page2/bn_fruit.png and b/image/page2_en/page2/bn_fruit.png differ diff --git a/image/page2_en/page2/bn_soda.png b/image/page2_en/page2/bn_soda.png index 7c3292b0..38e2e35f 100644 Binary files a/image/page2_en/page2/bn_soda.png and b/image/page2_en/page2/bn_soda.png differ diff --git a/image/page2_en/page2/bp_cho_caramel.png b/image/page2_en/page2/bp_cho_caramel.png new file mode 100644 index 00000000..d8fc088f Binary files /dev/null and b/image/page2_en/page2/bp_cho_caramel.png differ diff --git a/image/page2_en/page2/bp_coffee.png b/image/page2_en/page2/bp_coffee.png new file mode 100644 index 00000000..15d49df3 Binary files /dev/null and b/image/page2_en/page2/bp_coffee.png differ diff --git a/image/page2_en/page2/bp_diy.png b/image/page2_en/page2/bp_diy.png new file mode 100644 index 00000000..41676f50 Binary files /dev/null and b/image/page2_en/page2/bp_diy.png differ diff --git a/image/page2_en/page2/bp_fruit.png b/image/page2_en/page2/bp_fruit.png new file mode 100644 index 00000000..37431cbb Binary files /dev/null and b/image/page2_en/page2/bp_fruit.png differ diff --git a/image/page2_en/page2/bp_soda.png b/image/page2_en/page2/bp_soda.png new file mode 100644 index 00000000..0b049947 Binary files /dev/null and b/image/page2_en/page2/bp_soda.png differ diff --git a/image/page2_en/page2/bp_tea.png b/image/page2_en/page2/bp_tea.png new file mode 100644 index 00000000..71522e78 Binary files /dev/null and b/image/page2_en/page2/bp_tea.png differ diff --git a/image/page2_en/page2/text1.png b/image/page2_en/page2/text1.png index 699fd904..87a507dc 100644 Binary files a/image/page2_en/page2/text1.png and b/image/page2_en/page2/text1.png differ diff --git a/image/page2_en/page2/text2.png b/image/page2_en/page2/text2.png index 47c90d95..71597e5a 100644 Binary files a/image/page2_en/page2/text2.png and b/image/page2_en/page2/text2.png differ diff --git a/xml/page_back_to_topup.xml b/xml/page_back_to_topup.xml new file mode 100644 index 00000000..0d94f616 --- /dev/null +++ b/xml/page_back_to_topup.xml @@ -0,0 +1,19 @@ + + 1080 + 1920 + + + + OpenInst 0 "ROOT/xml/service_menu.xml" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml" + + + 60000 + + ;Var menu_status = "stop" + + + + diff --git a/xml/page_board.xml b/xml/page_board.xml index 68f562e1..63a99525 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -172,6 +172,8 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml" + Open "ROOT/xml/service_menu.xml" diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index d3d4bcf6..606b370c 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -10,10 +10,117 @@ Var StarwState = "Enable" Var countClick2 = 0 + Var Timeout = 0 + + + + + If ActionOKCase = 1 Then + If CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + 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 + + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + Else + + If ActionOKCase = 2 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + EndIf + + + + If ActionOKCase = 1 Then + If CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + 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 + + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + Else + + If ActionOKCase = 2 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + EndIf + + + 800 + Var Timeout = Timeout + 1 + Var CountDownBrewing = CountDownBrewing - 1 ; run test; @@ -21,11 +128,26 @@ ; Open "ROOT/taobin_project/xml/page_drinkok.xml" ;EndIf If CountDownBrewing = 0 Then - Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" EndIf Var ShowCountDownBrewing = CountDownBrewing + + If Timeout > 120 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + + If Timeout > 60 Then + Var MachineState_Result = 2 + EndIf + + If ChangeFlag = 1 Then + Var ChangeTimeout = ChangeTimeout + 1 + EndIf + + If ChangeOK = 2 Then If ActionOKCase = 0 Then Var TelephoneNumber = "0899999999" @@ -40,6 +162,61 @@ EndIf EndIf + If ChangeTimeout > 30 Then + If ActionOKCase = 0 Then + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var TelephoneNumber = "0899999999" + 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 + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If ChangeOK = 4 Then + If ActionOKCase = 0 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + 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 MachineState_Result = 1 Then Var Timeout = 0 Var ProcessText = "" @@ -84,7 +261,7 @@ If ChangeFlag = 0 Then Var ChangeFlag = 1 Change ServiceAmount2 - Var ChangeOK = 0 + EndIf Else If CoinAmount > 0 Then @@ -92,20 +269,50 @@ Var ChangeFlag = 1 Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign Change ServiceAmount2 - Var ChangeOK = 0 + EndIf Else Var ChangeOK = 4 EndIf EndIf Else - Var ChangeOK = 3 + + If CodeChannel = 0 Then + + If CoinAmount > 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount2 = CoinAmount + Change CoinAmount + + EndIf + Else + Var ChangeOK = 3 + EndIf + + Else + + If CoinAmount > 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount2 = CoinAmount + Change CoinAmount + + EndIf + Else + Var ChangeOK = 4 + EndIf + + EndIf + + + EndIf OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" EndIf EndIf @@ -162,7 +369,9 @@ ; this copy in file menu_brew2.xml and menu_lid_straw.xml If ChangeStatus = "payout-end" Then - Var ChangeOK = 2 + If ChangeFlag = 1 Then + Var ChangeOK = 2 + EndIf EndIf diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index ed76f96c..069b92f3 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -33,27 +33,27 @@ - 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 + ;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 - If ChangeStatus = "payout-end" Then - Var ChangeOK = 1 - EndIf + ;If ChangeStatus = "payout-end" Then + ; Var ChangeOK = 1 + ;EndIf @@ -104,34 +104,6 @@ - - - - ; menu row 1 + + + + diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index eb8543a7..061c654f 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -23,9 +23,9 @@ ;If CountDownBrewing = 40 Then ; Open "ROOT/taobin_project/xml/page_drinkok.xml" ;EndIf - If CountDownBrewing = 0 Then - Open "ROOT/taobin_project/xml/page_drinkok.xml" - EndIf + ;If CountDownBrewing = 0 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf Var ShowCountDownBrewing = CountDownBrewing @@ -38,7 +38,7 @@ Var Timeout = Timeout + 1 If Timeout > 20 Then - ;Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf TimerReset diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index b27ea064..a8cde5b4 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -11,7 +11,7 @@ Var Timeout = 0 ;Open "ROOT/taobin_project/xml/page_show_consent.xml" - Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + ;Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 1000 @@ -22,15 +22,15 @@ ;If CountDownBrewing = 40 Then ; Open "ROOT/taobin_project/xml/page_drinkok.xml" ;EndIf - If CountDownBrewing = 0 Then - Open "ROOT/taobin_project/xml/page_drinkok.xml" - EndIf + ;If CountDownBrewing = 0 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf Var ShowCountDownBrewing = CountDownBrewing Var Timeout = Timeout + 1 - If Timeout > 5 Then + If Timeout > 30 Then ;Var CoffeePoint = 1 ;Open "ROOT/taobin_project/xml/page_show_consent.xml" diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 8447a95d..3bceec00 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -10,7 +10,7 @@ Var Timeout = 0 ;CoffeePoint - Var CoffeePoint = 5 + ;Var CoffeePoint = 5 Var BmiYear = "0/0/0/1/0/0" Var PointCrm = "pdpa1" Var GetScore = "" @@ -32,9 +32,9 @@ ;If CountDownBrewing = 40 Then ; Open "ROOT/taobin_project/xml/page_drinkok.xml" ;EndIf - If CountDownBrewing = 0 Then - Open "ROOT/taobin_project/xml/page_drinkok.xml" - EndIf + ;If CountDownBrewing = 0 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf Var ShowCountDownBrewing = CountDownBrewing diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 0963121a..6af78695 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -32,6 +32,11 @@ Var CountStepPackPayment = 0 + + Var IntVendingCampaign = 0 + Var CodeChannel = 0 + + 900 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index f72c85e1..d7b0a629 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -16,6 +16,11 @@ ;SAVELOG topping2 ;SAVELOG topping3 + + + Var PayInfoCFlag = 0 + Var ActionOKCase = 0 + Var VendingCampaign = IntVendingCampaign Var PayAmount = PriceDrink @@ -30,7 +35,7 @@ Var CoinInCounter = 0 Var PayAmount = PriceDrink - Var RemainAmount = PayAmount + Var RemainAmount = PayAmount - IntVendingCampaign Var RemainAmountStr = "" + RemainAmount Var Timeout = 0 Var PayOK = 0 @@ -52,7 +57,7 @@ Var CancleState = "Enable" Var VendingDiscount = DiscountDrink - Var VendingCampaign = 0 + Var CashTextWarning = "" Var QRErrorState = "Invisible" @@ -99,11 +104,17 @@ Else Var PayState1 = "PressForever" - Var PayState2 = "Enable" + If IntVendingCampaign = 0 Then + Var PayState2 = "Enable" + Else + Var PayState2 = "Disable" + EndIf Var PayState3 = "Enable" Var showRemaining = charOfBaht + RemainAmountStr EndIf + + Var PayWithQR = 0 Var NoGotoMenupage = "false" @@ -116,38 +127,55 @@ Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash_2.png" EndIf + If IntVendingCampaign >= PayAmount Then + Var RemainAmount = 0 + Var RemainAmountStr = "" + RemainAmount + CoinVending OFF + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + + EndIf + + + - 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/page_page4-1.xml" - Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - Var BrewingTextThai = "เตรียมแก้ว" - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If ActionOKCase = 0 Then + 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 - EndIf + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Var PayWithQR = 1 + ;Open "/media/bt/xml/page_page4-1.xml" - If ReqPayInfoFlag = 1 Then - Var QRCODE99 = SessionID - Var QRCODE99 = QRCODE99 + Ext1a - SAVELOG QRCODE99 - Var QRCODE99 = QRCODE99 + Ext21 - Var QRCODETMP = QRCODE99 - Var ReqPayInfoFlag = 0 + Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + Var BrewingTextThai = "เตรียมแก้ว" + Open "ROOT/taobin_project/xml/page_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 + Else + Var PayInfoCFlag = 1 + EndIf - EndIf @@ -155,95 +183,149 @@ Var Timeout = Timeout + 1 - If Timeout > 120 Then - ; + + + If Timeout > 90 Then + If ActionOKCase = 1 Then + Var PayInfoCFlag = 1 + EndIf + EndIf + + If PayInfoCFlag = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + 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 + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + + + If CoinInOK = 1 Then + Var CoinInCounter = CoinInCounter + 1 + If CoinInCounter = 1 Then + + Var ChangeOK = 1 + Var Timeout = 60 + Var PayOK = 1 + + EndIf + EndIf + + If Timeout > 60 Then If PayOK = 1 Then - If ChangeOK = 1 Then - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" - Else - If Timeout > 180 Then - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - EndIf Else If CancelFlag = 0 Then VendingQR OFF CoinVending OFF - - - - If CoinAmount > 0 Then - Var CancelFlag = 1 - Var CancelCounter = 0 - Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Var CancelFlag = 1 + Var CancelCounter = 0 + If CoinAmount = 0 Then + If IntVendingCampaign = 0 Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf EndIf - - + EndIf EndIf EndIf - Var CancelCounter = CancelCounter + 1 If CancelFlag = 1 Then - ;Var VendingQRCode = "ERROR" + + Var CancelCounter = CancelCounter + 1 If CancelCounter = 3 Then ;Change CoinAmount If CoinAmount > 0 Then Change CoinAmount Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + If ActionOKCase = 0 Then + Var ActionOKCase = 1 + Var PayInfoCFlag = 1 + EndIf EndIf EndIf - EndIf + If CancelCounter >= 33 Then + Var ChangeOK = 1 + EndIf + ; This copy in file menu_catalog.xml - 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 - If NoGotoMenupage = "false" Then - - Open "ROOT/taobin_project/xml/page_catalog.xml" - EndIf - - EndIf - EndIf - - Var CoinInCounter = CoinInCounter + 1 - If CoinInOK = 1 Then - If CoinInCounter = 1 Then - - Var RemainAmount = PayAmount - CoinAmount - If CoinAmount >= PayAmount Then - Var Canout = CoinAmount - PayAmount - If Canout > 0 Then - Change Canout - Else - Var ChangeOK = 1 - EndIf - - Var Timeout = 118 - Var PayOK = 1 - - MakeDrinkV1 SelectDrink SelectSugarID - - Open "ROOT/taobin_project/xml/page_thankyou.xml" - + If ActionOKCase = 0 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 + ;If NoGotoMenupage = "false" Then + ; + ; Open "ROOT/taobin_project/xml/page_catalog.xml" + ;EndIf + Var ActionOKCase = 1 EndIf EndIf + EndIf + ;Var CoinInCounter = CoinInCounter + 1 + ;If CoinInOK = 1 Then + ; If CoinInCounter = 3 Then + ; + ; Var RemainAmount = PayAmount - CoinAmount + ; If CoinAmount >= PayAmount Then + ; Var Canout = CoinAmount - PayAmount + ; If Canout > 0 Then + ; Change Canout + ; Else + ; Var ChangeOK = 1 + ; EndIf + ; + ; Var Timeout = 118 + ; Var PayOK = 1 + ; + ; MakeDrinkV1 SelectDrink SelectSugarID + ; + ; Open "ROOT/taobin_project/xml/page_thankyou.xml" + ; + ; EndIf + ; EndIf + ;EndIf + Refresh TimerReset @@ -257,17 +339,22 @@ TimerReset + If CoinInFlag = 0 Then + VendingQR OFF + EndIf + Var CoinInFlag = 1 If CoinInOK = 0 Then Var RemainAmount = PayAmount - CoinAmount - If CoinAmount >= PayAmount Then + Var RemainAmount = RemainAmount - IntVendingCampaign + Var SumCoinAmount = CoinAmount + IntVendingCampaign + If SumCoinAmount >= PayAmount Then ;Var VendingQRCode = "ERROR" CoinVending OFF - Var Canout = CoinAmount - PayAmount + Var Canout = SumCoinAmount - PayAmount If Canout = 0 Then - Var RemainAmountStr = 0 Else Var RemainAmountStr = "ทอน " + Canout @@ -300,8 +387,12 @@ CoinVending OFF Var CancelFlag = 1 Var CancelCounter = 0 + If CoinAmount = 0 Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + Var showRemaining = "คืนเงิน" - Open "ROOT/taobin_project/xml/page_catalog.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf EndIf @@ -322,7 +413,7 @@ ;Open "ROOT/taobin_project/xml/page_thankyou.xml" - Open "ROOT/taobin_project/xml/page_collect_point_1.xml" + Open "ROOT/taobin_project/xml/page_payment_code.xml" @@ -417,18 +508,21 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var alphaState = "Enable" - CoinVending OFF - VendingQR ON - Refresh - If CoinAmount > 0 Then - Change CoinAmount - Var ChangeOK = 0 - Var CancelFlag = 1 - Var CancelCounter = 0 - Var NoGotoMenupage = "true" - + If CoinInFlag = 0 Then + Var alphaState = "Enable" + CoinVending OFF + VendingQR ON + Refresh + + If CoinAmount > 0 Then + Change CoinAmount + Var ChangeOK = 0 + Var CancelFlag = 1 + Var CancelCounter = 0 + Var NoGotoMenupage = "true" + + EndIf EndIf ; If CoinInFlag = 0 Then @@ -454,21 +548,33 @@ VendingQR OFF + - CoinVending OFF - - - If CoinAmount > 0 Then - Change CoinAmount - Var ChangeOK = 0 - Var CancelFlag = 1 - Var CancelCounter = 0 - - Else - Var ChangeOK = 1 + If CoinInOK = 0 Then + If CancelFlag = 0 Then + CoinVending OFF + Var CancelFlag = 1 + Var CancelCounter = 0 + If CoinAmount = 0 Then + If IntVendingCampaign = 0 Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + EndIf + EndIf EndIf - Open "ROOT/taobin_project/xml/page_catalog.xml" + + ;If CoinAmount > 0 Then + ; Change CoinAmount + ; Var ChangeOK = 0 + ; Var CancelFlag = 1 + ; Var CancelCounter = 0 + ; + ;Else + ; ;Var ChangeOK = 1 + ;EndIf + + ;Open "ROOT/taobin_project/xml/page_catalog.xml" diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 91669f87..cff8e630 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -55,8 +55,49 @@ Var VendingREFID = SessionID If IntVendingCampaign > 0 Then - ;Var QRChannel = 0 - ;Open "ROOT/xml/menu_Page4-WithCode.xml" + Var QRChannel = 0 + + If IntVendingCampaign >= PayAmount Then + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf + + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + 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 ECommerce = ECommerce + VendingCode + Var ECommerce = ECommerce + ":" + Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + ":" + Var ECommerce = ECommerce + VendingCampaignRI3 + 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 CodeChannel = 2 + Else If VendingCode = "C13" Then @@ -65,10 +106,39 @@ Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf + If VendingCode = "C24" Then + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + If VendingCode = "C25" Then + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + If VendingCode = "C30" Then + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + Var ShowErrorText = "Enable" EndIf + + Else + + Var CreditAmount = 0 + Var QRCODE99 = SessionID + Var QRCODE99 = QRCODE99 + Ext1a + Var QRCODE99 = QRCODE99 + Ext21 + Var QRCODETMP = QRCODE99 + Var CodeChannel = 1 + + Open "ROOT/taobin_project/xml/page_payment_cash.xml" EndIf @@ -78,8 +148,17 @@ If CodeChannel = 1 Then Var ShowErrorText = "Enable" - + Refresh EndIf + + If CodeChannel = 2 Then + Var CodeChannel = 1 + Var QRCODE99 = "" + Var QRCODETMP = "" + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + EndIf + + @@ -348,8 +428,12 @@ SoundVolume - If RoadShow = "true" Then + + If RoadShow = "true" Then + If TelephoneNumber = "00000000" Then + Var ShowErrorText = "Enable" + EndIf Else If TelephoneNumber = "00000000" Then Var ShowErrorText = "Enable" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index d50f70db..a9b8c606 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -10,15 +10,36 @@ Var CountDownThankyou = 3 Var CountDownBrewing = 99 Var ShowCountDownBrewing = CountDownBrewing + Var Timeout = 0 + Var ChangeFlag = 0 + Var ErrTimeout = 0 + Var ActionOKCase = 0 + - 800 + 1000 Var CountDownBrewing = CountDownBrewing - 1 Var CountDownThankyou = CountDownThankyou - 1 + + Var Timeout = Timeout + 1 + If Timeout = 3 Then + If IntVendingCampaign < PayAmount Then + Var SumCoinAmount = CoinAmount + IntVendingCampaign + If SumCoinAmount >= PayAmount Then + Var Canout = SumCoinAmount - PayAmount + If Canout > 0 Then + Change Canout + EndIf + EndIf + EndIf + EndIf + + ; run test; If CountDownThankyou = 0 Then - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + ;Open "ROOT/taobin_project/xml/page_lid_straw.xml" ;Open "ROOT/taobin_project/xml/page_brewing.xml" + Open "ROOT/taobin_project/xml/page_collect_point_1.xml" EndIf Var ShowCountDownBrewing = CountDownBrewing diff --git a/xml/topview_button_back_main.xml b/xml/topview_button_back_main.xml index e69de29b..818c522d 100644 --- a/xml/topview_button_back_main.xml +++ b/xml/topview_button_back_main.xml @@ -0,0 +1,25 @@ + + "Enable" + 1080 + 1920 + + TopView "show" + + + + + + \ No newline at end of file