From 4d2d5aff76d50f47925e6dbc8681ad790855bd60 Mon Sep 17 00:00:00 2001 From: Muhammad Faraz Maqsood Date: Fri, 1 Mar 2024 21:02:09 +0500 Subject: [PATCH 1/5] fix: add slash at the end of payment mfe url Payments page appears to be blank without ending forward slash --- tutorecommerce/templates/ecommerce/tasks/ecommerce/init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorecommerce/templates/ecommerce/tasks/ecommerce/init b/tutorecommerce/templates/ecommerce/tasks/ecommerce/init index 3e36096c..47e9c411 100644 --- 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 %} From 7ce2e49626d8e3a850d1c31802650c5fd25d65f0 Mon Sep 17 00:00:00 2001 From: Muhammad Faraz Maqsood Date: Fri, 1 Mar 2024 21:08:36 +0500 Subject: [PATCH 2/5] add changelog entry --- ...0448_faraz.maqsood_add_slash_as_payment_page_appears_blank.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/20240301_210448_faraz.maqsood_add_slash_as_payment_page_appears_blank.md diff --git a/changelog.d/20240301_210448_faraz.maqsood_add_slash_as_payment_page_appears_blank.md b/changelog.d/20240301_210448_faraz.maqsood_add_slash_as_payment_page_appears_blank.md new file mode 100644 index 00000000..a3151b40 --- /dev/null +++ b/changelog.d/20240301_210448_faraz.maqsood_add_slash_as_payment_page_appears_blank.md @@ -0,0 +1 @@ +- [Bugfix] Add forward slash at the end of payment page url. Payment page appears to be blank without forward slash in production. (by @Faraz32123) \ No newline at end of file From 773073e438c18f1da030eb850d336f36ff9f7108 Mon Sep 17 00:00:00 2001 From: Muhammad Faraz Maqsood Date: Fri, 1 Mar 2024 21:46:58 +0500 Subject: [PATCH 3/5] v17.0.1 --- CHANGELOG.md | 9 +++++++++ ...60838_danyal.faheem_add_configuration_step_in_docs.md | 1 - changelog.d/20240212_115536_regis_pkg_resources.md | 1 - ...az.maqsood_add_slash_as_payment_page_appears_blank.md | 1 - tutorecommerce/__about__.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 changelog.d/20240122_160838_danyal.faheem_add_configuration_step_in_docs.md delete mode 100644 changelog.d/20240212_115536_regis_pkg_resources.md delete mode 100644 changelog.d/20240301_210448_faraz.maqsood_add_slash_as_payment_page_appears_blank.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b4cf36b..5a3d193f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,15 @@ instructions, because git commits are used to generate release notes: + +## 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) + ## 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 deleted file mode 100644 index b46b7fa7..00000000 --- a/changelog.d/20240122_160838_danyal.faheem_add_configuration_step_in_docs.md +++ /dev/null @@ -1 +0,0 @@ -[Improvement] Added flex_run_environment setting variable for cybersource payment. Updated docs for it as well. (by @Danyal-Faheem) \ No newline at end of file diff --git a/changelog.d/20240212_115536_regis_pkg_resources.md b/changelog.d/20240212_115536_regis_pkg_resources.md deleted file mode 100644 index 35b6d201..00000000 --- a/changelog.d/20240212_115536_regis_pkg_resources.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Make plugin compatible with Python 3.12 by removing dependency on `pkg_resources`. (by @regisb) diff --git a/changelog.d/20240301_210448_faraz.maqsood_add_slash_as_payment_page_appears_blank.md b/changelog.d/20240301_210448_faraz.maqsood_add_slash_as_payment_page_appears_blank.md deleted file mode 100644 index a3151b40..00000000 --- a/changelog.d/20240301_210448_faraz.maqsood_add_slash_as_payment_page_appears_blank.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Add forward slash at the end of payment page url. Payment page appears to be blank without forward slash in production. (by @Faraz32123) \ No newline at end of file diff --git a/tutorecommerce/__about__.py b/tutorecommerce/__about__.py index a08b09c5..dba3a77b 100644 --- a/tutorecommerce/__about__.py +++ b/tutorecommerce/__about__.py @@ -1 +1 @@ -__version__ = "17.0.0" +__version__ = "17.0.1" From 06be420f42909d8cf4035a5e75747c6726027e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Tue, 20 Feb 2024 15:15:40 +0100 Subject: [PATCH 4/5] ci: remove now useless OPENEDX_RELEASE variable --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d133ad7..fb6aa3fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,6 @@ variables: TUTOR_IMAGES: ecommerce ecommerce-worker orders-dev payment-dev TUTOR_PYPI_PACKAGE: tutor-ecommerce TUTOR_EXTRA_ENABLED_PLUGINS: discovery mfe - OPENEDX_RELEASE: quince GITHUB_REPO: overhangio/tutor-ecommerce include: From 7d2defd66e928de17608cfa1a16d1c366aa34fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Tue, 5 Mar 2024 11:51:51 +0500 Subject: [PATCH 5/5] ci: don't even try to auto-add PRs to github project Auto-adding PRs to the Github project is not working because the github-token is not available there. --- .github/workflows/auto-add-to-project.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/auto-add-to-project.yml b/.github/workflows/auto-add-to-project.yml index d4ab7a42..7dadeb66 100644 --- a/.github/workflows/auto-add-to-project.yml +++ b/.github/workflows/auto-add-to-project.yml @@ -1,9 +1,6 @@ -name: Auto Add Issues and Pull Requests to Project +name: Auto Add Issues to Project on: - pull_request: - types: - - opened issues: types: - opened