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

Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
Pakin 2023-10-10 15:56:49 +07:00
commit 23a97ccc6b
18 changed files with 5777 additions and 5746 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_drink_disable_n2/bn_iced_pepsi_Black.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

BIN
image/page_drink_n/bn_iced_pepsi_Black.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_iced_pepsi_Black.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_iced_pepsi_Black.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Before After
Before After

12
inter/mys/xml/event/promotion_2.xml
View file

@ -606,12 +606,14 @@
<Text> <Text>
<X> 987 </X> <X> 940 </X>
<Y> 462 </Y> <Y> 462 </Y>
<Size> 22 </Size> <Size> 22 </Size>
<Width> 170 </Width>
<Height> 30 </Height>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<Value> "Unit: RM"</Value> <Value> "Prices in MYR"</Value>
</Text> </Text>
<EventWebApp> <EventWebApp>
@ -11479,7 +11481,7 @@
Var aliasName[3] = "-" Var aliasName[3] = "-"
Var aliasDesc[3] = "-" Var aliasDesc[3] = "-"
Var aliasName[4] = "PEPSI Black" Var aliasName[4] = "PEPSI Black"
Var aliasDesc[4] = "Pepsi Black, Ais" Var aliasDesc[4] = "Pepsi Black, Ais, Zero Sugar"
Var NameLang[0][0] = "" Var NameLang[0][0] = ""
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
@ -11499,7 +11501,7 @@
Var DescLang[1][1] = "เป๊ปซี่" Var DescLang[1][1] = "เป๊ปซี่"
Var DescLang[1][2] = "-" Var DescLang[1][2] = "-"
Var DescLang[1][3] = "-" Var DescLang[1][3] = "-"
Var DescLang[1][4] = "Pepsi, Ais" Var DescLang[1][4] = "Pepsi, Ais, Zero Sugar"
Var NameLang[2][0] = "" Var NameLang[2][0] = ""
Var NameLang[2][1] = "" Var NameLang[2][1] = ""
Var NameLang[2][2] = "" Var NameLang[2][2] = ""
@ -11577,7 +11579,7 @@
<LanguageSlot2>เป๊ปซี่</LanguageSlot2> <LanguageSlot2>เป๊ปซี่</LanguageSlot2>
<LanguageSlot3>Pepsi Black, Ice</LanguageSlot3> <LanguageSlot3>Pepsi Black, Ice</LanguageSlot3>
<LanguageSlot4>เป๊ปซี่</LanguageSlot4> <LanguageSlot4>เป๊ปซี่</LanguageSlot4>
<LanguageSlot5>Pepsi Black, Ais</LanguageSlot5> <LanguageSlot5>Pepsi Black, Ais, Zero Sugar</LanguageSlot5>
<LanguageSlot6>เป๊ปซี่</LanguageSlot6> <LanguageSlot6>เป๊ปซี่</LanguageSlot6>
</LanguageGroup> </LanguageGroup>
</Text> </Text>

12
inter/mys/xml/event/promotion_3.xml
View file

@ -606,12 +606,14 @@
<Text> <Text>
<X> 987 </X> <X> 940 </X>
<Y> 462 </Y> <Y> 462 </Y>
<Size> 22 </Size> <Size> 22 </Size>
<Width> 170 </Width>
<Height> 30 </Height>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<Value> "Unit: RM"</Value> <Value> "Prices in MYR"</Value>
</Text> </Text>
<EventWebApp> <EventWebApp>
@ -11479,7 +11481,7 @@
Var aliasName[3] = "-" Var aliasName[3] = "-"
Var aliasDesc[3] = "-" Var aliasDesc[3] = "-"
Var aliasName[4] = "PEPSI Black" Var aliasName[4] = "PEPSI Black"
Var aliasDesc[4] = "Pepsi Black, Ais" Var aliasDesc[4] = "Pepsi Black, Ais, Zero Sugar"
Var NameLang[0][0] = "" Var NameLang[0][0] = ""
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
@ -11499,7 +11501,7 @@
Var DescLang[1][1] = "เป๊ปซี่" Var DescLang[1][1] = "เป๊ปซี่"
Var DescLang[1][2] = "-" Var DescLang[1][2] = "-"
Var DescLang[1][3] = "-" Var DescLang[1][3] = "-"
Var DescLang[1][4] = "Pepsi, Ais" Var DescLang[1][4] = "Pepsi, Ais, Zero Sugar"
Var NameLang[2][0] = "" Var NameLang[2][0] = ""
Var NameLang[2][1] = "" Var NameLang[2][1] = ""
Var NameLang[2][2] = "" Var NameLang[2][2] = ""
@ -11577,7 +11579,7 @@
<LanguageSlot2>เป๊ปซี่</LanguageSlot2> <LanguageSlot2>เป๊ปซี่</LanguageSlot2>
<LanguageSlot3>Pepsi Black, Ice</LanguageSlot3> <LanguageSlot3>Pepsi Black, Ice</LanguageSlot3>
<LanguageSlot4>เป๊ปซี่</LanguageSlot4> <LanguageSlot4>เป๊ปซี่</LanguageSlot4>
<LanguageSlot5>Pepsi Black, Ais</LanguageSlot5> <LanguageSlot5>Pepsi Black, Ais, Zero Sugar</LanguageSlot5>
<LanguageSlot6>เป๊ปซี่</LanguageSlot6> <LanguageSlot6>เป๊ปซี่</LanguageSlot6>
</LanguageGroup> </LanguageGroup>
</Text> </Text>

12
inter/mys/xml/event/promotion_pepsi_099.lxml
View file

