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

GBR: Remove member name from UKB, Changed Vanilla Latte images, ignore collect point

Browse source
This commit is contained in:
Kenta420 2025-06-12 11:18:26 +07:00
parent 91abc6c2b9
commit 6a6aba3285
12 changed files with 56 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/gbr/image/page_drink_disable_n2/bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

BIN
inter/gbr/image/page_drink_n/bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

BIN
inter/gbr/image/page_drink_picture2_n/bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

BIN
inter/gbr/image/page_drink_press_n/bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

2
inter/gbr/xml/event/tricker.ev
View file

@ -9,6 +9,8 @@
; Enable app game ; Enable app game
Var GameEnableFromTrickerEv = 0 Var GameEnableFromTrickerEv = 0
Var SettingIgnoreCollectPoint = 1
Var NewCollectPointFlag = 1 Var NewCollectPointFlag = 1
Var ValentinePro = 0 Var ValentinePro = 0

20
inter/gbr/xml/page_catalog_group_coffee.lxml
View file

@ -1160,7 +1160,7 @@
Var PD_CODE2 = "55-01-02-0001" Var PD_CODE2 = "55-01-02-0001"
Var PD_CODE3 = "##-##-##-####" Var PD_CODE3 = "##-##-##-####"
; begin lang ; begin lang
Var aliasName[0] = "LONG BLACK" Var aliasName[0] = "AMERICANO"
Var aliasDesc[0] = "Espresso, Water" Var aliasDesc[0] = "Espresso, Water"
Var aliasName[1] = "กาแฟดำ(อเมริกาโน)" Var aliasName[1] = "กาแฟดำ(อเมริกาโน)"
Var aliasDesc[1] = "กาแฟ และน้ำ" Var aliasDesc[1] = "กาแฟ และน้ำ"
@ -1172,7 +1172,7 @@
Var aliasDesc[4] = "" Var aliasDesc[4] = ""
Var aliasName[5] = "" Var aliasName[5] = ""
Var aliasDesc[5] = "" Var aliasDesc[5] = ""
Var NameLang[0][0] = "Hot LONG BLACK" Var NameLang[0][0] = "Hot AMERICANO"
Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)" Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
Var NameLang[0][3] = "" Var NameLang[0][3] = ""
@ -1184,7 +1184,7 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "Espresso, Air" Var DescLang[0][4] = "Espresso, Air"
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced LONG BLACK" Var NameLang[1][0] = "Iced AMERICANO"
Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)" Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""
@ -1255,9 +1255,9 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>LONG BLACK</LanguageSlot1> <LanguageSlot1>AMERICANO</LanguageSlot1>
<LanguageSlot2>กาแฟดำ(อเมริกาโน)</LanguageSlot2> <LanguageSlot2>กาแฟดำ(อเมริกาโน)</LanguageSlot2>
<LanguageSlot3>LONG BLACK</LanguageSlot3> <LanguageSlot3>AMERICANO</LanguageSlot3>
<LanguageSlot4>กาแฟดำ(อเมริกาโน)</LanguageSlot4> <LanguageSlot4>กาแฟดำ(อเมริกาโน)</LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6>กาแฟดำ(อเมริกาโน)</LanguageSlot6> <LanguageSlot6>กาแฟดำ(อเมริกาโน)</LanguageSlot6>
@ -1434,7 +1434,7 @@
Var PD_CODE2 = "55-21-02-0001" Var PD_CODE2 = "55-21-02-0001"
Var PD_CODE3 = "##-##-##-####" Var PD_CODE3 = "##-##-##-####"
; begin lang ; begin lang
Var aliasName[0] = "LONG BLACK" Var aliasName[0] = "AMERICANO"
Var aliasDesc[0] = "Espresso, Water" Var aliasDesc[0] = "Espresso, Water"
Var aliasName[1] = "กาแฟดำ(อเมริกาโน)" Var aliasName[1] = "กาแฟดำ(อเมริกาโน)"
Var aliasDesc[1] = "กาแฟ และน้ำ" Var aliasDesc[1] = "กาแฟ และน้ำ"
@ -1446,7 +1446,7 @@
Var aliasDesc[4] = "" Var aliasDesc[4] = ""
Var aliasName[5] = "" Var aliasName[5] = ""
Var aliasDesc[5] = "" Var aliasDesc[5] = ""
Var NameLang[0][0] = "Hot LONG BLACK" Var NameLang[0][0] = "Hot AMERICANO"
Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)" Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
Var NameLang[0][3] = "" Var NameLang[0][3] = ""
@ -1458,7 +1458,7 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "Espresso, Air" Var DescLang[0][4] = "Espresso, Air"
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced LONG BLACK" Var NameLang[1][0] = "Iced AMERICANO"
Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)" Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""
@ -1529,9 +1529,9 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>LONG BLACK</LanguageSlot1> <LanguageSlot1>AMERICANO</LanguageSlot1>
<LanguageSlot2>กาแฟดำ(อเมริกาโน)</LanguageSlot2> <LanguageSlot2>กาแฟดำ(อเมริกาโน)</LanguageSlot2>
<LanguageSlot3>LONG BLACK</LanguageSlot3> <LanguageSlot3>AMERICANO</LanguageSlot3>
<LanguageSlot4>กาแฟดำ(อเมริกาโน)</LanguageSlot4> <LanguageSlot4>กาแฟดำ(อเมริกาโน)</LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6>กาแฟดำ(อเมริกาโน)</LanguageSlot6> <LanguageSlot6>กาแฟดำ(อเมริกาโน)</LanguageSlot6>

