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

image/event/image_template3

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+normal_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
-normal_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+normal_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
-press_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+press_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
-press_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+press_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
-disable_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+disable_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
-disable_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+disable_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png

inter/hkg/xml/page_drinkfail_hkg.lxml

@@ -17,34 +17,7 @@
     Var MachineErrorDetailAll = MachineErrorDetail + " / "
 	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
 
-	
-
 	DEBUGVAR TelephoneNumberProblem
-
-    ; try-get-user
-    Var payload = "HKG/" + TelephoneNumberProblem
-    Var payload = payload + "/-"
-    Var payload = payload + "/-"
-    Var payload = payload + "/-"
-    Var payload = payload + "/-"
-
-    DEBUGVAR payload
-
-    Var Seeker.IsMember = 0
-    Var SendProblemOfMember = 0
-    Var ShowQRByNoMember = "Invisible"
-
-    Var TaobinName = ""
-    
-    If TelephoneNumberProblem = "" Then
-        Var ShowQRByNoMember = "Enable"
-    Else
-        GETACCEXT payload 35
-    EndIf
-
-
-    Var StepX = 1
-    Var Ext1a = ""
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -56,38 +29,6 @@
 
 	If Timeout > 30 Then
 
-        If SendProblemOfMember = 1 Then
-
-            DEBUGVAR TelephoneNumberProblem
-
-            StrLen TelephoneNumberProblem TelNumLen
-            If TelNumLen >= MinPhoneNumber Then  
-
-                Var ProblemID = 7
-
-                Var ChooseProblem = "taobin purchasing problems"
-
-                If Seeker.PayWithQR = 1 Then
-                    Var  VendingTSIDProblem = VendingTSIDTmp
-                    If Seeker.CampaignPayChanel = "promptpay" Then
-                        Var ProblemID = 8
-                        Var ChooseProblem = "taobin purchasing problems(Void Failed)"
-                    EndIf
-                Else
-                    Var VendingTSIDProblem = VendingTSID
-                EndIf
-
-                
-                PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
-
-            EndIf
-
-        EndIf
-
-
-
-
-
         If MachineStage = "remove-cup" Then
 			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
 		Else
@@ -114,62 +55,6 @@
 
 ;include="ROOT/taobin_project/inc/video.inc"
 
-<EventActionOk>
-
-If StepX = 1 Then
-    If Ext1a = "ok" Then
-        Var TaobinName = Ext1d
-
-        If TaobinName = "" Then
-            Var Seeker.IsMember = 0
-        Else
-            If TaobinName = "-" Then
-                Var Seeker.IsMember = 0
-            Else
-                Var Seeker.IsMember = 1
-            EndIf
-        EndIf
-
-        DEBUGVAR Seeker.IsMember
-
-        If Seeker.IsMember = 1 Then
-            SAVELOG "Already member, will send problem"
-            Var SendProblemOfMember = 1
-        Else
-            SAVELOG "Not member, show QR"
-            Var SendProblemOfMember = 0
-            Var ShowQRByNoMember = "Enable"
-        EndIf
-
-    Else
-        Var Seeker.IsMember = 0
-        SAVELOG "StepX.error, show QR"
-        Var ShowQRByNoMember = "Enable"
-    EndIf
-
-EndIf
-
-
-</EventActionOk>
-
-<EventActionError>
-
-If StepX = 1 Then
-
-    SAVELOG "ActionError show QR"
-    Var ShowQRByNoMember = "Enable"
-
-EndIf
-
-
-</EventActionError>
-
-
-
-
-
-
-
 
 <Image>
 <X> 43 </X>
@@ -180,15 +65,14 @@ EndIf
 <Image>
 <X> 429 </X>
 <Y> 1301 </Y>
-<State> ShowQRByNoMember </State>
 <Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
 </Image>
 
-;<Image>
+<Image>
-;<X> 190 </X>
+<X> 190 </X>
-;<Y> 1548 </Y>
+<Y> 1548 </Y>
-;<Filename> Var( DirImage + "/text13.png" ) </Filename>
+<Filename> Var( DirImage + "/text13.png" ) </Filename>
-;</Image>
+</Image>
 
 
 <Button>
@@ -196,42 +80,8 @@ EndIf
 <Y> 1720 </Y>
 <Filename> Var( DirImage + "/bn_close.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
 <EventClick>
 
-	StrLen TelephoneNumberProblem TelNumLen
-
-    If SendProblemOfMember = 1 Then
-
-        If TelNumLen >= MinPhoneNumber Then 
-
-            Var ProblemID = 7
-
-            Var ChooseProblem = "taobin purchasing problems" 
-
-            If Seeker.PayWithQR = 1 Then
-                Var  VendingTSIDProblem = VendingTSIDTmp
-
-                If Seeker.CampaignPayChanel = "promptpay" Then
-                    Var ProblemID = 8
-                    Var ChooseProblem = "taobin purchasing problems(Void Failed)"
-                EndIf
-            Else
-                Var VendingTSIDProblem = VendingTSID
-            EndIf
-
-            
-            PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
-
-        EndIf
-
-    EndIf
-
-
-
-
-			
 	If MachineStage = "remove-cup" Then
 		Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
 	Else

inter/hkg/xml/page_remove_cup.lxml

@@ -18,13 +18,14 @@
 		
 	LED LedDoorDoor 5 255 255 255 255
 
-	Var CheckCupStateDoorCupClose = ""
+	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
-	Var CheckCupStateDoorCupCloseCnt = 0
 
-	DEBUGVAR DoorCupPosition
+	Var ShowMenuNameAndImage = "Invisible"
-	If DoorCupPosition = "bottom" Then
+	Var RemoveCupOnArmID = -1
-		Var buttonRemoveCup = "Enable"
+	Var remove_cup_name = ""
-	EndIf
+	Var remove_cup_image = ""
+
+	RootLayoutVisible 3 "show"
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -34,53 +35,48 @@
 	Var MachineErrorDetailAll = MachineErrorDetail + " / "
 	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
 
-
+	If InternationalEnable = 1 Then
-	If MachineStage = "show-menu" Then
+		Var MachineErrorDetailAll = MachineErrorDetailEng
-		Open "ROOT/taobin_project/xml/page_board.xml"
-
 	EndIf
+
+	; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
+	If HaveCup = "false" Then
+		If MachineStage = "show-menu" Then
+			Open "ROOT/taobin_project/xml/page_board.xml"
+
+		EndIf
+	EndIf
+	If CupOnArm = "true" Then
+		If MachineStage = "show-menu" Then
+			Open "ROOT/taobin_project/xml/page_board.xml"
+
+		EndIf
+	EndIf
+
 	If MachineStage = "close-maintenance" Then
-		Open "ROOT/taobin_project/xml/page_show_error.lxml"
+		Open "ROOT/taobin_project/xml/page_show_error.xml"
+
 	EndIf
 
-	Var Timeout = Timeout + 1
+	;include=ROOT/taobin_project/inc/remove_cup_step.inc
-	DEBUGVAR Timeout
-	If Timeout > 5 Then
-		Var Timeout = 0
 
-		DEBUGVAR DoorCupPosition
+
+	Var RemoveCupOnArmID = 0
+	If RemoveCupOnArmID > 0 Then
 		If DoorCupPosition = "bottom" Then
-			Var buttonRemoveCup = "Enable"
+			Var ShowMenuNameAndImage = "Invisible"
+			Var RemoveCupOnArmID = -1
+		Else
+			DEBUGVAR RemoveCupOnArmID
+			DEBUGVAR DrinkImageOnArm[RemoveCupOnArmID]
+			DEBUGVAR DrinkNameOnArm[RemoveCupOnArmID]
+
+			Var remove_cup_image = DrinkImageOnArm[RemoveCupOnArmID]
+			Var remove_cup_name = DrinkNameOnArm[RemoveCupOnArmID]
+			Var ShowMenuNameAndImage = "Enable"
 		EndIf
 	EndIf
 
-	; Logic have differrent drinkfail3.xml 
-	; protect lock 
-	; 
-
-	If CheckCupStateDoorCupCloseCnt > 0 Then
-		Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
-	EndIf
-
-	If CheckCupStateDoorCupCloseCnt = 0 Then
-		Var CheckCupStateDoorCupClose = ""
-	EndIf
-
-	DEBUGVAR HaveCup
-
-	If HaveCup = "true" Then
-
-
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
-
-	DEBUGVAR buttonRemoveCup
-	DEBUGVAR CheckCupStateDoorCupClose
-
-
 	Refresh
 	TimerReset
 
@@ -116,13 +112,7 @@
 <Volume> SoundVolume </Volume>
 <State> buttonRemoveCup </State>
 <EventClick> 
-
+	;include=ROOT/taobin_project/inc/remove_cup_button.inc
-
-	Machine RemoveCup
-	Machine DoorLidOpen
-	Var buttonRemoveCup = "Invisible"
-   Var CheckCupStateDoorCupClose = "reset"
-   Var CheckCupStateDoorCupCloseCnt = 30
 </EventClick>
 <Language>
   <ID> 000411 </ID>
@@ -133,6 +123,37 @@
 </Language>
 </Button>
 
+<Image>
+<X> 125 </X>
+<Y> 1700 </Y>
+<Height> 300 </Height>
+<Width> 320 </Width>
+<State> ShowMenuNameAndImage </State>
+<Filename> remove_cup_image </Filename>
+</Image>
+
+
+<Text>
+<X> 300 </X>
+<Y> 1750 </Y>
+<State> ShowMenuNameAndImage </State>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Font> KanitLightTTF </Font>
+<Size> 48 </Size>
+<Color> HeadlineColor </Color>
+<Value>
+	eval(
+		STRCONTAIN "size" remove_cup_name SizeFromSheet
+		If SizeFromSheet = "true" Then
+			SPLIT Seeker.showname "###" 1 PureName
+			Var return = PureName
+		Else
+			Var return = Seeker.showname
+		EndIf
+	)
+</Value>
+</Text>
 
 <Text>
 <X> 5 </X>

inter/tha/.special/RoadShow.ev

@@ -1,6 +1,6 @@
 
-SAVELOG "RoadShow.ev 201316 201494 01 Mar "
+SAVELOG "RoadShow.ev 200587 "
-SAVELOG "200435 28 feb"
+SAVELOG "200587 04 mar"
 
 
 Var RoadShow = "false"
@@ -16,31 +16,26 @@ Var RoadShowBoxID = 0
 If SystemDateYearInt = 2025 Then
 
 	If BoxID = 201316 Then
-		Var RoadShowBoxID = 1
+		Var RoadShowBoxID = 0
 	EndIf
 	If BoxID = 200435 Then
-		Var RoadShowBoxID = 2
+		Var RoadShowBoxID = 0
 	EndIf
-	
-	If SystemDateMonthInt = 2 Then
-
-		If RoadShowBoxID = 2 Then
-			If SystemDateDayInt = 28 Then
-				Var RoadShow = "true"
-			EndIf
-		EndIf
 
+	If BoxID = 200587 Then
+		Var RoadShowBoxID = 1
 	EndIf
 	
 	If SystemDateMonthInt = 3 Then
 
 		If RoadShowBoxID = 1 Then
-			If SystemDateDayInt = 1 Then
+			If SystemDateDayInt = 4 Then
-				Var RoadShow = "true"
+				
 			EndIf
 		EndIf
 
 	EndIf
+	
 
 
 EndIf

inter/tha/hardware/powder_schedule.ev

@@ -4,7 +4,7 @@
 
 DEBUGVAR LastTimeUseChannel10InMinute
 DEBUGVAR CurrentXMLFileName0
-SAVELOG "powder schedule version 1.07"
+SAVELOG "powder schedule version 1.08"
 
 DEBUGVAR PowderPayPushLowScheduleTurnOn10
 
@@ -12,7 +12,7 @@ If PowderPayPushLowScheduleTurnOn10 = "1" Then
     Var PowderPayPushLowScheduleTurnOn10 = 1
 EndIf
 
-If PowderPayPushLowScheduleTurnOn10 = 99 Then
+If PowderPayPushLowScheduleTurnOn10 = 1 Then
     If SystemTimeHourInt = 3 Then
         If SystemTimeMinuteInt = 30 Then
             ; idle 
@@ -58,24 +58,10 @@ Else
 
     If PowderScheduleForCh10 = "start" Then 
     
-        Var MachinePowderCamTestResult = "hurr"
+        Var PowderScheduleForCh10 = "powder-run"
-        Var PowderScheduleForCh10 = "wait"
-        __CMD "CLI" "check-cam-powder" "-" "-"
-        Var PowderDriverToLowPositionResult = ""
-
         
     EndIf
 
-    DEBUGVAR MachinePowderCamTestResult
-  
-    If PowderScheduleForCh10 = "wait" Then
-        
-        DEBUGVAR PowderScheduleForCh10
-        If MachinePowderCamTestResult = "pass" Then
-            Var PowderScheduleForCh10 = "powder-run"
-            Var MachinePowderCamTestResult = ""
-        EndIf
-    EndIf
 
     If PowderScheduleForCh10 = "powder-run" Then
         Var PowderScheduleForCh10 = "wait-low-test"

inter/tha/menu/lang.tsv

@@ -1105,7 +1105,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง

inter/tha/xml/multi/page_catalog_group_cocktail.lxml

@@ -16791,13 +16791,13 @@
 	<State> Flag( 11-99-05-0050.Button,$Sum1199050050) </State> 
 	<Button>
 	<State> $Sum1199050050 </State> 
-	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//" </Filename>
+	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Glenfiddich Highball.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Glenfiddich Highball.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Glenfiddich Highball.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Glenfiddich Highball.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
 		Var PriceD1 = $-.Price
@@ -16807,9 +16807,9 @@
 		Var PD_CODE2 = "11-99-05-0050"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Glenfiddich Highball"
+		Var aliasName[0] = "Glenfiddich\nHighball"
 		Var aliasDesc[0] = "Glenfiddich, Soda"
-		Var aliasName[1] = "Glenfiddich Highball"
+		Var aliasName[1] = "Glenfiddich\nHighball"
 		Var aliasDesc[1] = "Glenfiddich, Soda"
 		Var aliasName[2] = "-"
 		Var aliasDesc[2] = "-"
@@ -16831,8 +16831,8 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "ICED Glenfiddich Highball"
+		Var NameLang[1][0] = "ICED Glenfiddich\nHighball"
-		Var NameLang[1][1] = "Glenfiddich Highball"
+		Var NameLang[1][1] = "Glenfiddich\nHighball"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
@@ -16935,10 +16935,10 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Glenfiddich Highball</LanguageSlot1>
+		<LanguageSlot1>Glenfiddich\nHighball</LanguageSlot1>
-		<LanguageSlot2>Glenfiddich Highball</LanguageSlot2>
+		<LanguageSlot2>Glenfiddich\nHighball</LanguageSlot2>
-		<LanguageSlot3>Glenfiddich Highball</LanguageSlot3>
+		<LanguageSlot3>Glenfiddich\nHighball</LanguageSlot3>
-		<LanguageSlot4>Glenfiddich Highball</LanguageSlot4>
+		<LanguageSlot4>Glenfiddich\nHighball</LanguageSlot4>
 		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
@@ -17146,13 +17146,13 @@
 	<State> Flag( 11-99-05-0051.Button,$Sum1199050051) </State> 
 	<Button>
 	<State> $Sum1199050051 </State> 
-	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//" </Filename>
+	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Glenfiddich Mizuwari.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Glenfiddich Mizuwari.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Glenfiddich Mizuwari.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Glenfiddich Mizuwari.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
 		Var PriceD1 = $-.Price
@@ -17162,9 +17162,9 @@
 		Var PD_CODE2 = "11-99-05-0051"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Glenfiddich Mizuwari"
+		Var aliasName[0] = "Glenfiddich\nMizuwari"
 		Var aliasDesc[0] = "Glenfiddich, Water"
-		Var aliasName[1] = "Glenfiddich Mizuwari"
+		Var aliasName[1] = "Glenfiddich\nMizuwari"
 		Var aliasDesc[1] = "Glenfiddich, Water"
 		Var aliasName[2] = "-"
 		Var aliasDesc[2] = "-"
@@ -17186,8 +17186,8 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "ICED Glenfiddich Mizuwari"
+		Var NameLang[1][0] = "ICED Glenfiddich\nMizuwari"
-		Var NameLang[1][1] = "Glenfiddich Mizuwari"
+		Var NameLang[1][1] = "Glenfiddich\nMizuwari"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
@@ -17290,10 +17290,10 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Glenfiddich Mizuwari</LanguageSlot1>
+		<LanguageSlot1>Glenfiddich\nMizuwari</LanguageSlot1>
-		<LanguageSlot2>Glenfiddich Mizuwari</LanguageSlot2>
+		<LanguageSlot2>Glenfiddich\nMizuwari</LanguageSlot2>
-		<LanguageSlot3>Glenfiddich Mizuwari</LanguageSlot3>
+		<LanguageSlot3>Glenfiddich\nMizuwari</LanguageSlot3>
-		<LanguageSlot4>Glenfiddich Mizuwari</LanguageSlot4>
+		<LanguageSlot4>Glenfiddich\nMizuwari</LanguageSlot4>
 		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
@@ -17501,13 +17501,13 @@
 	<State> Flag( 11-99-05-0052.Button,$Sum1199050052) </State> 
 	<Button>
 	<State> $Sum1199050052 </State> 
-	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//" </Filename>
+	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Balvenie Highball.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Balvenie Highball.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Balvenie Highball.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Balvenie Highball.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
 		Var PriceD1 = $-.Price
@@ -17856,13 +17856,13 @@
 	<State> Flag( 11-99-05-0053.Button,$Sum1199050053) </State> 
 	<Button>
 	<State> $Sum1199050053 </State> 
-	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//" </Filename>
+	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Balvenie Mizuwari.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Balvenie Mizuwari.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Balvenie Mizuwari.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Balvenie Mizuwari.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
 		Var PriceD1 = $-.Price
@@ -18211,13 +18211,13 @@
 	<State> Flag( 11-99-05-0054.Button,$Sum1199050054) </State> 
 	<Button>
 	<State> $Sum1199050054 </State> 
-	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//" </Filename>
+	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Macallan Lumina Highball.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Macallan Lumina Highball.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Macallan Lumina Highball.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Macallan Lumina Highball.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
 		Var PriceD1 = $-.Price
@@ -18227,9 +18227,9 @@
 		Var PD_CODE2 = "11-99-05-0054"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Macallan Lumina Highball"
+		Var aliasName[0] = "Macallan Lumina\nHighball"
 		Var aliasDesc[0] = "Macallan Lumina, Soda"
-		Var aliasName[1] = "Macallan Lumina Highball"
+		Var aliasName[1] = "Macallan Lumina\nHighball"
 		Var aliasDesc[1] = "Macallan Lumina, Soda"
 		Var aliasName[2] = "-"
 		Var aliasDesc[2] = "-"
@@ -18251,8 +18251,8 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "ICED Macallan Lumina Highball"
+		Var NameLang[1][0] = "ICED Macallan Lumina\nHighball"
-		Var NameLang[1][1] = "Macallan Lumina Highball"
+		Var NameLang[1][1] = "Macallan Lumina\nHighball"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
@@ -18355,10 +18355,10 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Macallan Lumina Highball</LanguageSlot1>
+		<LanguageSlot1>Macallan Lumina\nHighball</LanguageSlot1>
-		<LanguageSlot2>Macallan Lumina Highball</LanguageSlot2>
+		<LanguageSlot2>Macallan Lumina\nHighball</LanguageSlot2>
-		<LanguageSlot3>Macallan Lumina Highball</LanguageSlot3>
+		<LanguageSlot3>Macallan Lumina\nHighball</LanguageSlot3>
-		<LanguageSlot4>Macallan Lumina Highball</LanguageSlot4>
+		<LanguageSlot4>Macallan Lumina\nHighball</LanguageSlot4>
 		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>
@@ -18566,13 +18566,13 @@
 	<State> Flag( 11-99-05-0055.Button,$Sum1199050055) </State> 
 	<Button>
 	<State> $Sum1199050055 </State> 
-	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//" </Filename>
+	<Filename> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Macallan Lumina Mizuwari.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Macallan Lumina Mizuwari.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Macallan Lumina Mizuwari.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + ""
+		Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Macallan Lumina Mizuwari.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
 		Var PriceD1 = $-.Price
@@ -18582,9 +18582,9 @@
 		Var PD_CODE2 = "11-99-05-0055"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Macallan Lumina Mizuwari"
+		Var aliasName[0] = "Macallan Lumina\nMizuwari"
 		Var aliasDesc[0] = "Macallan Lumina, Water"
-		Var aliasName[1] = "Macallan Lumina Mizuwari"
+		Var aliasName[1] = "Macallan Lumina\nMizuwari"
 		Var aliasDesc[1] = "Macallan Lumina, Water"
 		Var aliasName[2] = "-"
 		Var aliasDesc[2] = "-"
@@ -18606,8 +18606,8 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "ICED Macallan Lumina Mizuwari"
+		Var NameLang[1][0] = "ICED Macallan Lumina\nMizuwari"
-		Var NameLang[1][1] = "Macallan Lumina Mizuwari"
+		Var NameLang[1][1] = "Macallan Lumina\nMizuwari"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
@@ -18710,10 +18710,10 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Macallan Lumina Mizuwari</LanguageSlot1>
+		<LanguageSlot1>Macallan Lumina\nMizuwari</LanguageSlot1>
-		<LanguageSlot2>Macallan Lumina Mizuwari</LanguageSlot2>
+		<LanguageSlot2>Macallan Lumina\nMizuwari</LanguageSlot2>
-		<LanguageSlot3>Macallan Lumina Mizuwari</LanguageSlot3>
+		<LanguageSlot3>Macallan Lumina\nMizuwari</LanguageSlot3>
-		<LanguageSlot4>Macallan Lumina Mizuwari</LanguageSlot4>
+		<LanguageSlot4>Macallan Lumina\nMizuwari</LanguageSlot4>
 		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>-</LanguageSlot6>
 	</LanguageGroup>

inter/tha/xml/multi/page_catalog_group_forkid.lxml

@@ -277,18 +277,18 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Strawberry Soda SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "สตรอเบอรีโซดา"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Strawberry, Soda & Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "สตรอเบอรี โซดา"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0041.Button
@@ -1330,30 +1330,30 @@
 		Var DescLang[0][3] = "-"
 		Var DescLang[0][4] = "-"
 		Var DescLang[0][5] = "-"
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED Milk"
-		Var NameLang[1][1] = ""
+		Var NameLang[1][1] = "นม "
-		Var NameLang[1][2] = ""
+		Var NameLang[1][2] = "-"
-		Var NameLang[1][3] = ""
+		Var NameLang[1][3] = "-"
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = ""
+		Var NameLang[1][5] = "-"
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Milk"
-		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] = ""
+		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = ""
+		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Milk SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "นม "
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Milk"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "นม"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = $12-03-01-0005.Button
 		Var PD_STAGE_2 = $12-03-02-0005.Button
@@ -1689,30 +1689,30 @@
 		Var DescLang[0][3] = "-"
 		Var DescLang[0][4] = "-"
 		Var DescLang[0][5] = "-"
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED Caramel Milk"
-		Var NameLang[1][1] = ""
+		Var NameLang[1][1] = "นมคาราเมล "
-		Var NameLang[1][2] = ""
+		Var NameLang[1][2] = "-"
-		Var NameLang[1][3] = ""
+		Var NameLang[1][3] = "-"
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = ""
+		Var NameLang[1][5] = "-"
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Milk, Caramel "
-		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] = ""
+		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = ""
+		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Caramel Milk SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "นมคาราเมล "
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Milk, Caramel "
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "นม คาราเมล  "
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = $12-03-01-0001.Button
 		Var PD_STAGE_2 = $12-03-02-0001.Button
@@ -2048,30 +2048,30 @@
 		Var DescLang[0][3] = "-"
 		Var DescLang[0][4] = "-"
 		Var DescLang[0][5] = "-"
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED Brown Sugar \nMilk"
-		Var NameLang[1][1] = ""
+		Var NameLang[1][1] = "นมบราวน์ชูการ์ "
-		Var NameLang[1][2] = ""
+		Var NameLang[1][2] = "-"
-		Var NameLang[1][3] = ""
+		Var NameLang[1][3] = "-"
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = ""
+		Var NameLang[1][5] = "-"
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Milk, Kokuto"
-		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] = ""
+		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = ""
+		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Brown Sugar \nMilk SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "นมบราวน์ชูการ์ "
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Milk, Kokuto"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "นม และ น้ำตาลแดง"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = $12-03-01-0003.Button
 		Var PD_STAGE_2 = $12-03-02-0003.Button
