Skip to content

Commit 3a2d1a3

Browse files
authored
Merge pull request #500 from MultinetInteractive/master
v3.11.0
2 parents 0be7673 + 3e3d5f9 commit 3a2d1a3

8 files changed

Lines changed: 33 additions & 20 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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.
44

5+
## [3.11.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.10.0...v3.11.0) (2023-10-02)
6+
7+
8+
### Features
9+
10+
* List number of free spots on programme list ([38529a8](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/38529a86da27169961bb53597a0f6069c4721d1c))
11+
512
## [3.10.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.9.2...v3.10.0) (2023-09-29)
613

714

PLUGIN-CHECKSUM

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14f81e2c8579a08c36c41a722bb72da7
1+
9bff8c7558e82bfecfc89796fa3d435d

content/template/programme/list.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<?php
2+
$spot_left_option = EDU()->get_option( 'eduadmin-spotsLeft', 'exactNumbers' );
3+
$always_few_spots = EDU()->get_option( 'eduadmin-alwaysFewSpots', '3' );
4+
$spot_settings = EDU()->get_option( 'eduadmin-spotsSettings', "1-5\n5-10\n10+" );
25

36
if ( empty( $programmes['Errors'] ) ) {
47
?>

content/template/programme/template/list-item.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@
2828
<?php
2929
if ( ! empty( $programme['ProgrammeStarts'] ) ) {
3030
$next_start = current( $programme['ProgrammeStarts'] );
31+
32+
$spots_left = intval( $next_start['ParticipantNumberLeft'] );
33+
3134
/* translators: 1. The date for the next programme start */
3235
echo wp_kses_post( sprintf( _x( 'Next start: %s', 'Next programme start', 'eduadmin-booking' ), get_display_date( $next_start['StartDate'] ) ) );
3336
echo '<br />';
34-
echo wp_kses_post( $next_start['ParticipantNumberLeft'] > 0 || intval( $next_start['MaxParticipantNumber'] ) == 0 ? '<span class="spots-left">' . _x( 'Spots left', 'frontend', 'eduadmin-booking' ) . '</span>' : '<span class="no-spots">' . _x( 'No spots', 'frontend', 'eduadmin-booking' ) . '</span>' );
37+
echo wp_kses_post("<span class=\"spots-left\">" . get_spots_left( $spots_left, intval( $next_start['MaxParticipantNumber'] ), $spot_left_option, $spot_settings, $always_few_spots ) . "</span>\n");
3538
}
3639
?>
3740
</div>

eduadmin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Plugin URI: https://www.eduadmin.se
1010
* Description: EduAdmin plugin to allow visitors to book courses at your website
1111
* Tags: booking, participants, courses, events, eduadmin, lega online
12-
* Version: 3.10.0
12+
* Version: 3.11.0
1313
* GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
1414
* GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
1515
* Requires at least: 5.8

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "eduadmin-wordpress-plugin",
33
"private": true,
4-
"version": "3.10.0",
4+
"version": "3.11.0",
55
"repository": "https://github.com/MultinetInteractive/EduAdmin-WordPress.git",
66
"author": "Chris Gårdenberg <chga@multinet.se>",
77
"license": "MIT",

readme.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# EduAdmin Booking
22
- Requires at least: 5.8
33
- Tested up to: 6.4
4-
- Stable tag: 3.10.0
4+
- Stable tag: 3.11.0
55
- Requires PHP: 7.0
66
- License: GPL3
77
- 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.
4040

4141
The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md)
4242

43+
### [3.11.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.10.0...v3.11.0) (2023-10-02)
44+
45+
46+
#### Features
47+
48+
* List number of free spots on programme list ([38529a8](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/38529a86da27169961bb53597a0f6069c4721d1c))
49+
4350
### [3.10.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.9.2...v3.10.0) (2023-09-29)
4451

4552

@@ -61,12 +68,5 @@ The full changelog available on [GitHub](https://github.com/MultinetInteractive/
6168

6269
* **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)
6370

64-
### [3.9.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.8.1...v3.9.0) (2023-09-15)
65-
66-
67-
#### Features
68-
69-
* New type of script, when you use the booking form in the API. ([92eabd8](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/92eabd85c6d6392e3ce68db769fd60f52258dc77)), closes [#412](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/412)
70-
7171

7272

readme.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Contributors: mnchga
33
Tags: booking, participants, courses, events, eduadmin, lega online
44
Requires at least: 5.8
55
Tested up to: 6.4
6-
Stable tag: 3.10.0
6+
Stable tag: 3.11.0
77
Requires PHP: 7.0
88
License: GPL3
99
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.
4545

4646
The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md)
4747

48+
### [3.11.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.10.0...v3.11.0) (2023-10-02)
49+
50+
51+
#### Features
52+
53+
* List number of free spots on programme list ([38529a8](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/38529a86da27169961bb53597a0f6069c4721d1c))
54+
4855
### [3.10.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.9.2...v3.10.0) (2023-09-29)
4956

5057

@@ -66,12 +73,5 @@ The full changelog available on [GitHub](https://github.com/MultinetInteractive/
6673

6774
* **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)
6875

69-
### [3.9.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.8.1...v3.9.0) (2023-09-15)
70-
71-
72-
#### Features
73-
74-
* New type of script, when you use the booking form in the API. ([92eabd8](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/92eabd85c6d6392e3ce68db769fd60f52258dc77)), closes [#412](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/412)
75-
7676

7777

0 commit comments

Comments
 (0)