Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add enable_learner_portal_offers to EnterpriseCustomer #1586

Merged
merged 1 commit into from
Jun 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Unreleased
----------
None

[3.50.0]
--------
feat: add `enable_learner_portal_offers` to `EnterpriseCustomer`

[3.49.10]
---------
fix: append backslash to ecommerce url and change `get` to `get_or_create` in `fulfill_pending_course_enrollments`
Expand Down
2 changes: 1 addition & 1 deletion enterprise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
Your project description goes here.
"""

__version__ = "3.49.10"
__version__ = "3.50.0"

default_app_config = "enterprise.apps.EnterpriseConfig"
1 change: 1 addition & 0 deletions enterprise/admin/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ class Meta:
"enable_portal_code_management_screen",
"enable_portal_subscription_management_screen",
"enable_learner_portal",
"enable_learner_portal_offers",
"hide_labor_market_data",
"enable_integrated_customer_learner_portal_search",
"enable_analytics_screen",
Expand Down
2 changes: 1 addition & 1 deletion enterprise/api/v1/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class Meta:
'enforce_data_sharing_consent', 'branding_configuration',
'identity_provider', 'enable_audit_enrollment', 'replace_sensitive_sso_username',
'enable_portal_code_management_screen', 'sync_learner_profile_data', 'enable_audit_data_reporting',
'enable_learner_portal', 'enable_portal_reporting_config_screen',
'enable_learner_portal', 'enable_learner_portal_offers', 'enable_portal_reporting_config_screen',
'enable_portal_saml_configuration_screen', 'contact_email',
'enable_portal_subscription_management_screen', 'hide_course_original_price', 'enable_analytics_screen',
'enable_integrated_customer_learner_portal_search',
Expand Down
23 changes: 23 additions & 0 deletions enterprise/migrations/0159_add_enable_learner_portal_offers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 3.2.12 on 2022-06-14 16:14

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('enterprise', '0158_remove_is_active_from_role_assignment'),
]

operations = [
migrations.AddField(
model_name='enterprisecustomer',
name='enable_learner_portal_offers',
field=models.BooleanField(default=False, help_text='Specifies whether enterprise offers will be made known to learners in the learner portal.'),
),
migrations.AddField(
model_name='historicalenterprisecustomer',
name='enable_learner_portal_offers',
field=models.BooleanField(default=False, help_text='Specifies whether enterprise offers will be made known to learners in the learner portal.'),
),
]
5 changes: 5 additions & 0 deletions enterprise/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,11 @@ class Meta:
help_text=_("Specifies whether the enterprise learner portal site should be made known to the learner.")
)

enable_learner_portal_offers = models.BooleanField(
default=False,
help_text=_("Specifies whether enterprise offers will be made known to learners in the learner portal.")
)

hide_labor_market_data = models.BooleanField(
default=False,
help_text=_("Specifies whether the labor market data should be made known to the learner in learner portal.")
Expand Down
5 changes: 5 additions & 0 deletions tests/test_enterprise/api/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1144,6 +1144,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
},
'sync_learner_profile_data': False,
'enable_learner_portal': False,
'enable_learner_portal_offers': False,
'enable_integrated_customer_learner_portal_search': True,
'enable_portal_subscription_management_screen': False,
'enable_analytics_screen': False,
Expand Down Expand Up @@ -1198,6 +1199,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
},
'sync_learner_profile_data': False,
'enable_learner_portal': False,
'enable_learner_portal_offers': False,
'enable_integrated_customer_learner_portal_search': True,
'enable_portal_subscription_management_screen': False,
'enable_analytics_screen': False,
Expand Down Expand Up @@ -1263,6 +1265,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
},
'sync_learner_profile_data': False,
'enable_learner_portal': False,
'enable_learner_portal_offers': False,
'enable_integrated_customer_learner_portal_search': True,
'enable_portal_subscription_management_screen': False,
'enable_analytics_screen': False,
Expand Down Expand Up @@ -1316,6 +1319,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
'enable_portal_lms_configurations_screen': False,
'enable_universal_link': False,
'enable_browse_and_request': False,
'enable_learner_portal_offers': False,
'enable_audit_data_reporting': False,
'site': {
'domain': 'example.com', 'name': 'example.com'
Expand Down Expand Up @@ -1523,6 +1527,7 @@ def test_enterprise_customer_with_access_to(
},
'sync_learner_profile_data': False,
'enable_learner_portal': False,
'enable_learner_portal_offers': False,
'enable_integrated_customer_learner_portal_search': True,
'enable_portal_subscription_management_screen': False,
'enable_analytics_screen': False,
Expand Down
1 change: 1 addition & 0 deletions tests/test_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ def setUp(self):
"enable_universal_link",
"enable_browse_and_request",
"enable_learner_portal",
"enable_learner_portal_offers",
"enable_integrated_customer_learner_portal_search",
"enable_analytics_screen",
"enable_slug_login",
Expand Down