@@ -2419,13 +2419,13 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = "Pink Milk Smoothie SMOOTHIE"
+		Var NameLang[2][0] = "Pink Milk SMOOTHIE"
-		Var NameLang[2][1] = "นมชมพูปั่น"
+		Var NameLang[2][1] = "นมชมพู "
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
 		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = "Salak , Milk, Sugar"
+		Var DescLang[2][0] = "Salak, Milk,\nSugar"
 		Var DescLang[2][1] = "น้ำแดงกลิ่นสละ นม \nน้ำตาล "
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
@@ -2762,30 +2762,30 @@
 		Var DescLang[0][3] = "-"
 		Var DescLang[0][4] = "-"
 		Var DescLang[0][5] = "-"
-		Var NameLang[1][0] = "ICED Cocoa X1"
+		Var NameLang[1][0] = "ICED Cocoa"
-		Var NameLang[1][1] = "โกโก้ตัวแม่"
+		Var NameLang[1][1] = "โกโก้ "
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = "-"
 		Var DescLang[1][0] = "Milk, Cocoa, Sugar"
-		Var DescLang[1][1] = "โกโก้ 1x นม และน้ำตาล"
+		Var DescLang[1][1] = "โกโก้ นมและน้ำตาล"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Cocoa SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "โกโก้ "
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Milk, Cocoa, Sugar"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "โกโก้ นมและน้ำตาล"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = $12-03-01-0002.Button
 		Var PD_STAGE_2 = $12-03-02-0002.Button
