Restaurant Reservations - Version 2.0.7

Version Description

(2019-10-31) = - Updating version number of enqueued admin files to help with incorrect styling after update - Correcting issue with premium license transfer

Download this release

Release Info

Developer Rustaurius
Plugin Icon 128x128 Restaurant Reservations
Version 2.0.7
Comparing to
See all releases

Code changes from version 2.0.6 to 2.0.7

Files changed (8) hide show
  1. includes/Compatibility.class.php +12 -0
  2. includes/CustomFields.class.php +2 -2
  3. includes/Dashboard.class.php +2 -2
  4. includes/Import.class.php +2 -2
  5. includes/Licenses.class.php +1 -1
  6. includes/Permissions.class.php +1 -1
  7. readme.txt +4 -0
  8. restaurant-reservations.php +3 -3
includes/Compatibility.class.php CHANGED
@@ -26,6 +26,8 @@ class rtbCompatibility {
26
  // Run a filter deprecrated in 1.4.3
27
  add_filter( 'rtb_bookings_table_views_date_range', array( $this, 'rtn_bookings_table_views_schedule' ) );
28
 
 
 
29
  // Make sure custom fields don't completely disappear in 1.5, should no longer be needed
30
  //add_action( 'admin_init', array( $this, 'maybe_bridge_cffrtb_to_1_5' ) );
31
 
@@ -61,6 +63,16 @@ class rtbCompatibility {
61
  return apply_filters( 'rtn_bookings_table_views_schedule', $views );
62
  }
63
 
 
 
 
 
 
 
 
 
 
 
64
  /**
65
  * Check whether or not we need to run some compatibiilty code for older
66
  * versions of the Custom Fields addon.
26
  // Run a filter deprecrated in 1.4.3
27
  add_filter( 'rtb_bookings_table_views_date_range', array( $this, 'rtn_bookings_table_views_schedule' ) );
28
 
29
+ add_action( 'admin_init', array($this, 'check_rtb_version' ) );
30
+
31
  // Make sure custom fields don't completely disappear in 1.5, should no longer be needed
32
  //add_action( 'admin_init', array( $this, 'maybe_bridge_cffrtb_to_1_5' ) );
33
 
63
  return apply_filters( 'rtn_bookings_table_views_schedule', $views );
64
  }
65
 
66
+ public function check_rtb_version() {
67
+ global $rtb_controller;
68
+
69
+ if ( get_option( 'rtb-version' ) != RTB_VERSION ) {
70
+ $rtb_controller->permissions->set_permissions();
71
+
72
+ update_option( 'rtb-version', RTB_VERSION );
73
+ }
74
+ }
75
+
76
  /**
77
  * Check whether or not we need to run some compatibiilty code for older
78
  * versions of the Custom Fields addon.
includes/CustomFields.class.php CHANGED
@@ -56,8 +56,8 @@ class rtbCustomFields {
56
  public function enqueue_scripts() {
57
  $currentScreen = get_current_screen();
58
  if ( $currentScreen->id == 'bookings_page_cffrtb-editor' ) {
59
- wp_enqueue_style( 'rtb-admin', RTB_PLUGIN_URL . '/assets/css/admin.css', array(), '2.0.0' );
60
- wp_enqueue_script( 'rtb-admin-js', RTB_PLUGIN_URL . '/assets/js/admin.js', array( 'jquery' ), '2.0.0', true );
61
  }
62
  }
63
 
56
  public function enqueue_scripts() {
57
  $currentScreen = get_current_screen();
58
  if ( $currentScreen->id == 'bookings_page_cffrtb-editor' ) {
59
+ wp_enqueue_style( 'rtb-admin', RTB_PLUGIN_URL . '/assets/css/admin.css', array(), RTB_VERSION );
60
+ wp_enqueue_script( 'rtb-admin-js', RTB_PLUGIN_URL . '/assets/js/admin.js', array( 'jquery' ), RTB_VERSION, true );
61
  }
62
  }
63
 
includes/Dashboard.class.php CHANGED
@@ -60,8 +60,8 @@ class rtbDashboard {
60
  public function enqueue_scripts() {
61
  $currentScreen = get_current_screen();
62
  if ( $currentScreen->id == 'bookings_page_rtb-dashboard' ) {
63
- wp_enqueue_style( 'rtb-admin', RTB_PLUGIN_URL . '/assets/css/admin.css', array(), '2.0.0' );
64
- wp_enqueue_script( 'rtb-admin-js', RTB_PLUGIN_URL . '/assets/js/admin.js', array( 'jquery' ), '2.0.0', true );
65
  }
66
  }
67
 
60
  public function enqueue_scripts() {
61
  $currentScreen = get_current_screen();
62
  if ( $currentScreen->id == 'bookings_page_rtb-dashboard' ) {
63
+ wp_enqueue_style( 'rtb-admin', RTB_PLUGIN_URL . '/assets/css/admin.css', array(), RTB_VERSION );
64
+ wp_enqueue_script( 'rtb-admin-js', RTB_PLUGIN_URL . '/assets/js/admin.js', array( 'jquery' ), RTB_VERSION, true );
65
  }
66
  }
67
 
includes/Import.class.php CHANGED
@@ -260,8 +260,8 @@ class rtbImport {
260
  public function enqueue_import_scripts() {
261
  $screen = get_current_screen();
262
  if($screen->id == 'fdm-menu_page_fdm-import'){
263
- wp_enqueue_style( 'fdm-admin', FDM_PLUGIN_URL . '/assets/css/admin.css', array(), '2.0.0' );
264
- wp_enqueue_script( 'fdm-admin-js', FDM_PLUGIN_URL . '/assets/js/admin.js', array( 'jquery' ), '2.0.0', true );
265
  }
266
  }
267
 
260
  public function enqueue_import_scripts() {
261
  $screen = get_current_screen();
262
  if($screen->id == 'fdm-menu_page_fdm-import'){
263
+ wp_enqueue_style( 'fdm-admin', FDM_PLUGIN_URL . '/assets/css/admin.css', array(), RTB_VERSION );
264
+ wp_enqueue_script( 'fdm-admin-js', FDM_PLUGIN_URL . '/assets/js/admin.js', array( 'jquery' ), RTB_VERSION, true );
265
  }
266
  }
267
 
includes/Licenses.class.php CHANGED
@@ -185,7 +185,7 @@ class rtbLicenses {
185
  return;
186
  }
187
 
188
- wp_enqueue_style( 'rtb-admin', RTB_PLUGIN_URL . '/assets/css/admin.css' );
189
  }
190
 
191
  /**
185
  return;
186
  }
187
 
188
+ wp_enqueue_style( 'rtb-admin', RTB_PLUGIN_URL . '/assets/css/admin.css', array(), RTB_VERSION );
189
  }
190
 
191
  /**
includes/Permissions.class.php CHANGED
@@ -36,7 +36,7 @@ class rtbPermissions {
36
 
37
  $bookings_objects = get_posts( array( 'post_type' => array( RTB_BOOKING_POST_TYPE ) ) );
38
 
39
- $this->permission_level = ( ( $cffrtb['status'] == 'valid' or $ebfrtb['status'] == 'valid' or $etfrtb['status'] == 'valid' or get_option("mcfrtb_license_key") ) ? 2 : ( ! empty($bookings_objects) ? 1 : 0 ) );
40
 
41
  update_option( "rtb-permission-level", $this->permission_level );
42
  }
36
 
37
  $bookings_objects = get_posts( array( 'post_type' => array( RTB_BOOKING_POST_TYPE ) ) );
38
 
39
+ $this->permission_level = ( ( array_key_exists('status', $cffrtb) or array_key_exists('status', $ebfrtb) or array_key_exists('status', $etfrtb) or get_option("mcfrtb_license_key") ) ? 2 : ( ! empty($bookings_objects) ? 1 : 0 ) );
40
 
41
  update_option( "rtb-permission-level", $this->permission_level );
42
  }
readme.txt CHANGED
@@ -175,6 +175,10 @@ Find answers to even more questions in the [FAQ](http://doc.fivestarplugins.com/
175
 
176
  == Changelog ==
177
 
 
 
 
 
178
  = 2.0.6 (2019-10-31) =
179
  - Corrects a missing function issue for exporting custom fields
180
 
175
 
176
  == Changelog ==
177
 
178
+ = 2.0.7 (2019-10-31) =
179
+ - Updating version number of enqueued admin files to help with incorrect styling after update
180
+ - Correcting issue with premium license transfer
181
+
182
  = 2.0.6 (2019-10-31) =
183
  - Corrects a missing function issue for exporting custom fields
184
 
restaurant-reservations.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Five Star Restaurant Reservations
4
  * Plugin URI: http://www.fivestarplugins.com/plugins/five-star-restaurant-reservations/
5
  * Description: Restaurant reservations made easy. Accept bookings online. Quickly confirm or reject reservations, send email notifications, set booking times and more.
6
- * Version: 2.0.6
7
  * Author: FiveStarPlugins
8
  * Author URI: https://profiles.wordpress.org/fivestarplugins/
9
  * Text Domain: restaurant-reservations
@@ -39,7 +39,7 @@ class rtbInit {
39
  public function __construct() {
40
 
41
  // Common strings
42
- define( 'RTB_VERSION', '1.8.2' );
43
  define( 'RTB_PLUGIN_DIR', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
44
  define( 'RTB_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
45
  define( 'RTB_PLUGIN_FNAME', plugin_basename( __FILE__ ) );
@@ -307,7 +307,7 @@ class rtbInit {
307
  }
308
 
309
  if ( $screen->base == 'toplevel_page_rtb-bookings' || $screen->base == $admin_page_hooks['rtb-bookings'] . '_page_rtb-settings' || $screen->base == $admin_page_hooks['rtb-bookings'] . '_page_rtb-addons' ) {
310
- wp_enqueue_style( 'rtb-admin-css', RTB_PLUGIN_URL . '/assets/css/admin.css' );
311
  wp_enqueue_script( 'rtb-admin', RTB_PLUGIN_URL . '/assets/js/admin.js', array( 'jquery' ), '', true );
312
  wp_enqueue_style( 'rtb-spectrum-css', RTB_PLUGIN_URL . '/assets/css/spectrum.css' );
313
  wp_enqueue_script( 'rtb-spectrum-js', RTB_PLUGIN_URL . '/assets/js/spectrum.js', array( 'jquery' ), '', true );
3
  * Plugin Name: Five Star Restaurant Reservations
4
  * Plugin URI: http://www.fivestarplugins.com/plugins/five-star-restaurant-reservations/
5
  * Description: Restaurant reservations made easy. Accept bookings online. Quickly confirm or reject reservations, send email notifications, set booking times and more.
6
+ * Version: 2.0.7
7
  * Author: FiveStarPlugins
8
  * Author URI: https://profiles.wordpress.org/fivestarplugins/
9
  * Text Domain: restaurant-reservations
39
  public function __construct() {
40
 
41
  // Common strings
42
+ define( 'RTB_VERSION', '2.0.7' );
43
  define( 'RTB_PLUGIN_DIR', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
44
  define( 'RTB_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
45
  define( 'RTB_PLUGIN_FNAME', plugin_basename( __FILE__ ) );
307
  }
308
 
309
  if ( $screen->base == 'toplevel_page_rtb-bookings' || $screen->base == $admin_page_hooks['rtb-bookings'] . '_page_rtb-settings' || $screen->base == $admin_page_hooks['rtb-bookings'] . '_page_rtb-addons' ) {
310
+ wp_enqueue_style( 'rtb-admin-css', RTB_PLUGIN_URL . '/assets/css/admin.css', array(), RTB_VERSION );
311
  wp_enqueue_script( 'rtb-admin', RTB_PLUGIN_URL . '/assets/js/admin.js', array( 'jquery' ), '', true );
312
  wp_enqueue_style( 'rtb-spectrum-css', RTB_PLUGIN_URL . '/assets/css/spectrum.css' );
313
  wp_enqueue_script( 'rtb-spectrum-js', RTB_PLUGIN_URL . '/assets/js/spectrum.js', array( 'jquery' ), '', true );