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

SGP: change theme in page payment

Browse source
This commit is contained in:
Pakin 2024-08-13 11:19:43 +07:00
parent e12d844dd5
commit 9986e9a167
25 changed files with 12489 additions and 5750 deletions
Download patch file Download diff file Expand all files Collapse all files

34
inter/sgp/menu/lang.tsv
View file

@ -77,8 +77,8 @@ TextID Note English Thai
000061 =+ SUGAR 2 g (8 cal) =+ น้ำตาล 2 g (8 cal)
000062 =+ SUGAR 5 g (19 cal) =+ น้ำตาล 5 g (19 cal)
000063 =+ SUGAR 7 g (26 cal) =+ น้ำตาล 7 g (26 cal)
Font=Kanit,Type=Medium,Size=36,Color=0xDE794E
Text
Font=Kanit,Type=Medium,Size=36,Color=0x0025FF
000064 Extra topping เพิ่มส่วนผสมพิเศษ
000065 Sweetness level ระดับความหวาน
000066 Straw and Lid หลอด และ ฝา
@ -86,31 +86,33 @@ TextID Note English Thai
000103 Vegan substitution นมทางเลือก
Text
Font=Kanit,Type=Regular,Size=36,Color=0x513C2F
Font=Kanit,Type=Regular,Size=36,Color=0x0025FF
000070 I want a straw รับหลอด
000071 I want a lid รับฝา
Font=Opun,Type=Medium,Size=10,Color=0xDE794E
Text
Font=Opun,Type=Medium,Size=10,Color=0x8092FF
000072 Ice will be ready at น้ำแข็งจะพร้อมเวลา
Text
Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
Font=Kanit,Type=Regular,Size=36,Color=0x746253
000073 Pay now ซื้อเลย
Font=Kanit,Type=Regular,Size=36,Color=0x746253
Text
Font=Kanit,Type=Regular,Size=36,Color=0x0025FF
Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
000074 Cancel ยกเลิก
Font=Kanit,Type=Light,Size=36,Color=0xFF0000
Text
Font=Kanit,Type=Light,Size=36,Color=0x0025FF
000075 Please choose drink type โปรดเลือกประเภทเครื่องดื่ม
Font=Kanit,Type=Regular,Size=28,Color=0x513C2F
Font=Kanit,Type=Medium,Size=28,Color=0x513C2F
Font=Kanit,Type=Regular,Size=28,Color=0x9D9D9D
Font=Kanit,Type=Regular,Size=28,Color=0xCFCFCF
Text
Font=Kanit,Type=Regular,Size=28,Color=0x0025FF
Font=Kanit,Type=Medium,Size=28,Color=0xFFFFFF
Font=Kanit,Type=Regular,Size=28,Color=0xA6B2FF
Font=Kanit,Type=Regular,Size=28,Color=0x8092FF
000081 Hot ร้อน
000082 Iced เย็น
000083 Blend ปั่น
Font=Kanit,Type=Regular,Size=24,Color=0x513C2F
Font=Kanit,Type=Regular,Size=24,Color=0x025FF
000084 Normal ปกติ
@ -118,7 +120,7 @@ TextID Note English Thai
Left of check box
Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30
Font=Kanit,Type=Light,Size=29,Color=0xA6B2FF,Align=end-center-vertical,LineHeight=30
000090 Out of straw หลอดหมด
000091 Out of lid ฝาหมด
000092 Only smoothie\n avalible สำหรับเมนูปั่น
@ -126,7 +128,7 @@ TextID Note English Thai
Text topping extra
Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,LineHeight=46
000100 1 Shot of Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] เอสเพรสโซ่ 1 ช็อต\n[ใช้เวลาชงนานขึ้น 1 นาที###Font=KanitLight,Size=15]
000101 Add extra Oreo crunchy เพิ่มท็อปปิ้งโอริโอภูเขาไฟ
000102 1 Shot of Single Origin Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] เอสเพรสโซ Single Origin 1 ช็อต\n[ใช้เวลาชงนานขึ้น 1 นาที###Font=KanitLight,Size=15]

Can't render this file because it has a wrong number of fields in line 8.

2
inter/sgp/xml/menu_catalog_new.lxml
View file

@ -6,7 +6,7 @@
<Y> 380 </Y>
<Width> 1080 </Width>
<Height> 1540 </Height>
<Color> WTCLightBlueColor </Color>
<Color> BackgroundColor </Color>
</Image>

1390
inter/sgp/xml/page_catalog_group_appfast.lxml
View file

File diff suppressed because it is too large Load diff

1446
inter/sgp/xml/page_catalog_group_coffee.lxml
View file

File diff suppressed because it is too large Load diff

1426
inter/sgp/xml/page_catalog_group_forkid.lxml
View file

File diff suppressed because it is too large Load diff

1416
inter/sgp/xml/page_catalog_group_health.lxml
View file

File diff suppressed because it is too large Load diff

1446
inter/sgp/xml/page_catalog_group_milk.lxml
View file

File diff suppressed because it is too large Load diff

1462
inter/sgp/xml/page_catalog_group_other.lxml
View file

File diff suppressed because it is too large Load diff

2
inter/sgp/xml/page_catalog_group_recommend.lxml
View file

@ -212,7 +212,7 @@
<Y> 380 </Y>
<Width> 1080 </Width>
<Height> 1540 </Height>
<Color> WTCLightBlueColor </Color>
<Color> BackgroundColor </Color>
</Image>

1452
inter/sgp/xml/page_catalog_group_tea.lxml
View file

File diff suppressed because it is too large Load diff

1396
inter/sgp/xml/page_catalog_group_whey.lxml
View file

File diff suppressed because it is too large Load diff

3
inter/sgp/xml/page_remove_cup.lxml
View file

@ -31,8 +31,7 @@
<EventTimeout>
;SAVELOG MachineErrorDetail
Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
Var MachineErrorDetailAll = MachineErrorDetailEng
If MachineStage = "show-menu" Then

4
inter/sgp/xml/page_topping_select6.lxml
View file

@ -6,6 +6,10 @@
<Volume> SoundVolume </Volume>
<EventOpen>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
If UsePepsiTheme = 1 Then
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml"
EndIf
Var UserSeletedSugar = 0

37
inter/whatthecup/color_settings.ev
View file

@ -7,6 +7,9 @@ Var WTCSemiMediumBlueColor = "0x3D59FF"
Var WTCBlueColor = "0x0025FF"
; case-1-bg-white
Var BackgroundColor = WTCLightBlueColor
Var HeadlineColor1 = WTCBlueColor
Var SubHeadlineColor1 = WTCBlueColor
Var BodyTextColor1 = WTCMediumBlueColor
@ -16,7 +19,15 @@ Var ButtonColor1 = WTCWhiteColor
Var ButtonTextColor1 = WTCBlueColor
Var ButtonDisabledColor1 = WTCLightBlueColor
Var HeadlineColor = WTCBlueColor
Var SubHeadlineColor = SubHeadlineColor1
Var PopupBodyTextColor = BodyTextColor1
; case-2-bg-light-blue
Var BackgroundColor2 = WTCLightBlueColor
Var HeadlineColor2 = WTCBlueColor
Var SubHeadlineColor2 = WTCBlueColor
Var BodyTextColor2 = WTCMediumBlueColor
@ -27,6 +38,9 @@ Var ButtonTextColor2 = WTCBlueColor
Var ButtonDisabledColor2 = WTCSemiLightBlueColor
; case-3-bg-medium-white
Var BackgroundColor3 = WTCMediumBlueColor
Var HeadlineColor3 = WTCWhiteColor
Var SubHeadlineColor3 = WTCWhiteColor
Var BodyTextColor3 = WTCSemiLightBlueColor
@ -37,6 +51,9 @@ Var ButtonTextColor3 = WTCBlueColor
Var ButtonDisabledColor3 = WTCSemiLightBlueColor
; case-4-bg-blue
Var BackgroundColor4 = WTCLightBlueColor
Var HeadlineColor4 = WTCWhiteColor
Var SubHeadlineColor4 = WTCWhiteColor
Var BodyTextColor4 = WTCSemiLightBlueColor
@ -46,3 +63,23 @@ Var ButtonColor4 = WTCWhiteColor
Var ButtonTextColor4 = WTCBlueColor
Var ButtonDisabledColor4 = WTCSemiLightBlueColor
If TargetThemeNum = 2 Then
Var BackgroundColor = BackgroundColor2
Var HeadlineColor = HeadlineColor2
Var SubHeadlineColor = BodyTextColor2
Var PopupBodyTextColor = WTCSemiMediumBlueColor
EndIf
If TargetThemeNum = 3 Then
Var BackgroundColor = BackgroundColor3
Var HeadlineColor = HeadlineColor3
Var SubHeadlineColor = BodyTextColor3
Var PopupBodyTextColor = BodyTextColor3
EndIf
If TargetThemeNum = 4 Then
Var BackgroundColor = BackgroundColor4
Var HeadlineColor = HeadlineColor4
Var SubHeadlineColor = BodyTextColor4
Var PopupBodyTextColor = BodyTextColor4
EndIf

7
inter/whatthecup/default_color_settings.ev Normal file
View file

@ -0,0 +1,7 @@
Var WelcomeColor = "0xEE8C62"
Var BackgroundColor = "0xeae6e1"
Var HeadlineColor = "0x513C2F"
Var SubHeadlineColor = "0x6F5F51"
Var PopupBodyTextColor = "0xB78F24"

0
inter/whatthecup/sgp/image/page_payment_en/page_payment/bd_credit_card.png → inter/whatthecup/sgp/image/page_payment_en/page_payment/bd_credit_card_ezlink.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Before After
Before After

0
inter/whatthecup/sgp/image/page_payment_en/page_payment/bp_credit_card.png → inter/whatthecup/sgp/image/page_payment_en/page_payment/bp_credit_card_ezlink.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Before After
Before After

2
inter/whatthecup/sgp/xml/page_catalog.lxml
View file

@ -282,7 +282,7 @@
<Y> 380 </Y>
<Width> 1080 </Width>
<Height> 1540 </Height>
<Color> WTCLightBlueColor </Color>
<Color> BackgroundColor </Color>
</Image>
<EventLanguageOnChange>

2497
inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml Normal file
View file

File diff suppressed because it is too large Load diff

4181
inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml Normal file
View file

File diff suppressed because it is too large Load diff

8
xml/page_board.xml
View file

@ -828,7 +828,7 @@
Var show_eng = "true"
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main_wtc.mp4"
Var ShowNetworkProblemText = "Network error. Payment Cash only."
@ -886,6 +886,7 @@
DEBUGVAR ShowButtonClick2
Var UsePepsiTheme = 1
Var TargetThemeNum = 2
EndIf
@ -1141,7 +1142,12 @@
;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png"
Var img_press_main_page = MainStartPepsiThemeDir + "bp_main_page_start.png"
Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main_wtc.mp4"
EndIf
Else
; default-theme
TRY "ROOT/taobin_project/inter/whatthecup/default_color_settings.ev"
EndIf
XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"

6
xml/page_payment.xml
View file

@ -2,7 +2,7 @@
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Background> BackgroundColor </Background>
<EventOpen>
; On open
;world-class
@ -511,7 +511,7 @@
<Align> Center </Align>
<Size> 66 </Size>
<Font> KanitMediumTTF </Font>
<Color> 0x513C2F </Color>
<Color> HeadlineColor </Color>
<Value> showname </Value>
</Text>
@ -523,7 +523,7 @@
<Align> Center </Align>
<Size> 24 </Size>
<Font> KanitLightTTF </Font>
<Color> 0x6F5F51 </Color>
<Color> SubHeadlineColor </Color>
<Value> showdesc </Value>
</Text>

12
xml/page_payment_cash-SGP.xml
View file

@ -7,6 +7,12 @@
<Sound> PlaySoundLag </Sound>
<EventOpen>
If UsePepsiTheme = 1 Then
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml"
EndIf
READ_FILE "/mnt/sdcard/coffeevending/sim_on" str_sim_on
DEBUGVAR str_sim_on
@ -1790,7 +1796,7 @@ EndIf
<Align> Center </Align>
<Size> 72 </Size>
<Font> KanitMediumTTF </Font>
<Color> 0xB78F24 </Color>
<Color> PopupBodyTextColor </Color>
<Value> showRemaining </Value>
</Text>
@ -1803,7 +1809,7 @@ EndIf
<Align> Center </Align>
<Size> 66 </Size>
<Font> KanitMediumTTF </Font>
<Color> 0x513C2F </Color>
<Color> HeadlineColor </Color>
<Value> showname </Value>
</Text>
@ -1814,7 +1820,7 @@ EndIf
<Align> Center </Align>
<Size> 24 </Size>
<Font> KanitLightTTF </Font>
<Color> 0x6F5F51 </Color>
<Color> SubHeadlineColor </Color>
<Value> showdesc </Value>
</Text>

8
xml/page_payment_cash.xml
View file

@ -2,7 +2,7 @@
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Background> BackgroundColor </Background>
<Volume> SoundVolume </Volume>
<Sound> PlaySoundLag </Sound>
<EventOpen>
@ -2771,7 +2771,7 @@
<Align> Center </Align>
<Size> 72 </Size>
<Font> KanitMediumTTF </Font>
<Color> 0xB78F24 </Color>
<Color> PopupBodyTextColor </Color>
<Value> showRemaining </Value>
</Text>
@ -2784,7 +2784,7 @@
<Align> Center </Align>
<Size> 72 </Size>
<Font> KanitMediumTTF </Font>
<Color> 0x513C2F </Color>
<Color> HeadlineColor </Color>
<Value> showname </Value>
</Text>
@ -2795,7 +2795,7 @@
<Align> Center </Align>
<Size> 24 </Size>
<Font> KanitLightTTF </Font>
<Color> 0x6F5F51 </Color>
<Color> SubHeadlineColor </Color>
<Value> showdesc </Value>
</Text>

2
xml/page_remove_cup.xml
View file

@ -25,7 +25,7 @@
EndIf
If StrCountryShort = "SGP" Then
;Open "ROOT/taobin_project/inter/sgp/xml/page_remove_cup.lxml"
Open "ROOT/taobin_project/inter/sgp/xml/page_remove_cup.lxml"
EndIf