Changeset 3288448

Timestamp:

05/06/2025 12:46:57 PM (7 months ago)

Author:

benitolopez

Message:

Releasing version 2.15.0

Location:

wp-hotelier/trunk

Files:

• hotelier.php (modified) (2 diffs)
• includes/admin/meta-boxes/views/reservation/html-meta-box-reservation-single-item.php (modified) (1 diff)
• includes/class-htl-info.php (modified) (3 diffs)
• includes/htl-extra-functions.php (modified) (1 diff)
• includes/privacy/class-htl-privacy.php (modified) (3 diffs)
• languages/wp-hotelier.pot (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• templates/booking/reservation-table-extras.php (modified) (1 diff)
• templates/reservation/item-extras.php (modified) (1 diff)

wp-hotelier/trunk/hotelier.php

@@ -4 +4 @@
  * Plugin URI:        https://wphotelier.com/?utm_source=wpadmin&utm_medium=plugin&utm_campaign=wphotelierplugin
  * Description:       Hotel booking plugin for WordPress.
- * Version:           2.14.4
+ * Version:           2.15.0
  * Author:            WP Hotelier
  * Author URI:        https://wphotelier.com/
  * Requires at least: 4.0
- * Tested up to:      6.6
+ * Tested up to:      6.8
  * License:           GPLv3
  * License URI:       http://www.gnu.org/licenses/gpl-3.0.html
@@ -32 +32 @@
      * @var string
      */
-    public $version = '2.14.4';
+    public $version = '2.15.0';
 
     /**

wp-hotelier/trunk/includes/admin/meta-boxes/views/reservation/html-meta-box-reservation-single-item.php

@@ -125 +125 @@
     <?php foreach ( $extras as $extra_id => $extra_data ) : ?>
         <?php
+        $extra_id    = apply_filters( 'translate_object_id', $extra_id, 'extra', true );
         $extra       = htl_get_extra( $extra_id );
         $extra_qty   = isset( $extra_data['qty'] ) ? $extra_data['qty'] : 1;

wp-hotelier/trunk/includes/class-htl-info.php

@@ -106 +106 @@
 
     /**
-     * Gets hotel checkin hours.
+     * Helper function to format hotel hours.
      *
-     * @return string
+     * @param array $hours The hours settings array
+     * @param string $filter_name The name of the filter to apply
+     * @return string Formatted time string
      */
-    public static function get_hotel_checkin() {
-        $checkin        = htl_get_option( 'hotel_checkin', array() );
-        $from           = isset( $checkin[ 'from' ] ) ? $checkin[ 'from' ] : 0;
-        $to             = isset( $checkin[ 'to' ] ) ? $checkin[ 'to' ] : 0;
+    private static function format_hotel_hours( $hours, $filter_name ) {
+        $from           = isset( $hours['from'] ) ? $hours['from'] : 0;
+        $to             = isset( $hours['to'] ) ? $hours['to'] : 0;
         $formatted_from = $from > 24 ? $from - 25 : $from;
         $formatted_from = sprintf( '%02d', $formatted_from );
@@ -120 +121 @@
         $formatted_to   = sprintf( '%02d', $formatted_to );
         $formatted_to   .= $to > 24 ? ':30' : ':00';
+        
+        // Check if from and to times are the same
+        if ( $from === $to ) {
+            $formatted_hours = date_i18n( get_option( 'time_format' ), strtotime( $formatted_from ) );
+        } else {
+            $formatted_hours = date_i18n( get_option( 'time_format' ), strtotime( $formatted_from ) ) . ' - ' . date_i18n( get_option( 'time_format' ), strtotime( $formatted_to ) );
+        }
 
-        $hotel_checkin  = date_i18n( get_option( 'time_format' ), strtotime( $formatted_from ) ) . ' - ' . date_i18n( get_option( 'time_format' ), strtotime( $formatted_to ) );
+        return apply_filters( $filter_name, $formatted_hours, $from, $to );
+    }
 
-        return apply_filters( 'hotelier_get_hotel_checkin', $hotel_checkin, $from, $to );
+    /**
+     * Gets hotel checkin hours.
+     *
+     * @return string
+     */
+    public static function get_hotel_checkin() {
+        $checkin = htl_get_option( 'hotel_checkin', array() );
+        return self::format_hotel_hours( $checkin, 'hotelier_get_hotel_checkin' );
     }
 
@@ -132 +148 @@
      */
     public static function get_hotel_checkout() {
-        $checkout       = htl_get_option( 'hotel_checkout', array() );
-        $from           = isset( $checkout[ 'from' ] ) ? $checkout[ 'from' ] : 0;
-        $to             = isset( $checkout[ 'to' ] ) ? $checkout[ 'to' ] : 0;
-        $formatted_from = $from > 24 ? $from - 25 : $from;
-        $formatted_from = sprintf( '%02d', $formatted_from );
-        $formatted_from .= $from > 24 ? ':30' : ':00';
-        $formatted_to   = $to > 24 ? $to - 25 : $to;
-        $formatted_to   = sprintf( '%02d', $formatted_to );
-        $formatted_to   .= $to > 24 ? ':30' : ':00';
-        $hotel_checkout = date_i18n( get_option( 'time_format' ), strtotime( $formatted_from ) ) . ' - ' . date_i18n( get_option( 'time_format' ), strtotime( $formatted_to ) );
-
-        return apply_filters( 'hotelier_get_hotel_checkout', $hotel_checkout, $from, $to );
+        $checkout = htl_get_option( 'hotel_checkout', array() );
+        return self::format_hotel_hours( $checkout, 'hotelier_get_hotel_checkout' );
     }
 

wp-hotelier/trunk/includes/htl-extra-functions.php

@@ -48 +48 @@
     );
 
+    $extras = apply_filters( 'hotelier_get_all_extras_ids', $extras );
+
     set_transient( 'hotelier_extras_ids', $extras, DAY_IN_SECONDS * 30 );
 

wp-hotelier/trunk/includes/privacy/class-htl-privacy.php

@@ -6 +6 @@
  * @category Class
  * @package  Hotelier/Classes
- * @version  1.6.0
+ * @version  2.15.0
  */
 
@@ -42 +42 @@
         include_once 'class-htl-privacy-exporters.php';
 
-        $this->init();
+        add_action( 'init', array( $this, 'init' ) );
     }
 