@ -606,12 +606,14 @@
<Text> <Text>
<X> 987 </X> <X> 940 </X>
<Y> 462 </Y> <Y> 462 </Y>
<Size> 22 </Size> <Size> 22 </Size>
<Width> 170 </Width>
<Height> 30 </Height>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<Value> "Unit: RM"</Value> <Value> "Prices in MYR"</Value>
</Text> </Text>
<EventWebApp> <EventWebApp>
@ -11479,7 +11481,7 @@
Var aliasName[3] = "-" Var aliasName[3] = "-"
Var aliasDesc[3] = "-" Var aliasDesc[3] = "-"
Var aliasName[4] = "PEPSI Black" Var aliasName[4] = "PEPSI Black"
Var aliasDesc[4] = "Pepsi Black, Ais" Var aliasDesc[4] = "Pepsi Black, Ais, Zero Sugar"
Var NameLang[0][0] = "" Var NameLang[0][0] = ""
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
@ -11499,7 +11501,7 @@
Var DescLang[1][1] = "เป๊ปซี่" Var DescLang[1][1] = "เป๊ปซี่"
Var DescLang[1][2] = "-" Var DescLang[1][2] = "-"
Var DescLang[1][3] = "-" Var DescLang[1][3] = "-"
Var DescLang[1][4] = "Pepsi, Ais" Var DescLang[1][4] = "Pepsi, Ais, Zero Sugar"
Var NameLang[2][0] = "" Var NameLang[2][0] = ""
Var NameLang[2][1] = "" Var NameLang[2][1] = ""
Var NameLang[2][2] = "" Var NameLang[2][2] = ""
@ -11577,7 +11579,7 @@
<LanguageSlot2>เป๊ปซี่</LanguageSlot2> <LanguageSlot2>เป๊ปซี่</LanguageSlot2>
<LanguageSlot3>Pepsi Black, Ice</LanguageSlot3> <LanguageSlot3>Pepsi Black, Ice</LanguageSlot3>
<LanguageSlot4>เป๊ปซี่</LanguageSlot4> <LanguageSlot4>เป๊ปซี่</LanguageSlot4>
<LanguageSlot5>Pepsi Black, Ais</LanguageSlot5> <LanguageSlot5>Pepsi Black, Ais, Zero Sugar</LanguageSlot5>
<LanguageSlot6>เป๊ปซี่</LanguageSlot6> <LanguageSlot6>เป๊ปซี่</LanguageSlot6>
</LanguageGroup> </LanguageGroup>
</Text> </Text>

6
inter/mys/xml/menu_catalog_new.lxml
View file

@ -438,12 +438,14 @@
<Text> <Text>
<X> 987 </X> <X> 940 </X>
<Y> 462 </Y> <Y> 462 </Y>
<Size> 22 </Size> <Size> 22 </Size>
<Width> 170 </Width>
<Height> 30 </Height>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<Value> "Unit: RM"</Value> <Value> "Prices in MYR"</Value>
</Text> </Text>
<EventWebApp> <EventWebApp>

1278
inter/mys/xml/page_catalog_group_appfast.lxml
View file

File diff suppressed because it is too large Load diff

1262
inter/mys/xml/page_catalog_group_coffee.lxml
View file

File diff suppressed because it is too large Load diff

1278
inter/mys/xml/page_catalog_group_forkid.lxml
View file

File diff suppressed because it is too large Load diff

1252
inter/mys/xml/page_catalog_group_health.lxml
View file

File diff suppressed because it is too large Load diff

1266
inter/mys/xml/page_catalog_group_milk.lxml
View file

File diff suppressed because it is too large Load diff

1262
inter/mys/xml/page_catalog_group_other.lxml
View file

File diff suppressed because it is too large Load diff

1332
inter/mys/xml/page_catalog_group_recommend.lxml
View file

File diff suppressed because it is too large Load diff

1262
inter/mys/xml/page_catalog_group_tea.lxml
View file

File diff suppressed because it is too large Load diff

1268
inter/mys/xml/page_catalog_group_whey.lxml
View file

File diff suppressed because it is too large Load diff

21
xml/page_payment.xml
View file

@ -61,12 +61,14 @@
DEBUGVAR CustomerFilterType DEBUGVAR CustomerFilterType
EndIf EndIf
;Var AdultFlag = 1
If NightTime = 1 Then If NightTime = 1 Then
Var PriceDrink = 60 If SelectDrink = "12-99-03-0066" Then
Var PriceDrink = 60
EndIf
EndIf EndIf
;Var AdultFlag = 1
Var QRCODE1 = "A000000677010112" Var QRCODE1 = "A000000677010112"
Var QRCODE2 = "010755600066301" Var QRCODE2 = "010755600066301"
@ -259,11 +261,14 @@
DEBUGVAR PriceDrinkTmp DEBUGVAR PriceDrinkTmp
If NightTime = 1 Then If NightTime = 1 Then
Var Seeker.VendingCode = "PX5" If SelectDrink = "12-99-03-0066" Then
Var Seeker.IntVendingCampaign = 30 Var PriceDrink = 60
Var Seeker.FreeVendingCampaign = 0 Var Seeker.VendingCode = "PX5"
Var Seeker.CodeChannel = 1 Var Seeker.IntVendingCampaign = 30
Var Seeker.CodeNumber = "00000000" Var Seeker.FreeVendingCampaign = 0
Var Seeker.CodeChannel = 1
Var Seeker.CodeNumber = "00000000"
EndIf
EndIf EndIf
If ChildrenFree = 1 Then If ChildrenFree = 1 Then