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

animation01/play_list.tsv

@@ -1094,3 +1094,11 @@ Iced Mocha	12-21-02-0064	1	2	3	4	5	15	7	59	23	24	167	2:47	23
 12-05-02-0118	7UP BANANA	1	18	56	23	13					24	120	2:00	23
 12-05-02-0119	7UP MELON	1	18	52	23	13					24	120	2:00	23
 12-05-02-0120	7UP PEACH	1	18	60	23	12					24	120	2:00	23
+
+
+12-03-02-0065	โกโก้ตัวมัม	1	15	17	23						24	120	2:00	23
+12-03-02-0067	โกโก้ตัวมารดา	1	15	17	23						24	120	2:00	23
+12-03-02-0066	โกโก้ตัวมาเท้อ	1	15	17	23						24	120	2:00	23
+12-03-01-0068	โกโก้ตัวสูตินรีร้อน	1	15	26							24	120	2:00	23
+12-03-02-0068	โกโก้ตัวสูตินรีเย็น	1	15	26	23						24	120	2:00	23
+12-03-02-0069	โกโก้ตัวแม่ลูกอ่อน	1	15	17	23						24	120	2:00	23

image/event/image_template3

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
-normal_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
-press_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
-press_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
-disable_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
-disable_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+normal_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+normal_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+press_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+press_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+disable_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+disable_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_

inter/aus/xml/page_remove_cup.lxml

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

inter/mys/animation01/play_list.tsv

@@ -570,8 +570,7 @@ Coconut Jasmine tea	12-02-02-0065	1	10	62	23						24	120	7:00	23
 Coconut Jasmine tea	12-02-03-0065	1	10	62	23	41					24	120	8:00	23
 
 PEPSI COCONUT SMOOTHIE	12-05-03-0091	1	23	62	14	41
-
-
+ESPRESSO SHAKE	12-24-02-0004	1	25	26	2	3	4	5	17	23	24	230	3:50	28
 
 
 

inter/mys/xml/event/tricker.ev

@@ -20,6 +20,10 @@ Var FromProThaiTea = 0
 Var ProYuzuEnable = 0
 Var FromProYuzu = 0
 
+
+; Pro free oreo topping
+Var PromotionOreoToppingFreeEnable = 0
+
 If SystemDateMonthInt = 6 Then
 	If SystemDateDayInt >= 15 Then
 		Var ProThaiTeaEnable = 1
@@ -46,9 +50,15 @@ If SystemDateMonthInt = 8 Then
 	Else
 		Var ProThaiTeaEnable = 0
 		Var ProYuzuEnable = 0
+
+		Var PromotionOreoToppingFreeEnable = 1
 	EndIf
 EndIf
 
+If SystemDateMonthInt = 9 Then
+	Var PromotionOreoToppingFreeEnable = 1
+EndIf
+
 If BoxID = 177746 Then
 	Var ProThaiTeaEnable = 1
 	Var ProYuzuEnable = 1

inter/mys/xml/page_catalog_group_coffee.lxml

@@ -20881,8 +20881,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "AMERICANO KELAPA"
+		Var aliasDesc[4] = "Espresso, Sirap Kelapa, Gula & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -20897,17 +20897,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "Iced Coconut Americano"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "AMERICANO KELAPA"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Espresso, Coconut Syrup,\nSugar, Water"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Espresso, Sirap Kelapa, Gula & Air"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -20972,7 +20972,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut Americano</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>AMERICANO KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -20988,7 +20988,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Espresso, Coconut Syrup,\nSugar, Water</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Espresso, Sirap Kelapa, Gula & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>

inter/mys/xml/page_catalog_group_health.lxml

@@ -6960,7 +6960,7 @@
 		Var PD_CODE2 = "12-02-02-1040"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "BLACK TEA  LIMENADE"
+		Var aliasName[0] = "BLACK TEA \nLIMENADE"
 		Var aliasDesc[0] = "Thai tea, Limenade and Water"
 		Var aliasName[1] = "ชาดำมะนาว"
 		Var aliasDesc[1] = "ชาไทย ผงมะนาว และน้ำ"
@@ -6972,7 +6972,7 @@
 		Var aliasDesc[4] = "Teh Thai, Limau, Air"
 		Var aliasName[5] = "-"
 		Var aliasDesc[5] = "-"
-		Var NameLang[0][0] = "Hot BLACK TEA  LIMENADE"
+		Var NameLang[0][0] = "Hot BLACK TEA LIMENADE"
 		Var NameLang[0][1] = "ชาดำมะนาวร้อน"
 		Var NameLang[0][2] = "-"
 		Var NameLang[0][3] = "-"
@@ -6984,7 +6984,7 @@
 		Var DescLang[0][3] = "-"
 		Var DescLang[0][4] = "Teh Thai, Limau, Air"
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "Iced BLACK TEA  LIMENADE"
+		Var NameLang[1][0] = "Iced BLACK TEA LIMENADE"
 		Var NameLang[1][1] = "ชาดำมะนาวเย็น"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
@@ -7055,9 +7055,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>BLACK TEA  LIMENADE</LanguageSlot1>
+		<LanguageSlot1>BLACK TEA \nLIMENADE</LanguageSlot1>
 		<LanguageSlot2>ชาดำมะนาว</LanguageSlot2>
-		<LanguageSlot3>BLACK TEA  LIMENADE</LanguageSlot3>
+		<LanguageSlot3>BLACK TEA \nLIMENADE</LanguageSlot3>
 		<LanguageSlot4>ชาดำมะนาว</LanguageSlot4>
 		<LanguageSlot5>TEH O LIMAU</LanguageSlot5>
 		<LanguageSlot6>ชาดำมะนาว</LanguageSlot6>

inter/mys/xml/page_catalog_group_milk.lxml

@@ -2306,8 +2306,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "SUSU KOKO KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Koko, Susu & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -2326,25 +2326,25 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "SUSU KOKO KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut syrup, Cocoa, Milk,\nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Koko, Susu & Air"
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "Coconut\nChocolate milk SMOOTHIE"
+		Var NameLang[2][0] = "Coconut Chocolate \nmilk SMOOTHIE###size=58"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE SUSU \nKOKO KELAPA###size=58"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut syrup, Cocoa, Milk,\nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa, Koko, Susu & Air"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -2397,7 +2397,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut\nChocolate milk</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>SUSU KOKO KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -2413,7 +2413,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut syrup, Cocoa, Milk,\nWater</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Koko, Susu & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -5566,8 +5566,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "SUSU KELAPA"
+		Var aliasDesc[4] = "Sirap Kelapa, Susu & Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -5586,25 +5586,25 @@
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "SUSU KELAPA AIS"
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Coconut syrup, Milk,\nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][4] = "Sirap Kelapa, Susu & Air"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "Coconut milk SMOOTHIE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "SMOOTHIE SUSU KELAPA"
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Coconut syrup, Milk,\nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "Sirap Kelapa, Susu & Air"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
@@ -5657,7 +5657,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut milk</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>SUSU KELAPA</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -5673,7 +5673,7 @@
 		<LanguageSlot2>-</LanguageSlot2>
 		<LanguageSlot3>Coconut syrup, Milk,\nWater</LanguageSlot3>
 		<LanguageSlot4>-</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>Sirap Kelapa, Susu & Air</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
 	</Text>