Merge remote-tracking branch 'origin/master' into nightly

overhangio · Mar 5, 2024 · 12edb6b · 12edb6b
2 parents e5deea8 + 7d2defd
commit 12edb6b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,15 @@ instructions, because git commits are used to generate release notes:
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-17.0.1'></a>
+## v17.0.1 (2024-03-01)
+
+- [Improvement] Added flex_run_environment setting variable for cybersource payment. Updated docs for it as well. (by @Danyal-Faheem)
+
+- [Bugfix] Make plugin compatible with Python 3.12 by removing dependency on `pkg_resources`. (by @regisb)
+
+- [Bugfix] Add forward slash at the end of payment page url. Payment page appears to be blank without forward slash in production. (by @Faraz32123)
+
 <a id='changelog-17.0.0'></a>
 ## v17.0.0 (2023-12-09)
 

diff --git a/changelog.d/20240122_160838_danyal.faheem_add_configuration_step_in_docs.md b/changelog.d/20240122_160838_danyal.faheem_add_configuration_step_in_docs.md
diff --git a/changelog.d/20240212_115536_regis_pkg_resources.md b/changelog.d/20240212_115536_regis_pkg_resources.md
diff --git a/tutorecommerce/__about__.py b/tutorecommerce/__about__.py
@@ -1 +1 @@
-__version__ = "17.0.0"
+__version__ = "17.0.1"
diff --git a/tutorecommerce/templates/ecommerce/tasks/ecommerce/init b/tutorecommerce/templates/ecommerce/tasks/ecommerce/init
@@ -22,7 +22,7 @@
   --payment-support-url="http://{{ LMS_HOST }}:8000/support" \
   --discovery_api_url=http://{{ DISCOVERY_HOST }}:8381/api/v1/ \
   --enable-microfrontend-for-basket-page=true \
-  --payment-microfrontend-url="http://{{ MFE_HOST }}:{{ app['port'] }}/{{ app_name }}"
+  --payment-microfrontend-url="http://{{ MFE_HOST }}:{{ app['port'] }}/{{ app_name }}/"
 
 # Production site
 ./manage.py create_or_update_site \
@@ -44,7 +44,7 @@
   --payment-support-url="{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}/support" \
   --discovery_api_url={% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ DISCOVERY_HOST }}/api/v1/ \
   --enable-microfrontend-for-basket-page=true \
-  --payment-microfrontend-url="{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ MFE_HOST }}/{{ app_name }}"
+  --payment-microfrontend-url="{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ MFE_HOST }}/{{ app_name }}/"
 {% endif %}
 {% endfor %}