From a7a7c398dedef40bbfc22a484e37ca3324019c2b Mon Sep 17 00:00:00 2001 From: ah-net <103565001+ah-net@users.noreply.github.com> Date: Fri, 28 Oct 2022 13:16:32 +0200 Subject: [PATCH 1/2] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 73bbc24..e111f12 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "require": { "php": ">=7.4 <8.2", "tweakwise/magento2-tweakwise": "^5.0", - "tweakwise/magento2-attributelanding": "^4.0" + "emico/m2-attributelanding": "^3.2" }, "type": "magento2-module", "replace": { From 69b6ae6aebfd7ce47335d6a0ac3f298e4b29caa1 Mon Sep 17 00:00:00 2001 From: ah-net <103565001+ah-net@users.noreply.github.com> Date: Tue, 1 Nov 2022 16:05:11 +0100 Subject: [PATCH 2/2] Compatible with emico/m2-attributelanding --- .../AjaxResultInitializer/LandingPageInitializer.php | 6 +++--- .../Url/RewriteResolver/LandingPageResolver.php | 2 +- src/Model/FilterApplier/TweakwiseFilterApplier.php | 4 ++-- .../LandingPageInputProvider.php | 4 ++-- src/Model/FilterHider/TweakwiseFilterHider.php | 6 +++--- src/Model/FilterManager.php | 12 ++++++------ src/Plugin/Model/AjaxNavigationResultPlugin.php | 2 +- src/Plugin/PathSlugStrategyPlugin.php | 2 +- src/Plugin/QueryParameterStrategyPlugin.php | 2 +- src/Plugin/Seo/FilterHelperPlugin.php | 2 +- src/Plugin/UrlPlugin.php | 4 ++-- src/etc/di.xml | 4 ++-- src/etc/module.xml | 2 +- .../frontend/layout/tweakwise_ajax_landingpage.xml | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Model/AjaxResultInitializer/LandingPageInitializer.php b/src/Model/AjaxResultInitializer/LandingPageInitializer.php index 391c2c3..2ecb89a 100644 --- a/src/Model/AjaxResultInitializer/LandingPageInitializer.php +++ b/src/Model/AjaxResultInitializer/LandingPageInitializer.php @@ -7,8 +7,8 @@ namespace Tweakwise\AttributeLandingTweakwise\Model\AjaxResultInitializer; -use Tweakwise\AttributeLanding\Model\FilterApplier\FilterApplierInterface; -use Tweakwise\AttributeLanding\Model\LandingPageContext; +use Emico\AttributeLanding\Model\FilterApplier\FilterApplierInterface; +use Emico\AttributeLanding\Model\LandingPageContext; use Tweakwise\Magento2Tweakwise\Model\AjaxNavigationResult; use Tweakwise\Magento2Tweakwise\Model\AjaxResultInitializer\InitializerInterface; use Magento\Catalog\Api\CategoryRepositoryInterface; @@ -18,7 +18,7 @@ use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\Exception\NotFoundException; use Magento\Framework\Registry; -use Tweakwise\AttributeLanding\Api\LandingPageRepositoryInterface; +use Emico\AttributeLanding\Api\LandingPageRepositoryInterface; class LandingPageInitializer implements InitializerInterface { diff --git a/src/Model/Catalog/Layer/Url/RewriteResolver/LandingPageResolver.php b/src/Model/Catalog/Layer/Url/RewriteResolver/LandingPageResolver.php index f1d7035..c566f3f 100644 --- a/src/Model/Catalog/Layer/Url/RewriteResolver/LandingPageResolver.php +++ b/src/Model/Catalog/Layer/Url/RewriteResolver/LandingPageResolver.php @@ -7,7 +7,7 @@ namespace Tweakwise\AttributeLandingTweakwise\Model\Catalog\Layer\Url\RewriteResolver; -use Tweakwise\AttributeLanding\Model\Config; +use Emico\AttributeLanding\Model\Config; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Url\RewriteResolver\RewriteResolverInterface; use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator; use Magento\Framework\App\Config\ScopeConfigInterface; diff --git a/src/Model/FilterApplier/TweakwiseFilterApplier.php b/src/Model/FilterApplier/TweakwiseFilterApplier.php index f1010a9..aef1dce 100644 --- a/src/Model/FilterApplier/TweakwiseFilterApplier.php +++ b/src/Model/FilterApplier/TweakwiseFilterApplier.php @@ -6,8 +6,8 @@ namespace Tweakwise\AttributeLandingTweakwise\Model\FilterApplier; -use Tweakwise\AttributeLanding\Api\Data\LandingPageInterface; -use Tweakwise\AttributeLanding\Model\FilterApplier\FilterApplierInterface; +use Emico\AttributeLanding\Api\Data\LandingPageInterface; +use Emico\AttributeLanding\Model\FilterApplier\FilterApplierInterface; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\NavigationContext; class TweakwiseFilterApplier implements FilterApplierInterface diff --git a/src/Model/FilterFormInputProvider/LandingPageInputProvider.php b/src/Model/FilterFormInputProvider/LandingPageInputProvider.php index 3f1baeb..2f328ad 100644 --- a/src/Model/FilterFormInputProvider/LandingPageInputProvider.php +++ b/src/Model/FilterFormInputProvider/LandingPageInputProvider.php @@ -6,8 +6,8 @@ */ namespace Tweakwise\AttributeLandingTweakwise\Model\FilterFormInputProvider; -use Tweakwise\AttributeLanding\Api\Data\LandingPageInterface; -use Tweakwise\AttributeLanding\Model\LandingPageContext; +use Emico\AttributeLanding\Api\Data\LandingPageInterface; +use Emico\AttributeLanding\Model\LandingPageContext; use Tweakwise\Magento2Tweakwise\Model\Config; use Tweakwise\Magento2Tweakwise\Model\FilterFormInputProvider\FilterFormInputProviderInterface; use Magento\Framework\App\RequestInterface; diff --git a/src/Model/FilterHider/TweakwiseFilterHider.php b/src/Model/FilterHider/TweakwiseFilterHider.php index 3cd9c73..6f811a9 100644 --- a/src/Model/FilterHider/TweakwiseFilterHider.php +++ b/src/Model/FilterHider/TweakwiseFilterHider.php @@ -6,9 +6,9 @@ namespace Tweakwise\AttributeLandingTweakwise\Model\FilterHider; -use Tweakwise\AttributeLanding\Api\Data\FilterInterface as LandingPageFilterInterface; -use Tweakwise\AttributeLanding\Api\Data\LandingPageInterface; -use Tweakwise\AttributeLanding\Model\FilterHider\FilterHiderInterface; +use Emico\AttributeLanding\Api\Data\FilterInterface as LandingPageFilterInterface; +use Emico\AttributeLanding\Api\Data\LandingPageInterface; +use Emico\AttributeLanding\Model\FilterHider\FilterHiderInterface; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter as TweakwiseFilter; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item as TweakwiseFilterItem; use Magento\Catalog\Model\Layer\Filter\FilterInterface; diff --git a/src/Model/FilterManager.php b/src/Model/FilterManager.php index 571ffc1..1fb74ed 100644 --- a/src/Model/FilterManager.php +++ b/src/Model/FilterManager.php @@ -6,12 +6,12 @@ namespace Tweakwise\AttributeLandingTweakwise\Model; -use Tweakwise\AttributeLanding\Api\Data\FilterInterface; -use Tweakwise\AttributeLanding\Api\Data\LandingPageInterface; -use Tweakwise\AttributeLanding\Model\Filter; -use Tweakwise\AttributeLanding\Model\FilterHider\FilterHiderInterface; -use Tweakwise\AttributeLanding\Model\LandingPageContext; -use Tweakwise\AttributeLanding\Model\UrlFinder; +use Emico\AttributeLanding\Api\Data\FilterInterface; +use Emico\AttributeLanding\Api\Data\LandingPageInterface; +use Emico\AttributeLanding\Model\Filter; +use Emico\AttributeLanding\Model\FilterHider\FilterHiderInterface; +use Emico\AttributeLanding\Model\LandingPageContext; +use Emico\AttributeLanding\Model\UrlFinder; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item; use Tweakwise\Magento2Tweakwise\Model\Client\Type\FacetType\SettingsType; use Magento\Catalog\Model\Layer; diff --git a/src/Plugin/Model/AjaxNavigationResultPlugin.php b/src/Plugin/Model/AjaxNavigationResultPlugin.php index 92f2640..2779f80 100644 --- a/src/Plugin/Model/AjaxNavigationResultPlugin.php +++ b/src/Plugin/Model/AjaxNavigationResultPlugin.php @@ -2,7 +2,7 @@ namespace Tweakwise\AttributeLandingTweakwise\Plugin\Model; -use Tweakwise\AttributeLanding\Model\LandingPageContext; +use Emico\AttributeLanding\Model\LandingPageContext; use Tweakwise\AttributeLandingTweakwise\Model\FilterManager; use Tweakwise\Magento2Tweakwise\Model\AjaxNavigationResult; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Url; diff --git a/src/Plugin/PathSlugStrategyPlugin.php b/src/Plugin/PathSlugStrategyPlugin.php index ede8b6b..95100a2 100644 --- a/src/Plugin/PathSlugStrategyPlugin.php +++ b/src/Plugin/PathSlugStrategyPlugin.php @@ -7,7 +7,7 @@ namespace Tweakwise\AttributeLandingTweakwise\Plugin; use Closure; -use Tweakwise\AttributeLanding\Model\LandingPageContext; +use Emico\AttributeLanding\Model\LandingPageContext; use Tweakwise\AttributeLandingTweakwise\Model\FilterManager; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Url\Strategy\PathSlugStrategy; diff --git a/src/Plugin/QueryParameterStrategyPlugin.php b/src/Plugin/QueryParameterStrategyPlugin.php index 69fd362..b325de4 100644 --- a/src/Plugin/QueryParameterStrategyPlugin.php +++ b/src/Plugin/QueryParameterStrategyPlugin.php @@ -6,7 +6,7 @@ */ namespace Tweakwise\AttributeLandingTweakwise\Plugin; -use Tweakwise\AttributeLanding\Model\LandingPageContext; +use Emico\AttributeLanding\Model\LandingPageContext; use Tweakwise\AttributeLandingTweakwise\Model\FilterManager; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Url\Strategy\QueryParameterStrategy; diff --git a/src/Plugin/Seo/FilterHelperPlugin.php b/src/Plugin/Seo/FilterHelperPlugin.php index e940b6e..b19e72f 100644 --- a/src/Plugin/Seo/FilterHelperPlugin.php +++ b/src/Plugin/Seo/FilterHelperPlugin.php @@ -6,7 +6,7 @@ namespace Tweakwise\AttributeLandingTweakwise\Plugin\Seo; -use Tweakwise\AttributeLanding\Model\LandingPageContext; +use Emico\AttributeLanding\Model\LandingPageContext; use Tweakwise\AttributeLandingTweakwise\Model\FilterManager; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item; use Tweakwise\Magento2Tweakwise\Model\Seo\FilterHelper; diff --git a/src/Plugin/UrlPlugin.php b/src/Plugin/UrlPlugin.php index a14115d..ac40f9c 100644 --- a/src/Plugin/UrlPlugin.php +++ b/src/Plugin/UrlPlugin.php @@ -7,8 +7,8 @@ namespace Tweakwise\AttributeLandingTweakwise\Plugin; use Closure; -use Tweakwise\AttributeLanding\Model\Config; -use Tweakwise\AttributeLanding\Model\LandingPageContext; +use Emico\AttributeLanding\Model\Config; +use Emico\AttributeLanding\Model\LandingPageContext; use Tweakwise\AttributeLandingTweakwise\Model\FilterManager; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item; use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\NavigationContext\CurrentContext; diff --git a/src/etc/di.xml b/src/etc/di.xml index 6e80329..455f574 100644 --- a/src/etc/di.xml +++ b/src/etc/di.xml @@ -1,7 +1,7 @@ - - + + Tweakwise\AttributeLandingTweakwise\Model\FilterApplier\TweakwiseFilterApplier diff --git a/src/etc/module.xml b/src/etc/module.xml index 440de86..0978bb0 100644 --- a/src/etc/module.xml +++ b/src/etc/module.xml @@ -2,7 +2,7 @@ - + diff --git a/src/view/frontend/layout/tweakwise_ajax_landingpage.xml b/src/view/frontend/layout/tweakwise_ajax_landingpage.xml index dcf1703..b52ec12 100644 --- a/src/view/frontend/layout/tweakwise_ajax_landingpage.xml +++ b/src/view/frontend/layout/tweakwise_ajax_landingpage.xml @@ -14,7 +14,7 @@ - +