THAI: Fix bug new payment credit for new minimum payment
This commit is contained in:
parent
5e71999d0d
commit
fe961389d2
4 changed files with 41 additions and 6 deletions
|
|
@ -1175,7 +1175,8 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
|
|
||||||
GETACCEXT TNumberTaobinMemberXXX 14
|
GETACCEXT TNumberTaobinMemberXXX 14
|
||||||
|
Var CoffeePointOld = 0
|
||||||
|
Var CoffeePoint = 0
|
||||||
Open "ROOT/taobin_project/xml/page_check_member_point.xml"
|
Open "ROOT/taobin_project/xml/page_check_member_point.xml"
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,6 @@
|
||||||
|
|
||||||
Var GetCreditFlag = 0
|
Var GetCreditFlag = 0
|
||||||
|
|
||||||
Var posX = 400
|
|
||||||
|
|
||||||
If show_eng = "true" Then
|
If show_eng = "true" Then
|
||||||
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
|
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
|
||||||
|
|
@ -34,11 +33,14 @@
|
||||||
If show_eng = "true" Then
|
If show_eng = "true" Then
|
||||||
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
|
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
|
||||||
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
|
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
|
||||||
|
Var Text_X = 170
|
||||||
Var posX = 270
|
Var posX = 270
|
||||||
|
|
||||||
|
|
||||||
Else
|
Else
|
||||||
|
Var Text_X = 255
|
||||||
|
Var posX = 400
|
||||||
|
|
||||||
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
|
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
|
||||||
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
|
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
|
||||||
|
|
||||||
|
|
@ -52,17 +54,19 @@
|
||||||
|
|
||||||
Var GetPayInfoFlag = 0
|
Var GetPayInfoFlag = 0
|
||||||
|
|
||||||
|
Var ReqPayWithCash = 0
|
||||||
|
|
||||||
Var TextWaiting = ""
|
Var TextWaiting = ""
|
||||||
|
|
||||||
|
GenHashWithTimeStamp PointCrm
|
||||||
|
|
||||||
Var text_44 = "/text_44.png"
|
Var text_44 = "/text_44.png"
|
||||||
Var text_show_amountInvalid = "/text_show_amountInvalid.png"
|
Var text_show_amountInvalid = "/text_show_amountInvalid.png"
|
||||||
Var text_show_amountInvalid2 = "/text_show_amountInvalid2.png"
|
Var text_show_amountInvalid2 = "/text_show_amountInvalid2.png"
|
||||||
|
|
||||||
If SumCreditAmount < PayAmountSubDiscount Then
|
If SumCreditAmount < PayAmountSubDiscount Then
|
||||||
Var Text_X = 246
|
|
||||||
Var Min = PayAmountSubDiscount - SumCreditAmount
|
Var Min = PayAmountSubDiscount - SumCreditAmount
|
||||||
Else
|
Else
|
||||||
Var Text_X = 263
|
|
||||||
Var Min = PayAmountSubDiscount
|
Var Min = PayAmountSubDiscount
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
@ -150,6 +154,16 @@ If ViewBill > 0 Then
|
||||||
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupQR.xml"
|
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupQR.xml"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
If ReqPayWithCash = 1 Then
|
||||||
|
Var Seeker.CreditReferenceTmp = "" + useCreditAmount
|
||||||
|
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
|
||||||
|
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
|
||||||
|
|
||||||
|
Var Seeker.StoreCreditFlag = 1
|
||||||
|
Var Seeker.CreditNotEnoughRefID = PointCrm
|
||||||
|
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupCash.xml"
|
||||||
|
EndIf
|
||||||
|
|
||||||
Refresh
|
Refresh
|
||||||
</EventActionOk>
|
</EventActionOk>
|
||||||
|
|
||||||
|
|
@ -560,7 +574,14 @@ If ViewBill > 0 Then
|
||||||
Else
|
Else
|
||||||
If PayCreditChannel = "cash" Then
|
If PayCreditChannel = "cash" Then
|
||||||
|
|
||||||
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupCash.xml"
|
If ReqPayWithCash = 0 Then
|
||||||
|
Var TelephoneNumber = Seeker.TNumberTaobinCredit
|
||||||
|
Var useCreditAmount = SumCreditAmount
|
||||||
|
Var BmiYear = useCreditAmount
|
||||||
|
Var GetScore = "useCredit"
|
||||||
|
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
|
||||||
|
Var ReqPayWithCash = 1
|
||||||
|
EndIf
|
||||||
|
|
||||||
Else
|
Else
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -170,6 +170,12 @@
|
||||||
If CancelFlag = 0 Then
|
If CancelFlag = 0 Then
|
||||||
SAVELOG "ButtonCancleAlpha2 > Timeout Order."
|
SAVELOG "ButtonCancleAlpha2 > Timeout Order."
|
||||||
|
|
||||||
|
If ReqPayWithCash = 1 Then
|
||||||
|
Var BmiYear = useCreditAmount
|
||||||
|
Var GetScore = "useCredit"
|
||||||
|
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
|
||||||
|
EndIf
|
||||||
|
|
||||||
Var CancelFlag = 1
|
Var CancelFlag = 1
|
||||||
Var CancelCounter = 0
|
Var CancelCounter = 0
|
||||||
Var RemainAmountStr = "คืนเงิน"
|
Var RemainAmountStr = "คืนเงิน"
|
||||||
|
|
@ -497,6 +503,12 @@ TimerReset
|
||||||
If CancelFlag = 0 Then
|
If CancelFlag = 0 Then
|
||||||
SAVELOG "ButtonCancleAlpha2 > Cancle Order."
|
SAVELOG "ButtonCancleAlpha2 > Cancle Order."
|
||||||
|
|
||||||
|
If ReqPayWithCash = 1 Then
|
||||||
|
Var BmiYear = useCreditAmount
|
||||||
|
Var GetScore = "useCredit"
|
||||||
|
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
|
||||||
|
EndIf
|
||||||
|
|
||||||
Var CancelFlag = 1
|
Var CancelFlag = 1
|
||||||
Var CancelCounter = 0
|
Var CancelCounter = 0
|
||||||
If show_eng = "true" Then
|
If show_eng = "true" Then
|
||||||
|
|
|
||||||
|
|
@ -364,6 +364,7 @@
|
||||||
Var Seeker.CurrCreditPinNum = Seeker.CoffeePinNumber
|
Var Seeker.CurrCreditPinNum = Seeker.CoffeePinNumber
|
||||||
|
|
||||||
DEBUGVAR Seeker.CurrCreditAmount
|
DEBUGVAR Seeker.CurrCreditAmount
|
||||||
|
DEBUGVAR Seeker.CreditNotEnoughRefID
|
||||||
|
|
||||||
If Seeker.CreditNotEnoughRefID = "" Then
|
If Seeker.CreditNotEnoughRefID = "" Then
|
||||||
Var CurrAmount = Seeker.CurrCreditAmount
|
Var CurrAmount = Seeker.CurrCreditAmount
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue