Release 1.2.0

vienthuong · vienthuong · commit 0f03fd1955e3 · 2021-11-19T01:44:23.000+07:00
diff --git a/CHANGELOG_en-GB.md b/CHANGELOG_en-GB.md
@@ -1,3 +1,7 @@
+# 1.2.0
+- [Issue-20] (https://github.com/FriendsOfShopware/FroshProductCompare/issues/20) Fixes cross-sellings compare does not work with product variants
+- [Issue-19] (https://github.com/FriendsOfShopware/FroshProductCompare/issues/19) Added a new plugin's config to hide attributes (description/price/rating/manufacturer or the whole section)
+
 # 1.1.0
 - Shopware 6.4 compatibility
 - [Issue-14] (https://github.com/FriendsOfShopware/FroshProductCompare/issues/14) Fixes cross-sellings compare does not work with product variants
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ http://shopware.thuong.lv/
 
 | Version 	| Requirements               	|
 |---------	|----------------------------	|
-| 1.0.6    	| Shopware 6.4 >=	            |
+| 1.2.0    	| Shopware 6.4 >=	            |
 
 ## License
     
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "frosh/product-compare",
     "description": "A Simple Product Compare plugin for Shopware 6",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "authors": [
diff --git a/src/Resources/app/storefront/dist/storefront/js/frosh-product-compare.js b/src/Resources/app/storefront/dist/storefront/js/frosh-product-compare.js
diff --git a/src/Resources/config/config.xml b/src/Resources/config/config.xml
@@ -20,6 +20,45 @@
             <defaultValue>false</defaultValue>
         </component>
 
+        <input-field type="multi-select">
+            <name>hideAttributes</name>
+            <label>Hide attributes</label>
+            <label lang="de-DE">Attribute ausblenden</label>
+            <options>
+                <option>
+                    <id>description</id>
+                    <name>Description</name>
+                    <name lang="de-DE">Beschreibung</name>
+                </option>
+                <option>
+                    <id>manufacturer</id>
+                    <name>Manufacturer</name>
+                    <name lang="de-DE">Hersteller</name>
+                </option>
+                <option>
+                    <id>price</id>
+                    <name>Price</name>
+                    <name lang="de-DE">Preis</name>
+                </option>
+                <option>
+                    <id>rating</id>
+                    <name>Rating</name>
+                    <name lang="de-DE">Bewertung</name>
+                </option>
+                <option>
+                    <id>overview</id>
+                    <name>Overview (Hide Overview section)</name>
+                    <name lang="de-DE">Übersicht (Abschnitt Übersicht ausblenden)</name>
+                </option>
+                <option>
+                    <id>specs</id>
+                    <name>Specifications (Hide Specifications section)</name>
+                    <name lang="de-DE">Spezifikationen (Abschnitt Spezifikationen ausblenden)</name>
+                </option>
+
+            </options>
+        </input-field>
+
         <component name="sw-property-multi-select">
             <name>selectedProperties</name>
             <label>Only show these properties</label>
diff --git a/src/Resources/public/administration/js/frosh-product-compare.js b/src/Resources/public/administration/js/frosh-product-compare.js
diff --git a/src/Resources/views/storefront/component/compare/content.html.twig b/src/Resources/views/storefront/component/compare/content.html.twig
@@ -1,6 +1,15 @@
 {% block frosh_product_compare_table_container %}
     <div class="comparison-table">
         {% set products = page.products %}
+        {% set hideAttributes = config('FroshProductCompare.config.hideAttributes') %}
+
+        {% set hideOverview = 'overview' in hideAttributes %}
+        {% set hideDescription = 'description' in hideAttributes %}
+        {% set hidePrice = 'price' in hideAttributes %}
+        {% set hideRating = 'rating' in hideAttributes %}
+        {% set hideManufacturer = 'manufacturer' in hideAttributes %}
+        {% set hideSpecs = 'specs' in hideAttributes %}
+
         {% set productsCount = products.count %}
         {% set isAjaxContent = app.request.attributes.get('_route') == 'frontend.compare.content' %}
         {% if productsCount is same as(0) %}
@@ -109,8 +118,12 @@
                             </tr>
                         </thead>
                     {% endblock %}
-                    {% sw_include '@Storefront/storefront/component/compare/section/overview.html.twig' %}
-                    {% sw_include '@Storefront/storefront/component/compare/section/specification.html.twig' %}
+                    {% if not hideOverview %}
+                        {% sw_include '@Storefront/storefront/component/compare/section/overview.html.twig' %}
+                    {% endif %}
+                    {% if not hideSpecs %}
+                        {% sw_include '@Storefront/storefront/component/compare/section/specification.html.twig' %}
+                    {% endif %}
                     {% if isAjaxContent %}
                         <tbody class="hide-on-print">
                         <tr>
diff --git a/src/Resources/views/storefront/component/compare/section/overview.html.twig b/src/Resources/views/storefront/component/compare/section/overview.html.twig
@@ -3,21 +3,30 @@
         <tr>
             <th class="text-uppercase" colspan="{{ productsCount + 1 }}">{{ "froshProductCompare.section.overview.title"|trans|sw_sanitize }}</th>
         </tr>
+        {% if not hideManufacturer %}
         <tr>
             <th>{{ "froshProductCompare.section.overview.manufacturer"|trans|sw_sanitize }}</th>
             {% sw_include '@Storefront/storefront/component/compare/partial/translated-nested-attribute-cells.html.twig' with {
                 attribute: 'manufacturer'
             } %}
         </tr>
+        {% endif %}
+
+        {% if not hidePrice %}
         <tr>
             <th>{{ "froshProductCompare.section.overview.price"|trans|sw_sanitize }}</th>
             {% sw_include '@Storefront/storefront/component/compare/partial/price-cells.html.twig' %}
         </tr>
+        {% endif %}
+
+        {% if not hideDescription %}
         <tr>
             <th>{{ "froshProductCompare.section.overview.description"|trans|sw_sanitize }}</th>
             {% sw_include '@Storefront/storefront/component/compare/partial/description-cells.html.twig' %}
         </tr>
-        {% if shopware.config.detail.showReviews %}
+        {% endif %}
+
+        {% if not hideRating %}
             <tr>
                 <th>{{ "froshProductCompare.section.overview.rating"|trans|sw_sanitize }}</th>
                 {% sw_include '@Storefront/storefront/component/compare/partial/rating-cells.html.twig' %}
diff --git a/src/Subscriber/FroshCrossSellingProductListingSubscriber.php b/src/Subscriber/FroshCrossSellingProductListingSubscriber.php
@@ -116,7 +116,7 @@ public function handleCrossSellingLoadedEvent(ProductCrossSellingsLoadedEvent $e
 
             $products = ProductListingResult::createFrom($products);
 
-            $productWithComparableData = $this->compareProductPageLoader->loadProductCompareData($products, $context);
+            $productWithComparableData = $this->compareProductPageLoader->loadProductCompareData($products, $salesChannelContext);
 
             $crossSellingElement->setProducts(new ProductCollection($productWithComparableData));
         }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "frosh/product-compare",`
`3`	`3`	`"description": "A Simple Product Compare plugin for Shopware 6",`
`4`		`- "version": "1.1.0",`
	`4`	`+ "version": "1.2.0",`
`5`	`5`	`"type": "shopware-platform-plugin",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"authors": [`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public function handleCrossSellingLoadedEvent(ProductCrossSellingsLoadedEvent $e`
`116`	`116`
`117`	`117`	`$products = ProductListingResult::createFrom($products);`
`118`	`118`
`119`		`- $productWithComparableData = $this->compareProductPageLoader->loadProductCompareData($products, $context);`
	`119`	`+ $productWithComparableData = $this->compareProductPageLoader->loadProductCompareData($products, $salesChannelContext);`
`120`	`120`
`121`	`121`	`$crossSellingElement->setProducts(new ProductCollection($productWithComparableData));`
`122`	`122`	`}`