Merge branch 'new_flow_payment' into masterpiece

This commit is contained in:
Kenta420 2024-01-23 17:49:14 +07:00
commit e8dca11335
15 changed files with 745 additions and 77 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

View file

@ -22,7 +22,7 @@
Open "ROOT/taobin_project/xml/page_brewing3Multi.xml"
Else
Var PayReference = ""
Var PayType = ""
Var PayType = "newpay"
EndIf
Var SelectDrink = Seeker.selected_a_drink

View file

@ -56,7 +56,7 @@
Var TimeoutWaitPay = 10
Var PayReference = ""
Var PayType = ""
Var PayType = "newpay"
Var MachineState_Result = 0
If LastMakeDrinkResult = "success" Then

View file

@ -174,6 +174,23 @@
</EventClick>
</Button>
<Button>
<X> 287 </X>
<Y> 930 </Y>
<State> PayState3</State>
<Filename> Var( DirImage + "/bn_codeS.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_codeS.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_codeS.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var PayCreditChannel = "credit"
Open "ROOT/taobin_project/xml/page_member_topupCode.xml"
</EventClick>
</Button>
<Button>
<X> 397 </X>
<Y> 1622 </Y>

View file

@ -0,0 +1,675 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Sound> PlaySoundCodeLang </Sound>
<Volume> SoundVolume </Volume>
<Refresh> "Partial" </Refresh>
<EventOpen>
; On open
Var ECommerce = ""
Var Seeker.FreeVendingCampaign = 0
Var Timeout = 0
Var GetPayInfoFlag = 0
Var Seeker.CodeChannel = 0
;Var VendingQRCode = "ERROR"
;VendingQR ON
;Var QRCODE99 = ""
;CoinVending OFF
VendingQR OFF
Var ShowTextNumber = "Enable"
Var ShowErrorText = "Invisible"
Var Tel_Confirm_State = "Invisible"
Var ErrorCause = ""
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
Else
Var DirImage = "ROOT/taobin_project/image/collectiing"
EndIf
Var CouponNumber = ""
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
;Open "ROOT/xml/page_board.xml"
Var Timeout = Timeout + 1
If Timeout > 180 Then
Open "ROOT/taobin_project/xml/page_member_topup3.xml"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventActionOk>
If Seeker.CodeChannel = 1 Then
SAVELOG "Seeker.CodeChannel 1 > ActOK."
DEBUGVAR ECommerce
SAVELOG ECommerce
SPLIT ECommerce "/" 5 CampaignID
SPLIT ECommerce "/" 6 CampaignCode
SPLIT ECommerce "/" 7 AmoutCoupon
Var IntAmoutCoupon = AmoutCoupon
INT IntAmoutCoupon
If IntAmoutCoupon > 0 Then
DEBUGVAR AmoutCoupon
DEBUGVAR CampaignID
DEBUGVAR CampaignCode
Var PayAmount = AmoutCoupon
DEBUGVAR PayAmount
AddData 42 TelephoneNumber CampaignCode CampaignID AmoutCoupon
Open "ROOT/taobin_project/xml/page_member_topupSuccess.xml"
Else
Var ShowErrorText = "Enable"
Var text_show_error = DirImage + "/text_show_error.png"
Var GetPayInfoFlag = 0
Var Seeker.CodeChannel = 0
EndIf
EndIf
</EventActionOk>
<EventActionError>
If Seeker.CodeChannel = 1 Then
Var CouponNumber = ""
Var ShowErrorText = "Enable"
SAVELOG ShowErrorText
Var text_show_error = DirImage + "/text_show_error2.png"
If ErrorCause = "failed_fromoper_0002" Then
Var text_show_error = DirImage + "/text_show_error.png"
EndIf
If ErrorCause = "failed_fromoper_0005" Then
Var text_show_error = DirImage + "/text_show_error3.png"
EndIf
If ErrorCause = "failed_fromoper_0006" Then
Var text_show_error = DirImage + "/text_show_error4.png"
EndIf
If ErrorCause = "failed_fromoper_0007" Then
Var text_show_error = DirImage + "/text_show_error7.png"
EndIf
If ErrorCause = "failed_fromoper_0008" Then
Var text_show_error = DirImage + "/text_show_error8.png"
EndIf
Var GetPayInfoFlag = 0
Var Seeker.CodeChannel = 0
Var Tel_Confirm_State = "Disable"
Refresh
EndIf
</EventActionError>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 601 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/img_popup1.png" </Filename>
</Image>
<Button>
<X> 263 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_1.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "1"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 405 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "2"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 547 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_3.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "3"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 691 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_A.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_A.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "A"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 263 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_4.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "4"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 405 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_5.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "5"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 547 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_6.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "6"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 691 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_B.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_B.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "B"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 263 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_7.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "7"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 405 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_8.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "8"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 547 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_9.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "9"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 691 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_C.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_C.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "C"
Var ShowTextNumber = "Invisible"
Trim CouponNumber 8
TimerReset
Refresh
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 405 </X>
<Y> 1432 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_0.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var CouponNumber = CouponNumber + "0"
Trim CouponNumber 8
StrLen CouponNumber CodeNumLen
If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowTextNumber = "Invisible"
TimerReset
Refresh
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 263 </X>
<Y> 1432 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_sh.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_sh.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
;Var CouponNumber = CouponNumber + "0"
Trim CouponNumber 8
StrLen CouponNumber CodeNumLen
If CodeNumLen = 0 Then
Var ShowTextNumber = "Invisible"
Var Mode# = 1
Var Str# = "#"
EndIf
TimerReset
Refresh
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
<Button>
<X> 547 </X>
<Y> 1432 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_back-1.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
Var Tel_Confirm_State = "Invisible"
StrLen CouponNumber CodeNumLen
If CodeNumLen > 0 Then
Trim CouponNumber -1
If CodeNumLen = 1 Then
Var ShowTextNumber = "Enable"
EndIf
Else
Var ShowTextNumber = "Enable"
EndIf
;Var ShowErrorText = "Invisible"
TimerReset
Refresh
</EventClick>
</Button>
<Button>
<X> 218 </X>
<Y> 1607 </Y>
<Filename> Var( DirImage + "/bn_back.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_back.png") </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_member_topup3.xml"
</EventClick>
</Button>
<Button>
<X> 577 </X>
<Y> 1607 </Y>
<Refresh> "Enable" </Refresh>
<State> Tel_Confirm_State </State>
<Filename> Var( DirImage + "/bn_confirm.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_confirm.png" )</FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_confirm.png" )</FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If UnitTestType = "2" Then
If CouponNumber = "00000001" Then
Var ShowErrorText = "Enable"
EndIf
Else
If CouponNumber = "00000002" Then
Var ShowErrorText = "Enable"
EndIf
If CouponNumber = "99999999" Then
Var ShowErrorText = "Enable"
EndIf
If GetPayInfoFlag = 0 Then
Var GetPayInfoFlag = 1
VendingQR OFF
Var RemainAmount = 0
;PrepareDrink SelectDrink SelectSugarID
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumber2 = "0899999999"
Var ServiceType = "coffee"
Var ECommerce = ""
Var ECommerce = ECommerce + "0"
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "0"
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "1"
Var ECommerce = ECommerce + ":"
Var ECommerce = ECommerce + "000001"
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "00-00-00-0000"
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "C00"
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + CouponNumber
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "A"
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var Timeout = 0
Var Seeker.CodeChannel = 1
EndIf
EndIf
SAVELOG ShowTextNumber
Refresh
</EventClick>
</Button>
<Image>
<X> 217 </X>
<Y> 802 </Y>
<Filename> Var( DirImage + "/img3.png" ) </Filename>
</Image>
<Image>
<X> 244 </X>
<Y> 816 </Y>
<State> ShowTextNumber </State>
<Refresh> "Enable" </Refresh>
<Filename> Var( DirImage + "/text_12.png" )</Filename>
</Image>
<Text>
<X> 0 </X>
<Y> 817 </Y>
<Width> 1080 </Width>
<Align> Center </Align>
<Size> 62 </Size>
<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color>
<Refresh> "Enable" </Refresh>
<Value> CouponNumber </Value>
</Text>
<Image>
<X> 188 </X>
<Y> 636 </Y>
<Filename> Var( DirImage + "/text_11.png" )</Filename>
</Image>
<Image>
<X> 152 </X>
<Y> 935 </Y>
<Refresh> "Enable" </Refresh>
<State> ShowErrorText </State>
<Filename> text_show_error </Filename>
</Image>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventUnitTest4>
Open "ROOT/taobin_project/xml/page_member_topupCode.xml"
</EventUnitTest4>
</Popup>

View file

@ -139,6 +139,7 @@
Var Seeker.VendingCampaign = 0
Var Seeker.VendingTSID = ""
Var Seeker.CreditNotEnoughRefID = ""
Var PayType = ""
Var CART_INDEX = 0

View file

@ -127,21 +127,6 @@
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
@ -151,7 +136,7 @@
DEBUGVAR Curr.CurrCreditTelNum
If Seeker = "next" Then
If Ext1a = "new customer" Then
If Ext1a = "new customer" Then
Var Curr = "curr"

View file

@ -944,12 +944,12 @@
If ReqAdddata22 = 0 Then
If Seeker = "next" Then
Var Curr = "curr"
If TelephoneNumber = Curr.CurrCreditTelNum Then
Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount
EndIf
EndIf
;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
@ -960,31 +960,7 @@
Else
If Seeker = "next" Then
Var Curr = "curr"
If TelephoneNumber = Curr.CurrCreditTelNum Then
Var SumCreditAmount = CoffeeCredit + Curr.CurrCreditAmount
If SumCreditAmount >= PayAmountSubDiscount Then
If ReqAdddata22 = 0 Then
Var useCreditTemp = PayAmountSubDiscount - 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
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
EndIf
Else

View file

@ -46,12 +46,12 @@
Var AcceptAuto = "false"
If Seeker = "next" Then
Var Curr = "curr"
If TelephoneNumber = Curr.CurrCreditTelNum Then
Var SumCreditAmount2 = SumCreditAmount + Curr.CurrCreditAmount
EndIf
EndIf
;If Seeker = "next" Then
; Var Curr = "curr"
; If TelephoneNumber = Curr.CurrCreditTelNum Then
; Var SumCreditAmount2 = SumCreditAmount + Curr.CurrCreditAmount
; EndIf
;EndIf
If show_eng = "true" Then
@ -215,6 +215,7 @@
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
Var Seeker.CreditNotEnoughRefID = PointCrm
Var Seeker.StoreCreditFlag = 1

View file

@ -100,27 +100,6 @@
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

View file

@ -58,7 +58,13 @@
Var Seeker.CurrCreditPinNum = Seeker.CoffeePinNumber
DEBUGVAR Seeker.CurrCreditAmount
Var CurrAmount = Seeker.CurrCreditAmount
Var CurrTelePhoneNum = Seeker.CurrCreditTelNum
Var CurrPinNum = Seeker.CurrCreditPinNum
Var RefID = ""
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
If Seeker.FreeVendingCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"

View file

@ -360,6 +360,34 @@
DEBUGVAR Seeker.CurrCreditAmount
If Seeker.CreditNotEnoughRefID = "" Then
Var CurrAmount = Seeker.CurrCreditAmount
Var CurrTelePhoneNum = Seeker.CurrCreditTelNum
Var CurrPinNum = Seeker.CurrCreditPinNum
Var RefID = ""
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
Else
Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign
If CoinAmount >= ServiceAmountSupCampain Then
Var CurrAmount = Seeker.CurrCreditAmount
Var RefID = "0/" + Seeker.CreditNotEnoughRefID
Var Seeker.CreditReferenceTmp = RefID
Else
Var CurrAmount = CoinAmount
Var RefID = "" + ServiceAmountSupCampain
Var RefID = RefID + "/"
Var RefID = RefID + Seeker.CreditNotEnoughRefID
Var Seeker.CreditReferenceTmp = RefID
EndIf
Var CurrTelePhoneNum = Seeker.CurrCreditTelNum
Var CurrPinNum = Seeker.CurrCreditPinNum
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
EndIf
If Seeker.FreeVendingCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else