diff --git a/inter/mys/image/page_drink_disable_n2/bn_ginger_cafe_latte.png b/inter/mys/image/page_drink_disable_n2/bn_ginger_cafe_latte.png
new file mode 100644
index 00000000..58170c50
Binary files /dev/null and b/inter/mys/image/page_drink_disable_n2/bn_ginger_cafe_latte.png differ
diff --git a/inter/mys/image/page_drink_n/bn_ginger_cafe_latte.png b/inter/mys/image/page_drink_n/bn_ginger_cafe_latte.png
new file mode 100644
index 00000000..9c1ec72d
Binary files /dev/null and b/inter/mys/image/page_drink_n/bn_ginger_cafe_latte.png differ
diff --git a/inter/mys/image/page_drink_picture2_n/bn_ginger_cafe_latte.png b/inter/mys/image/page_drink_picture2_n/bn_ginger_cafe_latte.png
new file mode 100644
index 00000000..6fd96d66
Binary files /dev/null and b/inter/mys/image/page_drink_picture2_n/bn_ginger_cafe_latte.png differ
diff --git a/inter/mys/image/page_drink_press_n/bn_ginger_cafe_latte.png b/inter/mys/image/page_drink_press_n/bn_ginger_cafe_latte.png
new file mode 100644
index 00000000..cedead67
Binary files /dev/null and b/inter/mys/image/page_drink_press_n/bn_ginger_cafe_latte.png differ
diff --git a/inter/mys/menu/lang.tsv b/inter/mys/menu/lang.tsv
index f1f92408..9c5aef5c 100644
--- a/inter/mys/menu/lang.tsv
+++ b/inter/mys/menu/lang.tsv
@@ -721,9 +721,9 @@ TextID	Note	English	Thai	China	Japan	Malaysia
 800654		Main Gate Switch	สวิทช์ประตู Main
 800655		Module Arm Switch	สวิทช์ Module แขน
 800656		Guard Bean Coffee Switch	สวิทช์ Guard Bean กาแฟ
-
-
-
+800657		Degree	องศา
+800658		Coarse	หยาบ
+800659		Fine	ละเอียด
 
 
 
diff --git a/inter/mys/xml/page_catalog_group_coffee.lxml b/inter/mys/xml/page_catalog_group_coffee.lxml
index 48af129a..7e445726 100644
--- a/inter/mys/xml/page_catalog_group_coffee.lxml
+++ b/inter/mys/xml/page_catalog_group_coffee.lxml
@@ -22127,13 +22127,13 @@
 	<State> Flag( 12-21-01-0061.Button,12-21-02-0061.Button,$Sum12210100611221020061) </State> 
 	<Button>
 	<State> $Sum12210100611221020061 </State> 
-	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_hot_lime_tea.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_hot_lime_tea.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_hot_lime_tea.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_ginger_cafe_latte.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_ginger_cafe_latte.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_ginger_cafe_latte.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_hot_lime_tea.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_ginger_cafe_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-21-01-0061.Price
 		Var PriceD2 = $12-21-02-0061.Price
diff --git a/xml/page_payment_cash-MYR.xml b/xml/page_payment_cash-MYR.xml
index 56ef49ef..edfcb30c 100644
--- a/xml/page_payment_cash-MYR.xml
+++ b/xml/page_payment_cash-MYR.xml
@@ -1640,7 +1640,7 @@ If alphaState = "Invisible" Then
 		If CancelFlag = 0 Then
             Var QR_POPUP = "/img_popup8.png"
             Var alphaState = "Enable"
-            Coin CARD
+            Coin CARDON
             Var ReqPayInfoFromCashOther = 2
         EndIf
 	EndIf
diff --git a/xml/sometime/RoadShow.ev b/xml/sometime/RoadShow.ev
index 5fe2a573..2125ed57 100644
--- a/xml/sometime/RoadShow.ev
+++ b/xml/sometime/RoadShow.ev
@@ -1,3 +1,17 @@
 ;Var EnableCash = ""
 ;Var EnableCash = "true"
-DEBUGVAR EnableCash
\ No newline at end of file
+DEBUGVAR EnableCash
+
+;Free
+Var RoadShow = "false"
+If BoxID = 200002 Then
+	Var RoadShow = "true"
+EndIf
+
+If BoxID = 210104 Then
+    Var RoadShow = "true"
+EndIf
+
+If BoxID = 210105 Then
+    Var RoadShow = "true"
+EndIf
\ No newline at end of file
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 6c1edd0a..a026de7f 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "8.15"
-	Var XMLPageVersionInt = 815
+	Var XMLPageVersion = "8.18"
+	Var XMLPageVersionInt = 818
 ;Oreo
 Var OreoGuarantee = 0
 </EventOpen>