Changeset 3246510
- Timestamp:
- 02/25/2025 02:28:30 PM (13 months ago)
- Location:
- eduadmin-booking/trunk
- Files:
-
- 2 added
- 7 edited
-
CHANGELOG.md (modified) (1 diff)
-
PLUGIN-CHECKSUM (modified) (1 diff)
-
eduadmin.php (modified) (2 diffs)
-
includes/edu-shortcodes.php (modified) (3 diffs)
-
includes/eduadmin-api-phpclient/eduadmin-api-classes.php (modified) (2 diffs)
-
includes/eduadmin-api-phpclient/eduadmin-api-client.php (modified) (2 diffs)
-
includes/eduadmin-api-phpclient/subclasses/odata/eduadmin-vouchertemplates.php (added)
-
includes/eduadmin-api-phpclient/subclasses/rest/eduadmin-voucher.php (added)
-
readme.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
eduadmin-booking/trunk/CHANGELOG.md
r3182102 r3246510 2 2 3 3 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. 4 5 ## [5.4.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.3.1...v5.4.0) (2025-02-25) 6 7 8 ### Features 9 10 * Added VoucherTemplate OData-endpoint ([9a6c631](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/9a6c6310fb4876ab4e1413e83d17491ffc018d6a)) 11 12 13 ### Bug Fixes 14 15 * Custom course detail views will no longer require an attribute to show on demand events. ([6f90e87](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/6f90e875845d78a44ab32dda817284ad8b8b82ca)) 16 17 18 ### Documentation 19 20 * Remove ondemand-attribute from detailinfo ([dfa3f59](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/dfa3f59c5bea11c8da99d5067e415d6859475a34)) 4 21 5 22 ### [5.3.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.3.0...v5.3.1) (2024-11-05) -
eduadmin-booking/trunk/PLUGIN-CHECKSUM
r3182130 r3246510 1 d60c86a7ef5ab86df88765cafd2408f7 1 ad8df46e2a1db959069163d7ffa25b3e -
eduadmin-booking/trunk/eduadmin.php
r3182102 r3246510 10 10 * Description: EduAdmin plugin to allow visitors to book courses at your website 11 11 * Tags: booking, participants, courses, events, eduadmin 12 * Version: 5. 3.112 * Version: 5.4.0 13 13 * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress 14 14 * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress … … 24 24 /* 25 25 EduAdmin Booking plugin 26 Copyright (C) 2015-202 4Chris Gårdenberg, MultiNet Interactive AB26 Copyright (C) 2015-2025 Chris Gårdenberg, MultiNet Interactive AB 27 27 28 28 This program is free software: you can redistribute it and/or modify -
eduadmin-booking/trunk/includes/edu-shortcodes.php
r3182069 r3246510 421 421 'order' => null, 422 422 'orderby' => null, 423 'ondemand' => false,424 423 'allcourses' => false, 425 424 ), … … 465 464 } 466 465 467 if ( ! $attributes['ondemand'] ) { 468 $edo = EDUAPIHelper()->GetCourseDetailInfo( $course_id, $fetch_months, $group_by_city ); 469 } else { 470 $edo = EDUAPIHelper()->GetOnDemandCourseDetailInfo( $course_id, $group_by_city ); 471 } 472 473 $selected_course = false; 466 $edo = EDUAPIHelper()->GetCourseDetailInfo( $course_id, $fetch_months, $group_by_city ); 474 467 475 468 if ( ! empty( $edo ) ) { 476 469 $selected_course = json_decode( $edo, true ); 470 } 471 472 $is_ondemand = $selected_course['OnDemand']; 473 474 if ( $is_ondemand ) { 475 $selected_course = json_decode( EDUAPIHelper()->GetOnDemandCourseDetailInfo( $course_id, $group_by_city ), true ); 477 476 } 478 477 … … 743 742 $ret_str .= ' data-showvenue="' . esc_attr( EDU()->is_checked( 'eduadmin-showEventVenueName', false ) ) . '"'; 744 743 $ret_str .= ' data-eventinquiry="' . esc_attr( EDU()->is_checked( 'eduadmin-allowInterestRegEvent', false ) ) . '"'; 745 $ret_str .= ' data-ondemand="' . esc_attr( $ attributes['ondemand']) . '"';744 $ret_str .= ' data-ondemand="' . esc_attr( $is_ondemand ) . '"'; 746 745 $ret_str .= ' data-allcourses="' . esc_attr( $attributes['allcourses'] ) . '"'; 747 746 $ret_str .= '>'; -
eduadmin-booking/trunk/includes/eduadmin-api-phpclient/eduadmin-api-classes.php
r3137602 r3246510 122 122 /** @var EduAdmin_OData_Subjects */ 123 123 public $Subjects = null; 124 /** @var EduAdmin_OData_VoucherTemplates */ 125 public $VoucherTemplates = null; 124 126 } 125 127 … … 180 182 /** @var string|null $Created */ 181 183 public $Created = null; 184 } 185 186 /** 187 * Class EduAdmin_Data_CreateVoucher 188 */ 189 class EduAdmin_Data_CreateVoucher { 190 182 191 } 183 192 -
eduadmin-booking/trunk/includes/eduadmin-api-phpclient/eduadmin-api-client.php
r3137602 r3246510 105 105 include_once 'subclasses/odata/eduadmin-reports.php'; 106 106 include_once 'subclasses/odata/eduadmin-subjects.php'; 107 include_once 'subclasses/odata/eduadmin-vouchertemplates.php'; 107 108 /* /OData Classes */ 108 109 … … 153 154 $this->OData->Reports = new EduAdmin_OData_Reports(); 154 155 $this->OData->Subjects = new EduAdmin_OData_Subjects(); 156 $this->OData->VoucherTemplates = new EduAdmin_OData_VoucherTemplates(); 155 157 156 158 // Load REST classes -
eduadmin-booking/trunk/readme.txt
r3182130 r3246510 4 4 Requires at least: 6.0 5 5 Tested up to: 6.6 6 Stable tag: 5. 3.16 Stable tag: 5.4.0 7 7 Requires PHP: 8.1 8 8 License: GPL3 … … 50 50 The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md) 51 51 52 ### [5.4.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.3.1...v5.4.0) (2025-02-25) 53 54 55 #### Features 56 57 * Added VoucherTemplate OData-endpoint ([9a6c631](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/9a6c6310fb4876ab4e1413e83d17491ffc018d6a)) 58 59 60 #### Bug Fixes 61 62 * Custom course detail views will no longer require an attribute to show on demand events. ([6f90e87](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/6f90e875845d78a44ab32dda817284ad8b8b82ca)) 63 64 65 #### Documentation 66 67 * Remove ondemand-attribute from detailinfo ([dfa3f59](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/dfa3f59c5bea11c8da99d5067e415d6859475a34)) 68 52 69 ### [5.3.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.3.0...v5.3.1) (2024-11-05) 53 70 … … 76 93 * Added repeatFrequency, repeatCount and courseMode for LD+JSON ([e5e5c42](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/e5e5c42bfe37d39c088e6901c2de3e7f31841e75)), closes [#511](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/511) 77 94 78 ### [5.1.3](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.1.2...v5.1.3) (2024-10-10)79 95 80 96 81
Note: See TracChangeset
for help on using the changeset viewer.