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

fix Can use credit from current for next order

Browse source
This commit is contained in:
miggaze 2022-05-24 14:07:55 +07:00
parent 6dc2c89b7a
commit b45738d20e
13 changed files with 360 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xml/page_board.xml
View file

@ -46,6 +46,11 @@
Var WebAppShow = "Enable"
Var PayType = ""
Var Seeker.CurrCreditAmount = 0
Var Seeker.CurrCreditUse = 0
Var Seeker.CurrCreditTelNum = ""
Var Seeker.CurrCreditPinNum = ""
; On open
Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"

6
xml/page_payment.xml
View file

@ -35,6 +35,12 @@
Var CountStepForCupFlagDelay = 1
Var Seeker.CurrCreditAmount = 0
Var Seeker.CurrCreditUse = 0
Var Seeker.CurrCreditTelNum = ""
Var Seeker.CurrCreditPinNum = ""
Var Seeker.TaobinErrorNetwork = 0
Var Seeker.VendingCode = "C00"

7
xml/page_payment_cash.xml
View file

@ -707,6 +707,7 @@
Var GetScore = "useCredit"
AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore
Var Seeker.IntVendingCredit = 0
Var Seeker.CurrCreditUse = 0
EndIf
@ -734,6 +735,7 @@
Var GetScore = "useCredit"
AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore
Var Seeker.IntVendingCredit = 0
Var Seeker.CurrCreditUse = 0
EndIf
Var CancelCounter = CancelCounter + 1
@ -993,6 +995,11 @@
If CoinInOK = 0 Then
If CancelFlag = 0 Then
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
SAVELOG "ButtonCancleMain > Cancle Order."
Machine CancelWepApp
CoinVending OFF

1
xml/page_payment_code.xml
View file

@ -158,6 +158,7 @@
SAVELOG "Seeker.CodeChannel 1 > ActOK."
DEBUGVAR ECommerce
SAVELOG ECommerce
SPLIT ECommerce "/" 5 Seeker.VendingCode

34
xml/page_payment_credit.xml
View file

@ -104,10 +104,42 @@
DEBUGVAR PinNumberUser
If Seeker = "next" Then
Var Curr = "curr"
DEBUGVAR CoffeeCredit
DEBUGVAR Curr.CurrCreditUse
If TelephoneNumber = Curr.CurrCreditTelNum Then
Var CoffeeCredit = CoffeeCredit - Curr.CurrCreditUse
If CoffeeCredit < 0 Then
Var CoffeeCredit = 0
EndIf
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_payment_credit2.xml"
Else
DEBUGVAR Ext1a
Var Curr = "curr"
DEBUGVAR Curr
DEBUGVAR Curr.CurrCreditTelNum
If Seeker = "next" Then
If Ext1a = "new customer" Then
Var Curr = "curr"
If TelephoneNumber = Curr.CurrCreditTelNum Then
Var CoffeeCredit = 0
Var PinNumberUser = Curr.CurrCreditPinNum
Open "ROOT/taobin_project/xml/page_payment_credit2.xml"
EndIf
EndIf
EndIf
Var ShowErrorText = "Enable"
EndIf
EndIf

96
xml/page_payment_credit2.xml
View file

@ -10,6 +10,9 @@
<EventOpen>
; On open
Var useCreditAmount = 0;
Var useCreditTemp = 0;
Var Timeout = 0
Var TimeoutSMS = 0
Var StateBGetSMS = "Enable"
@ -66,7 +69,8 @@
If SumCreditAmount >= PayAmount Then
If ReqAdddata22 = 0 Then
Var BmiYear = PayAmount
Var useCreditAmount = PayAmount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqAdddata22 = 1
@ -149,7 +153,7 @@
If ReqFlag = 0 Then
If ReqAdddata22 = 1 Then
Var Seeker.CreditReferenceTmp = "" + PayAmount
Var Seeker.CreditReferenceTmp = "" + useCreditAmount
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
@ -165,6 +169,12 @@
Var VendingCreditRemain = "" + SumCreditAmount
If useCreditTemp > 0 Then
Var Seeker.CurrCreditUse = useCreditTemp
EndIf
If CART_COUNT >= 1 Then
Cart "PreparID" 1
@ -787,7 +797,7 @@
DEBUGVAR "USER BN_BACK"
If ReqAdddata22 = 1 Then
Var BmiYear = PayAmount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
EndIf
@ -806,48 +816,7 @@
<FilenameDisable> Var( DirImage + "/bn_confirm.png" )</FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var ShowSentSmsText = "Invisible"
Var Timeout = 0
If PinNumberUser = PinNumber Then
Var SumCreditAmount = CoffeeCredit
If SumCreditAmount >= PayAmount Then
If ReqAdddata22 = 0 Then
Var BmiYear = PayAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqAdddata22 = 1
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
EndIf
Else
Var ShowErrorText = "Enable"
Var PinNumber = ""
Var ShowTextNumber1 = "Invisible"
Var ShowTextNumber2 = "Invisible"
Var ShowTextNumber3 = "Invisible"
Var ShowTextNumber4 = "Invisible"
EndIf
;Var DataTmp = TelephoneNumber + "/"
;Var DataTmp = DataTmp + PinNumber
;GETACCEXT DataTmp 19
Var ReqFlag = 0
Refresh
<EventClick>
</EventClick>
</Button>
@ -956,7 +925,16 @@
If SumCreditAmount >= PayAmount Then
If ReqAdddata22 = 0 Then
Var BmiYear = PayAmount
If Seeker = "next" Then
Var Curr = "curr"
If TelephoneNumber = Curr.CurrCreditTelNum Then
Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount
EndIf
EndIf
Var useCreditAmount = PayAmount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqAdddata22 = 1
@ -964,7 +942,31 @@
Else
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
If Seeker = "next" Then
Var Curr = "curr"
If TelephoneNumber = Curr.CurrCreditTelNum Then
Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount
If SumCreditAmount >= PayAmount Then
If ReqAdddata22 = 0 Then
Var useCreditTemp = PayAmount - CoffeeCredit
Var useCreditAmount = CoffeeCredit
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqAdddata22 = 1
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
EndIf
EndIf
Else

