fix Can use credit from current for next order
This commit is contained in:
parent
6dc2c89b7a
commit
b45738d20e
13 changed files with 360 additions and 75 deletions
|
|
@ -127,7 +127,7 @@
|
|||
|
||||
StrLen PinNumber TelNumLen
|
||||
If TelNumLen >= 4 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
;Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
|
||||
|
|
@ -152,6 +152,10 @@
|
|||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen >= 4 Then
|
||||
Function 2
|
||||
EndIf
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -171,7 +175,7 @@
|
|||
|
||||
StrLen PinNumber TelNumLen
|
||||
If TelNumLen >= 4 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
;Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
|
||||
|
|
@ -195,6 +199,10 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen >= 4 Then
|
||||
Function 2
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -213,7 +221,7 @@
|
|||
|
||||
StrLen PinNumber TelNumLen
|
||||
If TelNumLen >= 4 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
;Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
|
||||
|
|
@ -237,6 +245,10 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen >= 4 Then
|
||||
Function 2
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -255,7 +267,7 @@
|
|||
|
||||
StrLen PinNumber TelNumLen
|
||||
If TelNumLen >= 4 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
;Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
|
||||
|
|
@ -279,6 +291,10 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen >= 4 Then
|
||||
Function 2
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -297,7 +313,7 @@
|
|||
|
||||
StrLen PinNumber TelNumLen
|
||||
If TelNumLen >= 4 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
;Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
|
||||
|
|
@ -321,6 +337,10 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen >= 4 Then
|
||||
Function 2
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -339,7 +359,7 @@
|
|||
|
||||
StrLen PinNumber TelNumLen
|
||||
If TelNumLen >= 4 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
;Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
|
||||
|
|
@ -363,6 +383,10 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen >= 4 Then
|
||||
Function 2
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -381,7 +405,7 @@
|
|||
|
||||
StrLen PinNumber TelNumLen
|
||||
If TelNumLen >= 4 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
;Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
|
||||
|
|
@ -405,6 +429,10 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen >= 4 Then
|
||||
Function 2
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -423,7 +451,7 @@
|
|||
|
||||
StrLen PinNumber TelNumLen
|
||||
If TelNumLen >= 4 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
;Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
|
||||
|
|
@ -447,6 +475,10 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen >= 4 Then
|
||||
Function 2
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -465,7 +497,7 @@
|
|||
|
||||
StrLen PinNumber TelNumLen
|
||||
If TelNumLen >= 4 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
;Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
|
||||
|
|
@ -489,6 +521,10 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen >= 4 Then
|
||||
Function 2
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -549,7 +585,7 @@
|
|||
Trim PinNumber 4
|
||||
StrLen PinNumber TelNumLen
|
||||
If TelNumLen >= 4 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
;Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
|
|
@ -576,6 +612,10 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen >= 4 Then
|
||||
Function 2
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -622,7 +662,6 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -831,6 +870,69 @@
|
|||
EndIf
|
||||
</EventMachine>
|
||||
|
||||
<Function2>
|
||||
|
||||
If FlagOKButton = 0 Then
|
||||
|
||||
Var FlagOKButton = 1
|
||||
|
||||
If Seeker.CoffeePinNumber = PinNumber Then
|
||||
Var Seeker.StoreCreditFlag = 1
|
||||
Var Seeker.CoffeePinNumber = PinNumber
|
||||
If Seeker.pageStoreCredit0 = 1 Then
|
||||
Var CoffeeCreditKeep = StoreCreditAmount + CoffeeCredit
|
||||
Open "ROOT/taobin_project/xml/page_payment_storeCredit3.xml"
|
||||
|
||||
Else
|
||||
|
||||
If ViewBill < RemainAmount Then
|
||||
CoinVending BILLSTACKALL
|
||||
;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
|
||||
Var FlagWaitUpdateCoinAmount = 1
|
||||
Var Timeout = 0
|
||||
Else
|
||||
|
||||
CoinVending BILLSTACKALL
|
||||
|
||||
Var CoffeeCreditKeep = RemainAmountKeep + CoffeeCredit
|
||||
Open "ROOT/taobin_project/xml/page_payment_storeCredit3.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
Var FlagOKButton = 0
|
||||
Var ShowTextNumber1 = "Invisible"
|
||||
Var ShowTextNumber2 = "Invisible"
|
||||
Var ShowTextNumber3 = "Invisible"
|
||||
Var ShowTextNumber4 = "Invisible"
|
||||
|
||||
Var ShowErrorText = "Enable"
|
||||
Var Tel_Confirm_State = "Invisible"
|
||||
|
||||
Var PinNumber = ""
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
|
||||
</Function2>
|
||||
|
||||
|
||||
|
||||
</Popup>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue