From b0c0d58a246c0644ed7538d443ec4b41ded5d079 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Fri, 27 Sep 2024 12:43:02 +0700 Subject: [PATCH] Add POS tricker --- xml/event/tricker.ev | 8 +++++++ xml/page_payment.xml | 11 ++++++---- xml/process/payment.ev | 49 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 55 insertions(+), 13 deletions(-) diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index cdd92fd9..9e40b4f4 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -445,3 +445,11 @@ If BoxID > 200000 Then EndIf EndIf + +; Check POS machine flag +Var ConnectWithPOSMachine = 0 + +READ_FILE "/mnt/sdcard/coffeevending/POS_MACHINE" POSMachineFlag +If POSMachineFlag = 1 Then + Var ConnectWithPOSMachine = 0 +EndIf \ No newline at end of file diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 7ad5ae92..5d64712e 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -331,10 +331,13 @@ Var param2 = PureName EndIf - Var WaitPOSStatus = 1 - Var TimeWaitPOSStatus = 0 - Var POS_SELL_STATUS = "-" - GetPOSStatus param1 param2 + If ConnectWithPOSMachine = 1 Then + Var WaitPOSStatus = 1 + Var TimeWaitPOSStatus = 0 + Var POS_SELL_STATUS = "-" + GetPOSStatus param1 param2 + EndIf + EndIf diff --git a/xml/process/payment.ev b/xml/process/payment.ev index 6f2bf7e9..a96dda06 100644 --- a/xml/process/payment.ev +++ b/xml/process/payment.ev @@ -1,6 +1,5 @@ DEBUGVAR "MIGGAZE0" If Seeker.PayWithQR = 1 Then - Var ServiceAmount2 = Seeker.ServiceAmount2 Var CreditReference = "" @@ -19,7 +18,7 @@ If Seeker.PayWithQR = 1 Then Var PayDetail = "" Var PayDetail2 = "" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + Else If Seeker.StoreCreditFlag = 1 Then @@ -31,12 +30,44 @@ If Seeker.PayWithQR = 1 Then Var PayDetail = "" Var PayDetail2 = "" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + EndIf EndIf - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev" + If ConnectWithPOSMachine = 1 Then + Var SelectDrink = Seeker.selected_a_drink + Var ExtendData = Seeker.ExtendData + Var ServiceAmount2 = Seeker.ServiceAmount2 + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditReference = Seeker.CreditReferenceTmp + Var VendingDiscount = Seeker.VendingDiscount + Var VendingCampaign = Seeker.VendingCampaign + Var TxReference = Seeker.TxRef1 + Var VendingOrderID = Seeker.ORDER_ID + Var PayType = "newpay" + + Var ServiceType = "coffee-payment" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + + Var PayDetail = "2/S:0/0//XML|" + Seeker.OrderChanel + + If GetFreeFromError = 1 Then + Var Seeker.CodeChannel = 1 + Var Seeker.VendingCode = "FAU" + Var Seeker.CodeNumber = "0000000000" + Var VendingCampaign = ServiceAmount2 + EndIf + + Var PayDetail2 = Seeker.PayDetail2 + POSPay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf + + Else TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev" @@ -62,7 +93,7 @@ If Seeker.PayWithQR = 1 Then Var PayDetail = "2/S:0/0//XML|" + Seeker.OrderChanel If GetFreeFromError = 1 Then - Var Seeker.CodeChannel = 1 + Var Seeker.CodeChannel = 1 Var Seeker.VendingCode = "FAU" Var Seeker.CodeNumber = "0000000000" Var VendingCampaign = ServiceAmount2 @@ -83,14 +114,14 @@ If Seeker.PayWithQR = 1 Then Var SessionID2 = SessionID2 + Seeker.CodeNumber Var SessionID2 = SessionID2 + "/" - + Var PayDetail2 = Seeker.PayDetail2 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else - - + + Var PayDetail2 = Seeker.PayDetail2 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + EndIf EndIf