Merge branch 'master' of https://github.com/openedx/edx-enterprise in…

…to bilalqamar95/node-v18-upgrade

CHANGELOG.rst

@@ -15,6 +15,18 @@ Change Log
 
 Unreleased
 ----------
+[3.69.0]
+--------
+refactor: Replaced the deprecated `NullBooleanField` with `BooleanField(null=True)`
+
+[3.68.1]
+--------
+fix: pick first object from CourseDetails
+
+[3.68.0]
+--------
+feat: add more metadata into `EnterpriseCourseEnrollmentView`
+
 [3.67.7]
 --------
 feat: marking orphaned content audits when catalogs are deleted
@@ -33,7 +45,7 @@ feat: add button to update customer modified time
 
 [3.67.3]
 --------
-feat: adding managent command to clear error state 
+feat: adding managent command to clear error state
 
 [3.67.2]
 --------
@@ -103,7 +115,7 @@ fix: making sure unenrollment is saved while revoking fulfillment
 
 [3.65.0]
 --------
-feat: new enterprise endpoint to surface filterable unenrolled subsidized enrollments 
+feat: new enterprise endpoint to surface filterable unenrolled subsidized enrollments
 
 [3.64.1]
 --------
@@ -112,10 +124,10 @@ fix: Reverted course_run_url for Executive Education courses
 [3.64.0]
 --------
 feat: Updated course_run_url for Executive Education courses
- 
+
 [3.63.0]
 --------
-feat: Hooking enterprise enrollments up to platform signals to write unenrollment records. 
+feat: Hooking enterprise enrollments up to platform signals to write unenrollment records.
       New field `unenrolled` on enterprise enrollments to track enrollment status, defaults to `None`.
 
 [3.62.7]

Dockerfile

@@ -17,6 +17,9 @@ MAINTAINER sre@edx.org
 
 # python3-pip; install pip to install application requirements.txt files
 
+# pkg-config
+#     mysqlclient>=2.2.0 requires this (https://github.com/PyMySQL/mysqlclient/issues/620)
+
 # libmysqlclient-dev; to install header files needed to use native C implementation for
 # MySQL-python for performance gains.
 
@@ -33,6 +36,7 @@ RUN apt-get update && apt-get -qy install --no-install-recommends \
  python3.8 \
  python3-pip \
  python3.8-venv \
+ pkg-config \
  libmysqlclient-dev \
  libssl-dev \
  python3-dev \

consent/migrations/0005_auto_20230707_0755.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.18 on 2023-07-07 07:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('consent', '0004_datasharingconsenttextoverrides'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='datasharingconsent',
+            name='granted',
+            field=models.BooleanField(help_text='Whether consent is granted.', null=True),
+        ),
+        migrations.AlterField(
+            model_name='historicaldatasharingconsent',
+            name='granted',
+            field=models.BooleanField(help_text='Whether consent is granted.', null=True),
+        ),
+    ]

consent/models.py

@@ -209,7 +209,7 @@ class Meta:
         null=False,
         help_text=_("Name of the user whose consent state is stored.")
     )
-    granted = models.NullBooleanField(help_text=_("Whether consent is granted."))
+    granted = models.BooleanField(null=True, help_text=_("Whether consent is granted."))
 
     @property
     def _exists(self):

enterprise/admin/__init__.py

@@ -188,6 +188,52 @@ class EnterpriseCustomerAdmin(DjangoObjectActions, SimpleHistoryAdmin):
     list_filter = ('active',)
     ordering = ('name',)
     search_fields = ('name', 'uuid',)
+
+    fieldsets = (
+        ('Enterprise info', {
+            'fields': ('name', 'active', 'slug', 'auth_org_id', 'country')
+        }),
+        ('Subsidy management screens ', {
+            'fields': ('enable_portal_learner_credit_management_screen',
+                       'enable_portal_subscription_management_screen',
+                       'enable_portal_code_management_screen'),
+            'description': ("Select the check boxes below to enable specific subsidy management screens"
+                            "on the organization's administrator portal. If an option is left unchecked,"
+                            "the customer administrator will not see the screen in their portal"
+                            "and will not be able to apply the associated configurations via self-service.")
+        }),
+        ('Subsidy settings', {
+            'fields': ('enable_browse_and_request', 'enable_universal_link'),
+            'description': ('Select the check boxes below to enable specific subsidy management settings'
+                            'for the administrator portal for subscription and codes customers.'
+                            'These should not be selected for customers that only have learner credit.')
+        }),
+        ('Data sharing consent', {
+            'fields': ('enable_data_sharing_consent', 'enforce_data_sharing_consent')
+        }),
+        ('Email and language ', {
+            'fields': ('contact_email', 'reply_to', 'sender_alias', 'default_language', 'hide_labor_market_data')
+        }),
+        ('Reporting', {
+            'fields': ('enable_portal_reporting_config_screen',)
+        }),
+        ('Integration and learning platform settings', {
+            'fields': ('enable_portal_lms_configurations_screen', 'enable_portal_saml_configuration_screen',
+                       'enable_slug_login', 'replace_sensitive_sso_username', 'hide_course_original_price')
+        }),
+        ('Recommended default settings for all enterprise customers', {
+            'fields': ('site', 'customer_type', 'enable_learner_portal',
+                       'enable_integrated_customer_learner_portal_search',
+                       'enable_analytics_screen', 'enable_audit_enrollment',
+                       'enable_audit_data_reporting', 'enable_learner_portal_offers',
+                       'enable_executive_education_2U_fulfillment'),
+            'description': ('The following default settings should be the same for '
+                            'the majority of enterprise customers,'
+                            'and are either rarely used, unlikely to be sold, '
+                            'or unlikely to be changed from the default.')
+        }),
+    )
+
     inlines = [
         EnterpriseCustomerBrandingConfigurationInline,
         EnterpriseCustomerIdentityProviderInline,