diff --git a/xml/page_member_topupCode.xml b/xml/page_member_topupCode.xml
index 99358ca8..9f48f3a9 100644
--- a/xml/page_member_topupCode.xml
+++ b/xml/page_member_topupCode.xml
@@ -36,10 +36,7 @@
Var DirImage = "ROOT/taobin_project/image/collectiing"
EndIf
- Var Mode# = 0
- Var Str# = ""
- Var TelephoneNumber# = ""
-
+ Var CouponNumber = ""
1000
@@ -68,170 +65,37 @@
DEBUGVAR ECommerce
SAVELOG ECommerce
- SPLIT ECommerce "/" 5 Seeker.VendingCode
- SPLIT ECommerce "/" 7 Seeker.VendingCampaignRI3
- SPLIT ECommerce "/" 8 VendingCampaign1
+ SPLIT ECommerce "/" 5 CampaignID
+ SPLIT ECommerce "/" 6 CampaignCode
+ SPLIT ECommerce "/" 7 AmoutCoupon
- If Seeker.VendingCode = "" Then
- Var Seeker.VendingCode = "C00"
- EndIf
+ Var IntAmoutCoupon = AmoutCoupon
+ INT IntAmoutCoupon
- If Seeker.VendingCode = "KBA:2" Then
- Var Seeker.VendingCode = "C00"
- EndIf
+ If IntAmoutCoupon > 0 Then
+ DEBUGVAR AmoutCoupon
+ DEBUGVAR CampaignID
+ DEBUGVAR CampaignCode
+ Var PayAmount = AmoutCoupon
+ DEBUGVAR PayAmount
- If Seeker.VendingCode = "AIR:2" Then
- Var Seeker.VendingCode = "C00"
- EndIf
-
- If Seeker.VendingCode = "TWN:2" Then
- Var Seeker.VendingCode = "C00"
- EndIf
-
- SAVELOG Seeker.VendingCode
- SAVELOG Seeker.VendingCampaignRI3
-
-
- If Seeker.VendingCode = "C00" Then
+ AddData 42 TelephoneNumber CampaignCode CampaignID AmoutCoupon
+ Open "ROOT/taobin_project/xml/page_member_topupSuccess.xml"
Else
-
- Var VendingCreditRemain = ""
- Var IntVendingCampaign1 = VendingCampaign1
- INT IntVendingCampaign1
-
- If IntVendingCampaign1 > 0 Then
- Var VendingCreditRemain = VendingCampaign1
- EndIf
-
-
-
- Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3
- INT Seeker.IntVendingCampaign
-
- Var VendingREFID = SessionID
-
- If Seeker.IntVendingCampaign > 0 Then
- Var QRChannel = 0
-
- If Seeker.IntVendingCampaign >= PayAmount Then
- ;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
- Var Seeker.VendingCampaign = PayAmount
- Var Seeker.FreeVendingCampaign = 1
- CoinVending OFF
- ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
- If CART_COUNT >= 1 Then
-
- Cart "PreparID" 1
- Var CART_INDEX = 1
- Var PayReference = ""
- GenHashWithTimeStamp PayReference
- Cart "MakeID" CART_INDEX
- Open "ROOT/taobin_project/xml/page_thankyou.xml"
- Else
- Var CART_INDEX = 0
-
- If Seeker = "curr" Then
- MakeDrinkV1 SelectDrink SelectSugarID
- Var TxRef1 = ""
- CreateTxRef1 TxRef1
- Else
- DEBUGVAR Seeker
- Var TxRef1 = ""
- CreateTxRef1 TxRef1
-
- Var DrinkPaid = SelectDrink
- Var PaidPaymentFromNextStage = 1
- EndIf
- Open "ROOT/taobin_project/xml/page_thankyou.xml"
- EndIf
- EndIf
-
-
-
-
-
- ;Var SessionID2 = SelectSlot + ":"
- ;Var SessionID2 = SessionID2 + Seeker.ExtendData
-
- ;Var CreditAmount1 = ""
- ;Var ServiceAmountFlow = ""
- ;Var TelephoneNumber2 = "0899999999"
- ;Var ServiceType = "coffee"
- ;Var ECommerce = ""
- ;Var ECommerce = ECommerce + PriceDrink
- ;Var ECommerce = ECommerce + "/"
- ;Var ECommerce = ECommerce + DiscountDrink
- ;Var ECommerce = ECommerce + "/"
- ;Var ECommerce = ECommerce + SessionID2
- ;Var ECommerce = ECommerce + "/"
- ;Var ECommerce = ECommerce + SelectDrink
- ;Var ECommerce = ECommerce + "/"
- ;Var ECommerce = ECommerce + "KBA:2/"
- ;Var ECommerce = ECommerce + Seeker.VendingCode
- ;Var ECommerce = ECommerce + ":"
- ;Var ECommerce = ECommerce + Seeker.CodeNumber
- ;Var ECommerce = ECommerce + ":"
- ;Var ECommerce = ECommerce + Seeker.VendingCampaignRI3
- ;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 = 2
-
- Var Seeker.CodeChannel = 1
-
- If CART_COUNT >= 1 Then
- Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
- Else
- Open "ROOT/taobin_project/xml/page_payment_cash.xml"
- EndIf
-
-
-
- Else
-
- Var ShowErrorText = "Enable"
- Var text_show_error = DirImage + "/text_show_error.png"
- Var GetPayInfoFlag = 0
- Var Seeker.CodeChannel = 0
-
- EndIf
+ Var ShowErrorText = "Enable"
+ Var text_show_error = DirImage + "/text_show_error.png"
+ Var GetPayInfoFlag = 0
+ Var Seeker.CodeChannel = 0
EndIf
- Else
-
- ;SAVELOG "Seeker.CodeChannel 2 > ActOK."
- ;
- ;Var CreditAmount = 0
- ;Var QRCODE99 = SessionID
- ;Var QRCODE99 = QRCODE99 + Ext1a
- ;Var QRCODE99 = QRCODE99 + Ext21
- ;Var QRCODETMP = QRCODE99
- ;Var Seeker.CodeChannel = 1
- ;
- ;If CART_COUNT >= 1 Then
- ; Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
- ;Else
- ; Open "ROOT/taobin_project/xml/page_payment_cash.xml"
- ;EndIf
-
-
EndIf
If Seeker.CodeChannel = 1 Then
- Var TelephoneNumber = ""
+ Var CouponNumber = ""
Var ShowErrorText = "Enable"
@@ -265,18 +129,6 @@
Refresh
EndIf
- If Seeker.CodeChannel = 2 Then
- Var Seeker.CodeChannel = 1
- Var QRCODE99 = ""
- Var QRCODETMP = ""
- If CART_COUNT >= 1 Then
- Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
- Else
- Open "ROOT/taobin_project/xml/page_payment_cash.xml"
- EndIf
- EndIf
-
-
@@ -304,16 +156,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "1"
+ Var CouponNumber = CouponNumber + "1"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -329,16 +179,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "2"
+ Var CouponNumber = CouponNumber + "2"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -354,16 +202,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "3"
+ Var CouponNumber = CouponNumber + "3"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -379,16 +225,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "A"
+ Var CouponNumber = CouponNumber + "A"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -404,16 +248,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "4"
+ Var CouponNumber = CouponNumber + "4"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -429,16 +271,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "5"
+ Var CouponNumber = CouponNumber + "5"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -454,16 +294,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "6"
+ Var CouponNumber = CouponNumber + "6"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -479,16 +317,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "B"
+ Var CouponNumber = CouponNumber + "B"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -504,16 +340,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "7"
+ Var CouponNumber = CouponNumber + "7"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -529,16 +363,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "8"
+ Var CouponNumber = CouponNumber + "8"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -554,16 +386,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "9"
+ Var CouponNumber = CouponNumber + "9"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -579,16 +409,14 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "C"
+ Var CouponNumber = CouponNumber + "C"
Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 8
-
- Var TelephoneNumber# = Str# + TelephoneNumber
+ Trim CouponNumber 8
TimerReset
Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
@@ -604,13 +432,11 @@
SoundVolume
Var Timeout = 0
- Var TelephoneNumber = TelephoneNumber + "0"
- Trim TelephoneNumber 8
+ Var CouponNumber = CouponNumber + "0"
+ Trim CouponNumber 8
- Var TelephoneNumber# = Str# + TelephoneNumber
-
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 8 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowTextNumber = "Invisible"
@@ -630,15 +456,14 @@
SoundVolume
Var Timeout = 0
- ;Var TelephoneNumber = TelephoneNumber + "0"
- Trim TelephoneNumber 8
- StrLen TelephoneNumber TelNumLen
- If TelNumLen = 0 Then
+ ;Var CouponNumber = CouponNumber + "0"
+ Trim CouponNumber 8
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen = 0 Then
Var ShowTextNumber = "Invisible"
Var Mode# = 1
Var Str# = "#"
- Var TelephoneNumber# = Str# + TelephoneNumber
EndIf
TimerReset
@@ -657,32 +482,22 @@
SoundVolume
Var Timeout = 0
- Var Clear# = 0
- StrLen TelephoneNumber TelNumLen
- If TelNumLen = 0 Then
- Var Clear# = 1
- EndIf
-
- Trim TelephoneNumber -1
Var Tel_Confirm_State = "Invisible"
- StrLen TelephoneNumber TelNumLen
-
- If TelNumLen = 0 Then
- If Clear# = 1 Then
+ StrLen CouponNumber CodeNumLen
+ If CodeNumLen > 0 Then
+ Trim CouponNumber -1
+ If CodeNumLen = 1 Then
Var ShowTextNumber = "Enable"
- Var Mode# = 0
- Var Str# = ""
EndIf
+ Else
+ Var ShowTextNumber = "Enable"
EndIf
- Var TelephoneNumber# = Str# + TelephoneNumber
-
;Var ShowErrorText = "Invisible"
TimerReset
Refresh
-
@@ -715,14 +530,14 @@
If UnitTestType = "2" Then
- If TelephoneNumber = "00000001" Then
+ If CouponNumber = "00000001" Then
Var ShowErrorText = "Enable"
EndIf
Else
- If TelephoneNumber = "00000002" Then
+ If CouponNumber = "00000002" Then
Var ShowErrorText = "Enable"
EndIf
- If TelephoneNumber = "99999999" Then
+ If CouponNumber = "99999999" Then
Var ShowErrorText = "Enable"
EndIf
@@ -733,8 +548,6 @@
VendingQR OFF
-
- Var Seeker.CodeNumber = TelephoneNumber
Var RemainAmount = 0
;PrepareDrink SelectDrink SelectSugarID
@@ -746,32 +559,22 @@
Var TelephoneNumber2 = "0899999999"
Var ServiceType = "coffee"
Var ECommerce = ""
- Var ECommerce = ECommerce + PriceDrink
-
+ Var ECommerce = ECommerce + "0"
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + "0"
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + "1"
Var ECommerce = ECommerce + ":"
- Var ECommerce = ECommerce + TOPPING_PRICE
+ Var ECommerce = ECommerce + "000001"
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + DiscountDrink
+ Var ECommerce = ECommerce + "00-00-00-0000"
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SessionID2
+ Var ECommerce = ECommerce + "C00"
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SelectDrink
+ Var ECommerce = ECommerce + CouponNumber
Var ECommerce = ECommerce + "/"
-
-
- If Mode# = 1 Then
- Var ECommerce = ECommerce + "S04"
- Else
- Var ECommerce = ECommerce + "C00"
- EndIf
-
-
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.CodeNumber
-
- Var ECommerce = ECommerce + ":"
- Var ECommerce = ECommerce + PromotionIDCurrentOrder
+ Var ECommerce = ECommerce + "A"
Var ServiceParameter = "max"
Var ServiceCharge = 0
@@ -786,9 +589,7 @@
GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var Timeout = 0
- Var TelephoneNumber = Seeker.CodeNumber
Var Seeker.CodeChannel = 1
-
EndIf
EndIf
@@ -823,7 +624,7 @@
RobotoBlack
0x513C2F
"Enable"
- TelephoneNumber#
+ CouponNumber
@@ -865,7 +666,9 @@
Open "/media/bt/xml/security_alarm.xml"
-
+
+ Open "ROOT/taobin_project/xml/page_member_topupCode.xml"
+