Changeset 2977769
- Timestamp:
- 10/11/2023 05:36:07 PM (2 years ago)
- Location:
- woocommerce-accommodation-bookings
- Files:
-
- 12 edited
- 1 copied
-
tags/1.2.1 (copied) (copied from woocommerce-accommodation-bookings/trunk)
-
tags/1.2.1/changelog.txt (modified) (1 diff)
-
tags/1.2.1/includes/class-wc-accommodation-bookings-plugin.php (modified) (6 diffs)
-
tags/1.2.1/includes/class-wc-accommodation-dependencies.php (modified) (6 diffs)
-
tags/1.2.1/languages/woocommerce-accommodation-bookings.pot (modified) (3 diffs)
-
tags/1.2.1/readme.txt (modified) (3 diffs)
-
tags/1.2.1/woocommerce-accommodation-bookings.php (modified) (2 diffs)
-
trunk/changelog.txt (modified) (1 diff)
-
trunk/includes/class-wc-accommodation-bookings-plugin.php (modified) (6 diffs)
-
trunk/includes/class-wc-accommodation-dependencies.php (modified) (6 diffs)
-
trunk/languages/woocommerce-accommodation-bookings.pot (modified) (3 diffs)
-
trunk/readme.txt (modified) (3 diffs)
-
trunk/woocommerce-accommodation-bookings.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
woocommerce-accommodation-bookings/tags/1.2.1/changelog.txt
r2963204 r2977769 1 1 *** Changelog *** 2 3 = 1.2.1 - 2023-10-10 = 4 * Dev - Hard code the paths to the asset data files. 5 * Dev - Update PHPCS and PHPCompatibility GitHub Actions. 6 * Fix - Fatal Error when WooCommerce is disabled. 7 * Tweak - Indicate compatibility with WooPayments extension. 2 8 3 9 = 1.2.0 - 2023-09-05 = -
woocommerce-accommodation-bookings/tags/1.2.1/includes/class-wc-accommodation-bookings-plugin.php
r2911748 r2977769 189 189 190 190 /** 191 * WooCommerce fallback notice. 192 * 193 * @since 1.2.1 194 */ 195 public function missing_wc_notice() { 196 /* translators: %s WC download URL link. */ 197 echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Accommodation Bookings requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-accommodation-bookings' ), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' ) . '</strong></p></div>'; 198 } 199 200 /** 191 201 * Load Classes 192 202 */ … … 206 216 */ 207 217 public function admin_includes() { 218 // Return if WooCommerce class not found. 219 if ( ! class_exists( 'WooCommerce' ) ) { 220 add_action( 'admin_notices', array( $this, 'missing_wc_notice' ) ); 221 return; 222 } 223 208 224 include WC_ACCOMMODATION_BOOKINGS_INCLUDES_PATH . 'admin/class-wc-accommodation-booking-admin-panels.php'; 209 225 include WC_ACCOMMODATION_BOOKINGS_INCLUDES_PATH . 'admin/class-wc-accommodation-booking-admin-product-settings.php'; … … 214 230 */ 215 231 public function frontend_assets() { 216 $booking_style_asset_data = $this->get_asset_data( 'frontend', 'css' ); 217 $booking_script_asset_data = $this->get_asset_data( 'booking-form', 'js/frontend' ); 218 219 $booking_script_dependencies = array_merge( 220 $booking_script_asset_data['dependencies'], 232 $dist_path = dirname( WC_ACCOMMODATION_BOOKINGS_MAIN_FILE ) . '/dist'; 233 $style_data = include $dist_path . '/css/frontend.asset.php'; 234 $script_data = include $dist_path . '/js/frontend/booking-form.asset.php'; 235 236 $script_dependencies = array_merge( 237 $script_data['dependencies'], 221 238 array( 'wc-bookings-booking-form' ) 222 239 ); … … 226 243 WC_ACCOMMODATION_BOOKINGS_PLUGIN_URL . '/dist/css/frontend.css', 227 244 null, 228 $ booking_style_asset_data['version']245 $style_data['version'] 229 246 ); 230 247 … … 232 249 'wc-accommodation-bookings-form', 233 250 WC_ACCOMMODATION_BOOKINGS_PLUGIN_URL . '/dist/js/frontend/booking-form.js', 234 $ booking_script_dependencies,235 $ booking_script_asset_data['version'],251 $script_dependencies, 252 $script_data['version'], 236 253 true 237 254 ); … … 313 330 update_option( 'wc_accommodation_bookings_version', $this->version ); 314 331 } 315 316 /**317 * Should return data from the asset file.318 *319 * @param string $script_file_name Script file name.320 * @param string $location Script file location.321 *322 * @return array323 */324 private function get_asset_data( $script_file_name, $location ): array {325 $asset_path = dirname( WC_ACCOMMODATION_BOOKINGS_MAIN_FILE ) . "/dist/$location/$script_file_name.asset.php";326 327 return require $asset_path;328 }329 332 } -
woocommerce-accommodation-bookings/tags/1.2.1/includes/class-wc-accommodation-dependencies.php
r2963204 r2977769 1 1 <?php 2 /** 3 * A WC_Accommodation_Dependencies class file. 4 * 5 * @package woocommerce-accommodation-bookings 6 */ 7 2 8 /** 3 9 * WC Accommodation Bookings Dependency Checker … … 8 14 class WC_Accommodation_Dependencies { 9 15 10 /**@var an array of active plugins*/ 16 /** 17 * Array of active plugins 18 * 19 * @var array of active plugins 20 */ 11 21 private static $active_plugins; 12 22 … … 32 42 33 43 return ( 34 in_array( $booking_file, self::$active_plugins )44 in_array( $booking_file, self::$active_plugins, true ) 35 45 || 36 46 array_key_exists( $booking_file, self::$active_plugins ) … … 38 48 class_exists( 'WC_Bookings' ) 39 49 || 40 in_array( $old_booking_file, self::$active_plugins )50 in_array( $old_booking_file, self::$active_plugins, true ) 41 51 || 42 52 array_key_exists( $old_booking_file, self::$active_plugins ) … … 46 56 /** 47 57 * Returns true if bookings is greater than a specific version and false if not 48 * @param string $verson The version to check against 58 * 59 * @param string $version The version to check against. 49 60 * @return boolean 50 61 */ … … 59 70 * Check dependencies. 60 71 * 61 * @throws Exception 72 * @throws Exception Show exception on dependencies failure. 62 73 */ 63 74 public static function check_dependencies() { -
woocommerce-accommodation-bookings/tags/1.2.1/languages/woocommerce-accommodation-bookings.pot
r2963204 r2977769 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: WooCommerce Accommodation Bookings 1.2. 0\n"5 "Project-Id-Version: WooCommerce Accommodation Bookings 1.2.1\n" 6 6 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-accommodation-bookings\n" 7 7 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 10 10 "Content-Type: text/plain; charset=UTF-8\n" 11 11 "Content-Transfer-Encoding: 8bit\n" 12 "POT-Creation-Date: 2023- 09-05T14:59:19+00:00\n"12 "POT-Creation-Date: 2023-10-10T14:35:01+00:00\n" 13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 14 14 "X-Generator: WP-CLI 2.8.1\n" … … 422 422 msgstr "" 423 423 424 #: includes/class-wc-accommodation-bookings-plugin.php:258 424 #. translators: %s WC download URL link. 425 #: includes/class-wc-accommodation-bookings-plugin.php:197 426 msgid "Accommodation Bookings requires WooCommerce to be installed and active. You can download %s here." 427 msgstr "" 428 429 #: includes/class-wc-accommodation-bookings-plugin.php:275 425 430 msgid "View Documentation" 426 431 msgstr "" 427 432 428 #: includes/class-wc-accommodation-bookings-plugin.php:2 58433 #: includes/class-wc-accommodation-bookings-plugin.php:275 429 434 msgid "Docs" 430 435 msgstr "" 431 436 432 #: includes/class-wc-accommodation-bookings-plugin.php:2 59437 #: includes/class-wc-accommodation-bookings-plugin.php:276 433 438 msgid "Visit Premium Customer Support Forum" 434 439 msgstr "" 435 440 436 #: includes/class-wc-accommodation-bookings-plugin.php:2 59441 #: includes/class-wc-accommodation-bookings-plugin.php:276 437 442 msgid "Premium Support" 438 443 msgstr "" 439 444 440 #: includes/class-wc-accommodation-dependencies.php: 69445 #: includes/class-wc-accommodation-dependencies.php:80 441 446 msgid "Accommodation Bookings requires Bookings plugin activated." 442 447 msgstr "" 443 448 444 #: includes/class-wc-accommodation-dependencies.php: 73449 #: includes/class-wc-accommodation-dependencies.php:84 445 450 msgid "Accommodation Bookings requires Bookings version 1.9+." 446 451 msgstr "" 447 452 448 #: includes/class-wc-accommodation-dependencies.php: 77453 #: includes/class-wc-accommodation-dependencies.php:88 449 454 msgid "Accommodation Bookings requires PHP version 7.3 or above." 450 455 msgstr "" -
woocommerce-accommodation-bookings/tags/1.2.1/readme.txt
r2963204 r2977769 4 4 Requires at least: 6.1 5 5 Tested up to: 6.2 6 Stable tag: 1.2. 06 Stable tag: 1.2.1 7 7 License: GNU General Public License v3.0 8 8 License URI: http://www.gnu.org/licenses/gpl-3.0.html … … 19 19 * Reservations that span nights instead of days. 20 20 * List check-in/check-out information on the product page, cart, and order pages. 21 22 Accommodation Bookings is fully [compatible with WooPayments](https://woocommerce.com/products/woopayments/). 21 23 22 24 == Installation == … … 36 38 37 39 == Changelog == 40 41 = 1.2.1 - 2023-10-10 = 42 * Dev - Hard code the paths to the asset data files. 43 * Dev - Update PHPCS and PHPCompatibility GitHub Actions. 44 * Fix - Fatal Error when WooCommerce is disabled. 45 * Tweak - Indicate compatibility with WooPayments extension. 38 46 39 47 = 1.2.0 - 2023-09-05 = -
woocommerce-accommodation-bookings/tags/1.2.1/woocommerce-accommodation-bookings.php
r2963204 r2977769 4 4 * Plugin URI: https://woocommerce.com/products/woocommerce-accommodation-bookings/ 5 5 * Description: An accommodations add-on for the WooCommerce Bookings extension. 6 * Version: 1.2. 06 * Version: 1.2.1 7 7 * Author: WooCommerce 8 8 * Author URI: https://woocommerce.com … … 26 26 } 27 27 28 define( 'WC_ACCOMMODATION_BOOKINGS_VERSION', '1.2. 0' ); // WRCS: DEFINED_VERSION.28 define( 'WC_ACCOMMODATION_BOOKINGS_VERSION', '1.2.1' ); // WRCS: DEFINED_VERSION. 29 29 30 30 require_once 'includes/class-wc-accommodation-bookings-plugin.php'; -
woocommerce-accommodation-bookings/trunk/changelog.txt
r2963204 r2977769 1 1 *** Changelog *** 2 3 = 1.2.1 - 2023-10-10 = 4 * Dev - Hard code the paths to the asset data files. 5 * Dev - Update PHPCS and PHPCompatibility GitHub Actions. 6 * Fix - Fatal Error when WooCommerce is disabled. 7 * Tweak - Indicate compatibility with WooPayments extension. 2 8 3 9 = 1.2.0 - 2023-09-05 = -
woocommerce-accommodation-bookings/trunk/includes/class-wc-accommodation-bookings-plugin.php
r2911748 r2977769 189 189 190 190 /** 191 * WooCommerce fallback notice. 192 * 193 * @since 1.2.1 194 */ 195 public function missing_wc_notice() { 196 /* translators: %s WC download URL link. */ 197 echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Accommodation Bookings requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-accommodation-bookings' ), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' ) . '</strong></p></div>'; 198 } 199 200 /** 191 201 * Load Classes 192 202 */ … … 206 216 */ 207 217 public function admin_includes() { 218 // Return if WooCommerce class not found. 219 if ( ! class_exists( 'WooCommerce' ) ) { 220 add_action( 'admin_notices', array( $this, 'missing_wc_notice' ) ); 221 return; 222 } 223 208 224 include WC_ACCOMMODATION_BOOKINGS_INCLUDES_PATH . 'admin/class-wc-accommodation-booking-admin-panels.php'; 209 225 include WC_ACCOMMODATION_BOOKINGS_INCLUDES_PATH . 'admin/class-wc-accommodation-booking-admin-product-settings.php'; … … 214 230 */ 215 231 public function frontend_assets() { 216 $booking_style_asset_data = $this->get_asset_data( 'frontend', 'css' ); 217 $booking_script_asset_data = $this->get_asset_data( 'booking-form', 'js/frontend' ); 218 219 $booking_script_dependencies = array_merge( 220 $booking_script_asset_data['dependencies'], 232 $dist_path = dirname( WC_ACCOMMODATION_BOOKINGS_MAIN_FILE ) . '/dist'; 233 $style_data = include $dist_path . '/css/frontend.asset.php'; 234 $script_data = include $dist_path . '/js/frontend/booking-form.asset.php'; 235 236 $script_dependencies = array_merge( 237 $script_data['dependencies'], 221 238 array( 'wc-bookings-booking-form' ) 222 239 ); … … 226 243 WC_ACCOMMODATION_BOOKINGS_PLUGIN_URL . '/dist/css/frontend.css', 227 244 null, 228 $ booking_style_asset_data['version']245 $style_data['version'] 229 246 ); 230 247 … … 232 249 'wc-accommodation-bookings-form', 233 250 WC_ACCOMMODATION_BOOKINGS_PLUGIN_URL . '/dist/js/frontend/booking-form.js', 234 $ booking_script_dependencies,235 $ booking_script_asset_data['version'],251 $script_dependencies, 252 $script_data['version'], 236 253 true 237 254 ); … … 313 330 update_option( 'wc_accommodation_bookings_version', $this->version ); 314 331 } 315 316 /**317 * Should return data from the asset file.318 *319 * @param string $script_file_name Script file name.320 * @param string $location Script file location.321 *322 * @return array323 */324 private function get_asset_data( $script_file_name, $location ): array {325 $asset_path = dirname( WC_ACCOMMODATION_BOOKINGS_MAIN_FILE ) . "/dist/$location/$script_file_name.asset.php";326 327 return require $asset_path;328 }329 332 } -
woocommerce-accommodation-bookings/trunk/includes/class-wc-accommodation-dependencies.php
r2963204 r2977769 1 1 <?php 2 /** 3 * A WC_Accommodation_Dependencies class file. 4 * 5 * @package woocommerce-accommodation-bookings 6 */ 7 2 8 /** 3 9 * WC Accommodation Bookings Dependency Checker … … 8 14 class WC_Accommodation_Dependencies { 9 15 10 /**@var an array of active plugins*/ 16 /** 17 * Array of active plugins 18 * 19 * @var array of active plugins 20 */ 11 21 private static $active_plugins; 12 22 … … 32 42 33 43 return ( 34 in_array( $booking_file, self::$active_plugins )44 in_array( $booking_file, self::$active_plugins, true ) 35 45 || 36 46 array_key_exists( $booking_file, self::$active_plugins ) … … 38 48 class_exists( 'WC_Bookings' ) 39 49 || 40 in_array( $old_booking_file, self::$active_plugins )50 in_array( $old_booking_file, self::$active_plugins, true ) 41 51 || 42 52 array_key_exists( $old_booking_file, self::$active_plugins ) … … 46 56 /** 47 57 * Returns true if bookings is greater than a specific version and false if not 48 * @param string $verson The version to check against 58 * 59 * @param string $version The version to check against. 49 60 * @return boolean 50 61 */ … … 59 70 * Check dependencies. 60 71 * 61 * @throws Exception 72 * @throws Exception Show exception on dependencies failure. 62 73 */ 63 74 public static function check_dependencies() { -
woocommerce-accommodation-bookings/trunk/languages/woocommerce-accommodation-bookings.pot
r2963204 r2977769 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: WooCommerce Accommodation Bookings 1.2. 0\n"5 "Project-Id-Version: WooCommerce Accommodation Bookings 1.2.1\n" 6 6 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-accommodation-bookings\n" 7 7 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 10 10 "Content-Type: text/plain; charset=UTF-8\n" 11 11 "Content-Transfer-Encoding: 8bit\n" 12 "POT-Creation-Date: 2023- 09-05T14:59:19+00:00\n"12 "POT-Creation-Date: 2023-10-10T14:35:01+00:00\n" 13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 14 14 "X-Generator: WP-CLI 2.8.1\n" … … 422 422 msgstr "" 423 423 424 #: includes/class-wc-accommodation-bookings-plugin.php:258 424 #. translators: %s WC download URL link. 425 #: includes/class-wc-accommodation-bookings-plugin.php:197 426 msgid "Accommodation Bookings requires WooCommerce to be installed and active. You can download %s here." 427 msgstr "" 428 429 #: includes/class-wc-accommodation-bookings-plugin.php:275 425 430 msgid "View Documentation" 426 431 msgstr "" 427 432 428 #: includes/class-wc-accommodation-bookings-plugin.php:2 58433 #: includes/class-wc-accommodation-bookings-plugin.php:275 429 434 msgid "Docs" 430 435 msgstr "" 431 436 432 #: includes/class-wc-accommodation-bookings-plugin.php:2 59437 #: includes/class-wc-accommodation-bookings-plugin.php:276 433 438 msgid "Visit Premium Customer Support Forum" 434 439 msgstr "" 435 440 436 #: includes/class-wc-accommodation-bookings-plugin.php:2 59441 #: includes/class-wc-accommodation-bookings-plugin.php:276 437 442 msgid "Premium Support" 438 443 msgstr "" 439 444 440 #: includes/class-wc-accommodation-dependencies.php: 69445 #: includes/class-wc-accommodation-dependencies.php:80 441 446 msgid "Accommodation Bookings requires Bookings plugin activated." 442 447 msgstr "" 443 448 444 #: includes/class-wc-accommodation-dependencies.php: 73449 #: includes/class-wc-accommodation-dependencies.php:84 445 450 msgid "Accommodation Bookings requires Bookings version 1.9+." 446 451 msgstr "" 447 452 448 #: includes/class-wc-accommodation-dependencies.php: 77453 #: includes/class-wc-accommodation-dependencies.php:88 449 454 msgid "Accommodation Bookings requires PHP version 7.3 or above." 450 455 msgstr "" -
woocommerce-accommodation-bookings/trunk/readme.txt
r2963204 r2977769 4 4 Requires at least: 6.1 5 5 Tested up to: 6.2 6 Stable tag: 1.2. 06 Stable tag: 1.2.1 7 7 License: GNU General Public License v3.0 8 8 License URI: http://www.gnu.org/licenses/gpl-3.0.html … … 19 19 * Reservations that span nights instead of days. 20 20 * List check-in/check-out information on the product page, cart, and order pages. 21 22 Accommodation Bookings is fully [compatible with WooPayments](https://woocommerce.com/products/woopayments/). 21 23 22 24 == Installation == … … 36 38 37 39 == Changelog == 40 41 = 1.2.1 - 2023-10-10 = 42 * Dev - Hard code the paths to the asset data files. 43 * Dev - Update PHPCS and PHPCompatibility GitHub Actions. 44 * Fix - Fatal Error when WooCommerce is disabled. 45 * Tweak - Indicate compatibility with WooPayments extension. 38 46 39 47 = 1.2.0 - 2023-09-05 = -
woocommerce-accommodation-bookings/trunk/woocommerce-accommodation-bookings.php
r2963204 r2977769 4 4 * Plugin URI: https://woocommerce.com/products/woocommerce-accommodation-bookings/ 5 5 * Description: An accommodations add-on for the WooCommerce Bookings extension. 6 * Version: 1.2. 06 * Version: 1.2.1 7 7 * Author: WooCommerce 8 8 * Author URI: https://woocommerce.com … … 26 26 } 27 27 28 define( 'WC_ACCOMMODATION_BOOKINGS_VERSION', '1.2. 0' ); // WRCS: DEFINED_VERSION.28 define( 'WC_ACCOMMODATION_BOOKINGS_VERSION', '1.2.1' ); // WRCS: DEFINED_VERSION. 29 29 30 30 require_once 'includes/class-wc-accommodation-bookings-plugin.php';
Note: See TracChangeset
for help on using the changeset viewer.