diff --git a/spiral/image/page_spiral/03-01-01-0039.png b/spiral/image/page_spiral/03-01-01-0039.png
new file mode 100644
index 00000000..5ebafca7
Binary files /dev/null and b/spiral/image/page_spiral/03-01-01-0039.png differ
diff --git a/spiral/image/page_spiral/03-01-01-0040.png b/spiral/image/page_spiral/03-01-01-0040.png
new file mode 100644
index 00000000..5a4f74d0
Binary files /dev/null and b/spiral/image/page_spiral/03-01-01-0040.png differ
diff --git a/spiral/image/page_spiral/03-02-01-0010.png b/spiral/image/page_spiral/03-02-01-0010.png
index 5ebafca7..f08c2177 100644
Binary files a/spiral/image/page_spiral/03-02-01-0010.png and b/spiral/image/page_spiral/03-02-01-0010.png differ
diff --git a/spiral/image/page_spiral/03-02-01-0011.png b/spiral/image/page_spiral/03-02-01-0011.png
index 5a4f74d0..d69bc538 100644
Binary files a/spiral/image/page_spiral/03-02-01-0011.png and b/spiral/image/page_spiral/03-02-01-0011.png differ
diff --git a/spiral/image/page_spiral/03-02-01-0012.png b/spiral/image/page_spiral/03-02-01-0012.png
new file mode 100644
index 00000000..37fc2fb7
Binary files /dev/null and b/spiral/image/page_spiral/03-02-01-0012.png differ
diff --git a/spiral/image/page_spiral/spiral_product_03-01-01-0039.png b/spiral/image/page_spiral/spiral_product_03-01-01-0039.png
new file mode 100644
index 00000000..55585741
Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-01-01-0039.png differ
diff --git a/spiral/image/page_spiral/spiral_product_03-01-01-0040.png b/spiral/image/page_spiral/spiral_product_03-01-01-0040.png
new file mode 100644
index 00000000..63d170db
Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-01-01-0040.png differ
diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0010.png b/spiral/image/page_spiral/spiral_product_03-02-01-0010.png
index 55585741..a7fd1ee4 100644
Binary files a/spiral/image/page_spiral/spiral_product_03-02-01-0010.png and b/spiral/image/page_spiral/spiral_product_03-02-01-0010.png differ
diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0011.png b/spiral/image/page_spiral/spiral_product_03-02-01-0011.png
index 63d170db..d785d2a6 100644
Binary files a/spiral/image/page_spiral/spiral_product_03-02-01-0011.png and b/spiral/image/page_spiral/spiral_product_03-02-01-0011.png differ
diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0012.png b/spiral/image/page_spiral/spiral_product_03-02-01-0012.png
new file mode 100644
index 00000000..b8b2b9d0
Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-02-01-0012.png differ
diff --git a/spiral/image/page_spiral_press/03-01-01-0039.png b/spiral/image/page_spiral_press/03-01-01-0039.png
new file mode 100644
index 00000000..af05793b
Binary files /dev/null and b/spiral/image/page_spiral_press/03-01-01-0039.png differ
diff --git a/spiral/image/page_spiral_press/03-01-01-0040.png b/spiral/image/page_spiral_press/03-01-01-0040.png
new file mode 100644
index 00000000..42a3eff3
Binary files /dev/null and b/spiral/image/page_spiral_press/03-01-01-0040.png differ
diff --git a/spiral/image/page_spiral_press/03-02-01-0010.png b/spiral/image/page_spiral_press/03-02-01-0010.png
index af05793b..5abcf1a0 100644
Binary files a/spiral/image/page_spiral_press/03-02-01-0010.png and b/spiral/image/page_spiral_press/03-02-01-0010.png differ
diff --git a/spiral/image/page_spiral_press/03-02-01-0011.png b/spiral/image/page_spiral_press/03-02-01-0011.png
index 42a3eff3..d15247fe 100644
Binary files a/spiral/image/page_spiral_press/03-02-01-0011.png and b/spiral/image/page_spiral_press/03-02-01-0011.png differ
diff --git a/spiral/image/page_spiral_press/03-02-01-0012.png b/spiral/image/page_spiral_press/03-02-01-0012.png
new file mode 100644
index 00000000..9205f524
Binary files /dev/null and b/spiral/image/page_spiral_press/03-02-01-0012.png differ
diff --git a/spiral/product.json b/spiral/product.json
index 1946a939..5d3c51f3 100644
--- a/spiral/product.json
+++ b/spiral/product.json
@@ -146,12 +146,12 @@
},
{
"id": 10,
- "code": "03-02-01-0010",
+ "code": "03-01-01-0039",
"name": "น้ำเสาวรส",
"nameE": "Passion Fruit Juice",
"desc": "SINGHA PARK",
"descE": "SINGHA PARK",
- "image": "03-02-01-0010.png",
+ "image": "03-01-01-0039.png",
"detail1": "น้ำเสาวรส 300 มล. สิงห์ปาร์ค น้ำผลไม้เสารสพร้อมดื่ม ไม่ใส่วัตถุกันเสียไม่แต่งสีแต่งกลิ่น ผลิตจากผลไม้สดจากไร่ รสเปรี้ยวอมหวาน เพิ่มความสดชื่นให้ร่างกาย",
"header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
"detail2": "ผลไม้ทำมาจากธรรมชาติ ไม่มีสารก่อให้เกิดการแพ้อาหาร",
@@ -162,12 +162,12 @@
},
{
"id": 11,
- "code": "03-02-01-0011",
+ "code": "03-01-01-0040",
"name": "น้ำมัลเบอร์รี่",
"nameE": "Mulberry Juice",
"desc": "SINGHA PARK",
"descE": "SINGHA PARK",
- "image": "03-02-01-0011.png",
+ "image": "03-01-01-0040.png",
"detail1": "แนะนำดื่มกันน้ำแข็งเต่าบิน น้ำมัลเบอร์รี่ 300 มล. สิงห์ปาร์ค น้ำผลไม้เสารสพร้อมดื่ม ไม่ใส่วัตถุกันเสียไม่แต่งสีแต่งกลิ่น ผลิตจากผลไม้สดจากไร่ รสเปรี้ยวอมหวาน เพิ่มความสดชื่นให้ร่างกาย",
"header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
"detail2": "ผลไม้ทำมาจากธรรมชาติ ไม่มีสารก่อให้เกิดการแพ้อาหาร",
@@ -175,6 +175,54 @@
"header2E": "Allergen Contains:",
"detail2E": "Made from real fruit. No substances that cause food allergies.",
"price": 50
+ },
+ {
+ "id": 12,
+ "code": "03-02-01-0010",
+ "name": "ปลาหมึกแห้งรสดังเดิม",
+ "nameE": "Original Dried Squid",
+ "desc": "TAO BIN SNACK STATION",
+ "descE": "TAO BIN SNACK STATION",
+ "image": "03-02-01-0010.png",
+ "detail1": "ปลาหมึกบดรสดังเดิม อร่อยจากเนื้อหมึกแท้ๆ",
+ "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
+ "detail2": "มีไข่ ถั่วเปลือกแข็ง และอาจมีแป้งสาลี นม ถั่วเหลือง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ปลาหมึก ซัลไฟต์",
+ "detail1E": "Delicious Squid snack from the sea.",
+ "header2E": "Allergen Contains:",
+ "detail2E": "May Contains: Egg, treenuts, gluten, milk, Soybean, peanuts, oat, sesame seeds, fish, squid, sulphites.",
+ "price": 65
+ },
+ {
+ "id": 13,
+ "code": "03-02-01-0011",
+ "name": "ปลาหมึกแห้งรสสไปร์ซี่",
+ "nameE": "Spicy Dried Squid",
+ "desc": "TAO BIN SNACK STATION",
+ "descE": "TAO BIN SNACK STATION",
+ "image": "03-02-01-0011.png",
+ "detail1": "ปลาหมึกบดรสเผ็ด อร่อยจากเนื้อหมึกแท้ๆ",
+ "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
+ "detail2": "มีไข่ ถั่วเปลือกแข็ง และอาจมีแป้งสาลี นม ถั่วเหลือง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ปลาหมึก ซัลไฟต์",
+ "detail1E": "Delicious slightly spicy Squid snack from the sea.",
+ "header2E": "Allergen Contains:",
+ "detail2E": "May Contains: Egg, treenuts, gluten, milk, Soybean, peanuts, oat, sesame seeds, fish, squid, sulphites.",
+ "price": 65
+ },
+ {
+ "id": 14,
+ "code": "03-02-01-0012",
+ "name": "ข้าวเกรียบปลาหมึก",
+ "nameE": "Squid Rice Cracker",
+ "desc": "TAO BIN SNACK STATION",
+ "descE": "TAO BIN SNACK STATION",
+ "image": "03-02-01-0012.png",
+ "detail1": "ข้าวเกรียบหมึก กรอบ หอม อร่อย ได้รสชาติของปลาหมึกแบบเต็มๆ",
+ "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
+ "detail2": "มีไข่ ถั่วเปลือกแข็ง และอาจมีแป้งสาลี นม ถั่วเหลือง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ปลาหมึก ซัลไฟต์",
+ "detail1E": "Squid Rice Cracker.",
+ "header2E": "Allergen Contains:",
+ "detail2E": "May Contains: Egg, treenuts, gluten, milk, Soybean, peanuts, oat, sesame seeds, fish, squid, sulphites.",
+ "price": 40
}
]
}
\ No newline at end of file
diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml
index 6646cf0a..1e0f9e54 100644
--- a/spiral/xml/page_catalog_vending_machine.xml
+++ b/spiral/xml/page_catalog_vending_machine.xml
@@ -9,7 +9,7 @@
"0xeae6e1"
SoundVolume
- Var SpiralSoftwareVersion = "1.03"
+ Var SpiralSoftwareVersion = "1.04"
Var ColorBrown = 0x746253
Var ColorBrown2 = 0x513C2F
@@ -472,7 +472,7 @@
Var NameDrink = $03-02-01-0001.NameE
Var NameDrinkTH = $03-02-01-0001.Name
Var DrinkDescriptionTH = $03-02-01-0001.description
- ;Var DrinkDescription = $03-02-01-0001.descriptionE
+ Var DrinkDescription = $03-02-01-0001.descriptionE
Var PriceDrink = $03-02-01-0001.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0001.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0001.image
@@ -629,7 +629,7 @@
Var NameDrink = $03-02-01-0002.NameE
Var NameDrinkTH = $03-02-01-0002.Name
Var DrinkDescriptionTH = $03-02-01-0002.description
- ;Var DrinkDescription = $03-02-01-0002.descriptionE
+ Var DrinkDescription = $03-02-01-0002.descriptionE
Var PriceDrink = $03-02-01-0002.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0002.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0002.image
@@ -785,7 +785,7 @@
Var NameDrink = $03-02-01-0003.NameE
Var NameDrinkTH = $03-02-01-0003.Name
Var DrinkDescriptionTH = $03-02-01-0003.description
- ;Var DrinkDescription = $03-02-01-0003.descriptionE
+ Var DrinkDescription = $03-02-01-0003.descriptionE
Var PriceDrink = $03-02-01-0003.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0003.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0003.image
@@ -945,7 +945,7 @@
Var NameDrink = $03-02-01-0004.NameE
Var NameDrinkTH = $03-02-01-0004.Name
Var DrinkDescriptionTH = $03-02-01-0004.description
- ;Var DrinkDescription = $03-02-01-0004.descriptionE
+ Var DrinkDescription = $03-02-01-0004.descriptionE
Var PriceDrink = $03-02-01-0004.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0004.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0004.image
@@ -1099,7 +1099,7 @@
Var NameDrink = $03-02-01-0005.NameE
Var NameDrinkTH = $03-02-01-0005.Name
Var DrinkDescriptionTH = $03-02-01-0005.description
- ;Var DrinkDescription = $03-02-01-0005.descriptionE
+ Var DrinkDescription = $03-02-01-0005.descriptionE
Var PriceDrink = $03-02-01-0005.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0005.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0005.image
@@ -1255,7 +1255,7 @@
Var NameDrink = $03-02-01-0006.NameE
Var NameDrinkTH = $03-02-01-0006.Name
Var DrinkDescriptionTH = $03-02-01-0006.description
- ;Var DrinkDescription = $03-02-01-0006.descriptionE
+ Var DrinkDescription = $03-02-01-0006.descriptionE
Var PriceDrink = $03-02-01-0006.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0006.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0006.image
@@ -1411,7 +1411,7 @@
Var NameDrink = $03-02-01-0007.NameE
Var NameDrinkTH = $03-02-01-0007.Name
Var DrinkDescriptionTH = $03-02-01-0007.description
- ;Var DrinkDescription = $03-02-01-0007.descriptionE
+ Var DrinkDescription = $03-02-01-0007.descriptionE
Var PriceDrink = $03-02-01-0007.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0007.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0007.image
@@ -1567,7 +1567,7 @@
Var NameDrink = $03-02-01-0008.NameE
Var NameDrinkTH = $03-02-01-0008.Name
Var DrinkDescriptionTH = $03-02-01-0008.description
- ;Var DrinkDescription = $03-02-01-0008.descriptionE
+ Var DrinkDescription = $03-02-01-0008.descriptionE
Var PriceDrink = $03-02-01-0008.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0008.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0008.image
@@ -1724,7 +1724,7 @@
Var NameDrink = $03-02-01-0009.NameE
Var NameDrinkTH = $03-02-01-0009.Name
Var DrinkDescriptionTH = $03-02-01-0009.description
- ;Var DrinkDescription = $03-02-01-0009.descriptionE
+ Var DrinkDescription = $03-02-01-0009.descriptionE
Var PriceDrink = $03-02-01-0009.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0009.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0009.image
@@ -1879,7 +1879,7 @@
Var NameDrink = $03-02-01-0010.NameE
Var NameDrinkTH = $03-02-01-0010.Name
Var DrinkDescriptionTH = $03-02-01-0010.description
- ;Var DrinkDescription = $03-02-01-0010.descriptionE
+ Var DrinkDescription = $03-02-01-0010.descriptionE
Var PriceDrink = $03-02-01-0010.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0010.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0010.image
@@ -2034,7 +2034,7 @@
Var NameDrink = $03-02-01-0011.NameE
Var NameDrinkTH = $03-02-01-0011.Name
Var DrinkDescriptionTH = $03-02-01-0011.description
- ;Var DrinkDescription = $03-02-01-0011.descriptionE
+ Var DrinkDescription = $03-02-01-0011.descriptionE
Var PriceDrink = $03-02-01-0011.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $03-02-01-0011.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $03-02-01-0011.image
@@ -2162,38 +2162,38 @@
-; button i=1 01-00-00-0012
+; button i=1 03-02-01-0012
33
22
225
296
- $01-00-00-0012.Button
+ $03-02-01-0012.Button
-; button i=1 01-00-00-0013
+; button i=1 03-01-01-0039
33
22
225
296
- $01-00-00-0013.Button
+ $03-01-01-0039.Button
+
+ 49
+ 117
+
+ eval(
+ If $03-01-01-0039.Button = "Disable" Then
+ Var return = "Enable"
+
+ Else
+ Var return = "Invisible"
+ EndIf
+ )
+
+ "ROOT/taobin_project/image//img_menu_err2.png"
+
+
+
+ 48
+ 116
+ 32
+ 128
+ 64
+ MITRegularTTF
+ 0x5A5A5A
+ "disable-show"
+ $03-01-01-0039.Button
+ text_unavailable
+ center-vertical-horizontal
+
+
+
10
251
@@ -2378,7 +2409,7 @@
17
KanitMediumTTF
ColorBrown2
- $01-00-00-0013.Price
+ $03-01-01-0039.Price
@@ -2403,7 +2434,7 @@
KanitMediumTTF
ColorBlack1
showthaiText
- $01-00-00-0013.Name
+ $03-01-01-0039.Name
@@ -2414,7 +2445,7 @@
KanitMediumTTF
ColorBrown
showthaiText
- $01-00-00-0013.description
+ $03-01-01-0039.description
@@ -2426,7 +2457,7 @@
KanitMediumTTF
ColorBlack1
showengText
- $01-00-00-0013.NameE
+ $03-01-01-0039.NameE
@@ -2437,7 +2468,7 @@
KanitMediumTTF
ColorBrown
showengText
- $01-00-00-0013.descriptionE
+ $03-01-01-0039.descriptionE
@@ -2445,38 +2476,38 @@
- ; button i=1 01-00-00-0014
+ ; button i=1 03-01-01-0040
33
22
225
296
- $01-00-00-0014.Button
+ $03-01-01-0040.Button
+
+ 49
+ 117
+
+ eval(
+ If $03-01-01-0040.Button = "Disable" Then
+ Var return = "Enable"
+
+ Else
+ Var return = "Invisible"
+ EndIf
+ )
+
+ "ROOT/taobin_project/image//img_menu_err2.png"
+
+
+
+ 48
+ 116
+ 32
+ 128
+ 64
+ MITRegularTTF
+ 0x5A5A5A
+ "disable-show"
+ $03-01-01-0040.Button
+ text_unavailable
+ center-vertical-horizontal
+
+
+
10
251
@@ -2505,7 +2567,7 @@
17
KanitMediumTTF
ColorBrown2
- $01-00-00-0014.Price
+ $03-01-01-0040.Price
@@ -2530,7 +2592,7 @@
KanitMediumTTF
ColorBlack1
showthaiText
- $01-00-00-0014.Name
+ $03-01-01-0040.Name
@@ -2541,7 +2603,7 @@
KanitMediumTTF
ColorBrown
showthaiText
- $01-00-00-0014.description
+ $03-01-01-0040.description
@@ -2553,7 +2615,7 @@
KanitMediumTTF
ColorBlack1
showengText
- $01-00-00-0014.NameE
+ $03-01-01-0040.NameE
@@ -2564,7 +2626,7 @@
KanitMediumTTF
ColorBrown
showengText
- $01-00-00-0014.descriptionE
+ $03-01-01-0040.descriptionE
@@ -2597,7 +2659,7 @@
Var NameDrink = $01-00-00-0015.NameE
Var NameDrinkTH = $01-00-00-0015.Name
Var DrinkDescriptionTH = $01-00-00-0015.description
- ;Var DrinkDescription = $01-00-00-0015.descriptionE
+ Var DrinkDescription = $01-00-00-0015.descriptionE
Var PriceDrink = $01-00-00-0015.Price
Var SpiralProduct = "ROOT/taobin_project/spiral/image/page_spiral/spiral_product_" + $01-00-00-0015.image
Var Spiraldetail = "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_detail_" + $01-00-00-0015.image