@@ -48 +48 @@
      * Hook in events.
      */
-    protected function init() {
+    public function init() {
         add_filter( 'wp_privacy_personal_data_exporters', array( $this, 'register_exporters' ), 5 );
         add_filter( 'wp_privacy_personal_data_erasers', array( $this, 'register_erasers' ) );

wp-hotelier/trunk/languages/wp-hotelier.pot

@@ -2156 +2156 @@
 msgstr ""
 
-#: ../includes/htl-extra-functions.php:137
+#: ../includes/htl-extra-functions.php:139
 msgid "This extra does not exists."
 msgstr ""
 
-#: ../includes/htl-extra-functions.php:147
+#: ../includes/htl-extra-functions.php:149
 msgid "This extra is not enabled."
 msgstr ""
@@ -4601 +4601 @@
 msgstr ""
 
-#: ../includes/admin/meta-boxes/views/reservation/html-meta-box-reservation-single-item.php:150
+#: ../includes/admin/meta-boxes/views/reservation/html-meta-box-reservation-single-item.php:151
 msgid "This room does not exist anymore"
 msgstr ""

wp-hotelier/trunk/readme.txt

@@ -3 +3 @@
 Tags: booking, hotel, booking system, hostel, reservations, reservations, b&b, rooms, wphotelier
 Requires at least: 4.1
-Tested up to: 6.7
-Stable tag: 2.14.4
+Tested up to: 6.8
+Stable tag: 2.15.0
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -131 +131 @@
 == Changelog ==
 
+= 2.15.0 - 2025-05-06 =
+* Add - Support for WordPress 6.8.
+* Fix - PHP warning for text domain not loaded correctly.
+
 = 2.14.4 - 2025-02-12 =
 * Fix - Reservation tables not showing correct info for paid deposits.

wp-hotelier/trunk/templates/booking/reservation-table-extras.php

@@ -18 +18 @@
 <?php foreach ( $extras as $extra_id => $extra_data ) : ?>
     <?php
+    $extra_id    = apply_filters( 'translate_object_id', $extra_id, 'extra', true );
     $extra       = htl_get_extra( $extra_id );
     $extra_qty   = isset( $extra_data['qty'] ) ? $extra_data['qty'] : 1;

wp-hotelier/trunk/templates/reservation/item-extras.php

@@ -31 +31 @@
 <?php foreach ( $extras as $extra_id => $extra_data ) : ?>
     <?php
+    $extra_id    = apply_filters( 'translate_object_id', $extra_id, 'extra', true );
     $extra       = htl_get_extra( $extra_id );
     $extra_qty   = isset( $extra_data['qty'] ) ? $extra_data['qty'] : 1;