20
inter/gbr/xml/page_catalog_group_health.lxml
View file

@ -61,7 +61,7 @@
Var PD_CODE2 = "55-01-02-1001" Var PD_CODE2 = "55-01-02-1001"
Var PD_CODE3 = "##-##-##-####" Var PD_CODE3 = "##-##-##-####"
; begin lang ; begin lang
Var aliasName[0] = "LONG BLACK" Var aliasName[0] = "AMERICANO"
Var aliasDesc[0] = "Espresso, Water" Var aliasDesc[0] = "Espresso, Water"
Var aliasName[1] = "กาแฟดำ\n(อเมริกาโน)" Var aliasName[1] = "กาแฟดำ\n(อเมริกาโน)"
Var aliasDesc[1] = "กาแฟ และน้ำร้อน\n(อเมริกาโน)" Var aliasDesc[1] = "กาแฟ และน้ำร้อน\n(อเมริกาโน)"
@ -73,7 +73,7 @@
Var aliasDesc[4] = "" Var aliasDesc[4] = ""
Var aliasName[5] = "" Var aliasName[5] = ""
Var aliasDesc[5] = "" Var aliasDesc[5] = ""
Var NameLang[0][0] = "Hot LONG BLACK" Var NameLang[0][0] = "Hot AMERICANO"
Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)" Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
Var NameLang[0][3] = "" Var NameLang[0][3] = ""
@ -85,7 +85,7 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "Espresso, Air" Var DescLang[0][4] = "Espresso, Air"
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced LONG BLACK" Var NameLang[1][0] = "Iced AMERICANO"
Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)" Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""
@ -156,9 +156,9 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>LONG BLACK</LanguageSlot1> <LanguageSlot1>AMERICANO</LanguageSlot1>
<LanguageSlot2>กาแฟดำ\n(อเมริกาโน)</LanguageSlot2> <LanguageSlot2>กาแฟดำ\n(อเมริกาโน)</LanguageSlot2>
<LanguageSlot3>LONG BLACK</LanguageSlot3> <LanguageSlot3>AMERICANO</LanguageSlot3>
<LanguageSlot4>กาแฟดำ\n(อเมริกาโน)</LanguageSlot4> <LanguageSlot4>กาแฟดำ\n(อเมริกาโน)</LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6>กาแฟดำ\n(อเมริกาโน)</LanguageSlot6> <LanguageSlot6>กาแฟดำ\n(อเมริกาโน)</LanguageSlot6>
@ -335,7 +335,7 @@
Var PD_CODE2 = "55-21-02-1001" Var PD_CODE2 = "55-21-02-1001"
Var PD_CODE3 = "##-##-##-####" Var PD_CODE3 = "##-##-##-####"
; begin lang ; begin lang
Var aliasName[0] = "LONG BLACK" Var aliasName[0] = "AMERICANO"
Var aliasDesc[0] = "Espresso, Water" Var aliasDesc[0] = "Espresso, Water"
Var aliasName[1] = "กาแฟดำ\n(อเมริกาโน)" Var aliasName[1] = "กาแฟดำ\n(อเมริกาโน)"
Var aliasDesc[1] = "กาแฟ และน้ำร้อน\n(อเมริกาโน)" Var aliasDesc[1] = "กาแฟ และน้ำร้อน\n(อเมริกาโน)"
@ -347,7 +347,7 @@
Var aliasDesc[4] = "" Var aliasDesc[4] = ""
Var aliasName[5] = "" Var aliasName[5] = ""
Var aliasDesc[5] = "" Var aliasDesc[5] = ""
Var NameLang[0][0] = "Hot LONG BLACK" Var NameLang[0][0] = "Hot AMERICANO"
Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)" Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
Var NameLang[0][3] = "" Var NameLang[0][3] = ""
@ -359,7 +359,7 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "Espresso, Air" Var DescLang[0][4] = "Espresso, Air"
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced LONG BLACK" Var NameLang[1][0] = "Iced AMERICANO"
Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)" Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""
@ -430,9 +430,9 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>LONG BLACK</LanguageSlot1> <LanguageSlot1>AMERICANO</LanguageSlot1>
<LanguageSlot2>กาแฟดำ\n(อเมริกาโน)</LanguageSlot2> <LanguageSlot2>กาแฟดำ\n(อเมริกาโน)</LanguageSlot2>
<LanguageSlot3>LONG BLACK</LanguageSlot3> <LanguageSlot3>AMERICANO</LanguageSlot3>
<LanguageSlot4>กาแฟดำ\n(อเมริกาโน)</LanguageSlot4> <LanguageSlot4>กาแฟดำ\n(อเมริกาโน)</LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6>กาแฟดำ\n(อเมริกาโน)</LanguageSlot6> <LanguageSlot6>กาแฟดำ\n(อเมริกาโน)</LanguageSlot6>

