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

free from problem,credit with cash qr

Browse source
This commit is contained in:
miggaze 2021-07-23 17:27:25 +07:00
parent 6c68e86ca1
commit 0eb70b24f7
12 changed files with 212 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_board.xml
View file

@ -11,6 +11,8 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
Var FileNumber = 1
Var GetFreeFromError = 0
Var taobin_version = "1.49"
; On open
@ -115,7 +117,7 @@
Var ShowPrice = "Enable"
Var ShowPrice = "Invisible"
If RoadShow = "true" Then
Var ShowPrice = "Invisible"
EndIf

25
xml/page_brewing3.xml
View file

@ -114,6 +114,13 @@
EndIf
If GetFreeFromError = 1 Then
;Var GetFreeFromError = 0
Var TelephoneNumberProblem = TelephoneNumberGOTFree
EndIf
@ -461,6 +468,10 @@
EndIf
EndIf
If MachineState_Result = 1 Then
Var MachineState_Result = 2
EndIf
If MachineState_Result = 1 Then
If waitAckPay = 0 Then
@ -500,6 +511,12 @@
;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 CodeChannel = 1
Var VendingCode = "C48"
Var CodeNumber = "0000000000"
EndIf
If PayWithQR = 0 Then
If CodeChannel = 1 Then
Var SessionID2 = SessionID2 + "/"
@ -535,6 +552,7 @@
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
@ -581,7 +599,12 @@
If StoreCreditFlag = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount2
If GetFreeFromError = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount2
EndIf
EndIf
EndIf

1
xml/page_drinkfail2-2.xml
View file

@ -155,4 +155,5 @@
<Value> MachineErrorDetailAll </Value>
</Text>
</Popup>

34
xml/page_drinkfail2.xml
View file

@ -9,11 +9,43 @@
; On open
Var TNumberTaobinMember = ""
If TelephoneNumberProblem = "" Then
Else
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
Var NumberFailed = "true"
CHECKNUMBERFAIL TelephoneNumberProblem NumberFailed
If ERROR_PAY_TIMEOUT = "false" Then
If NumberFailed = "false" Then
If show_eng = "true" Then
Var TextErrorShow = ERROR_BREW_CAUSE_ENG
Else
If show_japan = "true" Then
Var TextErrorShow = ERROR_BREW_CAUSE_JAPAN
Else
Var TextErrorShow = ERROR_BREW_CAUSE_THAI
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_drinkfail4.xml"
EndIf
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
Else
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
EndIf
EndIf

4
xml/page_payment.xml
View file

@ -38,6 +38,8 @@
Var FreeVendingCampaign = 0
Var CodeChannel = 0
Var CoinVendingOnFlag = 0
Var IntVendingCredit = 0
Var StoreCreditFlag = 0
Var pageStoreCredit0 = 0
@ -195,7 +197,7 @@
</Text>
<Image>
<X> 199 </X>
<X> 144 </X>
<Y> 413 </Y>
<Filename> Var( DirImage + "/text_1.png" ) </Filename>
</Image>

48
xml/page_payment_cash.xml
View file

@ -43,6 +43,7 @@
Var PayAmount = PriceDrink
Var RemainAmount = PayAmount - IntVendingCampaign
Var RemainAmount = RemainAmount - CoinAmount
Var RemainAmount = RemainAmount - IntVendingCredit
Var RemainAmountStr = "" + RemainAmount
Var Timeout = 0
Var PayOK = 0
@ -149,6 +150,13 @@
Var PayState4 = "Disable"
Var CoinInFlag = 1
EndIf
If IntVendingCredit > 0 Then
Var PayState2 = "Disable"
Var PayState4 = "Disable"
EndIf
Var showRemaining = charOfBaht + RemainAmountStr
If show_eng = "true" Then
@ -183,6 +191,14 @@
EndIf
EndIf
If GetFreeFromError = 1 Then
Var FreeVendingCampaign = 1
CoinVending OFF
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
If IntVendingCampaign >= PayAmount Then
Var RemainAmount = 0
Var RemainAmountStr = "" + RemainAmount
@ -196,6 +212,7 @@
Var RemainAmount = PayAmount - CoinAmount
Var RemainAmount = RemainAmount - IntVendingCampaign
Var RemainAmount = RemainAmount - IntVendingCredit
Var SumCoinAmount = CoinAmount + IntVendingCampaign
If SumCoinAmount >= PayAmount Then
;Var VendingQRCode = "ERROR"
@ -254,12 +271,27 @@
Var PayOfflineMode = 0
EndIf
Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png"
Var pay_with_chanel_text = DirImage + "/text_1.png"
If DisableUsingCode = "true" Then
SAVELOG "Diable code because using topping."
Var PayState2 = "Disable"
Var pay_with_code_image = DirImage + "/bp_pay_with_code_error.png"
Else
Var pay_with_code_image = DirImage + "/bp_pay_with_code.png"
If IntVendingCredit > 0 Then
Var pay_with_code_image = DirImage + "/bp_pay_with_code_error2.png"
Var pay_with_credit_image = DirImage + "/bp_pay_with_credit_error2.png"
Var pay_with_chanel_text = DirImage + "/text_2.png"
Else
Var pay_with_code_image = DirImage + "/bp_pay_with_code.png"
EndIf
EndIf
</EventOpen>
@ -318,6 +350,8 @@
EndIf
Var Timeout = Timeout + 1
@ -541,7 +575,7 @@
Var RemainAmount = PayAmount - CoinAmount
Var RemainAmount = RemainAmount - IntVendingCampaign
Var RemainAmount = RemainAmount - IntVendingCredit
If ViewBill > RemainAmount Then
Var RemainAmountKeep = ViewBill - RemainAmount
@ -569,7 +603,10 @@
Var RemainAmount = PayAmount - CoinAmount
Var RemainAmount = RemainAmount - IntVendingCampaign
Var RemainAmount = RemainAmount - IntVendingCredit
Var SumCoinAmount = CoinAmount + IntVendingCampaign
Var SumCoinAmount = CoinAmount + IntVendingCredit
If SumCoinAmount >= PayAmount Then
;Var VendingQRCode = "ERROR"
CoinVending OFF
@ -655,9 +692,9 @@
</Video>
<Image>
<X> 199 </X>
<X> 144 </X>
<Y> 413 </Y>
<Filename> Var( DirImage + "/text_1.png" ) </Filename>
<Filename> pay_with_chanel_text </Filename>
</Image>
@ -819,7 +856,7 @@
<State> PayState4</State>
<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_pay_with_credit.png") </FilenameDisable>
<FilenameDisable> pay_with_credit_image </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1189,4 +1226,5 @@
</Popup>