@@ -3121,30 +3121,30 @@
 		Var DescLang[0][3] = "-"
 		Var DescLang[0][4] = "-"
 		Var DescLang[0][5] = "-"
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED Melon Milk"
-		Var NameLang[1][1] = ""
+		Var NameLang[1][1] = "นมเมล่อน"
-		Var NameLang[1][2] = ""
+		Var NameLang[1][2] = "-"
-		Var NameLang[1][3] = ""
+		Var NameLang[1][3] = "-"
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = ""
+		Var NameLang[1][5] = "-"
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Milk & Melon"
-		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] = ""
+		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = ""
+		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Melon Milk SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "นมเมล่อน"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Milk & Melon"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "นม และ น้ำเชื่อมเมล่อน"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = $12-03-01-0022.Button
 		Var PD_STAGE_2 = $12-03-02-0022.Button
@@ -3492,14 +3492,14 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "Strawberry Cocoa \nSmoothie SMOOTHIE"
+		Var NameLang[2][0] = "Cocoa Strawberry SMOOTHIE"
-		Var NameLang[2][1] = "โกโก้สตรอเบอรีปั่น"
+		Var NameLang[2][1] = "โกโก้สตรอเบอรี"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
 		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = "Milk, Cocoa, Strawberry"
+		Var DescLang[2][0] = "Strawberry, Milk,\nCocoa, Sugar"
-		Var DescLang[2][1] = "นม สตรอเบอรี \nโกโก้ และน้ำแข็ง"
+		Var DescLang[2][1] = "สตรอเบอรี นม โกโก้\nและน้ำตาล"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
@@ -4557,18 +4557,18 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Salak Soda SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "น้ำแดงโซดา"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Salak, Soda & Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "น้ำแดงกลิ่นสละ โซดา "
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0008.Button
@@ -5965,30 +5965,30 @@
 		Var DescLang[0][3] = "-"
 		Var DescLang[0][4] = "-"
 		Var DescLang[0][5] = "-"
