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

fix bug coupon

Browse source
This commit is contained in:
miggaze 2022-03-09 13:45:09 +07:00
parent ef4bab5a26
commit 9859a57628
13 changed files with 175 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment/bn_cash.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Before After
Before After

BIN
image/page_payment/bn_pay_with_code.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Before After
Before After

BIN
image/page_payment/bn_pay_with_credit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6 KiB

Before After
Before After

BIN
image/page_payment/bn_pay_with_shoppy.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
image/page_payment/bn_prompt_pay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Before After
Before After

BIN
image/page_payment/bp_cash.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Before After
Before After

BIN
image/page_payment/bp_pay_with_code.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Before After
Before After

BIN
image/page_payment/bp_pay_with_credit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Before After
Before After

BIN
image/page_payment/bp_pay_with_shoppy.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Before After
Before After

BIN
image/page_payment/bp_prompt_pay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Before After
Before After

2
xml/page_check_member2.xml
View file

@ -573,7 +573,7 @@
If CouponTypeB = "103" Then If CouponTypeB = "103" Then
Var CouponNameB = "/imgCouponC40.png" Var CouponNameB = "/imgCouponC40.png"
EndIf EndIf
If CouponTypeB = "103" Then If CouponTypeB = "105" Then
Var CouponNameB = "/imgCouponC38.png" Var CouponNameB = "/imgCouponC38.png"
EndIf EndIf
If CouponTypeB = "106" Then If CouponTypeB = "106" Then

53
xml/page_check_newmember2.xml
View file

@ -51,7 +51,7 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > 30 Then If Timeout > 40 Then
Open "ROOT/taobin_project/xml/page_check_member.xml" Open "ROOT/taobin_project/xml/page_check_member.xml"
EndIf EndIf
@ -75,14 +75,6 @@
Var TNumberTaobinMemberXXX = TelephoneNumber Var TNumberTaobinMemberXXX = TelephoneNumber
Trim TNumberTaobinMemberXXX 3
Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-"
Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7
Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8
Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9
Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10
Var CoffeePointRank = Ext1b Var CoffeePointRank = Ext1b
INT CoffeePointRank INT CoffeePointRank
Var CoffeePointRankTmp = CoffeePointRank Var CoffeePointRankTmp = CoffeePointRank
@ -118,6 +110,8 @@
Var CouponInfo9 = Ext1i Var CouponInfo9 = Ext1i
Var CouponInfo10 = Ext1j Var CouponInfo10 = Ext1j
Var GetAccFlag = 0
Open "ROOT/taobin_project/xml/page_check_member2.xml" Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf EndIf
@ -126,16 +120,45 @@
If GetAccFlag = 1 Then If GetAccFlag = 1 Then
Var GetAccFlag = 0 Var GetAccFlag = 2
If Ext1a = "ok" Then If Ext1a = "ok" Then
Var TaobinName = ""
Var TaobinCoupons = ""
Var TaobinExpire = ""
Var TaobinLevel = ""
Var TNumberTaobinMemberXXX = TelephoneNumber
Var CoffeePointRank = 0
INT CoffeePointRank
Var CoffeePointRankTmp = CoffeePointRank
Var PolygonST1 = "Invisible"
Var PolygonST2 = "Invisible"
Var CouponSTA = "Invisible"
Var CouponSTB = "Invisible"
Var CouponPage = 1
Var MakeDrinkState = 0
Var CouponInfo1 = ""
Var CouponInfo2 = ""
Var CouponInfo3 = ""
Var CouponInfo4 = ""
Var CouponInfo5 = ""
Var CouponInfo6 = ""
Var CouponInfo7 = ""
Var CouponInfo8 = ""
Var CouponInfo9 = ""
Var CouponInfo10 = ""
Var TaobinCredit = 0 Var TaobinCredit = 0
;GETACCEXT TelephoneNumber 14 GETACCEXT TelephoneNumber 14
;Var StepX = 1 Var StepX = 1
;Var Ext1a = "ok" Var Ext1a = "ok"
Open "ROOT/taobin_project/xml/page_check_member2.xml" ;Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else Else
Var ShowErrorText = "Enable" Var ShowErrorText = "Enable"
Var ShowText = "Invisible" Var ShowText = "Invisible"
@ -154,7 +177,7 @@
</EventActionOk> </EventActionOk>
<EventActionError> <EventActionError>
If GetAccFlag = 1 Then If GetAccFlag > 0 Then
Var ShowErrorText = "Enable" Var ShowErrorText = "Enable"
Var ShowText = "Invisible" Var ShowText = "Invisible"
Var GetAccFlag = 0 Var GetAccFlag = 0

146
xml/page_payment_cash.xml
View file

