Merge pull request #497 from MultinetInteractive/master

v3.9.2

Author: itssimple

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.9.2](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.9.1...v3.9.2) (2023-09-26)
+
+
+### Refactoring
+
+* 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)
 
 

Gulpfile.js

@@ -22,7 +22,7 @@ gulp.task("styles-admin", function () {
 
 gulp.task("readme-version", function () {
 	return gulp
-		.src("src/readme.md")
+		.src("src/readme.*")
 		.pipe(replace("$PLUGINVERSION$", pinfo.version))
 		.pipe(replace("$PLUGINATLEAST$", pinfo.config.eduadmin.requiresAtLeast))
 		.pipe(replace("$PLUGINTESTEDTO$", pinfo.config.eduadmin.testedUpTo))
@@ -82,7 +82,7 @@ gulp.task("default", function () {
 	gulp.watch("src/scss/frontend/**/*.scss", gulp.series("styles-frontend"));
 	gulp.watch("src/scss/admin/**/*.scss", gulp.series("styles-admin"));
 	gulp.watch("src/eduadmin.php", gulp.series("eduadmin-version"));
-	gulp.watch("src/readme.md", gulp.series("readme-version"));
+	gulp.watch("src/readme.*", gulp.series("readme-version"));
 	gulp.watch(
 		"package.json",
 		gulp.series("readme-version", "eduadmin-version")

PLUGIN-CHECKSUM

@@ -1 +1 @@
-aa4d899950d162a8261ab42e4dffcf4d
+026e2a4bf09a14fb3bd4ee69ccc896cf

content/template/listTemplate/template_A_listCourses.php

@@ -20,7 +20,7 @@
 					continue;
 				}
 				include 'blocks/course-block-a.php';
-				$current_events++;
+				$current_events ++;
 			}
 		} else {
 			?>

eduadmin.php

@@ -9,11 +9,11 @@
  * 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.9.1
+ * Version:	3.9.2
  * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
  * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
  * Requires at least: 5.8
- * Tested up to: 6.3.0
+ * Tested up to: 6.4
  * Requires PHP: 7.0
  * Author:	Chris Gårdenberg, MultiNet Interactive AB
  * Author URI:	https://www.multinet.com

includes/edu-shortcodes.php

@@ -446,7 +446,7 @@ function eduadmin_get_detailinfo( $attributes ) {
 					$ret_str .= '<div class="pricename"><span class="pricename-price">' . esc_html( edu_get_price( current( $prices )['Price'], $selected_course['ParticipantVat'], $attributes['eventprice'] ) ) . "</span></div>\n";
 				} else {
 					foreach ( $prices as $price ) {
-						$ret_str .= wp_kses_post( sprintf( '<div class="pricename"><span class="pricename-description">%1$s</span> <span class="pricename-price">%2$s</span></div>', $price['PriceNameDescription'], edu_get_price( $price['Price'], $edo['ParticipantVat'], $attributes['eventprice'] ) ) ) . "\n";
+						$ret_str .= wp_kses_post( sprintf( '<div class="pricename"><span class="pricename-description">%1$s</span> <span class="pricename-price">%2$s</span></div>', $price['PriceNameDescription'], edu_get_price( $price['Price'], $selected_course['ParticipantVat'], $attributes['eventprice'] ) ) ) . "\n";
 					}
 				}
 			}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "eduadmin-wordpress-plugin",
 	"private": true,
-	"version": "3.9.1",
+	"version": "3.9.2",
 	"repository": "https://github.com/MultinetInteractive/EduAdmin-WordPress.git",
 	"author": "Chris Gårdenberg <chga@multinet.se>",
 	"license": "MIT",
@@ -30,7 +30,7 @@
 			"path": "./node_modules/cz-conventional-changelog"
 		},
 		"eduadmin": {
-			"testedUpTo": "6.3.0",
+			"testedUpTo": "6.4",
 			"requiresAtLeast": "5.8",
 			"minimumPhpVersion": "7.0"
 		}

readme.md

@@ -1,54 +1,51 @@
-=== EduAdmin Booking ===
-Contributors: mnchga
-Tags: booking, participants, courses, events, eduadmin, lega online
-Requires at least: 5.8
-Tested up to: 6.3.0
-Stable tag: 3.9.1
-Requires PHP: 7.0
-License: GPL3
-License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
+# EduAdmin Booking
+- Requires at least: 5.8
+- Tested up to: 6.4
+- Stable tag: 3.9.2
+- Requires PHP: 7.0
+- License: GPL3
+- License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
 
 EduAdmin plugin to allow visitors to book courses at your website. Requires EduAdmin-account.
 
-== Description ==
+## Description
 
 Plugin that you connect to [EduAdmin](https://www.eduadmin.se) to enable booking on your website.
 
-[<img src="https://img.shields.io/wordpress/plugin/v/eduadmin-booking.svg" alt="Plugin version" />](https://wordpress.org/plugins/eduadmin-booking/)
-[<img src="https://img.shields.io/wordpress/plugin/dt/eduadmin-booking.svg" alt="Downloads" />](https://wordpress.org/plugins/eduadmin-booking/)
-[<img src="https://img.shields.io/wordpress/v/eduadmin-booking.svg" alt="Tested up to" />](https://wordpress.org/plugins/eduadmin-booking/)
-
-[<img src="https://badges.gitter.im/MultinetInteractive/EduAdmin-WordPress.png" alt="Gitter" />](https://gitter.im/MultinetInteractive/EduAdmin-WordPress)
-[<img src="https://travis-ci.org/MultinetInteractive/EduAdmin-WordPress.svg?branch=master" alt="Build status" />](https://travis-ci.org/MultinetInteractive/EduAdmin-WordPress)
-[<img src="https://scrutinizer-ci.com/g/MultinetInteractive/EduAdmin-WordPress/badges/quality-score.png?b=master" alt="Code quality" />](https://scrutinizer-ci.com/g/MultinetInteractive/EduAdmin-WordPress/?branch=master)
-
 [<img src="https://img.shields.io/github/commits-since/MultinetInteractive/EduAdmin-WordPress/latest.svg" alt="Commits since latest plugin version" />](https://wordpress.org/plugins/eduadmin-booking/)
 
 Requires the following PHP-modules
 
 - php-curl
 - php-mbstring
 
-== Installation ==
+## Installation
 
 -   Upload the zip-file (or install from WordPress) and activate the plugin
 -   Provide the API key from EduAdmin.
 -   Create pages for the different views and give them their shortcodes
 
-== Upgrade Notice ==
+## Upgrade Notice
 
-= 3.0 =
+### 3.0
 
 Styles have been remade for the end user login page, and the booking list page. Please check that any custom styles are still working, or you might need to fix them.
 
-= 2.0 =
+### 2.0
 
 We have replaced everything with a new API-client, so some things may be broken. If you experience any bugs (not new feature-requests), please contact the MultiNet Support.
 If you notice that your API key doesn't work any more, you have to contact us.
 
-== Changelog ==
+## Changelog
+
+The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md)
+
+### [3.9.2](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.9.1...v3.9.2) (2023-09-26)
 
-The full changelog available on https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md
+
+#### Refactoring
+
+* 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)
 
@@ -66,20 +63,5 @@ The full changelog available on https://github.com/MultinetInteractive/EduAdmin-
 
 ### [3.8.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.8.0...v3.8.1) (2023-09-08)
 
-### [3.8.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.7.1...v3.8.0) (2023-09-08)
-
-
-#### Features
-
-* Added actions for showing course/event lists ([2fcdc70](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/2fcdc70a71969bbd9e1967e72e615f840321d13d)), closes [#488](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/488)
-* Added actions for viewing detail views, booking forms and performing a purchase (not programs) ([a3270b2](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/a3270b265919513935f817c87bc259c91877e9db)), closes [#488](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/488)
-* Added actions for viewing detail views, booking forms and performing a purchase of programs ([5dee4ec](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/5dee4ecc0abf158b98e2d0a63499c953f46a5409)), closes [#488](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/488)
-* Added actions for viewing detail views, booking forms and performing a purchase of programs ([d2757b4](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/d2757b478c470e8717cc522fe6ee58c86d339f9e)), closes [#488](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/488)
-
-
-#### Documentation
-
-* Added information about Actions ([2042c70](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/2042c7023647eb2e3f09c5d5db0b2faf7bf9d4a5))
-
 
 

readme.txt

@@ -0,0 +1,72 @@
+=== EduAdmin Booking ===
+Contributors: mnchga
+Tags: booking, participants, courses, events, eduadmin, lega online
+Requires at least: 5.8
+Tested up to: 6.4
+Stable tag: 3.9.2
+Requires PHP: 7.0
+License: GPL3
+License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
+Donate link: https://github.com/sponsors/itssimple
+
+EduAdmin plugin to allow visitors to book courses at your website. Requires EduAdmin-account.
+
+== Description ==
+
+Plugin that you connect to [EduAdmin](https://www.eduadmin.se) to enable bookings of both courses and programmes through your website.
+
+Requires the following PHP-modules
+
+- php-curl
+- php-mbstring
+
+== Installation ==
+
+-   Upload the zip-file (or install from WordPress) and activate the plugin
+-   Provide the API key from EduAdmin.
+-   Create pages for the different views and give them their shortcodes
+
+== Frequently Asked Questions ==
+
+== Screenshots ==
+
+== Upgrade Notice ==
+
+= 3.0 =
+
+Styles have been remade for the end user login page, and the booking list page. Please check that any custom styles are still working, or you might need to fix them.
+
+= 2.0 =
+
+We have replaced everything with a new API-client, so some things may be broken. If you experience any bugs (not new feature-requests), please contact the MultiNet Support.
+If you notice that your API key doesn't work any more, you have to contact us.
+
+== Changelog ==
+
+The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md)
+
+### [3.9.2](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.9.1...v3.9.2) (2023-09-26)
+
+
+#### Refactoring
+
+* 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)
+
+### [3.9.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.8.1...v3.9.0) (2023-09-15)
+
+
+#### Features
+
+* 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)
+
+### [3.8.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.8.0...v3.8.1) (2023-09-08)
+
+
+

scripts/trunk_gh.sh

@@ -56,6 +56,7 @@ rm -fR $PROJECT_ROOT/node_modules
 rm -fR $PROJECT_ROOT/src
 rm -fR $PROJECT_ROOT/docs
 rm -fR $PROJECT_ROOT/new_website
+rm -fR $PROJECT_ROOT/readme.md
 
 # Make sure we are in the project root
 cd $PROJECT_ROOT