Changeset 3327281

Timestamp:

07/14/2025 05:04:47 AM (7 months ago)

Author:

mergado

Message:

4.2.0

Location:

mergado-marketing-pack/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/templates/partials/tabs-adsys/adsys-biano.php (modified) (1 diff)
• mergado-marketing-pack.php (modified) (2 diffs)
• src/Feed/Product/ProductFeed.php (modified) (5 diffs)
• src/Feed/Product/ProductFeedItem.php (modified) (3 diffs)
• src/Helper/ProductDetailRequestHelper.php (modified) (1 diff)
• src/Service/External/Biano/BianoService.php (modified) (2 diffs)
• src/Service/External/Biano/BianoServiceIntegration.php (modified) (3 diffs)
• src/Service/External/Biano/templates/initDefault.php (modified) (2 diffs)

mergado-marketing-pack/trunk/README.txt

@@ -1 +1 @@
 === Mergado Pack ===
-Stable tag: 4.1.2
+Stable tag: 4.2.0
 Contributors: mergado
 Donate link: https://pack.mergado.com/woocommerce
@@ -269 +269 @@
 == Changelog ==
 
+= 4.2.0 =
+* NEW: Product feed - Brand element implemented
+* NEW: Biano - new languages/countries implemented - [BG, GR, PL, IT, PT]
+* IMPROVEMENT: Product feed - include description and short description for special product types
+
 = 4.1.2 =
 * FIX: Product Feed – Resolved an issue where feeds failed to generate for products in certain category configurations

mergado-marketing-pack/trunk/admin/templates/partials/tabs-adsys/adsys-biano.php

@@ -28 +28 @@
 
         <?php
-        foreach (BianoService::LANGUAGES as $lang):
+        foreach (BianoService::LANGUAGES as $lang => $domain):
             $activeLangName = BianoService::getActiveLangName($lang);
             $activeMerchantId = BianoService::getMerchantIdName($lang);

mergado-marketing-pack/trunk/mergado-marketing-pack.php

@@ -17 +17 @@
  * Plugin URI:        https://www.mergado.cz
  * Description:       Earn more on price comparator sites. <strong>REQUIRES: Woocommerce</strong>
- * Version:           4.1.2
+ * Version:           4.2.0
  * Author:            Mergado technologies, s. r. o.
  * Author URI:        https://www.mergado.cz
@@ -46 +46 @@
 }
 
-define('PLUGIN_VERSION', '4.1.2');
+define('PLUGIN_VERSION', '4.2.0');
 define( '__MERGADO_DIR__', plugin_dir_path( __FILE__ ) );
 define( '__MERGADO_BASE_FILE__', plugin_dir_path( __FILE__ ) . 'mergado-marketing-pack.php' );

mergado-marketing-pack/trunk/src/Feed/Product/ProductFeed.php

@@ -359 +359 @@
                     $productFeedItem->setCategory($categories['category']);
                     $productFeedItem->setCategoriesAlternative($categories['alternative_categories']);
+                    $productFeedItem->setBrands($this->getProductBrands($v['id']));
 
                     $productFeedItem->setTags($this->getTags($productObject));
@@ -402 +403 @@
 
                         $categories = $this->getCategories($category_ids);
+                        $productFeedItem->setBrands($this->getProductBrands($parentObject->get_id()));
                     } else {
                         $categories = ['category' => '', 'alternative_categories' => []];
@@ -408 +410 @@
                     $productFeedItem->setCategory($categories['category']);
                     $productFeedItem->setCategoriesAlternative($categories['alternative_categories']);
+
                     $productFeedItem->setTags($this->getTags($parentObject));
 
@@ -450 +453 @@
                     if ($productSizes['weight'] != "") {
                         $productFeedItem->setShippingWeight(sprintf('%s %s', $productSizes['weight'], $weightUnit));
+                    }
+                } else {
+                    // Universal description for other types
+                    if ($description = $productObject->get_description()) {
+                        $productFeedItem->setDescription($description);
+                    }
+
+                    if ($shortDescription = $productObject->get_short_description()) {
+                        $productFeedItem->setDescriptionShort($shortDescription);
+                    }
+
+                    if ($v['id']) {
+                        $productFeedItem->setBrands($this->getProductBrands($v['id']));
                     }
                 }
@@ -694 +710 @@
     }
 