@ -111,6 +111,7 @@
Var PayState3 = "Invisible" Var PayState3 = "Invisible"
Var PayState4 = "Invisible" Var PayState4 = "Invisible"
Var PayState5 = "Invisible" Var PayState5 = "Invisible"
Var PayState6 = "Invisible"
Var showRemaining = "Free" Var showRemaining = "Free"
Else Else
@ -119,11 +120,13 @@
Var PayState2 = "Enable" Var PayState2 = "Enable"
Var PayState4 = "Enable" Var PayState4 = "Enable"
Var PayState5 = "Enable" Var PayState5 = "Enable"
Var PayState6 = "Enable"
Else Else
SAVELOG "Cash only IntVendingCampaign" SAVELOG "Cash only IntVendingCampaign"
Var PayState2 = "Disable" Var PayState2 = "Disable"
Var PayState4 = "Disable" Var PayState4 = "Disable"
Var PayState5 = "Disable" Var PayState5 = "Disable"
Var PayState6 = "Disable"
EndIf EndIf
Var PayState3 = "Enable" Var PayState3 = "Enable"
@ -135,6 +138,7 @@
Var PayState3 = "Disable" Var PayState3 = "Disable"
Var PayState4 = "Disable" Var PayState4 = "Disable"
Var PayState5 = "Disable" Var PayState5 = "Disable"
Var PayState6 = "Disable"
Var CoinInFlag = 1 Var CoinInFlag = 1
EndIf EndIf
@ -143,6 +147,7 @@
Var PayState2 = "Disable" Var PayState2 = "Disable"
Var PayState4 = "Disable" Var PayState4 = "Disable"
Var PayState5 = "Disable" Var PayState5 = "Disable"
Var PayState6 = "Disable"
EndIf EndIf
@ -258,6 +263,7 @@
Var PayState3 = "Disable" Var PayState3 = "Disable"
Var PayState4 = "Disable" Var PayState4 = "Disable"
Var PayState5 = "Disable" Var PayState5 = "Disable"
Var PayState6 = "Disable"
Var PayOfflineMode = 1 Var PayOfflineMode = 1
Else Else
@ -303,6 +309,7 @@
If ShoppyPayEnable = "true" Then If ShoppyPayEnable = "true" Then
Else Else
Var PayState5 = "Disable" Var PayState5 = "Disable"
Var PayState6 = "Disable"
EndIf EndIf
@ -507,6 +514,24 @@
EndIf EndIf
EndIf EndIf
If ReqPayInfoFlag = 3 Then
If VendingQRTypeResult = "TWN:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var QRCODE99Shoppy = SessionID
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
SAVELOG Ext1a
SAVELOG QRCODE99Shoppy
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
Var ReqPayInfoFlag = 0
SAVELOG QRCODE99Shoppy
SAVELOG Ext21
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
EndIf
EndIf
Else Else
Var PayInfoCFlag = 1 Var PayInfoCFlag = 1
EndIf EndIf
@ -530,6 +555,13 @@
Var LOADING_STATE = "Invisible" Var LOADING_STATE = "Invisible"
EndIf EndIf
EndIf EndIf
If ReqPayInfoFlag = 3 Then
Var QRErrorFlag = 1
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
EndIf
EndIf
Else Else
Var PayInfoCFlag = 1 Var PayInfoCFlag = 1
EndIf EndIf
@ -996,8 +1028,8 @@
</Image> </Image>
<Button> <Button>
<X> 287 </X> <X> 60 </X>
<Y> 1261 </Y> <Y> 1255 </Y>
<State> PayState1</State> <State> PayState1</State>
<Filename> FilenameShowbuttonCashBN </Filename> <Filename> FilenameShowbuttonCashBN </Filename>
<FilenamePress> FilenameShowbuttonCashBP </FilenamePress> <FilenamePress> FilenameShowbuttonCashBP </FilenamePress>
@ -1032,8 +1064,8 @@
</Button> </Button>
<Button> <Button>
<X> 287 </X> <X> 804 </X>
<Y> 1677</Y> <Y> 1255</Y>
<State> PayState2</State> <State> PayState2</State>
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename> <Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
@ -1057,8 +1089,8 @@
</Button> </Button>
<Button> <Button>
<X> 287 </X> <X> 308 </X>
<Y> 1365 </Y> <Y> 1255 </Y>
<State> PayState3</State> <State> PayState3</State>
<Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename> <Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_prompt_pay.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bp_prompt_pay.png") </FilenamePress>
@ -1163,8 +1195,8 @@
</Button> </Button>
<Button> <Button>
<X> 287 </X> <X> 556 </X>
<Y> 1573 </Y> <Y> 1255 </Y>
<State> PayState4</State> <State> PayState4</State>
<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename> <Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
@ -1191,8 +1223,8 @@
</Button> </Button>
<Button> <Button>
<X> 287 </X> <X> 431 </X>
<Y> 1469 </Y> <Y> 1503 </Y>
<State> PayState5</State> <State> PayState5</State>
<Filename> Var( DirImage + "/bn_pay_with_shoppy.png") </Filename> <Filename> Var( DirImage + "/bn_pay_with_shoppy.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_shoppy.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bp_pay_with_shoppy.png") </FilenamePress>
@ -1269,6 +1301,100 @@
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> 680 </X>
<Y> 1503 </Y>
<State> PayState6</State>
<Filename> Var( DirImage + "/bn_pay_with_true.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_true.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_pay_with_true.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If Timeout < 120 Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
If alphaState = "Invisible" Then
Var QR_POPUP = "/img_popup3.png"
Var LOADING_STATE = "Enable"
Var QRCODE99 = ""
Var FlagQROpened = 1
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "TWN:2/"
;If IntVendingCampaign > 0 Then
; Var ECommerceQR = ECommerceQR + Seeker.VendingCode
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
;EndIf
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 3
Refresh
EndIf
EndIf
EndIf
EndIf
</EventClick>
</Button>
<Button>
<X> 173 </X>
<Y> 1503 </Y>
<State> PayState6</State>
<Filename> Var( DirImage + "/bn_pay_with_linepay.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_linepay.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_pay_with_linepay.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
</EventClick>
</Button>
<Button> <Button>
<X> 287 </X> <X> 287 </X>
<Y> 1781 </Y> <Y> 1781 </Y>