29
xml/page_payment_credit3.xml
View file

@ -18,8 +18,13 @@
;Var CoffeeCredit = Ext1b
;INT CoffeeCredit
Var SumCreditAmount = CoffeeCredit
;Var SumCreditAmount = 5
Var SumCreditAmount2 = SumCreditAmount
Var useCreditTemp = 0;
Var NotEnoughFlag = 0
@ -38,6 +43,13 @@
Var AcceptAuto = "false"
If Seeker = "next" Then
Var Curr = "curr"
If TelephoneNumber = Curr.CurrCreditTelNum Then
Var SumCreditAmount2 = SumCreditAmount + Curr.CurrCreditAmount
EndIf
EndIf
EndIf
Var ShowLoadingText = "Invisible"
@ -166,7 +178,7 @@
Var Seeker.TNumberTaobinCredit = TelephoneNumber
Var Seeker.CoffeePinNumber = PinNumber
Var Seeker.IntVendingCredit = SumCreditAmount
Var Seeker.IntVendingCredit = SumCreditAmount2
Var Seeker.CreditReferenceTmp = "" + SumCreditAmount
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
@ -175,6 +187,10 @@
Var Seeker.StoreCreditFlag = 1
If useCreditTemp > 0 Then
Var Seeker.CurrCreditUse = useCreditTemp
EndIf
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
@ -244,7 +260,7 @@
<Font> KanitRegularTTF </Font>
<Color> 0xDE794E </Color>
<Value> SumCreditAmount </Value>
<Value> SumCreditAmount2 </Value>
</Text>
@ -305,6 +321,13 @@
SAVELOG "payment_credit3-p227."
If Seeker = "next" Then
Var Curr = "curr"
If TelephoneNumber = Curr.CurrCreditTelNum Then
Var useCreditTemp = Curr.CurrCreditAmount
EndIf
EndIf
Var BmiYear = SumCreditAmount
Var GetScore = "useCredit"

5
xml/page_payment_multi.xml
View file

@ -147,6 +147,11 @@
Var CountStepPackPayment = 0
Var Seeker.CurrCreditAmount = 0
Var Seeker.CurrCreditUse = 0
Var Seeker.CurrCreditTelNum = ""
Var Seeker.CurrCreditPinNum = ""
Var Seeker.TaobinErrorNetwork = 0
Var Seeker.VendingCode = "C00"

30
xml/page_payment_storeCredit.xml
View file

@ -89,6 +89,27 @@
INT CoffeeCredit
Var Seeker.CoffeePinNumber = Ext1c
If Seeker = "next" Then
Var Curr = "curr"
DEBUGVAR CoffeeCredit
DEBUGVAR Curr.CurrCreditAmount
If TelephoneNumber = Curr.CurrCreditTelNum Then
Var CoffeeCredit = CoffeeCredit + Curr.CurrCreditAmount
If Curr.CurrCreditUse > 0 Then
Var CoffeeCredit = CoffeeCredit - Curr.CurrCreditUse
If CoffeeCredit < 0 Then
Var CoffeeCredit = 0
EndIf
EndIf
EndIf
EndIf
Var Seeker.TNumberTaobinCredit = TelephoneNumber
If Seeker.pageStoreCredit0 = 1 Then
@ -115,6 +136,13 @@
CoinVending BILLSTACKALL
Var CoffeeCreditKeep = RemainAmountKeep + CoffeeCredit
;If Seeker = "next" Then
; Var Curr = "curr"
; Var CoffeeCreditKeep = CoffeeCreditKeep - Curr.CurrCreditUse
;EndIf
Open "ROOT/taobin_project/xml/page_payment_storeCredit3.xml"
EndIf
@ -126,6 +154,8 @@
Else
If Ext1a = "new customer" Then
Var CoffeeCreditKeep = 0
Var CoffeeCredit = 0
Var Seeker.TNumberTaobinCredit = TelephoneNumber
Open "ROOT/taobin_project/xml/page_payment_storeCredit2.xml"

124
xml/page_payment_storeCredit2-2.xml
View file

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

