Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project
This commit is contained in:
commit
5a38b6a384
4 changed files with 23 additions and 9 deletions
|
|
@ -33,8 +33,7 @@
|
|||
|
||||
EndIf
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_show_error.lxml"
|
||||
EndIf
|
||||
|
||||
If Timeout = 0 Then
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@ Name=pepween,file=page_catalog_group_pro_pepween.skt
|
|||
คุณยายท้ายหมู่บ้าน The Haunting\nHag of village เป๊ปซี่ น้ำเชื่อมบ๊วย ผงชาไทย และโซดา Pepsi, Plum, Thai Tea and Soda - 12-99-05-0062 - bn_haunting_hag_of_village.png - - -
|
||||
อาถรรพ์คืนวันพุธ Midnight's Enigma เป๊ปซี่ น้ำเชื่อมบ๊วย ผงมะนาว และโซดา Pepsi Plum Lime and Soda - 12-99-05-0064 - bn_midnight_enigma.png - - -
|
||||
ล้า ท้า หลอน Unbelievers' Demise เป๊ปซี่ ชามะลิ น้ำเชื่อมเมล่อน และโซดา Pepsi Jasmine Melon and Soda - 12-99-05-0065 - bn_unbelievers_demise.png - - -
|
||||
ดิน 7 ป่าช้า 7 Haunted Woods ? (เป๊ปซี่ นม และโอริโอ้ ) ? (pepsi oreo) - - 12-99-03-0066 bn_haunted_woods.png - - -
|
||||
ดิน 7 ป่าช้า 7 Haunted Woods เป๊ปซี่ นม และโอริโอ้ Pepsi oreo - - 12-99-03-0066 bn_haunted_woods.png - - -
|
||||
|
||||
|
||||
|
||||
|
|
@ -410,6 +410,7 @@ Name=CockTail,file=page_catalog_group_cocktail.skt
|
|||
Biofuel Biofuel Strawberry syrup, Pineaple \njuice Ice, Malibu Strawberry syrup, Pineaple \njuice Ice, Malibu - 11-99-05-0008 - bn_Alcohol_Long_Night.png - - - - #N/A - #N/A #N/A
|
||||
Coal Story Bro Coal Story Bro Black sugar syrup, Milk, Ice, \nMount Gay Rum Black sugar syrup, Milk, Ice, \nMount Gay Rum - 11-99-05-0009 - bn_Alcohol_Good_Night_Kiss.png - - - - #N/A - #N/A #N/A
|
||||
Bangkok\nUnderwater Bangkok\nUnderwater Lychee juice, Pineaple juice, \nIce, Mount Gay Rum Lychee juice, Pineaple juice, \nIce, Mount Gay Rum - 11-99-05-0010 - bn_Alcohol_Forever_Love.png - - - - #N/A - #N/A #N/A
|
||||
|
||||
Druzhba Pipe Druzhba Pipe Blue lable, soda Blue lable, soda - 11-99-05-0012 - bn_iced_soda_blue.png - - - - #N/A - #N/A #N/A
|
||||
2050 2050 Blue lable, water Blue lable, water - 11-99-05-0013 - bn_iced_blue.png - - - - #N/A - #N/A #N/A
|
||||
Petrol Fumes Petrol Fumes Gold lable, soda Gold lable, soda - 11-99-05-0017 - bn_iced_soda_gold.png - - -
|
||||
|
|
@ -419,6 +420,16 @@ Name=CockTail,file=page_catalog_group_cocktail.skt
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Name=Obsolete,file=page_obsolete.skt
|
||||
นมมะม่วง MANGO MILK นม น้ำเชื่อมมะม่วง Milk, Mango Syrup, & 12-03-02-0007 - - bn_Mango_milk.png ฿40.00 - - NN NN
|
||||
nUll nUll nUll nUll 12-04-02-0012 - - - #N/A - - #N/A NN
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 3.
|
|
|
@ -406,15 +406,18 @@
|
|||
<EventClick>
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
|
||||
Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
|
||||
If CountryName = "Malaysia" Then
|
||||
; zone promote
|
||||
TRY OpenFileXML
|
||||
EndIf
|
||||
; Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
|
||||
; If CountryName = "Malaysia" Then
|
||||
; ; zone promote
|
||||
; TRY OpenFileXML
|
||||
; EndIf
|
||||
|
||||
If CountryName = "Thailand" Then
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
EndIf
|
||||
Else
|
||||
Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
|
||||
TRY OpenFileXML
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
|
|||
|
|
@ -268,6 +268,7 @@
|
|||
Var Seeker.FreeVendingCampaign = 0
|
||||
Var Seeker.CodeChannel = 1
|
||||
Var Seeker.CodeNumber = "00000000"
|
||||
Var Seeker.VendingCampaignRI3 = 30
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue