From af4b96322d9a23fa9b96b1ddf8820f155187898e Mon Sep 17 00:00:00 2001 From: miggaze Date: Mon, 1 Aug 2022 16:00:47 +0700 Subject: [PATCH] keep trans, status sell, error code 1303 --- xml/page_board.xml | 39 +++++++++++++++---- xml/page_board_1.xml | 9 +++-- xml/page_brewing3.xml | 47 ++++++++++++++++++---- xml/page_brewing3Conti.xml | 33 ++++++++++++++-- xml/page_cannotConti.xml | 28 +++++++++++++ xml/page_catalog.xml | 14 ++++++- xml/page_catalog2.xml | 12 +++++- xml/page_catalog_cocktail.xml | 11 +++++- xml/page_catalog_free.xml | 12 ++++-- xml/page_collect_point_3.xml | 2 +- xml/page_get_yourchange.xml | 8 +++- xml/page_lid_straw.xml | 28 +++++++++++++ xml/page_member_topupCash.xml | 6 +++ xml/page_member_topupSuccess.xml | 58 ++++++++++++++++++--------- xml/page_payment.xml | 22 ++++++++++- xml/page_payment_cash.xml | 65 ++++++++++++++++++++++++++----- xml/page_payment_cashMore.xml | 23 ++++++----- xml/page_payment_code.xml | 4 ++ xml/page_payment_codeAIS.xml | 4 ++ xml/page_payment_codeDtac.xml | 4 ++ xml/page_payment_codeLotus.xml | 4 ++ xml/page_payment_codeSCG.xml | 4 ++ xml/page_payment_codeThe1.xml | 4 ++ xml/page_payment_codeTrue.xml | 4 ++ xml/page_payment_credit2.xml | 5 +++ xml/page_payment_credit3.xml | 6 +++ xml/page_payment_storeCredit3.xml | 4 ++ xml/page_thankyou.xml | 46 ++++++++++++++++++++++ xml_main/startup.xml | 1 + 29 files changed, 436 insertions(+), 71 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 018a97e1..fcc2b51d 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -182,11 +182,18 @@ EndIf - - - + DEBUGVAR SELLSTATUS DEBUGVAR NetworkStatus - If NetworkStatus = "ACTIVATE" Then + + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf + + If SELLONLINE = 1 Then Var ShowNetworkProblem = "Invisible" Var ShowNetworkProblemText = "" Machine NetworkUp @@ -204,6 +211,9 @@ WEB "ENABLE" Else + + + Var ShowNetworkProblem = "Enable" Var ShowButtonClick2 = "Invisible" Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" @@ -212,6 +222,7 @@ Var QRCODE99 = "" WEB "DISABLE" + EndIf @@ -237,7 +248,14 @@ Else Machine Initial Var StartUpExt = "false" + ;DEBUGVAR "FlushTxRef1" + ;FlushTxRef1 EndIf + + ;DEBUGVAR "FlushTxRef1" + ;FlushTxRef1 + + StopLongPlay @@ -447,7 +465,7 @@ Topping "ClearNextOrder" "-" - If NetworkStatus = "DEACTIVE" Then + If SELLSTATUS = "DEACTIVE" Then Open "/ROOT/xml/offline.xml" EndIf @@ -502,6 +520,11 @@ Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT + If SELLSTATUS = "DEACTIVE" Then + Open "/ROOT/xml/offline.xml" + EndIf + + 1000 @@ -513,7 +536,7 @@ ;Open "/ROOT/xml/outservice.xml" Var WebAppShow = "Invisible" EndIf - If NetworkStatus = "DEACTIVE" Then + If SELLSTATUS = "DEACTIVE" Then Open "/ROOT/xml/offline.xml" EndIf @@ -730,7 +753,9 @@ SAVELOG NetworkStatus - Open "/mnt/sdcard/coffeevending/xml/main.xml" + If SELLSTATUS = "DEACTIVE" Then + Open "/mnt/sdcard/coffeevending/xml/main.xml" + EndIf diff --git a/xml/page_board_1.xml b/xml/page_board_1.xml index 778c912b..9c6f2c29 100644 --- a/xml/page_board_1.xml +++ b/xml/page_board_1.xml @@ -128,9 +128,10 @@ Else If NetworkStatus = "DOWN" Then - Open "/ROOT/xml/outservice.xml" + ;Open "/ROOT/xml/outservice.xml" + Var WebAppShow = "Invisible" EndIf - If NetworkStatus = "DEACTIVE" Then + If SELLSTATUS = "DEACTIVE" Then Open "/ROOT/xml/offline.xml" EndIf @@ -244,7 +245,9 @@ SAVELOG NetworkStatus - Open "/mnt/sdcard/coffeevending/xml/main.xml" + If SELLSTATUS = "DEACTIVE" Then + Open "/mnt/sdcard/coffeevending/xml/main.xml" + EndIf diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index b3d150a5..f47958b6 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -6,6 +6,8 @@ SoundVolume + DEBUGVAR TxRef1 + SAVELOG "page_brewing3.xml" DEBUGVAR MachineStage @@ -163,6 +165,8 @@ Var CreditReference = Seeker.CreditReferenceTmp Var VendingDiscount = Seeker.VendingDiscount Var VendingCampaign = Seeker.VendingCampaign + Var TxReference = Seeker.TxRef1 + DEBUGVAR TxReference If show_eng = "true" Then @@ -498,15 +502,24 @@ If NextOrderStatus = "Disable" Then - Var PayDetail="1/F:1221/0/" + Var PayDetail="2/F:1221/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel Else - Var PayDetail = "1/" + HURR_FOREVER + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + + Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel EndIf @@ -552,14 +565,23 @@ If NextOrderStatus = "Disable" Then - Var PayDetail="1/F:1221/0/" + Var PayDetail="2/F:1221/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel Else - Var PayDetail = "1/" + HURR_FOREVER + + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel EndIf @@ -598,15 +620,22 @@ If NextOrderStatus = "Disable" Then - Var PayDetail="1/F:1221/0/" + Var PayDetail="2/F:1221/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel Else + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf - Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel EndIf @@ -669,18 +698,20 @@ Var ServiceCredit = SelectDrink Var SuggestID = "" - Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" If GetFreeFromError = 1 Then Var Seeker.CodeChannel = 1 - Var Seeker.VendingCode = "C48" + Var Seeker.VendingCode = "FAU" Var Seeker.CodeNumber = "0000000000" Var VendingCampaign = ServiceAmount2 EndIf diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 2de4aae9..c12ed85d 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -125,6 +125,8 @@ Var CreditReference = Seeker.CreditReferenceTmp Var VendingDiscount = Seeker.VendingDiscount Var VendingCampaign = Seeker.VendingCampaign + Var TxReference = Seeker.TxRef1 + DEBUGVAR TxReference Var DirImage = "ROOT/taobin_project/image/complete/" @@ -387,11 +389,18 @@ EndIf - Var PayDetail = "1/" + HURR_FOREVER + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + + Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel @@ -434,11 +443,18 @@ Var PayO2 = Seeker.CoffeePinNumber EndIf - Var PayDetail = "1/" + HURR_FOREVER + + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" @@ -474,11 +490,18 @@ Var ACC = Seeker.TNumberTaobinMember EndIf - Var PayDetail = "1/" + HURR_FOREVER + + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel @@ -543,11 +566,13 @@ Var ServiceCredit = SelectDrink Var SuggestID = "" - Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" diff --git a/xml/page_cannotConti.xml b/xml/page_cannotConti.xml index e60b71c9..fb54812c 100644 --- a/xml/page_cannotConti.xml +++ b/xml/page_cannotConti.xml @@ -427,19 +427,28 @@ If NextOrderStatus = "Disable" Then Var PayDetail="1/F:1221/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel Else DEBUGVAR error_code_stop_now If error_code_stop_now > 0 Then Var PayDetail="1/F:" + error_code_stop_now Var PayDetail = PayDetail + "/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel Else + + + Var PayDetail = "1/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel EndIf EndIf @@ -486,18 +495,27 @@ If NextOrderStatus = "Disable" Then Var PayDetail="1/F:1221/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel Else DEBUGVAR error_code_stop_now If error_code_stop_now > 0 Then Var PayDetail="1/F:" + error_code_stop_now Var PayDetail = PayDetail + "/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel Else + + + Var PayDetail = "1/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel EndIf EndIf @@ -537,18 +555,28 @@ If NextOrderStatus = "Disable" Then Var PayDetail="1/F:1221/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel Else DEBUGVAR error_code_stop_now If error_code_stop_now > 0 Then Var PayDetail="1/F:" + error_code_stop_now Var PayDetail = PayDetail + "/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel Else + + + + Var PayDetail = "1/" + HURR_FOREVER Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel EndIf diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 46777224..5f6cb36c 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -65,14 +65,24 @@ Var StrawAutoRelease2 = "false" - If NetworkStatus = "ACTIVATE" Then + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf + + + + If SELLONLINE = 1 Then Var ShowButtonClick2 = "Enable" Else Var ShowButtonClick2 = "Invisible" Var ButtontoTopupMenu = "Invisible" EndIf - If NetworkStatus = "ACTIVATE" Then + If SELLONLINE = 1 Then Var ShowNetworkProblem = "Invisible" Var ShowNetworkProblemText = "" diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index 7b7eb9e5..12ef18e6 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -47,15 +47,23 @@ Var StrawAutoRelease1 = "false" Var StrawAutoRelease2 = "false" + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf - If NetworkStatus = "ACTIVATE" Then + + If SELLONLINE = 1 Then Var ShowButtonClick2 = "Enable" Else Var ShowButtonClick2 = "Invisible" Var ButtontoTopupMenu = "Invisible" EndIf - If NetworkStatus = "ACTIVATE" Then + If SELLONLINE = 1 Then Var ShowNetworkProblem = "Invisible" Var ShowNetworkProblemText = "" diff --git a/xml/page_catalog_cocktail.xml b/xml/page_catalog_cocktail.xml index f06c4d90..f6964f9c 100644 --- a/xml/page_catalog_cocktail.xml +++ b/xml/page_catalog_cocktail.xml @@ -57,15 +57,22 @@ Var StrawAutoRelease1 = "false" Var StrawAutoRelease2 = "false" + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf - If NetworkStatus = "ACTIVATE" Then + If SELLONLINE = 1 Then Var ShowButtonClick2 = "Enable" Else Var ShowButtonClick2 = "Invisible" Var ButtontoTopupMenu = "Invisible" EndIf - If NetworkStatus = "ACTIVATE" Then + If SELLONLINE = 1 Then Var ShowNetworkProblem = "Invisible" Var ShowNetworkProblemText = "" diff --git a/xml/page_catalog_free.xml b/xml/page_catalog_free.xml index 58530056..6f18548c 100644 --- a/xml/page_catalog_free.xml +++ b/xml/page_catalog_free.xml @@ -37,15 +37,21 @@ Var StrawAutoRelease1 = "false" Var StrawAutoRelease2 = "false" - + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf - If NetworkStatus = "ACTIVATE" Then + If SELLONLINE = 1 Then Var ShowButtonClick2 = "Enable" Else Var ShowButtonClick2 = "Invisible" EndIf - If NetworkStatus = "ACTIVATE" Then + If SELLONLINE = 1 Then Var ShowNetworkProblem = "Invisible" Var ShowNetworkProblemText = "" diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 8c88737c..1561191c 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -644,7 +644,7 @@ Var Timeout = Timeout + 1 - If Timeout > 60 Then + If Timeout > 5 Then diff --git a/xml/page_get_yourchange.xml b/xml/page_get_yourchange.xml index 4e1cca13..a55fa695 100644 --- a/xml/page_get_yourchange.xml +++ b/xml/page_get_yourchange.xml @@ -28,7 +28,7 @@ Var DirImage = "ROOT/taobin_project/image/page_thankyou" EndIf - + @@ -49,6 +49,12 @@ If Timeout >= 30 Then + If Seeker.PayWithQR = 0 Then + DEBUGVAR TxRef1 + UpdateTxRef1 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail + EndIf + + If Seeker = "next" Then ;CoinBack Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 01753cf7..a0d0f6f4 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -77,16 +77,44 @@ ;If lidAndStrawOldPageIgnore = "true" Then ; Var lidAndStrawOldPageIgnore = "false" + + If Seeker.PayWithQR = 0 Then + + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + EndIf If Seeker = "next" Then ;CoinBack If ChangeFlag2 = 0 Then + If Seeker.PayWithQR = 0 Then + DEBUGVAR TxRef1 + UpdateTxRef1 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail + EndIf Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else Open "ROOT/taobin_project/xml/page_get_yourchange.xml" EndIf Else If ChangeFlag2 = 0 Then + If Seeker.PayWithQR = 0 Then + DEBUGVAR TxRef1 + UpdateTxRef1 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail + EndIf + Open "ROOT/taobin_project/xml/page_brewing3.xml" Else Open "ROOT/taobin_project/xml/page_get_yourchange.xml" diff --git a/xml/page_member_topupCash.xml b/xml/page_member_topupCash.xml index e3dbf201..a2e45dd2 100644 --- a/xml/page_member_topupCash.xml +++ b/xml/page_member_topupCash.xml @@ -117,6 +117,9 @@ Var ServiceType = "credit" Var SessionID2 = "00-00-00-0000" Var ServiceCredit = "coffee" + + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Open "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -274,6 +277,9 @@ Var CoinInOK = 1 Var CoinInCounter = 0 + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else diff --git a/xml/page_member_topupSuccess.xml b/xml/page_member_topupSuccess.xml index 1fe6b5ca..55748ff4 100644 --- a/xml/page_member_topupSuccess.xml +++ b/xml/page_member_topupSuccess.xml @@ -49,28 +49,42 @@ EndIf - If PayCreditChannel = "cash" Then - Var SumCreditAmount = TaobinCredit + CoinAmount - - Var TelephoneNumber = TelephoneNumber - Var PayO2 = PinNumber - - - Var VendingDiscount = 0 - Var VendingCampaign = 0 - Var ServiceType = "credit" - Var SessionID2 = "00-00-00-0000" - Var ServiceCredit = "coffee" - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - Else - - EndIf + Var FlagPayCredit = 1 + Var ExitState = "Disable" 1000 + If Timeout > 1 Then + If FlagPayCredit = 1 Then + If PayCreditChannel = "cash" Then + Var SumCreditAmount = TaobinCredit + CoinAmount + + Var TelephoneNumber = TelephoneNumber + Var PayO2 = PinNumber + + + DEBUGVAR TxRef1 + + Var TxReference = TxRef1 + + + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = "00-00-00-0000" + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Var FlagPayCredit = 0 + Else + + EndIf + EndIf + + Var ExitState = "Enable" + EndIf @@ -138,13 +152,17 @@ @@ -152,13 +170,17 @@ diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 1a75081e..4c7ede05 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -63,6 +63,12 @@ Var CountStepForCupFlagDelay = 1 + Var VendingBank = "other" + + + Var Seeker.TxRef1 = "" + Var Seeker.OrderChanel = "Normal" + Var Seeker.CurrCreditAmount = 0 Var Seeker.CurrCreditUse = 0 Var Seeker.CurrCreditTelNum = "" @@ -167,6 +173,14 @@ MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf + + Var NOCashFlag = 0 + + If SELLSTATUS = "SELLNOCASH" Then + Var NOCashFlag = 1 + EndIf + + @@ -255,7 +269,11 @@ If AdultFlag = 1 Then Var CoinAmount = 0 Else - CoinVending XBILL + If NOCashFlag = 0 Then + CoinVending XBILL + Else + Var CoinAmount = 0 + EndIf EndIf ;Var CoinAmount = 0 Var Delay = 1 @@ -316,6 +334,8 @@ If DelayCount >= 2 Then If web_readyOK = "true" Then + + Var Seeker.OrderChanel = "WebApp" Var Seeker.selected_a_drink = SelectDrink Var Seeker.ServiceAmount2 = PriceDrink diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index eec3414a..a5c9faeb 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -236,6 +236,11 @@ CoinVending OFF If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" @@ -300,9 +305,15 @@ Var EnoughChange = "yes" - + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf - If NetworkStatus = "DOWN" Then + If SELLONLINE = 0 Then SAVELOG "Cash only NetworkStatus down" Var PayState2 = "Disable" @@ -312,20 +323,39 @@ Var PayState6 = "Disable" Var PayOfflineMode = 1 + + Var ShowNetworkProblem = "Enable" + Var ShowButtonClick2 = "Invisible" + Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" + Else Var PayOfflineMode = 0 - EndIf - If NetworkStatus = "ACTIVATE" Then Var ShowNetworkProblem = "Invisible" Var ShowNetworkProblemText = "" - - Else - Var ShowNetworkProblem = "Enable" - Var ShowButtonClick2 = "Invisible" - Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" EndIf + If NOCashFlag = 1 Then + Var PayState1 = "Disable" + EndIf + + ;cancel order + If SELLSTATUS = "DEACTIVE" Then + Var SELLONLINE = 1 + EndIf + + ;If NetworkStatus = "ACTIVATE" Then + ; Var ShowNetworkProblem = "Invisible" + ; Var ShowNetworkProblemText = "" + ; + ;Else + ; Var ShowNetworkProblem = "Enable" + ; Var ShowButtonClick2 = "Invisible" + ; Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" + ;EndIf + + + Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png" Var pay_with_chanel_text = DirImage + "/text_1.png" @@ -511,7 +541,15 @@ If ReqPayInfoFlag2 = 1 Then - Var Seeker.CampaignPayChanel = "kbank" + + DEBUGVAR VendingBank + If VendingBank = "kbank" Then + Var Seeker.CampaignPayChanel = "kbank" + Else + Var Seeker.CampaignPayChanel = "cash" + EndIf + + EndIf If ReqPayInfoFlag2 = 2 Then Var Seeker.CampaignPayChanel = "shopee" @@ -525,6 +563,8 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + ;Var TxRef1 = "" + ;CreateTxRef1 TxRef1 EndIf Var Seeker.PayWithQR = 1 Var Seeker.VendingTSID = VendingTSID @@ -758,6 +798,11 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index 66f81895..9fb3f784 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -283,9 +283,15 @@ Var EnoughChange = "yes" - + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf - If NetworkStatus = "DOWN" Then + If SELLONLINE = 0 Then Var PayState2 = "Disable" Var PayState3 = "Disable" @@ -293,20 +299,19 @@ Var PayState5 = "Disable" Var PayOfflineMode = 1 + + Var ShowNetworkProblem = "Enable" + Var ShowButtonClick2 = "Invisible" + Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" Else Var PayOfflineMode = 0 - EndIf - If NetworkStatus = "ACTIVATE" Then Var ShowNetworkProblem = "Invisible" Var ShowNetworkProblemText = "" - - Else - Var ShowNetworkProblem = "Enable" - Var ShowButtonClick2 = "Invisible" - Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" EndIf + + Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png" Var pay_with_chanel_text = DirImage + "/text_1.png" diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 3d237631..1bf3db03 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -226,8 +226,12 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 Else DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_codeAIS.xml b/xml/page_payment_codeAIS.xml index 61fd1dcd..90da389e 100644 --- a/xml/page_payment_codeAIS.xml +++ b/xml/page_payment_codeAIS.xml @@ -141,8 +141,12 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 Else DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_codeDtac.xml b/xml/page_payment_codeDtac.xml index 6982255c..f3373f60 100644 --- a/xml/page_payment_codeDtac.xml +++ b/xml/page_payment_codeDtac.xml @@ -141,8 +141,12 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 Else DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_codeLotus.xml b/xml/page_payment_codeLotus.xml index 64c5e08f..dec85be2 100644 --- a/xml/page_payment_codeLotus.xml +++ b/xml/page_payment_codeLotus.xml @@ -141,8 +141,12 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 Else DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_codeSCG.xml b/xml/page_payment_codeSCG.xml index e8845d29..10f55540 100644 --- a/xml/page_payment_codeSCG.xml +++ b/xml/page_payment_codeSCG.xml @@ -141,8 +141,12 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 Else DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_codeThe1.xml b/xml/page_payment_codeThe1.xml index 86425f25..b0c2e8b8 100644 --- a/xml/page_payment_codeThe1.xml +++ b/xml/page_payment_codeThe1.xml @@ -141,8 +141,12 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 Else DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_codeTrue.xml b/xml/page_payment_codeTrue.xml index eb64c195..741db3f2 100644 --- a/xml/page_payment_codeTrue.xml +++ b/xml/page_payment_codeTrue.xml @@ -141,8 +141,12 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 Else DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index e9548956..647d7e5d 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -188,8 +188,13 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index fb16a446..bd200b1d 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -162,8 +162,14 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + + Var TxRef1 = "" + CreateTxRef1 TxRef1 + Else DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index 7247c93c..956c8649 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -67,8 +67,12 @@ If Seeker = "curr" Then MakeDrinkV1 SelectDrink SelectSugarID + Var TxRef1 = "" + CreateTxRef1 TxRef1 Else DEBUGVAR Seeker + Var TxRef1 = "" + CreateTxRef1 TxRef1 EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 17148c07..8f1e49d0 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -234,6 +234,52 @@ If RoadShow = "true" Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else + + If Seeker.PayWithQR = 0 Then + Var ServiceAmount2 = Seeker.ServiceAmount2 + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + + Var PdpaAccept = 0 + Var CreditReference = Seeker.CreditReferenceTmp + Var VendingDiscount = Seeker.VendingDiscount + Var VendingCampaign = Seeker.VendingCampaign + Var PayDetail = "2/F:1115/0//XML|" + Seeker.OrderChanel + Var PayType = "" + Var Seeker.TxRef1 = TxRef1 + + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.CodeNumber + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.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 + Seeker.CodeNumber + Var SessionID2 = SessionID2 + "/" + + UpdateTxRef1 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail + Else + DEBUGVAR TxRef1 + UpdateTxRef1 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail + EndIf + EndIf + If PayOfflineMode = 1 Then If StoreCreditAmount > 0 Then diff --git a/xml_main/startup.xml b/xml_main/startup.xml index f6505d7d..511fbb16 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -8,6 +8,7 @@ "/ROOT/pictures/startup.bmp" 3000 + FlushTxRef1 Open "/ROOT/xml/main.xml"