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

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-11-29 16:52:23 +07:00
commit 70b6b737c3
14 changed files with 1694 additions and 1652 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment/bd_pay_with_ewallet.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Before After
Before After

BIN
image/page_payment/bn_pay_with_ewallet.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 9 KiB

Before After
Before After

BIN
image/page_payment/bp_pay_with_ewallet.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Before After
Before After

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 9 KiB

Before After
Before After

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

10
xml/page_board.xml
View file

@ -1672,6 +1672,16 @@ PRICE "Reset" "-"
SAVELOG "EventDrink EventDrink EventDrink EventDrink EventDrink "
</EventDrink>
<EventSleepMode>
DEBUGVAR sleepmodeEnable
If sleepmodeEnable = "true" Then
SLEEPMODE
EndIf
</EventSleepMode>
<Timeout> 1000 </Timeout>
<EventTimeout>

1560
xml/page_catalog_group_milk_winter_wonder.xml
View file

File diff suppressed because it is too large Load diff

1703
xml/page_catalog_group_tea_thick_tea.xml
View file

File diff suppressed because it is too large Load diff

1
xml/page_payment.xml
View file

@ -24,6 +24,7 @@
Var ALP_CashOtherEnable = ""
Var UNP_CashOtherEnable = ""
Var ACU_CashOtherEnable = ""
Var TAO_CashOtherEnable = ""
Var GetPayInfoFlag = 0

6
xml/page_payment_cash-AUS.xml
View file

@ -358,6 +358,7 @@
Var PayOfflineMode = 1
Var ShowNetworkProblem = "Enable"
Var ShowNetworkProblemText = "Network error. Payment with credit card only."
Var ShowButtonClick2 = "Invisible"
@ -727,8 +728,11 @@
SPLIT MemberData ":" 2 EMAMemberSurname
SPLIT MemberData ":" 3 _EMAMemberBalance
INT _EMAMemberBalance
Var EMAMemberName !assigned SprintFmt("[%s]", _EMAMemberName)
Var EMAMemberBalance !assigned SprintFmt("Remain Balance: $%s", _EMAMemberBalance)
Var _BalanceFormat = "Remain Balance: $%.2f"
Var EMAMemberBalance !assigned StringFmt(_EMAMemberBalance, _BalanceFormat, PreScaleConvertShow)
DEBUGVAR EMAMemberName
DEBUGVAR EMAMemberSurname

14
xml/page_payment_cash.xml
View file

@ -2874,7 +2874,19 @@ eval(
<Button>
<X> X_CASH3 </X>
<Y> 1276 </Y>
<State> PayState4</State>
<State>
eval(
Var shouldEnable = "Disable"
If TAO_CashOtherEnable = "true" Then
Var shouldEnable = "Enable"
Else
If EnableCashOtherAll = "true" Then
Var shouldEnable = "Enable"
EndIf
EndIf
Var return = shouldEnable
)
</State>
<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
<FilenameDisable> pay_with_credit_image </FilenameDisable>

47
xml/page_payment_code.xml
View file

@ -192,6 +192,7 @@
STRCONTAIN "ALP" CashOtherButtonControl ALP_CashOtherEnable
STRCONTAIN "UNP" CashOtherButtonControl UNP_CashOtherEnable
STRCONTAIN "ACU" CashOtherButtonControl ACU_CashOtherEnable
STRCONTAIN "TAO" CashOtherButtonControl TAO_CashOtherEnable
DEBUGVAR TWN_CashOtherEnable
DEBUGVAR KBA_CashOtherEnable
@ -202,6 +203,7 @@
DEBUGVAR ALP_CashOtherEnable
DEBUGVAR UNP_CashOtherEnable
DEBUGVAR ACU_CashOtherEnable
DEBUGVAR TAO_CashOtherEnable
EndIf
EndIf
@ -468,7 +470,8 @@
<X> 263 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_1.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -493,7 +496,8 @@
<X> 405 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -518,7 +522,8 @@
<X> 547 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_3.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -543,7 +548,8 @@
<X> 691 </X>
<Y> 1004 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_A.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_A.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_A.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -568,7 +574,8 @@
<X> 263 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_4.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -593,7 +600,8 @@
<X> 405 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_5.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -618,7 +626,8 @@
<X> 547 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_6.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -643,7 +652,8 @@
<X> 691 </X>
<Y> 1148 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_B.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_B.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_B.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -668,7 +678,8 @@
<X> 263 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_7.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -693,7 +704,8 @@
<X> 405 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_8.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -718,7 +730,8 @@
<X> 547 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_9.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -743,7 +756,8 @@
<X> 691 </X>
<Y> 1292 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_C.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_C.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_C.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -768,7 +782,8 @@
<X> 405 </X>
<Y> 1432 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_0.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -794,7 +809,8 @@
<X> 263 </X>
<Y> 1432 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_sh.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_sh.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_sh.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -821,7 +837,8 @@
<X> 547 </X>
<Y> 1432 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_back-1.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
<FilenamePress
> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>

5
xml/vending_info2.xml
View file

@ -181,6 +181,8 @@
Var FailCaseIncorrect = "popup_incorrect.png"
Var FailCaseTimeout = "popup_timeout.png"
Var sleepmodeEnable = "false"
</EventOpen>
<Timeout> 1000 </Timeout>
@ -196,6 +198,7 @@
EndIf
If Timeout > 30 Then
Var sleepmodeEnable = "true"
Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
@ -1068,7 +1071,7 @@
Var PasswordOK = 0
__CMD "cancel-pw-newui" "-" "-" "-"
Var sleepmodeEnable = "true"
Open "ROOT/taobin_project/xml/page_board.xml"
</EventClick>
</Button>