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

C36 and fix images

Browse source
This commit is contained in:
miggaze 2021-03-08 19:05:42 +07:00
parent 0a6cc72644
commit 0e52f2ac15
10 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment_cash_extend/bn_keep.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 4 KiB

Before After
Before After

BIN
image/page_payment_cash_extend/bp_keep.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 4 KiB

Before After
Before After

BIN
image/page_payment_cash_extend/img_popup12.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

BIN
image/page_payment_cash_extend_en/bn_keep.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Before After
Before After

BIN
image/page_payment_cash_extend_en/bp_keep.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Before After
Before After

BIN
image/page_payment_cash_extend_en/img_popup12.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

19
xml/page_brewing3.xml
View file

@ -31,11 +31,7 @@
EndIf EndIf
Var waitAckPay = 0
Var VendingTSIDTmp = ""
If PayWithQR = 1 Then
Var VendingTSIDTmp = VendingTSID
EndIf
</EventOpen> </EventOpen>
@ -307,6 +303,9 @@
Var ServiceCredit = SelectDrink Var ServiceCredit = SelectDrink
Var SuggestID = "" Var SuggestID = ""
Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
If PayWithQR = 0 Then If PayWithQR = 0 Then
If CodeChannel = 1 Then If CodeChannel = 1 Then
Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "/"
@ -349,6 +348,9 @@
Else Else
If ChangeFlag2 = 1 Then If ChangeFlag2 = 1 Then
Var TelephoneNumber = "0899999999" Var TelephoneNumber = "0899999999"
Var VendingDiscount = 0 Var VendingDiscount = 0
@ -375,6 +377,13 @@
;no wait ack pay ;no wait ack pay
Var waitAckPay = 0 Var waitAckPay = 0
Var SVT = "coffee"
Var ACC = "089999999"
Var DEE = "1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
PAYEXT SVT ACC VendingTSID DEE
EndIf EndIf

2
xml/page_payment.xml
View file

@ -107,7 +107,7 @@
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "KBA" Var ECommerce = ECommerce + "KBA:1"
Var ServiceParameter = "max" Var ServiceParameter = "max"
Var ServiceCharge = 0 Var ServiceCharge = 0
Var AccountType = "new" Var AccountType = "new"

22
xml/page_payment_cash.xml
View file

@ -1004,17 +1004,17 @@
</EventClick> </EventClick>
</Button> </Button>
<Text> ;<Text>
<X> 0 </X> ;<X> 0 </X>
<Y> 1041 </Y> ;<Y> 1041 </Y>
<Size> 100 </Size> ;<Size> 100 </Size>
<Align> Center </Align> ;<Align> Center </Align>
<Width> 1080 </Width> ;<Width> 1080 </Width>
<Font> KanitRegularTTF </Font> ;<Font> KanitRegularTTF </Font>
<State> alphaState3 </State> ;<State> alphaState3 </State>
<Color> 0xDE794E </Color> ;<Color> 0xDE794E </Color>
<Value> RemainAmountKeep </Value> ;<Value> RemainAmountKeep </Value>
</Text> ;</Text>

10
xml/page_payment_code.xml
View file

@ -120,7 +120,7 @@
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "KBA/" Var ECommerce = ECommerce + "KBA:1/"
Var ECommerce = ECommerce + VendingCode Var ECommerce = ECommerce + VendingCode
Var ECommerce = ECommerce + ":" Var ECommerce = ECommerce + ":"
Var ECommerce = ECommerce + CodeNumber Var ECommerce = ECommerce + CodeNumber
@ -187,6 +187,14 @@
Open "ROOT/taobin_project/xml/page_thankyou.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf EndIf
If VendingCode = "C36" Then
Var VendingCampaign = PayAmount
CoinVending OFF
;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
Var ShowErrorText = "Enable" Var ShowErrorText = "Enable"
Var GetPayInfoFlag = 0 Var GetPayInfoFlag = 0