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

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

Browse source
This commit is contained in:
nattapon tachawong 2024-11-06 11:28:40 +07:00
commit 75384db447
5 changed files with 43 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment_en/page_payment/img_popup1-AUS.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
inter/aus/image/payment_cash/bd_pay_qrcode.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4 KiB

Before After
Before After

BIN
inter/aus/image/payment_cash/bn_pay_qrcode.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Before After
Before After

BIN
inter/aus/image/payment_cash/bp_pay_qrcode.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5 KiB

Before After
Before After

94
xml/page_payment_cash-AUS.xml
View file

@ -230,27 +230,6 @@
Var Seeker.PayWithQR = 0 Var Seeker.PayWithQR = 0
Var NoGotoMenupage = "false" Var NoGotoMenupage = "false"
If show_eng = "true" Then
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
Else
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
EndIf
Var X_CASH = 216
If RoadShow = "true" Then
Var X_CASH = 287
If show_eng = "true" Then
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
Else
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
EndIf
EndIf
If GetFreeFromError = 1 Then If GetFreeFromError = 1 Then
Var Seeker.FreeVendingCampaign = 1 Var Seeker.FreeVendingCampaign = 1
@ -1447,36 +1426,9 @@
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename> <Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
</Image> </Image>
<Button>
<X> 664 </X>
<Y> 1276</Y>
<State> PayState2</State>
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
<FilenameDisable> pay_with_code_image </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If alphaState = "Invisible" Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
CashlessReq OFF
Var TelephoneNumber = ""
Var Tel_Confirm_State = "Disable"
Open "ROOT/taobin_project/xml/page_payment_code.xml"
EndIf
EndIf
EndIf
</EventClick>
</Button>
<Button> <Button>
<X> X_CASH </X> <X> 216 </X>
<Y> 1276 </Y> <Y> 1276 </Y>
<State> PayState5 </State> <State> PayState5 </State>
<Filename> Var( DirImage + "/bn_pay_with_ccard.png") </Filename> <Filename> Var( DirImage + "/bn_pay_with_ccard.png") </Filename>
@ -1533,6 +1485,33 @@ EndIf
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> 664 </X>
<Y> 1276 </Y>
<State> PayState2</State>
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
<FilenameDisable> pay_with_code_image </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If alphaState = "Invisible" Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
CashlessReq OFF
Var TelephoneNumber = ""
Var Tel_Confirm_State = "Disable"
Open "ROOT/taobin_project/xml/page_payment_code.xml"
EndIf
EndIf
EndIf
</EventClick>
</Button>
<Button> <Button>
<X> 328 </X> <X> 328 </X>
@ -1550,7 +1529,7 @@ EndIf
If CancelFlag = 0 Then If CancelFlag = 0 Then
If alphaState = "Invisible" Then If alphaState = "Invisible" Then
Var QR_POPUP = "/img_popup1.png" Var QR_POPUP = "/img_popup1-AUS.png"
Var QRCODE99 = "" Var QRCODE99 = ""
Var LOADING_STATE = "Enable" Var LOADING_STATE = "Enable"
@ -1622,11 +1601,24 @@ EndIf
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> 552 </X>
<Y> 1499 </Y>
<State> "Enable" </State>
<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
</EventClick>
</Button>
<Button> <Button>
<X> 552 </X> <X> 552 </X>
<Y> 1499 </Y> <Y> 1499 </Y>
<State> PayState3</State> <State> "Invisible" </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_codeOther.png" </Filename> <Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_codeOther.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_codeOther.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_codeOther.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_with_codeOther.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_with_codeOther.png" </FilenameDisable>