Changeset 3174802
- Timestamp:
- 10/24/2024 08:31:44 AM (17 months ago)
- Location:
- recras
- Files:
-
- 14 edited
- 1 copied
-
tags/6.2.2 (copied) (copied from recras/trunk)
-
tags/6.2.2/changelog.md (modified) (1 diff)
-
tags/6.2.2/css/fixreactdatepicker.css (modified) (3 diffs)
-
tags/6.2.2/readme.txt (modified) (2 diffs)
-
tags/6.2.2/recras-wordpress-plugin.php (modified) (1 diff)
-
tags/6.2.2/src/Arrangement.php (modified) (2 diffs)
-
tags/6.2.2/src/ContactForm.php (modified) (2 diffs)
-
tags/6.2.2/src/Plugin.php (modified) (1 diff)
-
trunk/changelog.md (modified) (1 diff)
-
trunk/css/fixreactdatepicker.css (modified) (3 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/recras-wordpress-plugin.php (modified) (1 diff)
-
trunk/src/Arrangement.php (modified) (2 diffs)
-
trunk/src/ContactForm.php (modified) (2 diffs)
-
trunk/src/Plugin.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
recras/tags/6.2.2/changelog.md
r3151413 r3174802 1 1 # Changelog 2 3 ## 6.2.2 (2024-10-24) 4 * Update "Fix book process datepicker styling" styles to latest version 5 * Updated "Tested up to" version to 6.7 6 * If package in a contact form is required, don't add an empty option 2 7 3 8 ## 6.2.1 (2024-09-13) -
recras/tags/6.2.2/css/fixreactdatepicker.css
r3062678 r3174802 39 39 } 40 40 .bookprocess .react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list { 41 height: calc(195px + (1.7em / 2));41 height: calc(195px + 1.7em / 2); 42 42 } 43 43 … … 68 68 .react-datepicker__quarter-text, 69 69 .react-datepicker__year-text 70 ): hover {70 ):not([aria-disabled=true]):hover { 71 71 border-radius: 0.3em; 72 72 } … … 161 161 padding-left: 0.2em; 162 162 } 163 .bookprocess .react-datepicker__calendar-icon { 164 width: 1em; 165 height: 1em; 166 vertical-align: -0.125em; 167 } -
recras/tags/6.2.2/readme.txt
r3151413 r3174802 2 2 Contributors: zanderz 3 3 Tags: recras, recreation, reservation, booking, voucher 4 Tested up to: 6. 65 Stable tag: 6.2. 14 Tested up to: 6.7 5 Stable tag: 6.2.2 6 6 License: GPLv2 or later 7 7 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 77 77 78 78 == Changelog == 79 80 = 6.2.2 = 81 * Update "Fix book process datepicker styling" styles to latest version 82 * Updated "Tested up to" version to 6.7 83 * If package in a contact form is required, don't add an empty option 79 84 80 85 = 6.2.1 = -
recras/tags/6.2.2/recras-wordpress-plugin.php
r3151413 r3174802 3 3 Plugin Name: Recras WordPress Plugin 4 4 Plugin URI: https://www.recras.nl/ 5 Version: 6.2. 15 Version: 6.2.2 6 6 Description: Easily integrate your Recras data into your own site 7 7 Requires at least: 6.4 -
recras/tags/6.2.2/src/Arrangement.php
r3127313 r3174802 271 271 * @return array|string 272 272 */ 273 public function getPackagesForContactForm(string $subdomain, int $contactformID )273 public function getPackagesForContactForm(string $subdomain, int $contactformID, bool $includeEmpty) 274 274 { 275 275 $form = ContactForm::getForm($subdomain, $contactformID); … … 279 279 } 280 280 281 $packages = [ 282 0 => '', 283 ]; 281 $packages = []; 282 if ($includeEmpty) { 283 $packages[0] = ''; 284 } 284 285 285 286 foreach ($form->Arrangementen as $pckg) { -
recras/tags/6.2.2/src/ContactForm.php
r3127313 r3174802 240 240 if (empty($arrangementen)) { 241 241 $classArrangement = new Arrangement(); 242 $arrangementen = $classArrangement->getPackagesForContactForm($options['subdomain'], $formID );242 $arrangementen = $classArrangement->getPackagesForContactForm($options['subdomain'], $formID, !$field->verplicht); 243 243 } 244 244 … … 256 256 'placeholder' => $options['placeholders'], 257 257 ]; 258 if (count($arrangementen) === 2 && $field->verplicht) { // 1 real package + 1 empty option 259 unset($arrangementen[0]); 258 if (count($arrangementen) === 1 && $field->verplicht) { 260 259 $selectOptions['selected'] = current(array_keys($arrangementen)); 261 260 } -
recras/tags/6.2.2/src/Plugin.php
r3127313 r3174802 269 269 if (get_option('recras_fix_react_datepicker')) { 270 270 // This version number is the react-datepicker version 271 wp_enqueue_style('fixreactdatepicker', $this->baseUrl . '/css/fixreactdatepicker.css', [], ' 6.6.0');271 wp_enqueue_style('fixreactdatepicker', $this->baseUrl . '/css/fixreactdatepicker.css', [], '7.4.0'); 272 272 } 273 273 -
recras/trunk/changelog.md
r3151413 r3174802 1 1 # Changelog 2 3 ## 6.2.2 (2024-10-24) 4 * Update "Fix book process datepicker styling" styles to latest version 5 * Updated "Tested up to" version to 6.7 6 * If package in a contact form is required, don't add an empty option 2 7 3 8 ## 6.2.1 (2024-09-13) -
recras/trunk/css/fixreactdatepicker.css
r3062678 r3174802 39 39 } 40 40 .bookprocess .react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list { 41 height: calc(195px + (1.7em / 2));41 height: calc(195px + 1.7em / 2); 42 42 } 43 43 … … 68 68 .react-datepicker__quarter-text, 69 69 .react-datepicker__year-text 70 ): hover {70 ):not([aria-disabled=true]):hover { 71 71 border-radius: 0.3em; 72 72 } … … 161 161 padding-left: 0.2em; 162 162 } 163 .bookprocess .react-datepicker__calendar-icon { 164 width: 1em; 165 height: 1em; 166 vertical-align: -0.125em; 167 } -
recras/trunk/readme.txt
r3151413 r3174802 2 2 Contributors: zanderz 3 3 Tags: recras, recreation, reservation, booking, voucher 4 Tested up to: 6. 65 Stable tag: 6.2. 14 Tested up to: 6.7 5 Stable tag: 6.2.2 6 6 License: GPLv2 or later 7 7 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 77 77 78 78 == Changelog == 79 80 = 6.2.2 = 81 * Update "Fix book process datepicker styling" styles to latest version 82 * Updated "Tested up to" version to 6.7 83 * If package in a contact form is required, don't add an empty option 79 84 80 85 = 6.2.1 = -
recras/trunk/recras-wordpress-plugin.php
r3151413 r3174802 3 3 Plugin Name: Recras WordPress Plugin 4 4 Plugin URI: https://www.recras.nl/ 5 Version: 6.2. 15 Version: 6.2.2 6 6 Description: Easily integrate your Recras data into your own site 7 7 Requires at least: 6.4 -
recras/trunk/src/Arrangement.php
r3127313 r3174802 271 271 * @return array|string 272 272 */ 273 public function getPackagesForContactForm(string $subdomain, int $contactformID )273 public function getPackagesForContactForm(string $subdomain, int $contactformID, bool $includeEmpty) 274 274 { 275 275 $form = ContactForm::getForm($subdomain, $contactformID); … … 279 279 } 280 280 281 $packages = [ 282 0 => '', 283 ]; 281 $packages = []; 282 if ($includeEmpty) { 283 $packages[0] = ''; 284 } 284 285 285 286 foreach ($form->Arrangementen as $pckg) { -
recras/trunk/src/ContactForm.php
r3127313 r3174802 240 240 if (empty($arrangementen)) { 241 241 $classArrangement = new Arrangement(); 242 $arrangementen = $classArrangement->getPackagesForContactForm($options['subdomain'], $formID );242 $arrangementen = $classArrangement->getPackagesForContactForm($options['subdomain'], $formID, !$field->verplicht); 243 243 } 244 244 … … 256 256 'placeholder' => $options['placeholders'], 257 257 ]; 258 if (count($arrangementen) === 2 && $field->verplicht) { // 1 real package + 1 empty option 259 unset($arrangementen[0]); 258 if (count($arrangementen) === 1 && $field->verplicht) { 260 259 $selectOptions['selected'] = current(array_keys($arrangementen)); 261 260 } -
recras/trunk/src/Plugin.php
r3127313 r3174802 269 269 if (get_option('recras_fix_react_datepicker')) { 270 270 // This version number is the react-datepicker version 271 wp_enqueue_style('fixreactdatepicker', $this->baseUrl . '/css/fixreactdatepicker.css', [], ' 6.6.0');271 wp_enqueue_style('fixreactdatepicker', $this->baseUrl . '/css/fixreactdatepicker.css', [], '7.4.0'); 272 272 } 273 273
Note: See TracChangeset
for help on using the changeset viewer.