diff --git a/.github/workflows/ci-workflow-deploy-production.yml b/.github/workflows/ci-workflow-deploy-production.yml index b653b5fc..296bd80f 100644 --- a/.github/workflows/ci-workflow-deploy-production.yml +++ b/.github/workflows/ci-workflow-deploy-production.yml @@ -16,10 +16,10 @@ jobs: fetch-depth: 1 submodules: true lfs: true - - name: Get Node 16.x + - name: Get Node 18.x uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Build source files shell: bash run: | diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 3b45dcf8..2eac2702 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -17,10 +17,10 @@ jobs: fetch-depth: 1 submodules: true lfs: true - - name: Get Node 16.x + - name: Get Node 18.x uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Build source files shell: bash run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f00a8da..c1023f67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [3.11.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.11.0...v3.11.1) (2023-10-09) + + +### Bug Fixes + +* **Programme:** Added check for StatusId, so that we only show programme starts with statusid 1 (Booked) ([cc9a797](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/cc9a7970fb7aaa989facd0aea7894edeaeb9407b)) + ## [3.11.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.10.0...v3.11.0) (2023-10-02) diff --git a/PLUGIN-CHECKSUM b/PLUGIN-CHECKSUM index afb0dee6..410f5285 100644 --- a/PLUGIN-CHECKSUM +++ b/PLUGIN-CHECKSUM @@ -1 +1 @@ -9bff8c7558e82bfecfc89796fa3d435d +081e6567affebd04ee2bd149100373bf diff --git a/eduadmin.php b/eduadmin.php index 4cae99dd..bded8450 100644 --- a/eduadmin.php +++ b/eduadmin.php @@ -9,7 +9,7 @@ * Plugin URI: https://www.eduadmin.se * Description: EduAdmin plugin to allow visitors to book courses at your website * Tags: booking, participants, courses, events, eduadmin, lega online - * Version: 3.11.0 + * Version: 3.11.1 * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress * Requires at least: 5.8 diff --git a/includes/edu-shortcodes.php b/includes/edu-shortcodes.php index abb94f96..057ce017 100644 --- a/includes/edu-shortcodes.php +++ b/includes/edu-shortcodes.php @@ -691,6 +691,7 @@ function eduadmin_get_programme_list( $attributes ) { 'ProgrammeStarts(' . '$filter=' . 'HasPublicPriceName' . + ' and StatusId eq 1' . ' and (ApplicationOpenDate le ' . date_i18n( 'c' ) . ' or ApplicationOpenDate eq null)' . ' and StartDate ge ' . date_i18n( 'c' ) . ';' . @@ -740,6 +741,7 @@ function eduadmin_get_programme_details( $attributes ) { 'ProgrammeStarts(' . '$filter=' . 'HasPublicPriceName' . + ' and StatusId eq 1' . ' and (ApplicationOpenDate le ' . date_i18n( 'c' ) . ' or ApplicationOpenDate eq null)' . ' and StartDate ge ' . date_i18n( 'c' ) . ';' . diff --git a/package.json b/package.json index 6429a194..0eca1e7a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "eduadmin-wordpress-plugin", "private": true, - "version": "3.11.0", + "version": "3.11.1", "repository": "https://github.com/MultinetInteractive/EduAdmin-WordPress.git", "author": "Chris Gårdenberg ", "license": "MIT", diff --git a/readme.md b/readme.md index 1d637769..57151813 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@ # EduAdmin Booking - Requires at least: 5.8 - Tested up to: 6.4 -- Stable tag: 3.11.0 +- Stable tag: 3.11.1 - Requires PHP: 7.0 - License: GPL3 - License URI: https://www.gnu.org/licenses/gpl-3.0.en.html @@ -40,6 +40,13 @@ If you notice that your API key doesn't work any more, you have to contact us. The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md) +### [3.11.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.11.0...v3.11.1) (2023-10-09) + + +#### Bug Fixes + +* **Programme:** Added check for StatusId, so that we only show programme starts with statusid 1 (Booked) ([cc9a797](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/cc9a7970fb7aaa989facd0aea7894edeaeb9407b)) + ### [3.11.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.10.0...v3.11.0) (2023-10-02) @@ -61,12 +68,5 @@ The full changelog available on [GitHub](https://github.com/MultinetInteractive/ * Made a readme.txt as well, for use in the SVN trunk. ([e6b6d61](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/e6b6d61b8e3f27c2841c25812f46f6d2cde3ead3)) -### [3.9.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.9.0...v3.9.1) (2023-09-25) - - -#### Bug Fixes - -* **Programme:** Fixed an issue where programme views/shortcodes weren't included in the correct way. ([fd0ee12](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/fd0ee128dfc1e324732544f9071640b5aba76e0c)), closes [#494](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/494) - diff --git a/readme.txt b/readme.txt index 77b146e5..a2b0cb96 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: mnchga Tags: booking, participants, courses, events, eduadmin, lega online Requires at least: 5.8 Tested up to: 6.4 -Stable tag: 3.11.0 +Stable tag: 3.11.1 Requires PHP: 7.0 License: GPL3 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html @@ -45,6 +45,13 @@ If you notice that your API key doesn't work any more, you have to contact us. The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md) +### [3.11.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.11.0...v3.11.1) (2023-10-09) + + +#### Bug Fixes + +* **Programme:** Added check for StatusId, so that we only show programme starts with statusid 1 (Booked) ([cc9a797](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/cc9a7970fb7aaa989facd0aea7894edeaeb9407b)) + ### [3.11.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.10.0...v3.11.0) (2023-10-02) @@ -66,12 +73,5 @@ The full changelog available on [GitHub](https://github.com/MultinetInteractive/ * Made a readme.txt as well, for use in the SVN trunk. ([e6b6d61](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/e6b6d61b8e3f27c2841c25812f46f6d2cde3ead3)) -### [3.9.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.9.0...v3.9.1) (2023-09-25) - - -#### Bug Fixes - -* **Programme:** Fixed an issue where programme views/shortcodes weren't included in the correct way. ([fd0ee12](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/fd0ee128dfc1e324732544f9071640b5aba76e0c)), closes [#494](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/494) -