diff --git a/spiral/product.json b/spiral/product.json
deleted file mode 100644
index ef0d2384..00000000
--- a/spiral/product.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "products": [
- {
- "id": 1,
- "code": "03-02-01-0001",
- "name": "ขนมปังอบกรอบ\nรสเนย",
- "nameE": "After You the nugget",
- "desc": "After You (อาฟเตอร์ ยู)",
- "descE": "After You Dessert Cafe",
- "image": "03-02-01-0001.png",
- "detail1": "ขนมปังอบกรอบรสเนย",
- "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
- "detail2": "มีแป้งสาลี นม ถั่วเหลือง และอาจมีถั่วเปลือกแข็ง ถั่วลิสง ไข่ ข้าวโอ๊ต เมล็ดงา ปลา ซัลไฟต์",
- "detail1E": "After You the nugget ",
- "header2E": "Allergen Contains:",
- "detail2E": "Gluten, milk, Soybean May Contains: egg, oat, treenuts, peanuts, sesame seeds, fish, sulphites",
- "price": 100
- },
- {
- "id": 2,
- "code": "03-02-01-0002",
- "name": "ขนมปังอบกรอบ\nรสซาวครีมและหัวหอม",
- "nameE": "Sour cream and\nonion nuggets",
- "desc": "After You (อาฟเตอร์ ยู)",
- "descE": "After You Dessert Cafe",
- "image": "03-02-01-0002.png",
- "detail1": "ขนมปังอบกรอบรสซาวครีมและหัวหอม",
- "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
- "detail2": "มีแป้งสาลี นม ถั่วเหลือง ไข่ และอาจมีถั่วเปลือกแข็ง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ซัลไฟต์",
- "detail1E": "Sour cream and onion nuggets",
- "header2E": "Allergen Contains:",
- "detail2E": "Gluten, milk, Soybean, egg May Contains: oat, treenuts, peanuts, sesame seeds, fish, sulphites",
- "price": 115
- },
- {
- "id": 3,
- "code": "03-02-01-0003",
- "name": "ขนมปังอบกรอบ\nรสไข่เค็ม",
- "nameE": "Salted egg nugget",
- "desc": "After You (อาฟเตอร์ ยู)",
- "descE": "After You Dessert Cafe",
- "image": "03-02-01-0003.png",
- "detail1": "ขนมปังอบกรอบรสไข่เค็ม",
- "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
- "detail2": "มีแป้งสาลี นม ถั่วเหลือง ไข่ และอาจมีถั่วเปลือกแข็ง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ซัลไฟต์",
- "detail1E": "Salted egg nugget",
- "header2E": "Allergen Contains:",
- "detail2E": "Gluten, milk, Soybean, egg May Contains: oat, treenuts, peanuts, sesame seeds, fish, sulphites",
- "price": 115
- },
- {
- "id": 4,
- "code": "03-02-01-0004",
- "name": "คุกกี้ธัญพืช",
- "nameE": "After You cornflake\ncookie",
- "desc": "After You (อาฟเตอร์ ยู)",
- "descE": "After You Dessert Cafe",
- "image": "03-02-01-0004.png",
- "detail1": "คุกกี้ธัญพืช",
- "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
- "detail2": "มีแป้งสาลี นม ไข่ และอาจมีถั่วเหลือง ถั่วเปลือกแข็ง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ซัลไฟต์",
- "detail1E": "After You cornflake cookie",
- "header2E": "Allergen Contains:",
- "detail2E": "Gluten, milk, egg May Contains: Soybean, treenuts, peanuts, oat, sesame seeds, fish, sulphites",
- "price": 85
- },
- {
- "id": 5,
- "code": "03-02-01-0005",
- "name": "เมอแรงค์ถั่วแมค\nคาเดเมีย",
- "nameE": "Macadamia\nMeringue",
- "desc": "After You (อาฟเตอร์ ยู)",
- "descE": "After You Dessert Cafe",
- "image": "03-02-01-0005.png",
- "detail1": "เมอแรงค์ถั่วแมคคาเดเมีย",
- "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:",
- "detail2": "มีไข่ ถั่วเปลือกแข็ง และอาจมีแป้งสาลี นม ถั่วเหลือง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ซัลไฟต์",
- "detail1E": "Macadamia Meringue",
- "header2E": "Allergen Contains:",
- "detail2E": "egg, treenuts, May Contains: Gluten, milk, Soybean, peanuts, oat, sesame seeds, fish, sulphites",
- "price": 120
- }
- ]
-}
\ 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 66ed7662..9b9c62d1 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.01"
+ Var SpiralSoftwareVersion = "1.02"
Var ColorBrown = 0x746253
Var ColorBrown2 = 0x513C2F
@@ -1217,38 +1217,38 @@
- ; button i=1 01-00-00-0006
+ ; button i=1 03-02-01-0006
33
22
225
296
- $01-00-00-0006.Button
+ $03-02-01-0006.Button
+
+ 49
+ 117
+
+ eval(
+ If $03-02-01-0006.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-02-01-0006.Button
+ text_unavailable
+ center-vertical-horizontal
+
+
+
10
251
@@ -1277,7 +1308,7 @@
17
KanitMediumTTF
ColorBrown2
- $01-00-00-0006.Price
+ $03-02-01-0006.Price
@@ -1302,7 +1333,7 @@
KanitMediumTTF
ColorBlack1
showthaiText
- $01-00-00-0006.Name
+ $03-02-01-0006.Name
@@ -1313,7 +1344,7 @@
KanitMediumTTF
ColorBrown
showthaiText
- $01-00-00-0006.description
+ $03-02-01-0006.description
@@ -1325,7 +1356,7 @@
KanitMediumTTF
ColorBlack1
showengText
- $01-00-00-0006.NameE
+ $03-02-01-0006.NameE
@@ -1336,44 +1367,44 @@
KanitMediumTTF
ColorBrown
showengText
- $01-00-00-0006.descriptionE
+ $03-02-01-0006.descriptionE
-; button i=1 01-00-00-0007
+; button i=1 03-02-01-0007
33
22
225
296
- $01-00-00-0007.Button
+ $03-02-01-0007.Button
+
+ 49
+ 117
+
+ eval(
+ If $03-02-01-0007.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-02-01-0007.Button
+ text_unavailable
+ center-vertical-horizontal
+
+
10
251
@@ -1402,7 +1463,7 @@
17
KanitMediumTTF
ColorBrown2
- $01-00-00-0007.Price
+ $03-02-01-0007.Price
@@ -1427,7 +1488,7 @@
KanitMediumTTF
ColorBlack1
showthaiText
- $01-00-00-0007.Name
+ $03-02-01-0007.Name
@@ -1438,7 +1499,7 @@
KanitMediumTTF
ColorBrown
showthaiText
- $01-00-00-0007.description
+ $03-02-01-0007.description
@@ -1450,7 +1511,7 @@
KanitMediumTTF
ColorBlack1
showengText
- $01-00-00-0007.NameE
+ $03-02-01-0007.NameE
@@ -1461,45 +1522,45 @@
KanitMediumTTF
ColorBrown
showengText
- $01-00-00-0007.descriptionE
+ $03-02-01-0007.descriptionE
-; button i=1 01-00-00-0008
+; button i=1 03-02-01-0008
33
22
225
296
- $01-00-00-0008.Button
+ $03-02-01-0008.Button
+
+ 49
+ 117
+
+ eval(
+ If $03-02-01-0008.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-02-01-0008.Button
+ text_unavailable
+ center-vertical-horizontal
+
+
10
251
@@ -1528,7 +1619,7 @@
17
KanitMediumTTF
ColorBrown2
- $01-00-00-0008.Price
+ $03-02-01-0008.Price
@@ -1553,7 +1644,7 @@
KanitMediumTTF
ColorBlack1
showthaiText
- $01-00-00-0008.Name
+ $03-02-01-0008.Name
@@ -1564,7 +1655,7 @@
KanitMediumTTF
ColorBrown
showthaiText
- $01-00-00-0008.description
+ $03-02-01-0008.description
@@ -1576,7 +1667,7 @@
KanitMediumTTF
ColorBlack1
showengText
- $01-00-00-0008.NameE
+ $03-02-01-0008.NameE
@@ -1587,7 +1678,7 @@
KanitMediumTTF
ColorBrown
showengText
- $01-00-00-0008.descriptionE
+ $03-02-01-0008.descriptionE
@@ -1595,38 +1686,38 @@
- ; button i=1 01-00-00-0009
+ ; button i=1 03-02-01-0009
33
22
225
296
- $01-00-00-0009.Button
+ $03-02-01-0009.Button
+
+ 49
+ 117
+
+ eval(
+ If $03-02-01-0009.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-02-01-0009.Button
+ text_unavailable
+ center-vertical-horizontal
+
+
10
251
@@ -1655,7 +1776,7 @@
17
KanitMediumTTF
ColorBrown2
- $01-00-00-0009.Price
+ $03-02-01-0009.Price
@@ -1680,7 +1801,7 @@
KanitMediumTTF
ColorBlack1
showthaiText
- $01-00-00-0009.Name
+ $03-02-01-0009.Name
@@ -1691,7 +1812,7 @@
KanitMediumTTF
ColorBrown
showthaiText
- $01-00-00-0009.description
+ $03-02-01-0009.description
@@ -1703,7 +1824,7 @@
KanitMediumTTF
ColorBlack1
showengText
- $01-00-00-0009.NameE
+ $03-02-01-0009.NameE
@@ -1714,7 +1835,7 @@
KanitMediumTTF
ColorBrown
showengText
- $01-00-00-0009.descriptionE
+ $03-02-01-0009.descriptionE