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

AUS: Update Topping select 6

Browse source
This commit is contained in:
Kenta420 2025-04-09 17:55:00 +07:00
parent c4f0b0f3db
commit 1657b9b2f7
10 changed files with 50871 additions and 51150 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment/img_popup1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

BIN
image/topping_inter/bd_sugar_4step.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

19
inter/aus/menu/lang.tsv
View file

@ -59,20 +59,39 @@ TextID Note English Thai
000051 140% 140%
Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Regular,Size=24,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0xCFCFCF,Align=Center
000052 No added sugar ไม่ใส่น้ำตาล
000053 Less sweet หวานกรุบกริบ
000054 Healthy sweet หวานรักสุขภาพ
000055 Just right หวานพอดี
001101 No added sugar ไม่ใส่น้ำตาล
001102 Less sweet หวานกรุบกริบ
001103 Perfect หวานพอดี
001104 Delight sweet หวานพอดี
Font=Kanit,Type=Regular,Size=15,Color=0x84776F,Align=Center Font=Kanit,Type=Regular,Size=15,Color=0x84776F,Align=Center
Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center
Font=Kanit,Type=Regular,Size=15,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=15,Color=0xCFCFCF,Align=Center
000056 =+ SUGAR 0 g (0 cal) =+ น้ำตาล 0 g (0 cal)
000057 =+ SUGAR 3 g (11 cal) =+ น้ำตาล 3 g (11 cal)
000058 =+ SUGAR 7 g (26 cal) =+ น้ำตาล 7 g (26 cal)
000059 =+ SUGAR 10 g (38 cal) =+ น้ำตาล 10 g (38 cal)
001110 =+ SUGAR 0 g (0 cal) =+ น้ำตาล 0 g (0 cal)
001111 =+ ADD 1-2g SUGAR =+ น้ำตาล 3 g (11 cal)
001121 =+ LESS 1-2g SUGAR =+ น้ำตาล 3 g (11 cal)
001112 =+ ADD 2-3g SUGAR =+ น้ำตาล 3 g (11 cal)
001122 =+ LESS 2-3g SUGAR =+ น้ำตาล 3 g (11 cal)
001113 =+ ADD 3-5g SUGAR =+ น้ำตาล 3 g (11 cal)
001123 =+ LESS 3-5g SUGAR =+ น้ำตาล 3 g (11 cal)
001115 =+ ADD 5-10g SUGAR =+ น้ำตาล 3 g (11 cal)
001125 =+ LESS 5-10g SUGAR =+ น้ำตาล 3 g (11 cal)
000060 =+ SUGAR 0 g (0 cal) =+ น้ำตาล 0 g (0 cal)
001060 =+ SUGAR 0 g (0 cal) =+ น้ำตาล 0 g (0 cal)
000061 =+ SUGAR 2 g (8 cal) =+ น้ำตาล 2 g (8 cal)
001061 =+ SUGAR 30% =+ น้ำตาล 2 g (8 cal)
000062 =+ SUGAR 5 g (19 cal) =+ น้ำตาล 5 g (19 cal)
000063 =+ SUGAR 7 g (26 cal) =+ น้ำตาล 7 g (26 cal)

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

48402
inter/aus/xml/page_catalog_group_coffee.lxml
View file

File diff suppressed because it is too large Load diff

72
inter/aus/xml/page_catalog_group_promotion_coconut.lxml
View file

