diff --git a/inter/sgp/xml/page_catalog_group_milk.lxml b/inter/sgp/xml/page_catalog_group_milk.lxml
index f7021ef8..840624c8 100644
--- a/inter/sgp/xml/page_catalog_group_milk.lxml
+++ b/inter/sgp/xml/page_catalog_group_milk.lxml
@@ -4523,7 +4523,7 @@
 
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-03-03-0048"
-			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0048, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_2_posi1.png")
+			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0048, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_2_posi1.png")
 			DEBUGVAR OverlayMenuFilter3
 			DEBUGVAR OverlayMenuFilter3_Value
 		Else
@@ -4712,7 +4712,7 @@
 	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_Milovalcocoa_smoothie.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_Milovalcocoa_smoothie.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_Milovalcocoa_smoothie.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_2_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_2_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4812,13 +4812,13 @@
 
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-03-03-0049"
-			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_2_posi1.png")
+			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_2_posi1.png")
 			DEBUGVAR OverlayMenuFilter3
 			DEBUGVAR OverlayMenuFilter3_Value
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-		Var OverlayMenuFilter = "xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_2_posi1.png")"
+		Var OverlayMenuFilter = "xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_2_posi1.png")"
 		
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
diff --git a/inter/sgp/xml/page_catalog_group_recommend.lxml b/inter/sgp/xml/page_catalog_group_recommend.lxml
index b38396c7..2ee4e7a9 100644
--- a/inter/sgp/xml/page_catalog_group_recommend.lxml
+++ b/inter/sgp/xml/page_catalog_group_recommend.lxml
@@ -11423,7 +11423,7 @@
 	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_Milovalcocoa_smoothie.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_Milovalcocoa_smoothie.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_Milovalcocoa_smoothie.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_2_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_2_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -11523,13 +11523,13 @@
 
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-03-03-0049"
-			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_2_posi1.png")
+			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_2_posi1.png")
 			DEBUGVAR OverlayMenuFilter3
 			DEBUGVAR OverlayMenuFilter3_Value
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-		Var OverlayMenuFilter = "xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_2_posi1.png")"
+		Var OverlayMenuFilter = "xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_2_posi1.png")"
 		
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
diff --git a/xml/page_board.xml b/xml/page_board.xml
index e9dbaf89..f9ce48d7 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -820,6 +820,7 @@
 		STRCONTAIN "521215" MaterialAvailable SugarZeroCalEnable
 
 		Var SettingDisableTaobinCredit = "true"
+		Var SettingDisableTaobinCode = "true"
 
 		; Singapore disable point
 		Var SettingIgnoreCollectPoint = 1
diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml
index 87f80e58..19bbd0a7 100644
--- a/xml/page_catalog.lxml
+++ b/xml/page_catalog.lxml
@@ -85,7 +85,7 @@
 		Var ShowNetworkProblem = "Enable"
 		Var ShowButtonClick2 = "Invisible"
 		Var ButtontoTopupMenu = "Invisible"
-		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+		;Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
 
 		Var QRCODE99 = ""
 		WEB "DISABLE"
diff --git a/xml/page_payment_cash-SGP.xml b/xml/page_payment_cash-SGP.xml
index 3f0437f5..a7ac3a48 100644
--- a/xml/page_payment_cash-SGP.xml
+++ b/xml/page_payment_cash-SGP.xml
@@ -221,10 +221,8 @@
 		Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
 
 	EndIf
-
 	
 
-
 	Var Seeker.PayWithQR = 0
 	Var NoGotoMenupage = "false"
 		If show_eng = "true" Then 
@@ -461,6 +459,15 @@
 	If SettingDisableTaobinCredit = "true" Then
 		Var PayState4 = "Invisible"
 	EndIf
+
+	If SettingDisableTaobinCode = "true" Then
+		Var PayState2 = "Invisible"
+	EndIf
+
+
+	Var PayState5 = "Invisible"
+	
+	
 </EventOpen>
 
 <EventActionOk>
@@ -829,8 +836,12 @@
 
 	  If RoadShow = "true" Then
 	  Else
-		Var PayState3 = "Disable"
-	  	Var PayState5 = "Disable"
+	  	If PayState3 = "Enable" Then
+			Var PayState3 = "Disable"
+		EndIf
+		If PayState5 = "Enable" Then
+		  	Var PayState5 = "Disable"
+	  	EndIf
 	  EndIf 
 
 	  Var LOADING_STATE = "Invisible"