+    protected function getProductBrands($productId): array
+    {
+        $brands = get_the_terms( $productId, 'product_brand' );
+
+        if ( is_wp_error($brands) || empty($brands) ) {
+            return [];
+        }
+
+        return $this->getFullBrandChains($brands);
+    }
+
+    protected function getFullBrandChains($brands): array
+    {
+        // Create a lookup array for quick parent finding
+        $brandLookup = [];
+        foreach ($brands as $brand) {
+            $brandLookup[$brand->term_id] = $brand;
+        }
+
+        // Find leaf nodes (brands that are not parents of any other brand)
+        $parentIds = [];
+        foreach ($brands as $brand) {
+            if ($brand->parent != 0) {
+                $parentIds[] = $brand->parent;
+            }
+        }
+
+        $leafBrands = [];
+        foreach ($brands as $brand) {
+            if (!in_array($brand->term_id, $parentIds)) {
+                $leafBrands[] = $brand;
+            }
+        }
+
+        $fullChains = [];
+        foreach ($leafBrands as $brand) {
+            $visited = [];
+            $chain = $this->buildChain($brand, $brandLookup, $visited);
+            $fullChains[] = implode(' | ', $chain);
+        }
+
+        return $fullChains;
+    }
+
+    protected function buildChain($brand, $brandLookup, &$visited = []): array
+    {
+        if (in_array($brand->term_id, $visited)) {
+            return [$brand->name];
+        }
+
+        $visited[] = $brand->term_id;
+        $chain = [$brand->name];
+
+        if ($brand->parent != 0 && isset($brandLookup[$brand->parent])) {
+            $parentChain = $this->buildChain($brandLookup[$brand->parent], $brandLookup, $visited);
+            $chain = array_merge($parentChain, $chain);
+        }
+
+        return $chain;
+    }
+
     protected function getCategories($categoryIds): array
     {

mergado-marketing-pack/trunk/src/Feed/Product/ProductFeedItem.php

@@ -42 +42 @@
     public $visibility;
     public $catalogVisibility;
+    public $brands = [];
 
     private $productType;
@@ -540 +541 @@
     {
         $this->categoriesAlternative = $categories;
+    }
+
+    /**
+     * @return array
+     */
+    public function getBrands(): array
+    {
+        return $this->brands;
+    }
+
+    /**
+     * @param array $brands
+     */
+    public function setBrands(array $brands): void
+    {
+        $this->brands = $brands;
     }
 
@@ -569 +586 @@
             }
 
+            foreach($this->getBrands() as $brands) {
+                $this->createXmlItemProperty($item, 'BRAND', $brands, true);
+            }
+
             $this->createXmlItemProperty($item, 'EAN', $this->getEan());
             $this->createXmlItemProperty($item, 'SHIPPING_SIZE', $this->getShippingSize());

mergado-marketing-pack/trunk/src/Helper/ProductDetailRequestHelper.php

@@ -69 +69 @@
             }
 
-            // Fix for older installations where global product may be string
+            // Fix for older instalations where global product may be string
             if ( ! is_object( $product ) ) {
                 $product = wc_get_product( get_the_ID() );

mergado-marketing-pack/trunk/src/Service/External/Biano/BianoService.php

@@ -26 +26 @@
     public const MERCHANT_ID = 'biano_merchant_id';
     public const ACTIVE_LANG = 'biano-form-active-lang';
-    public const LANGUAGES = ['CZ', 'SK', 'RO', 'NL', 'HU'];
+    public const LANGUAGES = [
+        'CZ' => 'cz',
+        'SK' => 'sk',
+        'RO' => 'ro',
+        'NL' => 'nl',
+        'HU' => 'hu',
+        'BG' => 'bg',
+        'GR' => 'gr',
+        'PL' => 'com/pl',
+        'IT' => 'it',
+        'PT' => 'pt',
+    ];
     public const CONVERSION_VAT_INCL = 'biano-vat-included';
     public const COMPOSITE_ID_ENABLED = 'mmp-biano-composite-id-enabled';
@@ -114 +125 @@
 
         foreach (self::LANGUAGES as $key => $item) {
-            $inputs[] = self::getMerchantIdName($item);
-            $checkboxes[] = self::getActiveLangName($item);
+            $inputs[] = self::getMerchantIdName($key);
+            $checkboxes[] = self::getActiveLangName($key);
         }
 

mergado-marketing-pack/trunk/src/Service/External/Biano/BianoServiceIntegration.php

@@ -59 +59 @@
 
             // Default solution
-            if (in_array($this->lang, BianoService::LANGUAGES)) {
+            if (array_key_exists($this->lang, BianoService::LANGUAGES)) {
 
                 $templateVariables = [
                     'merchantId' => $merchantId,
                     'consent' => $this->cookieService->advertisementEnabled() ? 'true' : 'false',
-                    'lang' => strtolower($this->lang)
+                    'domain' => BianoService::LANGUAGES[$this->lang]
                 ];
 
@@ -207 +207 @@
             // Biano star
             $bianoStarServiceIntegration = BianoStarServiceIntegration::getInstance();
-            $bianoStarShouldeBeSent = $bianoStarServiceIntegration->shouldBeSent($orderId);
+            $bianoStarShouldBeSent = $bianoStarServiceIntegration->shouldBeSent($orderId);
 
             $templatePath = __DIR__ . '/templates/purchase.php';
@@ -216 +216 @@
                 'currency' => $order->get_currency(),
                 'items' => json_encode($products, JSON_NUMERIC_CHECK),
-                'bianoStarShouldBeSent' => $bianoStarShouldeBeSent
+                'bianoStarShouldBeSent' => $bianoStarShouldBeSent
             ];
 
 
-            if ($bianoStarShouldeBeSent) {
+            if ($bianoStarShouldBeSent) {
                 $bianoStarService = $bianoStarServiceIntegration->getService();
 

mergado-marketing-pack/trunk/src/Service/External/Biano/templates/initDefault.php

@@ -5 +5 @@
     };
 
-    const bianoLanguage = '<?php echo $lang; ?>';
+    const bianoDomain = '<?php echo $domain; ?>';
 
     !function (b, i, a, n, o, p, x, s) {
@@ -21 +21 @@
         p = i.createElement(s);
         p.async = !0;
-        p.src = 'https://' + (n ? 'pixel.biano.' + bianoLanguage : 'bianopixel.com') +
+        p.src = 'https://' + (n ? 'pixel.biano.' + bianoDomain : 'bianopixel.com') +
             '/' + (a.debug ? 'debug' : 'min') + '/pixel.js';
         x = i.getElementsByTagName(s)[0];