pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'bonus12M' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2022-08-02 10:08:03 +07:00
commit ebb9316b84
28 changed files with 427 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

40
xml/page_board.xml
View file

@ -196,11 +196,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
@ -218,6 +225,9 @@
WEB "ENABLE"
Else
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
@ -230,6 +240,7 @@
Var QRCODE99 = ""
WEB "DISABLE"
EndIf
@ -255,7 +266,14 @@
Else
Machine Initial
Var StartUpExt = "false"
;DEBUGVAR "FlushTxRef1"
;FlushTxRef1
EndIf
;DEBUGVAR "FlushTxRef1"
;FlushTxRef1
StopLongPlay
@ -485,7 +503,7 @@
Topping "ClearNextOrder" "-"
If NetworkStatus = "DEACTIVE" Then
If SELLSTATUS = "DEACTIVE" Then
Open "/ROOT/xml/offline.xml"
EndIf
@ -514,6 +532,12 @@
Var NETCORE_EVENT_CNT_X = 0
Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT
If SELLSTATUS = "DEACTIVE" Then
Open "/ROOT/xml/offline.xml"
EndIf
DEBUGVAR CameraCount
If CameraCount = 0 Then
CameraService "Start"
@ -534,7 +558,7 @@
Var WebAppShow = "Invisible"
EndIf
If NetworkStatus = "DEACTIVE" Then
If SELLSTATUS = "DEACTIVE" Then
Open "/ROOT/xml/offline.xml"
EndIf
@ -751,7 +775,9 @@
<EventNetDeactive>
SAVELOG NetworkStatus
Open "/mnt/sdcard/coffeevending/xml/main.xml"
If SELLSTATUS = "DEACTIVE" Then
Open "/mnt/sdcard/coffeevending/xml/main.xml"
EndIf
</EventNetDeactive>
<EventWebApp>

9
xml/page_board_1.xml
View file

@ -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 @@
<EventNetDeactive>
SAVELOG NetworkStatus
Open "/mnt/sdcard/coffeevending/xml/main.xml"
If SELLSTATUS = "DEACTIVE" Then
Open "/mnt/sdcard/coffeevending/xml/main.xml"
EndIf
</EventNetDeactive>

47
xml/page_brewing3.xml
View file

@ -6,6 +6,8 @@
<Volume> SoundVolume </Volume>
<EventOpen>
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

33
xml/page_brewing3Conti.xml
View file

@ -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"

28
xml/page_cannotConti.xml
View file

@ -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

14
xml/page_catalog.xml
View file

@ -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 = ""

12
xml/page_catalog2.xml
View file

@ -53,15 +53,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 = ""

11
xml/page_catalog_cocktail.xml
View file

@ -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 = ""

12
xml/page_catalog_free.xml
View file

@ -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 = ""

8
xml/page_get_yourchange.xml
View file

@ -28,7 +28,7 @@
Var DirImage = "ROOT/taobin_project/image/page_thankyou"
EndIf
</EventOpen>
@ -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"

28
xml/page_lid_straw.xml
View file

@ -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"

6
xml/page_member_topupCash.xml
View file

@ -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

58
xml/page_member_topupSuccess.xml
View file

@ -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"
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
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 @@
<Button>
<X> 99 </X>
<Y> 1688 </Y>
<State> ExitState </State>
<Filename> Var( DirImage + "/bn_main.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_main.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
If Timeout > 2 Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
</EventClick>
</Button>
@ -152,13 +170,17 @@
<Button>
<X> 695 </X>
<Y> 1688 </Y>
<State> ExitState </State>
<Filename> Var( DirImage + "/bn_drink.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_drink.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If Timeout > 2 Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
</EventClick>
</Button>

22
xml/page_payment.xml
View file

@ -67,6 +67,12 @@
Var VendingBank = "other"
Var Seeker.TxRef1 = ""
Var Seeker.OrderChanel = "Normal"
Var Seeker.CurrCreditAmount = 0
Var Seeker.CurrCreditUse = 0
Var Seeker.CurrCreditTelNum = ""
@ -171,6 +177,14 @@
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
Var NOCashFlag = 0
If SELLSTATUS = "SELLNOCASH" Then
Var NOCashFlag = 1
EndIf
</EventOpen>
@ -259,7 +273,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
@ -320,6 +338,8 @@
If DelayCount >= 2 Then
If web_readyOK = "true" Then
Var Seeker.OrderChanel = "WebApp"
Var Seeker.selected_a_drink = SelectDrink
Var Seeker.ServiceAmount2 = PriceDrink

55
xml/page_payment_cash.xml
View file

@ -244,6 +244,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"
@ -308,9 +313,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"
@ -320,20 +331,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"
@ -538,6 +568,8 @@
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
;Var TxRef1 = ""
;CreateTxRef1 TxRef1
EndIf
Var Seeker.PayWithQR = 1
Var Seeker.VendingTSID = VendingTSID
@ -771,6 +803,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"

23
xml/page_payment_cashMore.xml
View file

@ -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"

4
xml/page_payment_code.xml
View file

@ -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

4
xml/page_payment_codeAIS.xml
View file

@ -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

4
xml/page_payment_codeDtac.xml
View file

@ -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

4
xml/page_payment_codeLotus.xml
View file

@ -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

4
xml/page_payment_codeSCG.xml
View file

@ -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

4
xml/page_payment_codeThe1.xml
View file

@ -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

4
xml/page_payment_codeTrue.xml
View file

@ -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

5
xml/page_payment_credit2.xml
View file

@ -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

6
xml/page_payment_credit3.xml
View file

@ -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

4
xml/page_payment_storeCredit3.xml
View file

@ -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"

46
xml/page_thankyou.xml
View file

@ -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