86
xml/page_payment_storeCredit2.xml
View file

@ -120,7 +120,7 @@
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
;Function 2
EndIf
Var ShowErrorText = "Invisible"
@ -143,7 +143,9 @@
TimerReset
Refresh
If TelNumLen >= 4 Then
Function 2
EndIf
</EventClick>
</Button>
@ -163,7 +165,7 @@
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
;Function 2
EndIf
Var ShowErrorText = "Invisible"
@ -185,6 +187,10 @@
TimerReset
Refresh
If TelNumLen >= 4 Then
Function 2
EndIf
</EventClick>
</Button>
@ -204,7 +210,7 @@
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
;Function 2
EndIf
Var ShowErrorText = "Invisible"
@ -226,6 +232,10 @@
TimerReset
Refresh
If TelNumLen >= 4 Then
Function 2
EndIf
</EventClick>
</Button>
@ -245,7 +255,7 @@
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
;Function 2
EndIf
Var ShowErrorText = "Invisible"
@ -267,6 +277,11 @@
TimerReset
Refresh
If TelNumLen >= 4 Then
Function 2
EndIf
</EventClick>
</Button>
@ -286,7 +301,7 @@
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
;Function 2
EndIf
Var ShowErrorText = "Invisible"
@ -308,6 +323,10 @@
TimerReset
Refresh
If TelNumLen >= 4 Then
Function 2
EndIf
</EventClick>
</Button>
@ -327,7 +346,7 @@
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
;Function 2
EndIf
Var ShowErrorText = "Invisible"
@ -349,6 +368,10 @@
TimerReset
Refresh
If TelNumLen >= 4 Then
Function 2
EndIf
</EventClick>
</Button>
@ -368,7 +391,7 @@
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
;Function 2
EndIf
Var ShowErrorText = "Invisible"
@ -390,6 +413,10 @@
TimerReset
Refresh
If TelNumLen >= 4 Then
Function 2
EndIf
</EventClick>
</Button>
@ -409,7 +436,7 @@
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
;Function 2
EndIf
Var ShowErrorText = "Invisible"
@ -431,6 +458,10 @@
TimerReset
Refresh
If TelNumLen >= 4 Then
Function 2
EndIf
</EventClick>
</Button>
@ -450,7 +481,7 @@
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
;Function 2
EndIf
Var ShowErrorText = "Invisible"
@ -472,6 +503,10 @@
TimerReset
Refresh
If TelNumLen >= 4 Then
Function 2
EndIf
</EventClick>
</Button>
@ -492,7 +527,7 @@
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
;Function 2
EndIf
Var ShowTextNumber = "Invisible"
@ -517,6 +552,10 @@
TimerReset
Refresh
If TelNumLen >= 4 Then
Function 2
EndIf
</EventClick>
</Button>
@ -759,8 +798,18 @@
If Seeker.pageStoreCredit0 = 1 Then
If Seeker = "next" Then
Var Curr = "curr"
Var CoffeeCreditKeep = StoreCreditAmount + 0
DEBUGVAR CoffeeCredit
DEBUGVAR Curr.CurrCreditAmount
If Seeker.TNumberTaobinCredit = Curr.CurrCreditTelNum Then
Var CoffeeCredit = CoffeeCredit + Curr.CurrCreditAmount
EndIf
EndIf
Var CoffeeCreditKeep = StoreCreditAmount + CoffeeCredit
Open "ROOT/taobin_project/xml/page_payment_storeCredit3.xml"
Else
@ -778,7 +827,18 @@
CoinVending BILLSTACKALL
Var CoffeeCreditKeep = RemainAmountKeep + 0
If Seeker = "next" Then
Var Curr = "curr"
DEBUGVAR CoffeeCredit
DEBUGVAR Curr.CurrCreditAmount
If Seeker.TNumberTaobinCredit = Curr.CurrCreditTelNum Then
Var CoffeeCredit = CoffeeCredit + Curr.CurrCreditAmount
EndIf
EndIf
Var CoffeeCreditKeep = RemainAmountKeep + CoffeeCredit
Open "ROOT/taobin_project/xml/page_payment_storeCredit3.xml"
EndIf

5
xml/page_payment_storeCredit3.xml
View file

@ -38,7 +38,12 @@
If Timeout > 5 Then
If Seeker.pageStoreCredit0 = 1 Then
Var Seeker.CurrCreditAmount = StoreCreditAmount
Var Seeker.CurrCreditTelNum = Seeker.TNumberTaobinCredit
Var Seeker.CurrCreditPinNum = Seeker.CoffeePinNumber
DEBUGVAR Seeker.CurrCreditAmount
If Seeker.FreeVendingCampaign = 1 Then

7
xml/page_thankyou.xml
View file

@ -252,6 +252,13 @@
Else
If Seeker.StoreCreditFlag = 1 Then
Var Seeker.CurrCreditAmount = StoreCreditAmount
Var Seeker.CurrCreditTelNum = Seeker.TNumberTaobinCredit
Var Seeker.CurrCreditPinNum = Seeker.CoffeePinNumber
DEBUGVAR Seeker.CurrCreditAmount
If Seeker.FreeVendingCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else