Merge branch 'main' into ahtisham/added_email_config

Author: AhtishamShahid

README.rst

@@ -33,6 +33,10 @@ After changing configuration,restart environment so the new environment variable
 If you rely on a specific "from" email for outgoing notifications, explicitly set ``NOTIFICATIONS_DEFAULT_FROM_EMAIL`` rather than relying on the platform-wide ``CONTACT_EMAIL``.
 
 
+The email and push notification settings under Account can be enabled/disabled using `NOTIFICATIONS_ENABLE_SHOW_EMAIL_CHANNEL`
+and `NOTIFICATIONS_ENABLE_SHOW_PUSH_CHANNEL`. `NOTIFICATIONS_ENABLE_SHOW_EMAIL_CHANNEL` is set to True while `NOTIFICATIONS_ENABLE_SHOW_PUSH_CHANNEL`
+is set to False by default.
+
 License
 *******
 

tutornotifications/patches/mfe-lms-production-settings

@@ -1,2 +1,3 @@
 
-MFE_CONFIG["SHOW_EMAIL_CHANNEL"] = True
+MFE_CONFIG["SHOW_EMAIL_CHANNEL"] = {{ NOTIFICATIONS_ENABLE_SHOW_EMAIL_CHANNEL }}
+MFE_CONFIG["SHOW_PUSH_CHANNEL"] = {{ NOTIFICATIONS_ENABLE_SHOW_PUSH_CHANNEL }}

tutornotifications/plugin.py

@@ -18,6 +18,8 @@
         # Prefix your setting names with 'NOTIFICATIONS_'.
         ("NOTIFICATIONS_VERSION", __version__),
         ("NOTIFICATIONS_DEFAULT_FROM_EMAIL", "{{ CONTACT_EMAIL }}")
+        ("NOTIFICATIONS_ENABLE_SHOW_EMAIL_CHANNEL", True),
+        ("NOTIFICATIONS_ENABLE_SHOW_PUSH_CHANNEL", False),
     ]
 )
 
@@ -134,6 +136,5 @@
             "org.openedx.frontend.layout.studio_header_search_button_slot.v1",
             notification_drawer_config,
         ),
-
     ],
 )