4
inter/gbr/xml/page_collect_point_1.lxml
View file

@ -8,6 +8,10 @@
<EventOpen> <EventOpen>
; On open ; On open
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Var InternationalEnable = 1 Var InternationalEnable = 1
Var ShowErrorText = "Invisible" Var ShowErrorText = "Invisible"

6
inter/gbr/xml/page_drinkfail_gbr.lxml
View file

@ -8,6 +8,12 @@
<EventOpen> <EventOpen>
; On open ; On open
DEBUGVAR InternationalEnable
DEBUGVAR CountryName
SAVELOG "Redirect to page_show_error"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
Var Seeker.TNumberTaobinMember = "" Var Seeker.TNumberTaobinMember = ""

10
xml/page_back_to_error.xml
View file

@ -6,25 +6,33 @@
; Reset here ; Reset here
Var CheckCupStateDoorCupClose = "" Var CheckCupStateDoorCupClose = ""
Var Opened = 0
If InternationalEnable = 1 Then If InternationalEnable = 1 Then
If CountryName = "Australia" Then If CountryName = "Australia" Then
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_show_error.lxml" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_show_error.lxml"
Var Opened = 1
EndIf EndIf
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
OpenInst 0 "ROOT/taobin_project/inter/sgp/xml/page_show_error.lxml" OpenInst 0 "ROOT/taobin_project/inter/sgp/xml/page_show_error.lxml"
Var Opened = 1
EndIf EndIf
If CountryName = "UnitedArabEmirates Dubai" Then If CountryName = "UnitedArabEmirates Dubai" Then
OpenInst 0 "ROOT/taobin_project/inter/uae_dubai/xml/page_show_error.lxml" OpenInst 0 "ROOT/taobin_project/inter/uae_dubai/xml/page_show_error.lxml"
Var Opened = 1
EndIf EndIf
If CountryName = "United Kingdom" Then If CountryName = "United Kingdom" Then
SAVELOG "Kenta420"
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/gbr/xml/page_show_error.lxml" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/gbr/xml/page_show_error.lxml"
Var Opened = 1
EndIf EndIf
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml" If Opened = 0 Then
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml"
EndIf
Else Else
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml"
EndIf EndIf

2
xml/page_drinkfail2.xml
View file

@ -35,7 +35,7 @@
EndIf EndIf
If CountryName = "United Kingdom" Then If CountryName = "United Kingdom" Then
Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail_gbr.lxml" Open "ROOT/taobin_project/inter/gbr/xml/page_drinkfail_gbr.lxml"
EndIf EndIf
If CountryName = "Malaysia" Then If CountryName = "Malaysia" Then

28
xml/page_payment_cash-GBR.xml
View file

@ -698,13 +698,13 @@
SAVELOG QRCODE99Shoppy SAVELOG QRCODE99Shoppy
SAVELOG Ext21 SAVELOG Ext21
SPLIT MemberData ":" 1 _EMAMemberName ;SPLIT MemberData ":" 1 _EMAMemberName
SPLIT MemberData ":" 2 EMAMemberSurname ;SPLIT MemberData ":" 2 EMAMemberSurname
SPLIT MemberData ":" 3 _EMAMemberBalance SPLIT MemberData ":" 3 _EMAMemberBalance
INT _EMAMemberBalance INT _EMAMemberBalance
Var EMAMemberName !assigned SprintFmt("[%s]", _EMAMemberName) ;Var EMAMemberName !assigned SprintFmt("[%s]", _EMAMemberName)
Var _BalanceFormat = "Remain Balance: £%.2f" Var _BalanceFormat = "Remain Balance: £%.2f"
Var EMAMemberBalance !assigned StringFmt(_EMAMemberBalance, _BalanceFormat, PreScaleConvertShow) Var EMAMemberBalance !assigned StringFmt(_EMAMemberBalance, _BalanceFormat, PreScaleConvertShow)
@ -1999,17 +1999,17 @@ EndIf
</Button> </Button>
<Text> ;<Text>
<X> 249 </X> ;<X> 249 </X>
<Y> 1186 </Y> ;<Y> 1186 </Y>
<State> EMAPopupSuccessState </State> ;<State> EMAPopupSuccessState </State>
<Width> 583 </Width> ;<Width> 583 </Width>
<Font> KanitLightTTF </Font> ;<Font> KanitLightTTF </Font>
<Size> 40 </Size> ;<Size> 40 </Size>
<Color> 0x513C2F </Color> ;<Color> 0x513C2F </Color>
<Align> center-vertical-horizontal </Align> ;<Align> center-vertical-horizontal </Align>
<Value> EMAMemberName </Value> ;<Value> EMAMemberName </Value>
</Text> ;</Text>
<Text> <Text>
<X> 249 </X> <X> 249 </X>