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

Merge branch 'masterpiece' of kong:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Kenta420 2024-03-14 17:35:00 +07:00
commit 8f3bb3d0ed
7 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment/CancelOrder2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
image/page_payment/bn_back2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/page_payment/bp_back2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
image/page_payment_en/page_payment/CancelOrder2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
image/page_payment_en/page_payment/bn_back2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
image/page_payment_en/page_payment/bp_back2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

20
xml/page_payment_cash.xml
View file

@ -221,6 +221,11 @@
Var Cancel_Img = "/CancelOrder.png"
Var PressCancel_CashPopup = 0
If RoadShow = "true" Then If RoadShow = "true" Then
Var PayState1 = "Enable" Var PayState1 = "Enable"
Var PayState2 = "Invisible" Var PayState2 = "Invisible"
@ -1801,9 +1806,15 @@
;Var Timeout = 0 ;Var Timeout = 0
EndIf EndIf
If Seeker = "curr" Then If Seeker = "curr" Then
If PressCancel_CashPopup = 2 Then
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml" Open "ROOT/taobin_project/xml/page_catalog.xml"
Else Else
If PressCancel_CashPopup = 2 Then
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf EndIf
EndIf EndIf
@ -1923,6 +1934,11 @@
Var ActionOKCase = 1 Var ActionOKCase = 1
Var PayInfoCFlag = 1 Var PayInfoCFlag = 1
EndIf EndIf
If PressCancel_CashPopup = 1 Then
Var PressCancel_CashPopup = 2
EndIf
EndIf EndIf
VendingQR OFF VendingQR OFF
@ -2984,6 +3000,8 @@
If FlagQROpened = 1 Then If FlagQROpened = 1 Then
Var CancelNumber = 12 Var CancelNumber = 12
EndIf EndIf
Var Cancel_Img = "/CancelOrder2.png"
Var PressCancel_CashPopup = 1
EndIf EndIf
EndIf EndIf
@ -3139,7 +3157,7 @@
<X> 0 </X> <X> 0 </X>
<Y> 380 </Y> <Y> 380 </Y>
<State> cancelState </State> <State> cancelState </State>
<Filename> Var( DirImage + "/CancelOrder.png" ) </Filename> <Filename> Var( DirImage + Cancel_Img ) </Filename>
</Image> </Image>
;<GIF> ;<GIF>