diff --git a/animation01/TaoBin2_draft02_art24.mp4 b/animation01/TaoBin2_draft02_art24.mp4
index 1a8824d6..b4fb67ac 100644
Binary files a/animation01/TaoBin2_draft02_art24.mp4 and b/animation01/TaoBin2_draft02_art24.mp4 differ
diff --git a/image/page_drink/bn_strawberry_Matcha.png b/image/page_drink/bn_strawberry_Matcha.png
index c8a1bd90..7720d43b 100644
Binary files a/image/page_drink/bn_strawberry_Matcha.png and b/image/page_drink/bn_strawberry_Matcha.png differ
diff --git a/image/page_drink/bn_strawberry_milk.png b/image/page_drink/bn_strawberry_milk.png
index ee41b419..0bba2095 100644
Binary files a/image/page_drink/bn_strawberry_milk.png and b/image/page_drink/bn_strawberry_milk.png differ
diff --git a/image/page_drink_disable/bn_protein_oreo.png b/image/page_drink_disable/bn_protein_oreo.png
index 9c3e3a6c..dbf47e8d 100644
Binary files a/image/page_drink_disable/bn_protein_oreo.png and b/image/page_drink_disable/bn_protein_oreo.png differ
diff --git a/image/page_drink_disable/bn_strawberry_milk.png b/image/page_drink_disable/bn_strawberry_milk.png
index 684cd1a5..0296717b 100644
Binary files a/image/page_drink_disable/bn_strawberry_milk.png and b/image/page_drink_disable/bn_strawberry_milk.png differ
diff --git a/image/page_drink_press/bn_strawberry_Matcha.png b/image/page_drink_press/bn_strawberry_Matcha.png
index 6449f61a..4a259889 100644
Binary files a/image/page_drink_press/bn_strawberry_Matcha.png and b/image/page_drink_press/bn_strawberry_Matcha.png differ
diff --git a/image/page_drink_press/bn_strawberry_milk.png b/image/page_drink_press/bn_strawberry_milk.png
index ada1525d..3b2e932d 100644
Binary files a/image/page_drink_press/bn_strawberry_milk.png and b/image/page_drink_press/bn_strawberry_milk.png differ
diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv
index a1c61d02..9dfef833 100644
--- a/sheet/best_seller.tsv
+++ b/sheet/best_seller.tsv
@@ -1,4 +1,6 @@
17/1/21
+12-03-02-0011
+12-03-02-0010
12-03-03-0009
12-03-03-0002
12-02-03-0004
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 91034ea8..c40d8d9b 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -174,6 +174,8 @@
LED LedDoorLid Off 255 255 255 255
+ DEBUGVAR AdvertiseProfile
+
SPLIT AdvertiseProfile "/" 1 AdvertiseProfile1
SPLIT AdvertiseProfile "/" 2 AdvertiseProfile2
SPLIT AdvertiseProfile "/" 3 AdvertiseProfile3
diff --git a/xml/page_catalog_choose_drink4.pml b/xml/page_catalog_choose_drink4.pml
index 9d82637c..8860320c 100644
--- a/xml/page_catalog_choose_drink4.pml
+++ b/xml/page_catalog_choose_drink4.pml
@@ -19,6 +19,9 @@
product_code.append('12-03-02-0004')
product_code.append('12-03-02-0006')
+ product_code.append('12-03-02-0011')
+ product_code.append('12-03-02-0010')
+
product_code.append('12-03-02-0005')
#product_code.append('12-03-02-0002')
product_code.append('12-03-02-0007')
diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml
index 644b545c..bfc58038 100644
--- a/xml/page_catalog_choose_drink4.xml
+++ b/xml/page_catalog_choose_drink4.xml
@@ -1328,7 +1328,219 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=11 12-03-02-0005
+ ; button i=11 12-03-02-0011
+
+ 33
+ 22
+ 225
+ 296
+ $12-03-02-0011.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-03-02-0011.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-03-02-0011.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-03-02-0011.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-03-02-0011.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-03-02-0011.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-03-02-0011.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=12 12-03-02-0010
+
+ 33
+ 22
+ 225
+ 296
+ $12-03-02-0010.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-03-02-0010.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-03-02-0010.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-03-02-0010.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-03-02-0010.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-03-02-0010.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-03-02-0010.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=13 12-03-02-0005
33
22
@@ -1434,7 +1646,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=12 12-03-02-0007
+ ; button i=14 12-03-02-0007
33
22
@@ -1540,7 +1752,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=13 12-03-03-0009
+ ; button i=15 12-03-03-0009
33
22
diff --git a/xml/page_catalog_choose_drink7.pml b/xml/page_catalog_choose_drink7.pml
index 7e355c12..993699b7 100644
--- a/xml/page_catalog_choose_drink7.pml
+++ b/xml/page_catalog_choose_drink7.pml
@@ -18,6 +18,7 @@
product_code.append('12-04-02-0009')
product_code.append('12-04-02-0010')
product_code.append('12-04-02-0011')
+ product_code.append('12-04-02-0014')
menu_count = len( product_code)
diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml
index c21ac533..afa10129 100644
--- a/xml/page_catalog_choose_drink7.xml
+++ b/xml/page_catalog_choose_drink7.xml
@@ -1539,6 +1539,112 @@
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
+
+ ; button i=13 12-04-02-0014
+
+ 33
+ 22
+ 225
+ 296
+ $12-04-02-0014.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-04-02-0014.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-04-02-0014.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-04-02-0014.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-04-02-0014.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-04-02-0014.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-04-02-0014.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
; Cart
diff --git a/xml/vending_info.xml b/xml/vending_info.xml
index 8edba718..18ec8a6e 100644
--- a/xml/vending_info.xml
+++ b/xml/vending_info.xml
@@ -88,9 +88,11 @@
Var Timeout = Timeout + 1
If Timeout > 15 Then
- Open "ROOT/xml/page_board.xml"
+ Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
+ DEBUGVAR AdvertiseProfile
+
Refresh
TimerReset
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index d7fcf024..39f64f93 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -34,7 +34,7 @@
Var AdvAmount = ""
Var AdvMobile = ""
Var AdvId = "00"
- Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
+ ;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
Var AdvertiseProfile1 = "00"
Var AdvertiseProfile2 = "00"
Var AdvertiseProfile3 = "00"