From d995b3906168cd83059b04299d0e00d5c572acac Mon Sep 17 00:00:00 2001 From: miggaze Date: Thu, 9 Dec 2021 15:29:52 +0700 Subject: [PATCH] Seeker --- xml/page_board.xml | 3 ++ xml/page_brewing3.xml | 6 ++- xml/page_payment.xml | 27 ++++++----- xml/page_payment_cash.xml | 97 +++++++++++++-------------------------- 4 files changed, 52 insertions(+), 81 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 23c707cf..f24030a1 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -14,6 +14,9 @@ DEBUGVAR SoundVolume + Var Seeker = "curr" + Var PauseOrder = "false" + DEBUGVAR web_ref DEBUGVAR web_payment DEBUGVAR web_telnum diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index d3670fac..776e4a16 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -963,13 +963,17 @@ + + diff --git a/xml/page_payment.xml b/xml/page_payment.xml index bbbedd33..4246dbdd 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -32,23 +32,22 @@ Var CountStepPackPayment = 0 - Var VendingCode = "C00" - Var VendingCampaignRI3 = 0 - Var IntVendingCampaign = 0 - Var FreeVendingCampaign = 0 - Var CodeChannel = 0 + Var Seeker.VendingCode = "C00" + Var Seeker.VendingCampaignRI3 = 0 + Var Seeker.IntVendingCampaign = 0 + Var Seeker.FreeVendingCampaign = 0 + Var Seeker.CodeChannel = 0 Var CoinVendingOnFlag = 0 - Var IntVendingCredit = 0 + Var Seeker.IntVendingCredit = 0 - Var StoreCreditFlag = 0 - Var pageStoreCredit0 = 0 - Var TNumberTaobinCredit = "" - Var TNumberTaobinMember = "" - Var VendingTSIDTmp = "" + Var Seeker.StoreCreditFlag = 0 + Var Seeker.pageStoreCredit0 = 0 + Var Seeker.TNumberTaobinCredit = "" + Var Seeker.TNumberTaobinMember = "" + Var Seeker.VendingTSIDTmp = "" - Var TNumberTaobinMember = "" - Var VendingTSIDTmp = "" + Var PayType = "" Var CART_INDEX = 0 @@ -86,7 +85,7 @@ Var MachineStage = "-" Var PayReference = "" - Var CreditReferenceTmp = "" + Var Seeker.CreditReferenceTmp = "" If web_app_prepar = "true" Then Var web_app_prepar = "false" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 41b23206..88b9ab00 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -150,7 +150,7 @@ - Var PayWithQR = 0 + Var Seeker.PayWithQR = 0 Var NoGotoMenupage = "false" If show_eng = "true" Then Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" @@ -172,21 +172,16 @@ EndIf If GetFreeFromError = 1 Then - Var FreeVendingCampaign = 1 - CoinVending OFF - MakeDrinkV1 SelectDrink SelectSugarID + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" 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 CoinInOK = 0 Then @@ -389,10 +384,11 @@ VendingQR OFF CoinVending 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" + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Var Seeker.PayWithQR = 1 + Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var BrewingTextThai = "เตรียมแก้ว" @@ -534,7 +530,11 @@ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc ;Var Timeout = 0 EndIf - Open "ROOT/taobin_project/xml/page_catalog.xml" + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + Open "ROOT/taobin_project/xml/page_brewing3.xml" + EndIf EndIf @@ -564,7 +564,10 @@ If Timeout > 180 Then If PayOK = 1 Then - MakeDrinkV1 SelectDrink SelectSugarID + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" Else @@ -581,7 +584,11 @@ If CoinAmount = 0 Then If IntVendingCampaign = 0 Then VendingQR OFF - Open "ROOT/taobin_project/xml/page_catalog.xml" + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + Open "ROOT/taobin_project/xml/page_brewing3.xml" + EndIf EndIf EndIf @@ -648,7 +655,11 @@ ;EndIf Var ActionOKCase = 1 If IntVendingCampaign = 0 Then - Open "ROOT/taobin_project/xml/page_catalog.xml" + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + Else + Open "ROOT/taobin_project/xml/page_brewing3.xml" + EndIf EndIf EndIf EndIf @@ -1504,53 +1515,7 @@ -