Changeset 3221428

Timestamp:

01/13/2025 09:06:21 AM (13 months ago)

Author:

ZanderZ

Message:

Update to version 6.3.0 from GitHub

Location:

recras

Files:

• tags/6.3.0 (copied) (copied from recras/trunk)
• tags/6.3.0/changelog.md (modified) (1 diff)
• tags/6.3.0/editor/plugin.js (modified) (2 diffs)
• tags/6.3.0/readme.txt (modified) (2 diffs)
• tags/6.3.0/recras-wordpress-plugin.php (modified) (1 diff)
• tags/6.3.0/src/Gutenberg.php (modified) (1 diff)
• tags/6.3.0/src/OnlineBooking.php (modified) (1 diff)
• tags/6.3.0/src/Plugin.php (modified) (7 diffs)
• tags/6.3.0/src/Settings.php (modified) (1 diff)
• tags/6.3.0/src/Transient.php (modified) (1 diff)
• tags/6.3.0/src/Vouchers.php (modified) (1 diff)
• trunk/changelog.md (modified) (1 diff)
• trunk/editor/plugin.js (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/recras-wordpress-plugin.php (modified) (1 diff)
• trunk/src/Gutenberg.php (modified) (1 diff)
• trunk/src/OnlineBooking.php (modified) (1 diff)
• trunk/src/Plugin.php (modified) (7 diffs)
• trunk/src/Settings.php (modified) (1 diff)
• trunk/src/Transient.php (modified) (1 diff)
• trunk/src/Vouchers.php (modified) (1 diff)

recras/tags/6.3.0/changelog.md

@@ -1 +1 @@
 # Changelog
+
+## 6.3.0 (2025-01-13)
+* The plugin now hides certain blocks/editor buttons, when they're not available in your Recras instance
+* Plugin now requires WP 6.5 or higher
 
 ## 6.2.3 (2025-01-06)

recras/tags/6.3.0/editor/plugin.js

@@ -16 +16 @@
     });
 
-    editor.addButton('recras-booking', {
-        title: recras_l10n.online_booking,
-        image: url + '/online-booking.svg',
-        onclick: function() {
-            tb_show(recras_l10n.online_booking, 'admin.php?page=form-booking');
-        }
-    });
+    if (recras_l10n.showOnlineBooking === 'yes') {
+        editor.addButton('recras-booking', {
+            title: recras_l10n.online_booking,
+            image: url + '/online-booking.svg',
+            onclick: function() {
+                tb_show(recras_l10n.online_booking, 'admin.php?page=form-booking');
+            }
+        });
+    }
 
     editor.addButton('recras-bookprocess', {
@@ -48 +50 @@
     });
 
-    editor.addButton('recras-voucher-sales', {
-        title: recras_l10n.voucherSales,
-        image: url + '/vouchers.svg',
-        onclick: function() {
-            tb_show(recras_l10n.product, 'admin.php?page=form-voucher-sales');
-        }
-    });
+    if (recras_l10n.showVoucherSales === 'yes') {
+        editor.addButton('recras-voucher-sales', {
+            title: recras_l10n.voucherSales,
+            image: url + '/vouchers.svg',
+            onclick: function () {
+                tb_show(recras_l10n.product, 'admin.php?page=form-voucher-sales');
+            }
+        });
+    }
 
     editor.addButton('recras-voucher-info', {

recras/tags/6.3.0/readme.txt

@@ -3 +3 @@
 Tags: recras, recreation, reservation, booking, voucher
 Tested up to: 6.7
-Stable tag: 6.2.3
+Stable tag: 6.3.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -77 +77 @@
 
 == Changelog ==
+
+= 6.3.0 =
+* The plugin now hides certain blocks/editor buttons, when they're not available in your Recras instance
+* Plugin now requires WP 6.5 or higher
 
 = 6.2.3 =

recras/tags/6.3.0/recras-wordpress-plugin.php

@@ -3 +3 @@
 Plugin Name: Recras WordPress Plugin
 Plugin URI: https://www.recras.nl/
-Version: 6.2.3
+Version: 6.3.0
 Description: Easily integrate your Recras data into your own site
-Requires at least: 6.4
+Requires at least: 6.5
 Requires PHP: 7.4.0
 Author: Recras

recras/tags/6.3.0/src/Gutenberg.php

@@ -69 +69 @@
             ],
         ];
