Merge branch 'hotfix/1.1.3'

gnahotelsolutions · Mar 20, 2024 · c77aeb0 · c77aeb0
2 parents 8aac4c5 + d9731ae
commit c77aeb0
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 20 deletions.
diff --git a/gnahs-wp-tools.php b/gnahs-wp-tools.php
@@ -3,7 +3,7 @@
  * Plugin Name: GNA Hotel Solutions WordPress Tools
  * Plugin URI: https://www.gnahs.com
  * Description: WordPress Hotel Tools developed by GNAHS
- * Version: 1.1.2
+ * Version: 1.1.3
  * Author: GNA Hotel Solutions
  * Author URI: https://www.gnahs.com
  * License: GPLv2 o posterior

diff --git a/includes/admin-page.php b/includes/admin-page.php
@@ -46,8 +46,8 @@ function gnahs_wp_tools_settings_init()
     );
 
     add_settings_field(
-        'gnahsengine_establishment_id',
-        __('Optional Establishment Code', 'gnahs-wp-tools'),
+        'gnahsengine_establishments',
+        __('Establishment codes (comma separated if there is more than one)', 'gnahs-wp-tools'),
         'gnahs_wp_tools_establishment_id_option_callback',
         'gnahs_wp_tools_settings',
         'gnahs_wp_tools_section'
@@ -63,7 +63,7 @@ function gnahs_wp_tools_settings_init()
 
     register_setting('gnahs_wp_tools_settings', 'gnahsengine_uuid');
     register_setting('gnahs_wp_tools_settings', 'gnahsengine_slug');
-    register_setting('gnahs_wp_tools_settings', 'gnahsengine_establishment_id');
+    register_setting('gnahs_wp_tools_settings', 'gnahsengine_establishments');
     register_setting('gnahs_wp_tools_settings', 'gnahsengine_api_url');
 }
 
@@ -79,7 +79,7 @@ function gnahs_wp_tools_slug_option_callback()
 
 function gnahs_wp_tools_establishment_id_option_callback()
 {
-    echo '<input type="text" name="gnahsengine_establishment_id" value="' . esc_attr(get_option('gnahsengine_establishment_id')) . '" />';
+    echo '<input type="text" name="gnahsengine_establishments" value="' . esc_attr(get_option('gnahsengine_establishments')) . '" />';
 }
 
 function gnahs_wp_tools_api_url_option_callback()

diff --git a/includes/booking-functions.php b/includes/booking-functions.php
@@ -16,7 +16,7 @@ function gnahs_booking_engine_shortcode($atts)
     $atts = shortcode_atts(
         array(
             'uuid'            => get_option('gnahsengine_uuid', ''),
-            'establishmentId' => get_option('gnahsengine_establishment_id', ''),
+            'establishments'  => get_option('gnahsengine_establishments', ''),
             'api'             => get_option('gnahsengine_api_url', ''),
         ),
         $atts

diff --git a/languages/gnahs-wp-tools-ca.mo b/languages/gnahs-wp-tools-ca.mo
diff --git a/languages/gnahs-wp-tools-ca.po b/languages/gnahs-wp-tools-ca.po
@@ -27,8 +27,8 @@ msgid "Client slug"
 msgstr "Slug del client"
 
 #: includes/admin-page.php:47
-msgid "Optional Establishment Code"
-msgstr "Codi d'establiment (opcional)"
+msgid "Establishment codes (comma separated if there is more than one)"
+msgstr "Codis d'establiment (separats per coma si n'hi ha més d'un)"
 
 #: includes/admin-page.php:55
 msgid "API URL Alias (https://alias.gnahs.app)"

diff --git a/languages/gnahs-wp-tools-en_UK.mo b/languages/gnahs-wp-tools-en_UK.mo
diff --git a/languages/gnahs-wp-tools-en_UK.po b/languages/gnahs-wp-tools-en_UK.po
@@ -27,8 +27,8 @@ msgid "Client slug"
 msgstr "Client slug"
 
 #: includes/admin-page.php:47
-msgid "Optional Establishment Code"
-msgstr "Optional Establishment Code"
+msgid "Establishment codes (comma separated if there is more than one)"
+msgstr "Establishment codes (comma separated if there is more than one)"
 
 #: includes/admin-page.php:55
 msgid "API URL Alias (https://alias.gnahs.app)"

diff --git a/languages/gnahs-wp-tools-es_ES.mo b/languages/gnahs-wp-tools-es_ES.mo
diff --git a/languages/gnahs-wp-tools-es_ES.po b/languages/gnahs-wp-tools-es_ES.po
@@ -27,8 +27,8 @@ msgid "Client slug"
 msgstr "Slug del cliente"
 
 #: includes/admin-page.php:47
-msgid "Optional Establishment Code"
-msgstr "Código de establecimiento (opcional)"
+msgid "Establishment codes (comma separated if there is more than one)"
+msgstr "Códigos de establecimiento (separados por coma si hay más de uno)"
 
 #: includes/admin-page.php:55
 msgid "API URL Alias (https://alias.gnahs.app)"

diff --git a/views/engine.php b/views/engine.php
@@ -1,13 +1,12 @@
 <div id="GNAHSEngine" style="max-width: none !important;"></div>
 <script>
-    window.BookingParams = window.BookingParams || {};
-    window.BookingParams.uuid = '<?= $atts['uuid'] ?>';
-    <?php if ($atts['establishmentId']) { ?>
-    window.BookingParams.singleEstablishment = <?= $atts['establishmentId'] ?>;
-    <?php } ?>
-    window.BookingParams.language = window.BookingParams.language || '<?= get_locale() ?>';
-    window.BookingParams.api = 'https://<?= $atts['api'] ?>.gnahs.app';
-    window.BookingParams.assets = 'https://<?= $atts['api'] ?>.gnahs.app/dist/';
+    window.BookingParams = {
+        uuid: '<?= $atts['uuid'] ?>',
+        establishments: [<?= $atts['establishments'] ?>],
+        language: '<?= get_locale() ?>',
+        api: 'https://<?= $atts['api'] ?>.gnahs.app',
+        assets: 'https://<?= $atts['api'] ?>.gnahs.app/dist/'
+    }
  </script>
  <script src="https://assets.gnahs.com/scripts/rho-initialization/gnahs-get-rho-initial-settings-v2.js" onload="(new GNAHSGetRhoInitialSettings())"></script>
  <script src="https://assets.gnahs.com/scripts/booking-engine/fetch.min.js"></script>