-		Var NameLang[1][0] = "ICED Forget love, take\nthe L"
+		Var NameLang[1][0] = "ICED Tokyo\nBanana Milk"
-		Var NameLang[1][1] = "คนลืมก่อนชนะ\nโอเคเราแพ้"
+		Var NameLang[1][1] = "นมโตเกียวบานาน่า"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = "-"
-		Var DescLang[1][0] = "Banana , Milk And Ice"
+		Var DescLang[1][0] = "Tokyo Banana, Milk, Sugar"
-		Var DescLang[1][1] = "กล้วย นม  และน้ำแข็ง"
+		Var DescLang[1][1] = "โตเกียวบานาน่า นมและน้ำตาล"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Tokyo\nBanana Milk SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "นมโตเกียวบานาน่า"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Tokyo Banana, Milk, Sugar"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "โตเกียวบานาน่า นมและน้ำตาล"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = $12-03-01-0023.Button
 		Var PD_STAGE_2 = $12-03-02-0023.Button
@@ -6324,30 +6324,30 @@
 		Var DescLang[0][3] = "-"
 		Var DescLang[0][4] = "-"
 		Var DescLang[0][5] = "-"
-		Var NameLang[1][0] = "ICED Kindness fix,\nzero romance drama."
+		Var NameLang[1][0] = "ICED Choco Tokyo\nBanana Milk"
-		Var NameLang[1][1] = "ที่ทำดีด้วยเขาไม่ได้มีใจ\nแต่เขามีเมตตา"
+		Var NameLang[1][1] = "นมช็อกโกโตเกียว\nบานาน่า"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = "-"
-		Var DescLang[1][0] = "Banana ,\nmilk, Cocoa"
+		Var DescLang[1][0] = "Tokyo Banana, Milk, Sugar"
-		Var DescLang[1][1] = "กล้วย  นม และโกโก้ และน้ำ"
+		Var DescLang[1][1] = "โกโก้ โตเกียวบานาน่า นมและน้ำตาล"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Choco Tokyo\nBanana Milk SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "นมช็อกโกโตเกียว\nบานาน่า"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Tokyo Banana, Milk, Sugar"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "โกโก้ โตเกียวบานาน่า นมและน้ำตาล"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = $12-03-01-0024.Button
 		Var PD_STAGE_2 = $12-03-02-0024.Button

inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml

@@ -267,13 +267,13 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = "Today is boiling\npoint reached SMOOTHIE"
+		Var NameLang[2][0] = "Pepsi SMOOTHIE"
-		Var NameLang[2][1] = "วันนี้ร้อนจนเดือด"
+		Var NameLang[2][1] = "เป๊ปซี่น้ำแข็ง"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
 		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = "Pepsi and Soda"
+		Var DescLang[2][0] = "Pepsi, Ice"
 		Var DescLang[2][1] = "เป๊ปซี่  "
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
@@ -977,14 +977,14 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = "Pepsi Smoothie SMOOTHIE"
+		Var NameLang[2][0] = "Pepsi SMOOTHIE"
-		Var NameLang[2][1] = "เป๊ปซี่ปั่น"
+		Var NameLang[2][1] = "เป๊ปซี่โซดา"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
 		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = "Pepsi, Ice"
+		Var DescLang[2][0] = "Pepsi, Soda And Ice"
-		Var DescLang[2][1] = "เป๊ปซี่  "
+		Var DescLang[2][1] = "เป๊ปซี่ โซดา และน้ำแข็ง"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
@@ -2752,18 +2752,18 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Pepsi Plum SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "เป๊ปซี่บ๊วย"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Pepsi, Ume & Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "เป๊ปซี่ บ๊วย โซดา  "
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0046.Button
@@ -3107,18 +3107,18 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Pepsi Plum SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "เป๊ปซี่บ๊วย"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Pepsi, Ume & Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "เป๊ปซี่ บ๊วย โซดา  "
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0104.Button
@@ -3462,18 +3462,18 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Pepsi Max Plum SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "เป๊ปซี่แม็กซ์บ๊วย"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Pepsi Max, Ume & Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "เป๊ปซี่แม็กซ์ บ๊วย โซดา  "
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0074.Button
@@ -4527,18 +4527,18 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Pepsi Melon SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "เป๊ปซี่เมล่อน"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Pepsi, Melon & Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "เป๊ปซี่ เมล่อน โซดา"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0047.Button
@@ -4882,18 +4882,18 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Pepsi Melon SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "เป๊ปซี่เมล่อน"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Pepsi, Melon & Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "เป๊ปซี่ เมล่อน โซดา"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0105.Button
@@ -5237,18 +5237,18 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Pepsi Max Melon SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "เป๊ปซี่แม็กเมล่อน"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Pepsi Max, Melon & Ice"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "เป๊ปซี่แม็กซ์ เมล่อน โซดา"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0075.Button
@@ -9852,18 +9852,18 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Coconut Pepsi SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "มะพร้าวน้ำหอมเป๊ปซี่"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut, Pepsi and Soda"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "มะพร้าว เป๊ปซี่ และโซดา"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0091.Button
@@ -10207,18 +10207,18 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = "-"
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "Coconut Pepsi SMOOTHIE"
-		Var NameLang[2][1] = ""
+		Var NameLang[2][1] = "มะพร้าวน้ำหอมเป๊ปซี่"
-		Var NameLang[2][2] = ""
+		Var NameLang[2][2] = "-"
-		Var NameLang[2][3] = ""
+		Var NameLang[2][3] = "-"
-		Var NameLang[2][4] = ""
+		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = ""
+		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut, Pepsi and Soda"
-		Var DescLang[2][1] = ""
+		Var DescLang[2][1] = "มะพร้าว เป๊ปซี่ และโซดา"
-		Var DescLang[2][2] = ""
+		Var DescLang[2][2] = "-"
-		Var DescLang[2][3] = ""
+		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = ""
+		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = ""
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0114.Button

