Skip to content

Commit 99c4e62

Browse files
brianmageplazabrianmageplaza
committed
Format Code
1 parent 3566d7b commit 99c4e62

File tree

7 files changed

+55
-67
lines changed

7 files changed

+55
-67
lines changed

‎Controller/Search/Result/Index.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ public function __construct(
9898
JsonData $jsonHelper,
9999
HelperData $moduleHelper
100100
) {
101-
$this->_storeManager = $storeManager;
101+
$this->_storeManager = $storeManager;
102102
$this->_catalogSession = $catalogSession;
103-
$this->_queryFactory = $queryFactory;
104-
$this->layerResolver = $layerResolver;
105-
$this->_jsonHelper = $jsonHelper;
106-
$this->_moduleHelper = $moduleHelper;
107-
$this->_helper = $helper;
103+
$this->_queryFactory = $queryFactory;
104+
$this->layerResolver = $layerResolver;
105+
$this->_jsonHelper = $jsonHelper;
106+
$this->_moduleHelper = $moduleHelper;
107+
$this->_helper = $helper;
108108

109109
parent::__construct($context);
110110
}
@@ -121,7 +121,7 @@ public function execute()
121121

122122
$query->setStoreId($this->_storeManager->getStore()->getId());
123123

124-
if ($query->getQueryText() != '') {
124+
if ($query->getQueryText() !== '') {
125125
if ($this->_helper->isMinQueryLength()) {
126126
$query->setId(0)->setIsActive(1)->setIsProcessed(1);
127127
} else {
@@ -139,8 +139,8 @@ public function execute()
139139

140140
if ($this->_moduleHelper->ajaxEnabled() && $this->getRequest()->isAjax()) {
141141
$navigation = $this->_view->getLayout()->getBlock('catalogsearch.leftnav');
142-
$products = $this->_view->getLayout()->getBlock('search.result');
143-
$result = [
142+
$products = $this->_view->getLayout()->getBlock('search.result');
143+
$result = [
144144
'products' => $products->toHtml(),
145145
'navigation' => $navigation->toHtml()
146146
];

‎Helper/Data.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
namespace Mageplaza\AjaxLayer\Helper;
2323

24+
use Magento\Customer\Model\Session;
25+
use Magento\Framework\DataObject;
2426
use Mageplaza\Core\Helper\AbstractData;
2527

2628
/**
@@ -32,9 +34,6 @@ class Data extends AbstractData
3234
const CONFIG_MODULE_PATH = 'layered_navigation';
3335
const FILTER_TYPE_LIST = 'list';
3436

35-
/** @var \Mageplaza\LayeredNavigation\Model\Layer\Filter */
36-
protected $filterModel;
37-
3837
/**
3938
* @param null $storeId
4039
*
@@ -53,10 +52,11 @@ public function ajaxEnabled($storeId = null)
5352
public function getLayerConfiguration($filters)
5453
{
5554
$filterParams = $this->_getRequest()->getParams();
56-
$config = new \Magento\Framework\DataObject([
55+
56+
$config = new DataObject([
5757
'active' => array_keys($filterParams),
5858
'params' => $filterParams,
59-
'isCustomerLoggedIn' => $this->objectManager->create('Magento\Customer\Model\Session')->isLoggedIn()
59+
'isCustomerLoggedIn' => $this->objectManager->create(Session::class)->isLoggedIn()
6060
]);
6161

6262
return self::jsonEncode($config->getData());

‎Plugin/Controller/Category/View.php‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@
2121

2222
namespace Mageplaza\AjaxLayer\Plugin\Controller\Category;
2323

24+
use Magento\Framework\Json\Helper\Data;
25+
use Mageplaza\AjaxLayer\Helper\Data as LayerData;
26+
2427
/**
2528
* Class View
2629
* @package Mageplaza\LayeredNavigation\Controller\Plugin\Category
2730
*/
2831
class View
2932
{
30-
/** @var \Magento\Framework\Json\Helper\Data */
33+
/** @var Data */
3134
protected $_jsonHelper;
3235

3336
/** @var \Mageplaza\LayeredNavigation\Helper\Data */
@@ -36,12 +39,12 @@ class View
3639
/**
3740
* View constructor.
3841
*
39-
* @param \Magento\Framework\Json\Helper\Data $jsonHelper
40-
* @param \Mageplaza\AjaxLayer\Helper\Data $moduleHelper
42+
* @param Data $jsonHelper
43+
* @param LayerData $moduleHelper
4144
*/
4245
public function __construct(
43-
\Magento\Framework\Json\Helper\Data $jsonHelper,
44-
\Mageplaza\AjaxLayer\Helper\Data $moduleHelper
46+
Data $jsonHelper,
47+
LayerData $moduleHelper
4548
) {
4649
$this->_jsonHelper = $jsonHelper;
4750
$this->_moduleHelper = $moduleHelper;

‎etc/adminhtml/system.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0"?>
2-
<!--
1+
<?xml version="1.0"?><!--
32
/**
43
* Mageplaza
54
*

‎etc/frontend/di.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0"?>
2-
<!--
1+
<?xml version="1.0"?><!--
32
/**
43
* Mageplaza
54
*

‎view/frontend/templates/layer/view.phtml‎

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<?php if ($block->canShowBlock()) : ?>
2323
<?php
2424
$filters = $block->getFilters();
25-
$layerConfig = $this->helper('Mageplaza\AjaxLayer\Helper\Data')->getLayerConfiguration($filters);
25+
$layerConfig = $this->helper(\Mageplaza\AjaxLayer\Helper\Data::class)->getLayerConfiguration($filters);
2626
$filtered = count($block->getLayer()->getState()->getFilters());
2727
?>
2828
<div class="block filter" id="layered-filter-block"
@@ -32,60 +32,51 @@
3232
<img src="<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>" alt="Loading...">
3333
</div>
3434
</div>
35-
<div class="block-title filter-title" data-count="<?php /* @escapeNotVerified */
36-
echo $filtered; ?>">
37-
<strong data-role="title"><?php /* @escapeNotVerified */
38-
echo __('Shop By') ?></strong>
35+
<div class="block-title filter-title" data-count="<?php echo $filtered; ?>">
36+
<strong data-role="title"><?php echo __('Shop By') ?></strong>
3937
</div>
4038
<div class="block-content filter-content">
4139
<?php echo $block->getChildHtml('state') ?>
4240
<?php if ($block->getLayer()->getState()->getFilters()) : ?>
4341
<div class="block-actions filter-actions">
44-
<a href="<?php /* @escapeNotVerified */
45-
echo $block->getClearUrl() ?>"
46-
class="action clear filter-clear"><span><?php /* @escapeNotVerified */
47-
echo __('Clear All') ?></span></a>
42+
<a href="<?php echo $block->getClearUrl() ?>" class="action clear filter-clear">
43+
<span><?php echo __('Clear All') ?></span>
44+
</a>
4845
</div>
4946
<?php endif; ?>
5047
<?php $wrapOptions = false; ?>
51-
<?php foreach ($filters
52-
53-
as $key => $filter) : ?>
54-
<?php if ($filter->getItemsCount()) : ?>
55-
<?php if (!$wrapOptions) : ?>
56-
<strong role="heading" aria-level="2"
57-
class="block-subtitle filter-subtitle"><?php echo __('Shopping Options') ?></strong>
58-
<div class="filter-options" id="narrow-by-list" data-role="content">
59-
<?php $wrapOptions = true;
60-
endif; ?>
61-
<div data-role="ln_collapsible" class="filter-options-item"
62-
attribute="<?php echo $filter->getRequestVar() ?>">
63-
<div data-role="ln_title" class="filter-options-title"><?php /* @escapeNotVerified */
64-
echo __($filter->getName()) ?></div>
65-
<div data-role="ln_content" class="filter-options-content"><?php /* @escapeNotVerified */
66-
echo $block->getChildBlock('renderer')->setFilter($filter)->render($filter); ?></div>
67-
</div>
48+
<?php foreach ($filters as $key => $filter) : ?>
49+
<?php if ($filter->getItemsCount()) : ?>
50+
<?php if (!$wrapOptions) : ?>
51+
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle">
52+
<?php echo __('Shopping Options') ?>
53+
</strong>
54+
<div class="filter-options" id="narrow-by-list" data-role="content">
55+
<?php $wrapOptions = true;
56+
endif; ?>
57+
<div data-role="ln_collapsible" class="filter-options-item" attribute="<?php echo $filter->getRequestVar() ?>">
58+
<div data-role="ln_title" class="filter-options-title"><?php echo __($filter->getName()) ?></div>
59+
<div data-role="ln_content" class="filter-options-content"><?php echo $block->getChildBlock('renderer')->setFilter($filter)->render($filter); ?></div>
60+
</div>
6861
<?php endif; ?>
69-
<?php endforeach; ?>
70-
<?php if ($wrapOptions) : ?>
71-
</div>
72-
<?php else : ?>
73-
<script>
74-
require([
75-
'jquery'
76-
], function ($) {
77-
$('#layered-filter-block').addClass('filter-no-options');
78-
});
79-
</script>
62+
<?php endforeach; ?>
63+
<?php if ($wrapOptions) : ?>
64+
</div>
65+
<?php else : ?>
66+
<script>
67+
require([
68+
'jquery'
69+
], function ($) {
70+
$('#layered-filter-block').addClass('filter-no-options');
71+
});
72+
</script>
8073
<?php endif; ?>
81-
8274
<script type="text/x-magento-init">
8375
{
8476
".block-content.filter-content":{
8577
"mpAjax": <?php echo $layerConfig ?>
8678
}
8779
}
88-
8980
</script>
9081
</div>
9182
</div>

‎view/frontend/web/js/model/loader.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
* @license https://www.mageplaza.com/LICENSE.txt
1919
*/
2020

21-
define(
22-
[
23-
'jquery'
24-
],
25-
function ($) {
21+
define(['jquery'], function ($) {
2622
'use strict';
2723

2824
return {

0 commit comments

Comments
 (0)