Booking Calendar - Version 8.5.1.1

Version Description

  • Fix. Show options "Force import" (ability to import bookings without checking) and "Trash all imported bookings before new import" in all versions of plugin.
Download this release

Release Info

Developer wpdevelop
Plugin Icon 128x128 Booking Calendar
Version 8.5.1.1
Comparing to
See all releases

Code changes from version 8.5.1 to 8.5.1.1

Files changed (6) hide show
  1. core/admin/page-ics-general.php +23 -20
  2. core/class/wpbc-class-welcome.php +1 -1
  3. core/lib/wpbc-booking-new.php +4 -2
  4. core/wpbc-activation.php +7 -6
  5. readme.txt +5 -2
  6. wpdev-booking.php +2 -2
core/admin/page-ics-general.php CHANGED
@@ -181,26 +181,28 @@ class WPBC_API_SettingsGeneralSync extends WPBC_Settings_API {
181
  , 'description' => ''
182
  , 'group' => 'import_advanced'
183
  );
184
- //FixIn: 8.4.7.1
185
- $this->fields['booking_ics_force_import'] = array(
186
- 'type' => 'checkbox'
187
- , 'default' => 'Off'
188
- , 'title' => __('Force import', 'booking')
189
- , 'label' => __('Import bookings without checking, if such bookings already have been imported.' ,'booking')
190
- , 'description' => ''
191
- , 'group' => 'import_advanced'
192
- );
193
- //FixIn: 8.4.7.12
194
- $this->fields['booking_ics_force_trash_before_import'] = array(
195
- 'type' => 'checkbox'
196
- , 'default' => 'Off'
197
- , 'title' => __('Trash all imported bookings before new import', 'booking') . ' ' . '[Experimental Feature]'
198
- , 'label' => __('Move all previously imported bookings to trash before new import bookings. Its can resolve issue of updating deleted and edited events in external sources. Its work only, if you are using one source (.ics feed) for importing into specific booking resource!' ,'booking')
199
- , 'description' => ''
200
- , 'group' => 'import_advanced'
201
- );
202
  }
203
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
204
  ////////////////////////////////////////////////////////////////////////
205
 
206
  }
@@ -389,14 +391,15 @@ class WPBC_Page_SettingsGeneralSync extends WPBC_Page_Structure {
389
 
390
  wpbc_close_meta_box_section();
391
 
392
- if ( class_exists( 'wpdev_bk_biz_s' ) ) {
 
393
 
394
  wpbc_open_meta_box_section( 'wpbc_settings_general_sync_events_fields', __( 'Import', 'booking' ) . ' ' . __( 'Advanced', 'booking' ) );
395
 
396
  $this->get_api()->show( 'import_advanced' );
397
 
398
  wpbc_close_meta_box_section();
399
- }
400
  ?>
401
 
402
  <div class="clear"></div>
181
  , 'description' => ''
182
  , 'group' => 'import_advanced'
183
  );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
184
  }
185
 
186
+ //FixIn: 8.5.1.1
187
+
188
+ //FixIn: 8.4.7.1
189
+ $this->fields['booking_ics_force_import'] = array(
190
+ 'type' => 'checkbox'
191
+ , 'default' => 'Off'
192
+ , 'title' => __('Force import', 'booking')
193
+ , 'label' => __('Import bookings without checking, if such bookings already have been imported.' ,'booking')
194
+ , 'description' => ''
195
+ , 'group' => 'import_advanced'
196
+ );
197
+ //FixIn: 8.4.7.12
198
+ $this->fields['booking_ics_force_trash_before_import'] = array(
199
+ 'type' => 'checkbox'
200
+ , 'default' => 'Off'
201
+ , 'title' => __('Trash all imported bookings before new import', 'booking') . ' ' . '[Experimental Feature]'
202
+ , 'label' => __('Move all previously imported bookings to trash before new import bookings. Its can resolve issue of updating deleted and edited events in external sources. Its work only, if you are using one source (.ics feed) for importing into specific booking resource!' ,'booking')
203
+ , 'description' => ''
204
+ , 'group' => 'import_advanced'
205
+ );
206
  ////////////////////////////////////////////////////////////////////////
207
 
208
  }
391
 
392
  wpbc_close_meta_box_section();
393
 
394
+ //FixIn: 8.5.1.1
395
+ // if ( class_exists( 'wpdev_bk_biz_s' ) ) {
396
 
397
  wpbc_open_meta_box_section( 'wpbc_settings_general_sync_events_fields', __( 'Import', 'booking' ) . ' ' . __( 'Advanced', 'booking' ) );