inter/tha/xml/multi/page_catalog_group_pro_12_day_12_menu.lxml

@@ -151,7 +151,7 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "Iced Super Cocoa X3 SMOOTHIE"
+		Var NameLang[2][0] = "Super Cocoa X3 SMOOTHIE"
 		Var NameLang[2][1] = "ซูเปอร์โกโก้เข้ม คูณ 3"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
@@ -861,14 +861,14 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "Coconut Milk\nSmoothie SMOOTHIE"
+		Var NameLang[2][0] = "coconut milk SMOOTHIE"
 		Var NameLang[2][1] = "มะพร้าวน้ำหอมปั่น\nนมนิวซีแลนด์"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
 		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = "Coconut , Milk"
+		Var DescLang[2][0] = "Coconut, Milk,\nWater"
-		Var DescLang[2][1] = "มะพร้าวน้ำหอมปั่น\nนม"
+		Var DescLang[2][1] = "มะพร้าว นม และน้ำ "
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
@@ -1216,13 +1216,13 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "Pink Milk Smoothie SMOOTHIE"
+		Var NameLang[2][0] = "Pink Milk SMOOTHIE"
-		Var NameLang[2][1] = "นมชมพูปั่น"
+		Var NameLang[2][1] = "นมชมพู "
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
 		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = "Salak , Milk, Sugar"
+		Var DescLang[2][0] = "Salak, Milk,\nSugar"
 		Var DescLang[2][1] = "น้ำแดงกลิ่นสละ นม \nน้ำตาล "
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
@@ -1566,7 +1566,7 @@
 		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = "-"
 		Var DescLang[1][0] = "Espresso, Water"
-		Var DescLang[1][1] = "กาแฟ และน้ำ "
+		Var DescLang[1][1] = "กาแฟ และน้ำ"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
@@ -1914,18 +1914,18 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED Americano"
-		Var NameLang[1][1] = ""
+		Var NameLang[1][1] = "อเมริกาโน"
-		Var NameLang[1][2] = ""
+		Var NameLang[1][2] = "-"
-		Var NameLang[1][3] = ""
+		Var NameLang[1][3] = "-"
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = ""
+		Var NameLang[1][5] = "-"
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Espresso, Water"
-		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] = ""
+		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = ""
+		Var DescLang[1][5] = "-"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -2636,14 +2636,14 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "Strawberry Cocoa \nSmoothie SMOOTHIE"
+		Var NameLang[2][0] = "Cocoa Strawberry SMOOTHIE"
-		Var NameLang[2][1] = "โกโก้สตรอเบอรีปั่น"
+		Var NameLang[2][1] = "โกโก้สตรอเบอรี"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
 		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = "Milk, Cocoa, Strawberry"
+		Var DescLang[2][0] = "Strawberry, Milk,\nCocoa, Sugar"
-		Var DescLang[2][1] = "นม สตรอเบอรี \nโกโก้ และน้ำแข็ง"
+		Var DescLang[2][1] = "สตรอเบอรี นม โกโก้\nและน้ำตาล"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
@@ -3334,18 +3334,18 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED Thai \nIced Espresso"
-		Var NameLang[1][1] = ""
+		Var NameLang[1][1] = "เอสเย็นแบบไทยๆ"
-		Var NameLang[1][2] = ""
+		Var NameLang[1][2] = "-"
-		Var NameLang[1][3] = ""
+		Var NameLang[1][3] = "-"
-		Var NameLang[1][4] = ""
+		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = ""
+		Var NameLang[1][5] = "-"
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Espresso, Milk, Sugar,Ice"
-		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] = ""
+		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = ""
+		Var DescLang[1][5] = "-"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -3701,14 +3701,14 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "Coconut \nJasmine Milk Tea SMOOTHIE"
+		Var NameLang[2][0] = "Coconut \nJasmine milk tea SMOOTHIE"
 		Var NameLang[2][1] = "มะพร้าว\nชามะลินมนิวซีแลนด์"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
 		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = "Coconut , Jasmine Tea,  Milk \nWater"
+		Var DescLang[2][0] = "Coconut, Jasmine Tea,  Milk \nWater"
-		Var DescLang[2][1] = "มะพร้าวชามะลินมนิวซีแลนด์"
+		Var DescLang[2][1] = "มะพร้าว ชามะลิ  นมและน้ำ"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
@@ -4062,8 +4062,8 @@
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
 		Var NameLang[2][5] = "-"
-		Var DescLang[2][0] = "Thai tea, Sugar, Warm milk"
+		Var DescLang[2][0] = "Thai Tea, Sugar, Milk"
-		Var DescLang[2][1] = "ชาไทย น้ำตาล และ นมอุ่น"
+		Var DescLang[2][1] = "ชาไทย และ นม"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
@@ -4400,7 +4400,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "ICED Lime \nGinger Tea"
-		Var NameLang[1][1] = "ชาขิงมะนาว"
+		Var NameLang[1][1] = "ชาขิงมะนาว "
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"