@ -1119,15 +1119,15 @@
</Text>
</Block>
; ==================> Len = 3
; - 51-02-02-0060 51-02-03-0060
; 51-02-01-0060 51-02-02-0060 51-02-03-0060
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 51-02-02-0060.Button,51-02-03-0060.Button,$Sum51020200605102030060) </State>
<State> Flag( 51-02-01-0060.Button,51-02-02-0060.Button,51-02-03-0060.Button,$Sum510201006051020200605102030060) </State>
<Button>
<State> $Sum51020200605102030060 </State>
<State> $Sum510201006051020200605102030060 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_COCONUT_MATCHA_LATTE.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_COCONUT_MATCHA_LATTE.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_COCONUT_MATCHA_LATTE.png" </FilenameDisable>
@ -1136,10 +1136,10 @@
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_COCONUT_MATCHA_LATTE.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD1 = $51-02-01-0060.Price
Var PriceD2 = $51-02-02-0060.Price
Var PriceD3 = $51-02-03-0060.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE1 = "51-02-01-0060"
Var PD_CODE2 = "51-02-02-0060"
Var PD_CODE3 = "51-02-03-0060"
; begin lang
@ -1155,13 +1155,13 @@
Var aliasDesc[4] = ""
Var aliasName[5] = ""
Var aliasDesc[5] = ""
Var NameLang[0][0] = ""
Var NameLang[0][0] = "HOT COCONUT MATCHA LATTE"
Var NameLang[0][1] = ""
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = ""
Var DescLang[0][0] = "Matcha, Coconut, Milk"
Var DescLang[0][1] = ""
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
@ -1192,7 +1192,7 @@
Var DescLang[2][4] = ""
Var DescLang[2][5] = ""
; end lang
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_1 = $51-02-01-0060.Button
Var PD_STAGE_2 = $51-02-02-0060.Button
Var PD_STAGE_3 = $51-02-03-0060.Button
Var SelectCountDrinkType = 0
@ -1213,7 +1213,7 @@
Topping "Load" "51-02-02-0060"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Topping "Load" "51-02-01-0060"
Else
Topping "Load" "51-02-03-0060"
EndIf
@ -1270,7 +1270,7 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<State> "Invisible" </State>
<State> $51-02-01-0060.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
</Image>
@ -1282,8 +1282,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<State> $51-02-01-0060.Button </State>
<Value> StringFmt( $51-02-01-0060.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
@ -1328,7 +1328,11 @@
eval(
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Invisible"
If $Sum510201006051020200605102030060 = "Disable" Then
Var ice_tab_process_show = "Disable"
Else
Var ice_tab_process_show = "Enable"
EndIf
Else
Var ice_tab_process_show = "Invisible"
@ -1344,8 +1348,8 @@
<Y> 117 </Y>
<State>
eval(
If $Sum51020200605102030060 = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
If $Sum510201006051020200605102030060 = "Disable" Then
STRCONTAIN "ERR" $51-02-01-0060.TAG tag1_is_disable
STRCONTAIN "ERR" $51-02-02-0060.TAG tag2_is_disable
STRCONTAIN "ERR" $51-02-03-0060.TAG tag3_is_disable
Var return = "Invisible"
@ -1381,7 +1385,7 @@
<Width>128</Width>
<Height>64</Height>
<Mode> "disable-show" </Mode>
<State> $Sum51020200605102030060 </State>
<State> $Sum510201006051020200605102030060 </State>
<Language>
<ID> 000013 </ID>
</Language>
@ -1389,15 +1393,15 @@
</Text>
</Block>
; ==================> Len = 3
; - 51-02-02-0061 51-02-03-0061
; 51-02-01-0061 51-02-02-0061 51-02-03-0061
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 51-02-02-0061.Button,51-02-03-0061.Button,$Sum51020200615102030061) </State>
<State> Flag( 51-02-01-0061.Button,51-02-02-0061.Button,51-02-03-0061.Button,$Sum510201006151020200615102030061) </State>
<Button>
<State> $Sum51020200615102030061 </State>
<State> $Sum510201006151020200615102030061 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_MATCHA_LATTE.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_MATCHA_LATTE.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_MATCHA_LATTE.png" </FilenameDisable>
@ -1406,10 +1410,10 @@
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_MATCHA_LATTE.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD1 = $51-02-01-0061.Price
Var PriceD2 = $51-02-02-0061.Price
Var PriceD3 = $51-02-03-0061.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE1 = "51-02-01-0061"
Var PD_CODE2 = "51-02-02-0061"
Var PD_CODE3 = "51-02-03-0061"
; begin lang
@ -1425,13 +1429,13 @@
Var aliasDesc[4] = ""
Var aliasName[5] = ""
Var aliasDesc[5] = ""
Var NameLang[0][0] = ""
Var NameLang[0][0] = "HOT COCONUT MATCHA TEA"
Var NameLang[0][1] = ""
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = ""
Var DescLang[0][0] = "Matcha, Coconut"
Var DescLang[0][1] = ""
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
@ -1462,7 +1466,7 @@
Var DescLang[2][4] = ""
Var DescLang[2][5] = ""
; end lang
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_1 = $51-02-01-0061.Button
Var PD_STAGE_2 = $51-02-02-0061.Button
Var PD_STAGE_3 = $51-02-03-0061.Button
Var SelectCountDrinkType = 0
@ -1483,7 +1487,7 @@
Topping "Load" "51-02-02-0061"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Topping "Load" "51-02-01-0061"
Else
Topping "Load" "51-02-03-0061"
EndIf
@ -1540,7 +1544,7 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<State> "Invisible" </State>
<State> $51-02-01-0061.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
</Image>
@ -1552,8 +1556,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<State> $51-02-01-0061.Button </State>
<Value> StringFmt( $51-02-01-0061.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
@ -1598,7 +1602,11 @@
eval(
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Invisible"
If $Sum510201006151020200615102030061 = "Disable" Then
Var ice_tab_process_show = "Disable"
Else
Var ice_tab_process_show = "Enable"
EndIf
Else
Var ice_tab_process_show = "Invisible"
@ -1614,8 +1622,8 @@
<Y> 117 </Y>
<State>
eval(
If $Sum51020200615102030061 = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
If $Sum510201006151020200615102030061 = "Disable" Then
STRCONTAIN "ERR" $51-02-01-0061.TAG tag1_is_disable
STRCONTAIN "ERR" $51-02-02-0061.TAG tag2_is_disable
STRCONTAIN "ERR" $51-02-03-0061.TAG tag3_is_disable
Var return = "Invisible"
@ -1651,7 +1659,7 @@
<Width>128</Width>
<Height>64</Height>
<Mode> "disable-show" </Mode>
<State> $Sum51020200615102030061 </State>
<State> $Sum510201006151020200615102030061 </State>
<Language>
<ID> 000013 </ID>
</Language>

10926
inter/aus/xml/page_catalog_group_recommend.lxml
View file

File diff suppressed because it is too large Load diff

10920
inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml
View file

File diff suppressed because it is too large Load diff

30644
inter/aus/xml/page_catalog_group_tea.lxml
View file

File diff suppressed because it is too large Load diff

1038
inter/aus/xml/page_topping_select6.lxml
View file

File diff suppressed because it is too large Load diff