Merge branch 'pos_aot' into masterpiece

This commit is contained in:
Kenta420 2024-10-08 12:53:14 +07:00
commit e6eff07907
11 changed files with 272 additions and 112 deletions

View file

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