ID card fix

2023-04-27 11:26:22 +07:00 · 2023-04-27 11:26:22 +07:00 · 5701b7a776
commit 5701b7a776
parent 962d628a28
18 changed files with 703 additions and 1358 deletions
--- a/xml/page_catalog_group_whey.xml
+++ b/xml/page_catalog_group_whey.xml
@ -550,8 +550,7 @@
 		Var NameDrink = "MATCHA SHAKE"
 		Var NameDrinkTH = "มัทฉะโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาเชียว นม"
-		Var DrinkDescription = "Whey protein,
-Matcha, & Milk"
+		Var DrinkDescription = "Whey protein, Matcha, & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Matcha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -800,8 +799,7 @@ Matcha, & Milk" </Value>
 		Var NameDrink = "MATCHA SHAKE"
 		Var NameDrinkTH = "มัทฉะโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาเชียว นม"
-		Var DrinkDescription = "Whey protein,
-Matcha, & Milk"
+		Var DrinkDescription = "Whey protein, Matcha, & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Matcha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1050,8 +1048,7 @@ Matcha, & Milk" </Value>
 		Var NameDrink = "CHOCOLATE SHAKE"
 		Var NameDrinkTH = "โกโก้โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน โกโก้ นม"
-		Var DrinkDescription = "Whey protein,
-Cocoa, & Milk"
+		Var DrinkDescription = "Whey protein, Cocoa, & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Chocolate.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1297,13 +1294,10 @@ Cocoa, & Milk" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "STRAWBERRY 
-SHAKE"
+		Var NameDrink = "STRAWBERRY  SHAKE"
 		Var NameDrinkTH = "สตอเบอร์รี่โปรตีน"
-		Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ 
-นม"
-		Var DrinkDescription = "Whey protein,Milk, 
-Strawberry Syrup"
+		Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่  นม"
+		Var DrinkDescription = "Whey protein,Milk,  Strawberry Syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Strawberry.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1551,13 +1545,10 @@ Strawberry Syrup" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "STRAWBERRY 
-SHAKE"
+		Var NameDrink = "STRAWBERRY  SHAKE"
 		Var NameDrinkTH = "สตอเบอร์รี่โปรตีน"
-		Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ 
-นม"
-		Var DrinkDescription = "Whey protein,Milk, 
-Strawberry Syrup"
+		Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่  นม"
+		Var DrinkDescription = "Whey protein,Milk,  Strawberry Syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Strawberry.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1807,10 +1798,8 @@ Strawberry Syrup" </Value>
 	<EventOnClick> 
 		Var NameDrink = "MELON SHAKE"
 		Var NameDrinkTH = "เมล่อนโปรตีน"
-		Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมเมล่อน 
-นม"
-		Var DrinkDescription = "Whey protein,Milk, 
-Melon Syrup"
+		Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมเมล่อน  นม"
+		Var DrinkDescription = "Whey protein,Milk,  Melon Syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_melon.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2060,8 +2049,7 @@ Melon Syrup" </Value>
 		Var NameDrink = "ESPRESSO SHAKE"
 		Var NameDrinkTH = "เอสเพรสโซ่โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน กาแฟ นม"
-		Var DrinkDescription = "Whey protein, Espresso
-& Milk"
+		Var DrinkDescription = "Whey protein, Espresso & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_espresso.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2310,8 +2298,7 @@ Melon Syrup" </Value>
 		Var NameDrink = "THAI TEA SHAKE"
 		Var NameDrinkTH = "ชานมไทยโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาไทย นม"
-		Var DrinkDescription = "Whey protein,
-Thai Tea, & Milk"
+		Var DrinkDescription = "Whey protein, Thai Tea, & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Thaitea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2560,8 +2547,7 @@ Thai Tea, & Milk" </Value>
 		Var NameDrink = "THAI TEA SHAKE"
 		Var NameDrinkTH = "ชานมไทยโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาไทย นม"
-		Var DrinkDescription = "Whey protein,
-Thai Tea, & Milk"
+		Var DrinkDescription = "Whey protein, Thai Tea, & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Thaitea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2807,13 +2793,10 @@ Thai Tea, & Milk" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "BROWN SUGAR 
-SHAKE"
+		Var NameDrink = "BROWN SUGAR  SHAKE"
 		Var NameDrinkTH = "บราวน์ชูการ์โปรตีน"
-		Var DrinkDescriptionTH = "เวย์โปรตีน นม 
-น้ำเชื่อมน้ำตาลแดง"
-		Var DrinkDescription = "Whey protein, Milk,
-Kokuto syrup"
+		Var DrinkDescriptionTH = "เวย์โปรตีน นม  น้ำเชื่อมน้ำตาลแดง"
+		Var DrinkDescription = "Whey protein, Milk, Kokuto syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_kokuto.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3061,13 +3044,10 @@ Kokuto syrup" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA 
-SHAKE"
+		Var NameDrink = "TAIWANESE TEA  SHAKE"
 		Var NameDrinkTH = "ชาไต้หวันโปรตีน"
-		Var DrinkDescriptionTH = "เวย์โปรตีน นม 
-ชาไต้หวัน"
-		Var DrinkDescription = "Whey protein, Milk,
-Taiwanese Tea, Sugar"
+		Var DrinkDescriptionTH = "เวย์โปรตีน นม  ชาไต้หวัน"
+		Var DrinkDescription = "Whey protein, Milk, Taiwanese Tea, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Taiwantea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3315,13 +3295,10 @@ Taiwanese Tea, Sugar" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA 
-SHAKE"
+		Var NameDrink = "TAIWANESE TEA  SHAKE"
 		Var NameDrinkTH = "ชาไต้หวันโปรตีน"
-		Var DrinkDescriptionTH = "เวย์โปรตีน นม 
-ชาไต้หวัน"
-		Var DrinkDescription = "Whey protein, Milk,
-Taiwanese Tea, Sugar"
+		Var DrinkDescriptionTH = "เวย์โปรตีน นม  ชาไต้หวัน"
+		Var DrinkDescription = "Whey protein, Milk, Taiwanese Tea, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Taiwantea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3571,10 +3548,8 @@ Taiwanese Tea, Sugar" </Value>
 	<EventOnClick> 
 		Var NameDrink = "CARAMEL SHAKE"
 		Var NameDrinkTH = "คาราเมลโปรตีน"
-		Var DrinkDescriptionTH = "เวย์โปรตีน นม 
-น้ำเชื่อมคาราเมล"
-		Var DrinkDescription = "Whey protein, Milk,
-Caramel Syrup"
+		Var DrinkDescriptionTH = "เวย์โปรตีน นม  น้ำเชื่อมคาราเมล"
+		Var DrinkDescription = "Whey protein, Milk, Caramel Syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_caramel.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price