398
 
399
  $this->get_api()->show( 'import_advanced' );
400
 
401
  wpbc_close_meta_box_section();
402
+ // }
403
  ?>
404
 
405
  <div class="clear"></div>
core/class/wpbc-class-welcome.php CHANGED
@@ -474,7 +474,7 @@ class WPBC_Welcome {
474
  . '<li>' . wpbc_recheck_strong_symbols( '**Trash booking in 1 mouse click** on link in email about new booking sending to Administrator. Even without requirement to login to WordPress admin panel. Its require to use **[click2trash]** shortcode at Booking > Settings > Emails > New (admin) page. (8.4.7.25)' ) . '</li>'
475
  . '<li>' . wpbc_recheck_strong_symbols( 'Ability to define sort **order of search availability results** at the Booking > Settings > Search page. (8.4.7.8) *(Business Large, MultiUser)*' ) . '</li>'
476
  . '<li>' . wpbc_recheck_strong_symbols( '** Experimental Feature**. Trash all imported bookings before new import. Move all previously imported bookings to trash before new import bookings. Its can **resolve issue of updating deleted and edited events in external sources**. Activate this option at Booking > Settings > Sync > "General" page. Its work only, if you are using one source (.ics feed) for importing into specific booking resource! Work only in update of Booking Manager 2.0.10 or newer. (8.4.7.12)' ) . '</li>'
477
- . '<li>' . wpbc_recheck_strong_symbols( 'Force import. Ability to import bookings without checking, if such bookings already have been imported. Activate this option at Booking > Settings > Sync > "General" page. Available in the Booking Manager 2.0.10 or newer. (2.0.10.1)(8.4.7.1)' ) . '</li>'
478
  . '</ul>'
479
 
480
  . '<h4>' .wpbc_recheck_strong_symbols( 'Improvement' ) . '</h4>'
474
  . '<li>' . wpbc_recheck_strong_symbols( '**Trash booking in 1 mouse click** on link in email about new booking sending to Administrator. Even without requirement to login to WordPress admin panel. Its require to use **[click2trash]** shortcode at Booking > Settings > Emails > New (admin) page. (8.4.7.25)' ) . '</li>'
475
  . '<li>' . wpbc_recheck_strong_symbols( 'Ability to define sort **order of search availability results** at the Booking > Settings > Search page. (8.4.7.8) *(Business Large, MultiUser)*' ) . '</li>'
476
  . '<li>' . wpbc_recheck_strong_symbols( '** Experimental Feature**. Trash all imported bookings before new import. Move all previously imported bookings to trash before new import bookings. Its can **resolve issue of updating deleted and edited events in external sources**. Activate this option at Booking > Settings > Sync > "General" page. Its work only, if you are using one source (.ics feed) for importing into specific booking resource! Work only in update of Booking Manager 2.0.10 or newer. (8.4.7.12)' ) . '</li>'
477
+ . '<li>' . wpbc_recheck_strong_symbols( '**Force import**. Ability to import bookings without checking, if such bookings already have been imported. Activate this option at Booking > Settings > Sync > "General" page. Available in the Booking Manager 2.0.10 or newer. (2.0.10.1)(8.4.7.1)' ) . '</li>'
478
  . '</ul>'
479
 
480
  . '<h4>' .wpbc_recheck_strong_symbols( 'Improvement' ) . '</h4>'
core/lib/wpbc-booking-new.php CHANGED
@@ -398,8 +398,10 @@ function wpbc_add_new_booking( $params , $is_edit_booking = false ){
398
  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
399
  // Update the Hash and Cost of the booking
400
  make_bk_action('wpbc_update_booking_hash', $booking_id, $bktype );
401
- make_bk_action('wpdev_booking_post_inserted', $booking_id, $bktype, $str_dates__dd_mm_yyyy, array($start_time, $end_time ) , $formdata );
402
-
 
 
403
  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
404
 
405
  $insert = wpbc_get_insert_sql_for_dates( $dates_in_diff_formats , $is_approved_dates, $booking_id );
398
  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
399
  // Update the Hash and Cost of the booking
400
  make_bk_action('wpbc_update_booking_hash', $booking_id, $bktype );
401
+
402
+ if ( $is_edit_booking === false ) { //FixIn: 8.5.2.1 - do not updare cost of booking, while editing this booking.
403
+ make_bk_action('wpdev_booking_post_inserted', $booking_id, $bktype, $str_dates__dd_mm_yyyy, array($start_time, $end_time ) , $formdata );
404
+ }
405
  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
406
 
407
  $insert = wpbc_get_insert_sql_for_dates( $dates_in_diff_formats , $is_approved_dates, $booking_id );
core/wpbc-activation.php CHANGED
@@ -1137,8 +1137,13 @@ function wpbc_get_default_options( $option_name = '', $is_get_multiuser_general_
1137
 
1138
 
1139
  }
1140
-
1141
-
 
 
 
 
 
1142
  ////////////////////////////////////////////////////////////////////////////
1143
  // BS
1144
  ////////////////////////////////////////////////////////////////////////////
@@ -1151,10 +1156,6 @@ function wpbc_get_default_options( $option_name = '', $is_get_multiuser_general_
1151
  //$mu_option4delete[]='booking_ics_import_add_change_over_time'; // No need to delete ^
1152
  $default_options['booking_ics_import_append_checkout_day'] = 'On';
1153
  //$mu_option4delete[]='booking_ics_import_append_checkout_day'; // No need to delete ^
1154
- $default_options['booking_ics_force_import'] = 'Off'; //FixIn: 8.4.7.1
1155
- //$mu_option4delete[]='booking_ics_force_import'; // No need to delete ^
1156
- $default_options['booking_ics_force_trash_before_import'] = 'Off'; //FixIn: 8.4.7.12
1157
- //$mu_option4delete[]='booking_ics_force_trash_before_import'; // No need to delete ^
1158
 
1159
  $default_options['booking_recurrent_time'] = 'Off';
1160
  $mu_option4delete[]='booking_recurrent_time';
1137
 
1138
 
1139
  }
1140
+
1141
+ //FixIn: 8.5.1.1
1142
+ $default_options['booking_ics_force_import'] = 'Off'; //FixIn: 8.4.7.1
1143
+ //$mu_option4delete[]='booking_ics_force_import'; // No need to delete ^
1144
+ $default_options['booking_ics_force_trash_before_import'] = 'Off'; //FixIn: 8.4.7.12
1145
+ //$mu_option4delete[]='booking_ics_force_trash_before_import'; // No need to delete ^
1146
+
1147
  ////////////////////////////////////////////////////////////////////////////
1148
  // BS
1149
  ////////////////////////////////////////////////////////////////////////////
1156
  //$mu_option4delete[]='booking_ics_import_add_change_over_time'; // No need to delete ^
1157
  $default_options['booking_ics_import_append_checkout_day'] = 'On';
1158
  //$mu_option4delete[]='booking_ics_import_append_checkout_day'; // No need to delete ^
 
 
 
 
1159
 
1160
  $default_options['booking_recurrent_time'] = 'Off';
1161
  $mu_option4delete[]='booking_recurrent_time';
readme.txt CHANGED
@@ -5,7 +5,7 @@ Tags: booking calendar, booking system, availability calendar, events calendar,
5
  Requires at least: 4.0
6
  Requires PHP: 5.2.4
7
  Tested up to: 5.2
8
- Stable tag: 8.5.1
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
@@ -226,6 +226,9 @@ Please see [Video Guides](https://wpbookingcalendar.com/help/).
226
  13. **Time Slots**. Simple configuration of **time slots** selection in booking form.
227
 
228
  == Changelog ==
 
 
 
229
  = 8.5.1 =
230
  - Changes in **all** versions:
231
  * **Translation** Spanish translation [100% completed] by Enrique Ferrater
@@ -258,7 +261,7 @@ Please see [Video Guides](https://wpbookingcalendar.com/help/).
258
  * **New**. Decline booking in 1 mouse click on link in email about new booking sending to Administrator. Even without requirement to login to WordPress admin panel. Its require to use [click2decline] shortcode at Booking > Settings > Emails > New (admin) page. (8.4.7.25)
259
  * **New**. Trash booking in 1 mouse click on link in email about new booking sending to Administrator. Even without requirement to login to WordPress admin panel. Its require to use [click2trash] shortcode at Booking > Settings > Emails > New (admin) page. (8.4.7.25)
260
  * **New**. Ability to define sort order of search availability results at the Booking > Settings > Search page. (8.4.7.8) *(Business Large, MultiUser)*
261
- * **New**. ** Experimental Feature**. Trash all imported bookings before new import. Move all previously imported bookings to trash before new import bookings. Its can resolve issue of updating deleted and edited events in external sources. Activate this option at Booking > Settings > Sync > "General" page. Its work only, if you are using one source (.ics feed) for importing into specific booking resource! Work only in update of Booking Manager 2.0.10 or newer. (8.4.7.12)
262
  * **Improvement**. Checking for seasonal availability in "child booking resources" during submitting booking for booking resource with specific capacity. If you have set unavailable dates in child booking resource via season filters, system will not save bookings in this child booking resource. (8.4.7.3) *(Business Large, MultiUser)*
263
  * **Improvement**. Set as unavailable the end time fields options, depend from selected date with booked timeslots (8.4.7.6) *(Business Small/Medium/Large, MultiUser)*
264
  * **Improvement**. Added autocomplete Off to the search form fields, to prevent of showing tooltips in search fields. (8.4.7.7) *(Business Large, MultiUser)*
5
  Requires at least: 4.0
6
  Requires PHP: 5.2.4
7
  Tested up to: 5.2
8
+ Stable tag: 8.5.1.1
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
226
  13. **Time Slots**. Simple configuration of **time slots** selection in booking form.
227
 
228
  == Changelog ==
229
+ = 8.5.1.1 =
230
+ * **Fix**. Show options "Force import" (ability to import bookings without checking) and "Trash all imported bookings before new import" in all versions of plugin.
231
+
232
  = 8.5.1 =
233
  - Changes in **all** versions:
234
  * **Translation** Spanish translation [100% completed] by Enrique Ferrater
261
  * **New**. Decline booking in 1 mouse click on link in email about new booking sending to Administrator. Even without requirement to login to WordPress admin panel. Its require to use [click2decline] shortcode at Booking > Settings > Emails > New (admin) page. (8.4.7.25)
262
  * **New**. Trash booking in 1 mouse click on link in email about new booking sending to Administrator. Even without requirement to login to WordPress admin panel. Its require to use [click2trash] shortcode at Booking > Settings > Emails > New (admin) page. (8.4.7.25)
263
  * **New**. Ability to define sort order of search availability results at the Booking > Settings > Search page. (8.4.7.8) *(Business Large, MultiUser)*
264
+ * **New**. **Experimental Feature**. Trash all imported bookings before new import. Move all previously imported bookings to trash before new import bookings. Its can resolve issue of updating deleted and edited events in external sources. Activate this option at Booking > Settings > Sync > "General" page. Its work only, if you are using one source (.ics feed) for importing into specific booking resource! Work only in update of Booking Manager 2.0.10 or newer. (8.4.7.12)
265
  * **Improvement**. Checking for seasonal availability in "child booking resources" during submitting booking for booking resource with specific capacity. If you have set unavailable dates in child booking resource via season filters, system will not save bookings in this child booking resource. (8.4.7.3) *(Business Large, MultiUser)*
266
  * **Improvement**. Set as unavailable the end time fields options, depend from selected date with booked timeslots (8.4.7.6) *(Business Small/Medium/Large, MultiUser)*
267
  * **Improvement**. Added autocomplete Off to the search form fields, to prevent of showing tooltips in search fields. (8.4.7.7) *(Business Large, MultiUser)*
wpdev-booking.php CHANGED
@@ -7,7 +7,7 @@ Author: wpdevelop, oplugins
7
  Author URI: https://wpbookingcalendar.com/
8
  Text Domain: booking
9
  Domain Path: /languages/
10
- Version: 8.5.1
11
  */
12
 
13
  /* Copyright 2009 - 2019 www.wpbookingcalendar.com (email: info@wpbookingcalendar.com),
@@ -29,7 +29,7 @@ Version: 8.5.1
29
  if ( ! defined( 'ABSPATH' ) ) die( '<h3>Direct access to this file do not allow!</h3>' ); // Exit if accessed directly
30
 
31
 
32
- if ( ! defined( 'WP_BK_VERSION_NUM' ) ) { define( 'WP_BK_VERSION_NUM', '8.5.1' ); }
33
 
34
  ////////////////////////////////////////////////////////////////////////////////
35
  // PRIMARY URL CONSTANTS
7
  Author URI: https://wpbookingcalendar.com/
8
  Text Domain: booking
9
  Domain Path: /languages/
10
+ Version: 8.5.1.1
11
  */
12
 
13
  /* Copyright 2009 - 2019 www.wpbookingcalendar.com (email: info@wpbookingcalendar.com),
29
  if ( ! defined( 'ABSPATH' ) ) die( '<h3>Direct access to this file do not allow!</h3>' ); // Exit if accessed directly
30
 
31
 
32
+ if ( ! defined( 'WP_BK_VERSION_NUM' ) ) { define( 'WP_BK_VERSION_NUM', '8.5.1.1' ); }
33
 
34
  ////////////////////////////////////////////////////////////////////////////////
35
  // PRIMARY URL CONSTANTS