+
+        if (!Settings::allowOnlinePackageBooking()) {
+            unset($gutenbergBlocks['onlinebooking']);
+        }
+        if (!Settings::allowOldVoucherSales()) {
+            unset($gutenbergBlocks['voucher-sales']);
+        }
+
         foreach ($gutenbergBlocks as $key => $block) {
             $handle = 'recras-gutenberg-' . $key;

recras/tags/6.3.0/src/OnlineBooking.php

@@ -13 +13 @@
     public static function renderOnlineBooking($attributes): string
     {
+        if (!Settings::allowOnlinePackageBooking()) {
+            error_log('Online booking of packages is integrated on your website, but is disabled in your Recras');
+            return '';
+        }
+
         if (is_string($attributes)) {
             $attributes = [];

recras/tags/6.3.0/src/Plugin.php

@@ -17 +17 @@
         $this->setBaseUrl();
         $this->transients = new Transient();
+
+        // Needs to run before: Gutenberg::addBlocks, self::loadAdminScripts
+        $this->checkOldSettings();
 
         // Init Localisation
@@ -90 +93 @@
             'edit_pages',
             Settings::PAGE_CACHE,
-            ['\Recras\Settings', 'clearCache']
+            ['\Recras\Settings', 'clearCachePage']
         );
         add_submenu_page(
@@ -122 +125 @@
      * Register our shortcodes
      */
-    public function addShortcodes(): void
+    private function addShortcodes(): void
     {
         add_shortcode(Availability::SHORTCODE, [Availability::class, 'renderAvailability']);
@@ -134 +137 @@
     }
 
+    private function checkOldSettings(): void
+    {
+        $subdomain = get_option('recras_subdomain');
+        if (!$subdomain) {
+            return;
+        }
+
+        $setting = $this->transients->get($subdomain . '_show_old_online_booking');
+        if ($setting === false) {
+            try {
+                $setting = Http::get($subdomain, 'instellingen/allow_online_package_booking');
+            } catch (\Exception $e) {
+                return;
+            }
+            if (is_object($setting) && property_exists($setting, 'waarde')) {
+                $this->transients->set($subdomain . '_show_old_online_booking', $setting->waarde, DAY_IN_SECONDS);
+            }
+        }
+
+        $setting = $this->transients->get($subdomain . '_show_old_voucher_sales');
+        if ($setting === false) {
+            try {
+                $setting = Http::get($subdomain, 'instellingen/allow_old_vouchers_sales');
+            } catch (\Exception $e) {
+                return;
+            }
+            if (is_object($setting) && property_exists($setting, 'waarde')) {
+                $this->transients->set($subdomain . '_show_old_voucher_sales', $setting->waarde, DAY_IN_SECONDS);
+            }
+        }
+    }
+
 
     //TODO: change to :never when we support only PHP 8.1+
@@ -143 +178 @@
         $errors += ContactForm::clearCache();
         $errors += Products::clearCache();
+        $errors += Settings::clearCache();
         $errors += Vouchers::clearCache();
 
@@ -174 +210 @@
     public function loadAdminScripts(): void
     {
-        wp_register_script('recras-admin', $this->baseUrl . '/js/admin.js', [], '4.0.0', true);
-        wp_localize_script('recras-admin', 'recras_l10n', [
+        $l10n = [
             'contact_form' => __('Contact form', $this::TEXT_DOMAIN),
             'no_connection' => __('Could not connect to your Recras', $this::TEXT_DOMAIN),
@@ -183 +218 @@
             'package_availability' => __('Package availability', $this::TEXT_DOMAIN),
             'product' => __('Product', $this::TEXT_DOMAIN),
+            'showOnlineBooking' => 'yes',
+            'showVoucherSales' => 'yes',
             'voucherInfo' => __('Voucher info', $this::TEXT_DOMAIN),
             'voucherSales' => __('Voucher sales', $this::TEXT_DOMAIN),
-        ]);
+        ];
+
+        if (!Settings::allowOnlinePackageBooking()) {
+            $l10n['showOnlineBooking'] = 'no';
+        }
+        if (!Settings::allowOldVoucherSales()) {
+            $l10n['showVoucherSales'] = 'no';
+        }
+
+        wp_register_script('recras-admin', $this->baseUrl . '/js/admin.js', [], '6.3.0', true);
+        wp_localize_script('recras-admin', 'recras_l10n', $l10n);
         wp_enqueue_script('recras-admin');
         wp_enqueue_style('recras-admin-style', $this->baseUrl . '/css/admin-style.css', [], '6.0.7');

recras/tags/6.3.0/src/Settings.php

@@ -115 +115 @@
 
 
-    public static function clearCache(): void
+    public static function allowOnlinePackageBooking(): bool
+    {
+        global $recrasPlugin;
+
+        $subdomain = get_option('recras_subdomain');
+        if (!$subdomain) {
+            return true;
+        }
+        $setting = $recrasPlugin->transients->get($subdomain . '_show_old_online_booking');
+        // if getting the transient fails, we want to show the button to be sure, so comparing with 'no' is safest
+        return ($setting === 'no') ? false : true;
+    }
+
+
+    public static function allowOldVoucherSales(): bool
+    {
+        global $recrasPlugin;
+
+        $subdomain = get_option('recras_subdomain');
+        if (!$subdomain) {
+            return true;
+        }
+        $setting = $recrasPlugin->transients->get($subdomain . '_show_old_voucher_sales');
+        // if getting the transient fails, we want to show the button to be sure, so comparing with 'no' is safest
+        return ($setting === 'no') ? false : true;
+    }
+
+    /**
+     * Clear voucher template cache (transients)
+     */
+    public static function clearCache(): int
+    {
+        global $recrasPlugin;
+
+        $subdomain = get_option('recras_subdomain');
+        $errors = 0;
+        if ($recrasPlugin->transients->get($subdomain . '_show_old_online_booking')) {
+            $errors = $recrasPlugin->transients->delete($subdomain . '_show_old_online_booking');
+        }
+        if ($recrasPlugin->transients->get($subdomain . '_show_old_voucher_sales')) {
+            $errors = $recrasPlugin->transients->delete($subdomain . '_show_old_voucher_sales');
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Admin page to clear the cache
+     */
+    public static function clearCachePage(): void
     {
         if (!current_user_can('edit_pages')) {

recras/tags/6.3.0/src/Transient.php

@@ -25 +25 @@
     }
 
-    public function set(string $name, $value): bool
+    // HOUR_IN_SECONDS is defined by WordPress
+    public function set(string $name, $value, int $expiration = HOUR_IN_SECONDS): bool
     {
-        return set_transient(self::BASE . $name, $value, HOUR_IN_SECONDS);
+        return set_transient(self::BASE . $name, $value, $expiration);
     }
 }

recras/tags/6.3.0/src/Vouchers.php

@@ -63 +63 @@
     public static function renderVoucherSales($attributes): string
     {
+        if (!Settings::allowOldVoucherSales()) {
+            error_log('The old method of selling vouchers is integrated on your website, but is disabled in your Recras');
+            return '';
+        }
+
         if (is_string($attributes)) {
             $attributes = [];

recras/trunk/changelog.md

@@ -1 +1 @@
 # Changelog
+
+## 6.3.0 (2025-01-13)
+* The plugin now hides certain blocks/editor buttons, when they're not available in your Recras instance
+* Plugin now requires WP 6.5 or higher
 
 ## 6.2.3 (2025-01-06)

recras/trunk/editor/plugin.js

@@ -16 +16 @@
     });
 
-    editor.addButton('recras-booking', {
-        title: recras_l10n.online_booking,
-        image: url + '/online-booking.svg',
-        onclick: function() {
-            tb_show(recras_l10n.online_booking, 'admin.php?page=form-booking');
-        }
-    });
+    if (recras_l10n.showOnlineBooking === 'yes') {
+        editor.addButton('recras-booking', {
+            title: recras_l10n.online_booking,
+            image: url + '/online-booking.svg',
+            onclick: function() {
+                tb_show(recras_l10n.online_booking, 'admin.php?page=form-booking');
+            }
+        });
+    }
 
     editor.addButton('recras-bookprocess', {
@@ -48 +50 @@
     });
 
-    editor.addButton('recras-voucher-sales', {
-        title: recras_l10n.voucherSales,
-        image: url + '/vouchers.svg',
-        onclick: function() {
-            tb_show(recras_l10n.product, 'admin.php?page=form-voucher-sales');
-        }
-    });
+    if (recras_l10n.showVoucherSales === 'yes') {
+        editor.addButton('recras-voucher-sales', {
+            title: recras_l10n.voucherSales,
+            image: url + '/vouchers.svg',
+            onclick: function () {
+                tb_show(recras_l10n.product, 'admin.php?page=form-voucher-sales');
+            }
+        });
+    }
 
     editor.addButton('recras-voucher-info', {

recras/trunk/readme.txt

@@ -3 +3 @@
 Tags: recras, recreation, reservation, booking, voucher
 Tested up to: 6.7
-Stable tag: 6.2.3
+Stable tag: 6.3.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -77 +77 @@
 
 == Changelog ==
+
+= 6.3.0 =
+* The plugin now hides certain blocks/editor buttons, when they're not available in your Recras instance
+* Plugin now requires WP 6.5 or higher
 
 = 6.2.3 =

recras/trunk/recras-wordpress-plugin.php

@@ -3 +3 @@
 Plugin Name: Recras WordPress Plugin
 Plugin URI: https://www.recras.nl/
-Version: 6.2.3
+Version: 6.3.0
 Description: Easily integrate your Recras data into your own site
-Requires at least: 6.4
+Requires at least: 6.5
 Requires PHP: 7.4.0
 Author: Recras

recras/trunk/src/Gutenberg.php

@@ -69 +69 @@
             ],
         ];
+
+        if (!Settings::allowOnlinePackageBooking()) {
+            unset($gutenbergBlocks['onlinebooking']);
+        }
+        if (!Settings::allowOldVoucherSales()) {
+            unset($gutenbergBlocks['voucher-sales']);
+        }
+
         foreach ($gutenbergBlocks as $key => $block) {
             $handle = 'recras-gutenberg-' . $key;

recras/trunk/src/OnlineBooking.php

@@ -13 +13 @@
     public static function renderOnlineBooking($attributes): string
     {
+        if (!Settings::allowOnlinePackageBooking()) {
+            error_log('Online booking of packages is integrated on your website, but is disabled in your Recras');
+            return '';
+        }
+
         if (is_string($attributes)) {
             $attributes = [];

recras/trunk/src/Plugin.php

@@ -17 +17 @@
         $this->setBaseUrl();
         $this->transients = new Transient();
+
+        // Needs to run before: Gutenberg::addBlocks, self::loadAdminScripts
+        $this->checkOldSettings();
 
         // Init Localisation
@@ -90 +93 @@
             'edit_pages',
             Settings::PAGE_CACHE,
-            ['\Recras\Settings', 'clearCache']
+            ['\Recras\Settings', 'clearCachePage']
         );
         add_submenu_page(
@@ -122 +125 @@
      * Register our shortcodes
      */
-    public function addShortcodes(): void
+    private function addShortcodes(): void
     {
         add_shortcode(Availability::SHORTCODE, [Availability::class, 'renderAvailability']);
@@ -134 +137 @@
     }
 
+    private function checkOldSettings(): void
+    {
+        $subdomain = get_option('recras_subdomain');
+        if (!$subdomain) {
+            return;
+        }
+
+        $setting = $this->transients->get($subdomain . '_show_old_online_booking');
+        if ($setting === false) {
+            try {
+                $setting = Http::get($subdomain, 'instellingen/allow_online_package_booking');
+            } catch (\Exception $e) {
+                return;
+            }
+            if (is_object($setting) && property_exists($setting, 'waarde')) {
+                $this->transients->set($subdomain . '_show_old_online_booking', $setting->waarde, DAY_IN_SECONDS);
+            }
+        }
+
+        $setting = $this->transients->get($subdomain . '_show_old_voucher_sales');
+        if ($setting === false) {
+            try {
+                $setting = Http::get($subdomain, 'instellingen/allow_old_vouchers_sales');
+            } catch (\Exception $e) {
+                return;
+            }
+            if (is_object($setting) && property_exists($setting, 'waarde')) {
+                $this->transients->set($subdomain . '_show_old_voucher_sales', $setting->waarde, DAY_IN_SECONDS);
+            }
+        }
+    }
+
 
     //TODO: change to :never when we support only PHP 8.1+
@@ -143 +178 @@
         $errors += ContactForm::clearCache();
         $errors += Products::clearCache();
+        $errors += Settings::clearCache();
         $errors += Vouchers::clearCache();
 
@@ -174 +210 @@
     public function loadAdminScripts(): void
     {
-        wp_register_script('recras-admin', $this->baseUrl . '/js/admin.js', [], '4.0.0', true);
-        wp_localize_script('recras-admin', 'recras_l10n', [
+        $l10n = [
             'contact_form' => __('Contact form', $this::TEXT_DOMAIN),
             'no_connection' => __('Could not connect to your Recras', $this::TEXT_DOMAIN),
@@ -183 +218 @@
             'package_availability' => __('Package availability', $this::TEXT_DOMAIN),
             'product' => __('Product', $this::TEXT_DOMAIN),
+            'showOnlineBooking' => 'yes',
+            'showVoucherSales' => 'yes',
             'voucherInfo' => __('Voucher info', $this::TEXT_DOMAIN),
             'voucherSales' => __('Voucher sales', $this::TEXT_DOMAIN),
-        ]);
+        ];
+
+        if (!Settings::allowOnlinePackageBooking()) {
+            $l10n['showOnlineBooking'] = 'no';
+        }
+        if (!Settings::allowOldVoucherSales()) {
+            $l10n['showVoucherSales'] = 'no';
+        }
+
+        wp_register_script('recras-admin', $this->baseUrl . '/js/admin.js', [], '6.3.0', true);
+        wp_localize_script('recras-admin', 'recras_l10n', $l10n);
         wp_enqueue_script('recras-admin');
         wp_enqueue_style('recras-admin-style', $this->baseUrl . '/css/admin-style.css', [], '6.0.7');

recras/trunk/src/Settings.php

@@ -115 +115 @@
 
 
-    public static function clearCache(): void
+    public static function allowOnlinePackageBooking(): bool
+    {
+        global $recrasPlugin;
+
+        $subdomain = get_option('recras_subdomain');
+        if (!$subdomain) {
+            return true;
+        }
+        $setting = $recrasPlugin->transients->get($subdomain . '_show_old_online_booking');
+        // if getting the transient fails, we want to show the button to be sure, so comparing with 'no' is safest
+        return ($setting === 'no') ? false : true;
+    }
+
+
+    public static function allowOldVoucherSales(): bool
+    {
+        global $recrasPlugin;
+
+        $subdomain = get_option('recras_subdomain');
+        if (!$subdomain) {
+            return true;
+        }
+        $setting = $recrasPlugin->transients->get($subdomain . '_show_old_voucher_sales');
+        // if getting the transient fails, we want to show the button to be sure, so comparing with 'no' is safest
+        return ($setting === 'no') ? false : true;
+    }
+
+    /**
+     * Clear voucher template cache (transients)
+     */
+    public static function clearCache(): int
+    {
+        global $recrasPlugin;
+
+        $subdomain = get_option('recras_subdomain');
+        $errors = 0;
+        if ($recrasPlugin->transients->get($subdomain . '_show_old_online_booking')) {
+            $errors = $recrasPlugin->transients->delete($subdomain . '_show_old_online_booking');
+        }
+        if ($recrasPlugin->transients->get($subdomain . '_show_old_voucher_sales')) {
+            $errors = $recrasPlugin->transients->delete($subdomain . '_show_old_voucher_sales');
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Admin page to clear the cache
+     */
+    public static function clearCachePage(): void
     {
         if (!current_user_can('edit_pages')) {

recras/trunk/src/Transient.php

@@ -25 +25 @@
     }
 
-    public function set(string $name, $value): bool
+    // HOUR_IN_SECONDS is defined by WordPress
+    public function set(string $name, $value, int $expiration = HOUR_IN_SECONDS): bool
     {
-        return set_transient(self::BASE . $name, $value, HOUR_IN_SECONDS);
+        return set_transient(self::BASE . $name, $value, $expiration);
     }
 }

recras/trunk/src/Vouchers.php

@@ -63 +63 @@
     public static function renderVoucherSales($attributes): string
     {
+        if (!Settings::allowOldVoucherSales()) {
+            error_log('The old method of selling vouchers is integrated on your website, but is disabled in your Recras');
+            return '';
+        }
+
         if (is_string($attributes)) {
             $attributes = [];