Changeset 3699779

Timestamp:

09/17/2026 08:18:17 AM (5 weeks ago)

Author:

skfaktura

Message:

Release 0.9.17

Location:

skfaktura-sk-for-woocommerce/trunk

Files:

• includes/class-skfaktura-woocommerce.php (modified) (4 diffs)
• readme.txt (modified) (2 diffs)
• skfaktura-sk-for-woocommerce.php (modified) (2 diffs)

skfaktura-sk-for-woocommerce/trunk/includes/class-skfaktura-woocommerce.php

@@ -118 +118 @@
         add_action('woocommerce_order_details_after_order_table', [$this, 'render_shipment_tracking'], 16);
         add_action('woocommerce_email_after_order_table', [$this, 'render_document_links_in_email'], 15, 4);
-        add_action('woocommerce_email_after_order_table', [$this, 'render_shipment_tracking_in_email'], 16, 4);
+        add_action('woocommerce_email_after_order_table', [$this, 'render_shipment_tracking_in_email'], PHP_INT_MAX, 4);
     }
 
@@ -1723 +1723 @@
             return;
         }
-
         echo '<section class="woocommerce-order-downloads skfaktura-shipment-tracking"><h2>Sledovanie zásielky</h2>';
         echo '<p>'.esc_html($tracking['provider_label'].' – '.$tracking['number']).'</p>';
@@ -1741 +1740 @@
             $order = $freshOrder;
         }
-        if ((string) $order->get_meta(self::META_TRACKING_NATIVE) === 'yes') {
-            return;
-        }
-
         $tracking = $this->shipment_tracking_data($order);
         if ($tracking === null) {
+            return;
+        }
+        if ($this->email_output_contains_tracking_url($tracking['url'])) {
             return;
         }
@@ -1761 +1759 @@
         echo '<p>'.esc_html($tracking['provider_label'].' – '.$tracking['number']).'</p>';
         echo '<p><a href="'.esc_url($tracking['url']).'" target="_blank" rel="noopener" style="'.esc_attr($this->button_style()).'">Sledovať zásielku</a></p>';
+    }
+
+    private function email_output_contains_tracking_url(string $trackingUrl): bool
+    {
+        $output = ob_get_contents();
+        if (! is_string($output) || $output === '') {
+            return false;
+        }
+
+        return strpos(html_entity_decode($output, ENT_QUOTES | ENT_HTML5, 'UTF-8'), $trackingUrl) !== false;
     }
 

skfaktura-sk-for-woocommerce/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 7.4
-Stable tag: 0.9.16
+Stable tag: 0.9.17
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -79 +79 @@
 == Changelog ==
 
+= 0.9.17 =
+* Odkaz na sledovanie sa spoľahlivo zobrazí v zákazníckom e-maile „Vybavená objednávka“ aj pri aktívnom kompatibilnom doplnku na sledovanie zásielok, bez zdvojenia už vykresleného odkazu.
+
 = 0.9.16 =
 * Odpojený e-shop si plugin zapamätá a zastaví opakovanú registráciu aj API prenosy objednávok.

skfaktura-sk-for-woocommerce/trunk/skfaktura-sk-for-woocommerce.php

@@ -3 +3 @@
  * Plugin Name: skFaktura.sk for WooCommerce
  * Description: Synchronizuje doklady, skladové množstvo a vybrané ceny podľa SKU medzi WooCommerce a skFaktura.sk.
- * Version: 0.9.16
+ * Version: 0.9.17
  * Plugin URI: https://skfaktura.sk
  * Requires at least: 6.0
@@ -16 +16 @@
 defined('ABSPATH') || exit;
 
-define('SKFAKTURA_WOO_VERSION', '0.9.16');
+define('SKFAKTURA_WOO_VERSION', '0.9.17');
 define('SKFAKTURA_WOO_FILE', __FILE__);
 define('SKFAKTURA_WOO_DIR', plugin_dir_path(__FILE__));