Merge pull request #246 from EmicoEcommerce/beta

Merge beta into master
EmicoEcommerce · Jan 16, 2025 · 2f248d3 · 2f248d3
2 parents 4f0aeaa + 0ab821d
commit 2f248d3
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 2 deletions.
diff --git a/Model/Catalog/Layer/Url/Strategy/FilterSlugManager.php b/Model/Catalog/Layer/Url/Strategy/FilterSlugManager.php
@@ -84,7 +84,7 @@ public function getSlugForFilterItem(Item $filterItem): string
         $lookupTable = $this->getLookupTable();
         $attribute = strtolower($filterItem->getAttribute()->getTitle());
 
-        if (isset($lookupTable[$attribute])) {
+        if (!empty($lookupTable[$attribute])) {
             return $lookupTable[$attribute];
         }
 
@@ -123,6 +123,10 @@ public function createFilterSlugByAttributeOptions(array $options)
                 $optionLabel = $optionLabel->render();
             }
 
+            if (empty($this->translitUrl->filter($option->getLabel()))) {
+                continue;
+            }
+
             if (isset($this->lookupTable[strtolower($option->getLabel())])) {
                 continue;
             }

diff --git a/Model/Client/Request/Catalog/BuilderTemplateRequest.php b/Model/Client/Request/Catalog/BuilderTemplateRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Tweakwise\Magento2Tweakwise\Model\Client\Request\Catalog;
+
+use Tweakwise\Magento2Tweakwise\Model\Client\Request\Catalog\TemplateRequest;
+use Tweakwise\Magento2Tweakwise\Model\Client\Response\Catalog\BuilderTemplateResponse;
+
+class BuilderTemplateRequest extends TemplateRequest
+{
+    /**
+     * @var string
+     */
+    protected $path = 'catalog/builders';
+
+    /**
+     * @return string
+     */
+    public function getResponseType(): string
+    {
+        return BuilderTemplateResponse::class;
+    }
+}
diff --git a/Model/Client/Request/ProductNavigationRequest.php b/Model/Client/Request/ProductNavigationRequest.php
@@ -121,4 +121,14 @@ public function setSortTemplateId($templateId)
         $this->setParameter('tn_st', $templateId);
         return $this;
     }
+
+    /**
+     * @param int|null $templateId
+     * @return ProductNavigationRequest
+     */
+    public function setBuilderTemplateId($templateId): ProductNavigationRequest
+    {
+        $this->setParameter('tn_b', $templateId);
+        return $this;
+    }
 }
diff --git a/Model/Client/Response/Catalog/BuilderTemplateResponse.php b/Model/Client/Response/Catalog/BuilderTemplateResponse.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Tweakwise\Magento2Tweakwise\Model\Client\Response\Catalog;
+
+use Tweakwise\Magento2Tweakwise\Model\Client\Response;
+use Tweakwise\Magento2Tweakwise\Model\Client\Type\TemplateType;
+
+class BuilderTemplateResponse extends Response
+{
+    /**
+     * @param TemplateType[]|array[] $templates
+     * @return $this
+     */
+    public function setBuilder(array $templates): BuilderTemplateResponse
+    {
+        $templates = $this->normalizeArray($templates, 'builder');
+
+        $values = [];
+        foreach ($templates as $value) {
+            if (!$value instanceof TemplateType) {
+                $value = new TemplateType($value, 'id');
+            }
+
+            $values[] = $value;
+        }
+
+        $this->data['templates'] = $values;
+        return $this;
+    }
+}
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -12,7 +12,7 @@
         <section id="tweakwise">
             <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>General</label>
-                <comment>Tweakwise version v8.3.3</comment>
+                <comment>Tweakwise version v8.4.0</comment>
                 <field id="authentication_key" translate="label,comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Authentication key</label>
                     <comment>Provided by Tweakwise (8 alphanumeric characters)</comment>

diff --git a/etc/di.xml b/etc/di.xml
@@ -270,6 +270,12 @@
         </arguments>
     </virtualType>
 
+    <virtualType name="Tweakwise\Magento2Tweakwise\Model\Config\Source\BuilderTemplate" type="Tweakwise\Magento2Tweakwise\Model\Config\Source\Template">
+        <arguments>
+            <argument name="requestFactory" xsi:type="object">Tweakwise\Magento2Tweakwise\Model\Client\RequestFactory\Catalog\BuilderTemplateRequest</argument>
+        </arguments>
+    </virtualType>
+
     <type name="Tweakwise\Magento2Tweakwise\Model\Config\Source\Language">
         <arguments>
             <argument name="requestFactory" xsi:type="object">Tweakwise\Magento2Tweakwise\Model\Client\RequestFactory\Catalog\LanguageRequest</argument>
@@ -403,6 +409,11 @@
             <argument name="type" xsi:type="string">Tweakwise\Magento2Tweakwise\Model\Client\Request\Catalog\SortTemplateRequest</argument>
         </arguments>
     </virtualType>
+    <virtualType name="Tweakwise\Magento2Tweakwise\Model\Client\RequestFactory\Catalog\BuilderTemplateRequest" type="Tweakwise\Magento2Tweakwise\Model\Client\RequestFactory">
+        <arguments>
+            <argument name="type" xsi:type="string">Tweakwise\Magento2Tweakwise\Model\Client\Request\Catalog\BuilderTemplateRequest</argument>
+        </arguments>
+    </virtualType>
     <virtualType name="Tweakwise\Magento2Tweakwise\Model\Client\RequestFactory\Catalog\LanguageRequest" type="Tweakwise\Magento2Tweakwise\Model\Client\RequestFactory">
         <arguments>
             <argument name="type" xsi:type="string">Tweakwise\Magento2Tweakwise\Model\Client\Request\Catalog\LanguageRequest</argument>