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

update flag for new payment

Browse source
This commit is contained in:
Kenta420 2024-01-31 17:43:31 +07:00
parent 068b298c2e
commit 9559b6dab1
6 changed files with 112 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/collectiing/text_44.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Before After
Before After

BIN
image/collectiing_en/text_44.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

14
xml/event/tricker.ev
View file

@ -62,6 +62,8 @@ Var ProPeachEnable = 0
Var NewCollectPoint = 1 Var NewCollectPoint = 1
Var NewFlowPaymentCode = 0
If SystemDateMonthInt = 10 Then If SystemDateMonthInt = 10 Then
@ -120,10 +122,22 @@ EndIf
If BoxID = 173149 Then If BoxID = 173149 Then
Var ProPeachEnable = 1 Var ProPeachEnable = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 200435 Then
Var ProPeachEnable = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 201316 Then
Var ProPeachEnable = 1
Var NewFlowPaymentCode = 1
EndIf EndIf
If BoxID = 105005 Then If BoxID = 105005 Then
Var ProPeachEnable = 1 Var ProPeachEnable = 1
Var NewFlowPaymentCode = 1
EndIf EndIf
If BoxID = 172644 Then If BoxID = 172644 Then

136
xml/page_payment_credit2.xml
View file

@ -932,91 +932,95 @@
<Function2> <Function2>
If NewFlowPaymentCode = 1 Then
Var ShowSentSmsText = "Invisible"
Var Timeout = 0
Var ShowSentSmsText = "Invisible" If PinNumberUser = PinNumber Then
Var Timeout = 0
If PinNumberUser = PinNumber Then Var SumCreditAmount = CoffeeCredit
Var SumCreditAmount = CoffeeCredit If SumCreditAmount >= PayAmountSubDiscount Then
If SumCreditAmount >= PayAmountSubDiscount Then Open "ROOT/taobin_project/xml/page_payment_credit3-0.xml"
Else
Var ShowNotEnoughText = "Enable"
Var Seeker.TNumberTaobinCredit = TelephoneNumber
Var Seeker.CoffeePinNumber = PinNumber
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
EndIf
Open "ROOT/taobin_project/xml/page_payment_credit3-0.xml"
Else Else
Var ShowNotEnoughText = "Enable"
Var Seeker.TNumberTaobinCredit = TelephoneNumber Var ShowErrorText = "Enable"
Var Seeker.CoffeePinNumber = PinNumber Var PinNumber = ""
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml" Var ShowTextNumber1 = "Invisible"
Var ShowTextNumber2 = "Invisible"
Var ShowTextNumber3 = "Invisible"
Var ShowTextNumber4 = "Invisible"
EndIf EndIf
Var ReqFlag = 0
Refresh
Else Else
Var ShowSentSmsText = "Invisible"
Var Timeout = 0
Var ShowErrorText = "Enable" If PinNumberUser = PinNumber Then
Var PinNumber = ""
Var ShowTextNumber1 = "Invisible"
Var ShowTextNumber2 = "Invisible"
Var ShowTextNumber3 = "Invisible"
Var ShowTextNumber4 = "Invisible"
Var SumCreditAmount = CoffeeCredit
If SumCreditAmount >= PayAmountSubDiscount Then
If ReqAdddata22 = 0 Then
;If Seeker = "next" Then
; Var Curr = "curr"
; If TelephoneNumber = Curr.CurrCreditTelNum Then
; Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount
; EndIf
;EndIf
Var useCreditAmount = PayAmountSubDiscount
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
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
EndIf EndIf
Var ReqFlag = 0
Refresh
</Function2> </Function2>
<Function3> <Function3>
Var ShowSentSmsText = "Invisible"
Var Timeout = 0
If PinNumberUser = PinNumber Then
Var SumCreditAmount = CoffeeCredit
If SumCreditAmount >= PayAmountSubDiscount Then
If ReqAdddata22 = 0 Then
;If Seeker = "next" Then
; Var Curr = "curr"
; If TelephoneNumber = Curr.CurrCreditTelNum Then
; Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount
; EndIf
;EndIf
Var useCreditAmount = PayAmountSubDiscount
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
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
</Function3> </Function3>

19
xml/page_payment_credit3-Topup.xml
View file

@ -35,7 +35,7 @@
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 posX = 430 Var posX = 270
Else Else
@ -58,7 +58,16 @@
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"
Var Min = PayAmountSubDiscount If SumCreditAmount < PayAmountSubDiscount Then
Var Text_X = 246
Var Min = PayAmountSubDiscount - SumCreditAmount
Else
Var Text_X = 263
Var Min = PayAmountSubDiscount
EndIf
;Var Min = PayAmountSubDiscount
Var Max = 5000 Var Max = 5000
;inter-image ;inter-image
@ -634,7 +643,7 @@ If ViewBill > 0 Then
<Width> 250 </Width> <Width> 250 </Width>
<Font> KanitRegularTTF </Font> <Font> KanitRegularTTF </Font>
<Color> 0xDE794E </Color> <Color> 0xDE794E </Color>
<Value> PayAmountSubDiscount </Value> <Value> Min </Value>
</Text> </Text>
@ -648,8 +657,8 @@ If ViewBill > 0 Then
<Image> <Image>
<X> 188 </X> <X> Text_X </X>
<Y> 640 </Y> <Y> 650 </Y>
<Refresh> "Enable" </Refresh> <Refresh> "Enable" </Refresh>
<Filename> Var( DirImage + text_44 )</Filename> <Filename> Var( DirImage + text_44 )</Filename>
</Image> </Image>

21
xml/page_payment_credit3-TopupCode.xml
View file

@ -56,14 +56,21 @@
If ReqAdddata42 = 1 Then If ReqAdddata42 = 1 Then
If Timeout = 3 Then If Timeout = 3 Then
If ReqAdddata22 = 0 Then If ReqAdddata22 = 0 Then
GenHashWithTimeStamp PointCrm Var SumCreditAndCouponAmount = IntAmoutCoupon + SumCreditAmount
Var useCreditAmount = PayAmountSubDiscount If SumCreditAndCouponAmount < PayAmountSubDiscount Then
Var BmiYear = useCreditAmount Var SumCreditAmount = SumCreditAndCouponAmount
Var GetScore = "useCredit" Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore Else
Var ReqAdddata22 = 1 GenHashWithTimeStamp PointCrm
Var Timeout = 0 Var useCreditAmount = PayAmountSubDiscount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ReqAdddata22 = 1
Var Timeout = 0
EndIf
EndIf EndIf
EndIf EndIf
EndIf EndIf