19
xml/page_payment_credit.xml
View file

@ -35,6 +35,8 @@
Var Ext1a = ""
Var GetAccFlag = 0
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -66,18 +68,21 @@
<EventActionOk>
;Open "ROOT/taobin_project/xml/page_payment_credit2.xml"
If Ext1a = "ok" Then
Open "ROOT/taobin_project/xml/page_payment_credit2.xml"
Else
Var ShowErrorText = "Enable"
If GetAccFlag = 1 Then
If Ext1a = "ok" Then
Open "ROOT/taobin_project/xml/page_payment_credit2.xml"
Else
Var ShowErrorText = "Enable"
EndIf
EndIf
Refresh
</EventActionOk>
<EventActionError>
Var ShowErrorText = "Enable"
If GetAccFlag = 1 Then
Var ShowErrorText = "Enable"
EndIf
Refresh
</EventActionError>
@ -537,7 +542,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var GetAccFlag = 1
GETACCEXT TelephoneNumber 13

92
xml/page_payment_credit3.xml
View file

@ -13,14 +13,24 @@
Var Timeout = 0
Var Tel_Confirm_State = "Disable"
Var ShowNotEnoughText = "Invisible"
Var CoffeeCredit = Ext1b
INT CoffeeCredit
Var SumCreditAmount = CoffeeCredit
;Var SumCreditAmount = 5
Var NotEnoughFlag = 0
If SumCreditAmount >= PayAmount Then
Var Tel_Confirm_State = "Enable"
Else
Var Tel_Confirm_State = "Enable"
Var ShowNotEnoughText = "Enable"
Var NotEnoughFlag = 1
EndIf
@ -123,19 +133,77 @@
<EventClick>
If NotEnoughFlag = 0 Then
CoinVending OFF
CoinVending OFF
Var TNumberTaobinCredit = TelephoneNumber
Var CoffeePinNumber = PinNumber
Var TNumberTaobinCredit = TelephoneNumber
Var CoffeePinNumber = PinNumber
Var StoreCreditFlag = 1
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
Var StoreCreditFlag = 1
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
Else
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var CodeChannel = 0
Var TNumberTaobinCredit = TelephoneNumber
Var CoffeePinNumber = PinNumber
Var IntVendingCredit = SumCreditAmount
;Var PriceDrinkWithCredit = PriceDrink - SumCreditAmount
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "KBA:2/"
Var ECommerceQR = ECommerceQR + "CRD"
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + TNumberTaobinCredit
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + SumCreditAmount
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var QRCODE99 = ""
Var QRCODETMP = ""
Var ReqPayInfoFlag = 1
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf
</EventClick>
</Button>
@ -144,7 +212,13 @@
<Image>
<X> 230 </X>
<Y> 920 </Y>
<Refresh> "Enable" </Refresh>
<State> ShowNotEnoughText </State>
<Filename> Var( DirImage + "/text_show_notEnough.png") </Filename>
</Image>

9
xml/page_payment_storeCredit0.xml
View file

@ -98,7 +98,14 @@
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml"
If TNumberTaobinCredit = "" Then
Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml"
Else
Var StoreCreditFlag = 1
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
</EventClick>
</Button>

2
xml/page_thankyou.xml
View file

@ -60,6 +60,8 @@
If FreeVendingCampaign = 0 Then
If IntVendingCampaign < PayAmount Then
Var SumCoinAmount = CoinAmount + IntVendingCampaign
Var SumCoinAmount = CoinAmount + IntVendingCredit
If SumCoinAmount >= PayAmount Then
Var Canout = SumCoinAmount - PayAmount
If Canout > 0 Then