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

AUS: update page_payment_cash -> Changed Icon, page_drinkfail

Browse source
This commit is contained in:
Kenta420 2024-12-27 11:25:16 +07:00
parent 5eeb32683a
commit 791ef8ba0a
18 changed files with 39 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
image/page_payment_en/page_payment/bn_pay_with_credit_AUS.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Before After
Before After

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
image/page_payment_en/page_payment/bp_pay_with_credit_AUS.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Before After
Before After

BIN
image/page_payment_en/page_payment/img_popup8-AUS.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Before After
Before After

BIN
inter/aus/image/page_doing/txt_102_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
inter/aus/image/page_doing/txt_16_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

BIN
inter/aus/image/page_doing/txt_187_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
inter/aus/image/page_doing/txt_188_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
inter/aus/image/page_doing/txt_40_en-1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
inter/aus/image/page_doing/txt_40_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

BIN
inter/aus/image/page_doing/txt_41_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

BIN
inter/aus/image/page_doing/txt_59_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
inter/aus/image/page_doing/txt_62_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

1
inter/aus/xml/menu_catalog_new.lxml
View file

@ -112,6 +112,7 @@
EndIf EndIf
Else Else
Var buttonRemoveCup = "Invisible" Var buttonRemoveCup = "Invisible"
Refresh
EndIf EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1

32
inter/aus/xml/page_drinkfail_aus.lxml
View file

@ -40,30 +40,11 @@
If ERROR_PAY_TIMEOUT = "true" Then If ERROR_PAY_TIMEOUT = "true" Then
If NumberFailed = "false" Then If NumberFailed = "false" Then
Var TextErrorShow = ERROR_BREW_CAUSE_ENG
If show_eng = "true" Then
Var TextErrorShow = ERROR_BREW_CAUSE_ENG
Else
If show_japan = "true" Then
Var TextErrorShow = ERROR_BREW_CAUSE_JAPAN
Else
Var TextErrorShow = ERROR_BREW_CAUSE_THAI
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_drinkfail4.xml"
EndIf EndIf
Var ErrorPayTimeoutFlag = 1
Else
Var ErrorPayTimeoutFlag = 1
EndIf EndIf
Var ErrorPayTimeoutFlag = 1
EndIf EndIf
@ -72,12 +53,7 @@
If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/inter/aus/image/page_drink_fail/"
Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
Else
Var DirImage = "ROOT/taobin_project/image/collectiing/"
EndIf
Var Timeout = 0 Var Timeout = 0
@ -158,7 +134,7 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > 15 Then If Timeout > 20 Then
If MachineStage = "remove-cup" Then If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml" Open "ROOT/taobin_project/xml/page_drinkfail3.xml"

10
inter/aus/xml/page_show_error.lxml
View file

@ -17,7 +17,6 @@
;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
Var show_error_normal = "Invisible"
Var show_error_sp1 = "Enable" Var show_error_sp1 = "Enable"
StopLongPlay StopLongPlay
@ -40,8 +39,7 @@
If stop_now = "true" Then If stop_now = "true" Then
Else Else
Var show_error_normal = "Enable" Var show_error_sp1 = "Enable"
Var show_error_sp1 = "Invisible"
EndIf EndIf
EndIf EndIf
@ -51,8 +49,7 @@
If stop_now = "true" Then If stop_now = "true" Then
Else Else
Var show_error_normal = "Enable" Var show_error_sp1 = "Enable"
Var show_error_sp1 = "Invisible"
EndIf EndIf
EndIf EndIf
@ -181,7 +178,7 @@
EndIf EndIf
If MachineStage = "drink-failed" Then If MachineStage = "drink-failed" Then
Var FirstOpen = 1 Var FirstOpen = 1
Var LEDSet = "true" Var LEDSet = "true"
;Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml" ;Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml"
Refresh Refresh
@ -207,6 +204,7 @@
DEBUGVAR MachineStage
DEBUGVAR show_error_normal DEBUGVAR show_error_normal
DEBUGVAR show_error_sp1 DEBUGVAR show_error_sp1
DEBUGVAR TimeOut DEBUGVAR TimeOut

20
xml/page_payment_cash-AUS.xml
View file

@ -1607,10 +1607,10 @@
<Button> <Button>
<X> 216 </X> <X> 216 </X>
<Y> 1276 </Y> <Y> 1176 </Y>
<State> PayWithCreditCardState </State> <State> PayWithCreditCardState </State>
<Filename> Var( DirImage + "/bn_pay_with_ccard.png") </Filename> <Filename> Var( DirImage + "/bn_pay_with_ccard_AUS.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_ccard.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bp_pay_with_ccard_AUS.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_pay_with_ccard.png") </FilenameDisable> <FilenameDisable> Var( DirImage + "/bd_pay_with_ccard.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
@ -1635,7 +1635,7 @@ EndIf
<Button> <Button>
<X> 439 </X> <X> 439 </X>
<Y> 1276 </Y> <Y> 1176 </Y>
<State> PayWithTaoCreditState </State> <State> PayWithTaoCreditState </State>
<Filename> Var( DirImage + "/bn_pay_with_credit_AUS.png") </Filename> <Filename> Var( DirImage + "/bn_pay_with_credit_AUS.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_credit_AUS.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bp_pay_with_credit_AUS.png") </FilenamePress>
@ -1666,7 +1666,7 @@ EndIf
<Button> <Button>
<X> 664 </X> <X> 664 </X>
<Y> 1276 </Y> <Y> 1176 </Y>
<State> PayWithCouponState </State> <State> PayWithCouponState </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>
@ -1694,7 +1694,7 @@ EndIf
<Button> <Button>
<X> 552 </X> <X> 552 </X>
<Y> 1499 </Y> <Y> 1399 </Y>
;<State> PayWithFatzebraState </State> ;<State> PayWithFatzebraState </State>
<State> "Invisible" </State> <State> "Invisible" </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_qrcode.png" </Filename> <Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_qrcode.png" </Filename>
@ -1784,7 +1784,7 @@ EndIf
<Button> <Button>
<X> 552 </X> <X> 552 </X>
<Y> 1499 </Y> <Y> 1399 </Y>
<State> "Enable" </State> <State> "Enable" </State>
<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename> <Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
@ -1798,7 +1798,7 @@ EndIf
<Button> <Button>
<X> 328 </X> <X> 328 </X>
<Y> 1499 </Y> <Y> 1399 </Y>
<State> PayWithAUBState </State> <State> PayWithAUBState </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_ema.png" </Filename> <Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_ema.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_ema.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
@ -2412,7 +2412,7 @@ EndIf
<Text> <Text>
<X> 0 </X> <X> 0 </X>
<Y> 1590 </Y> <Y> 1640 </Y>
<Size> 36 </Size> <Size> 36 </Size>
<Align> Center </Align> <Align> Center </Align>
<Width> 1080 </Width> <Width> 1080 </Width>
@ -2424,7 +2424,7 @@ EndIf
<Text> <Text>
<X> 0 </X> <X> 0 </X>
<Y> 1660 </Y> <Y> 1700 </Y>
<Size> 20 </Size> <Size> 20 </Size>
<Align> Center </Align> <Align> Center </Align>
<Width> 1080 </Width> <Width> 1080 </Width>