7. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2020-08-14 00:01:29 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

7.1 Files compared

#LocationFileLast Modified
1Porto v3.2.3/Magento 2.x/Porto Theme/app/code/Mageplaza/AjaxLayer/HelperData.php2018-10-10 20:33:22 +0000
2Porto v3.2.4/Magento 2.x/Porto Theme/app/code/Mageplaza/AjaxLayer/HelperData.php2020-06-26 11:11:14 +0000

7.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged6116
Changed25
Inserted23
Removed13

7.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

7.4 Active regular expressions

No regular expressions were active.

7.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Mageplaza 3  * Mageplaza
4  * 4  *
5  * NOTICE OF LICENSE 5  * NOTICE OF LICENSE
6  * 6  *
7  * This source file is subject to the Mageplaza.com license that is 7  * This source file is subject to the Mageplaza.com license that is
8  * available through the world-wide-web at this URL: 8  * available through the world-wide-web at this URL:
9  * https://www.mageplaza.com/LICENSE.txt 9  * https://www.mageplaza.com/LICENSE.txt
10  * 10  *
11  * DISCLAIMER 11  * DISCLAIMER
12  * 12  *
13  * Do not edit or add to this file if you wish to upgrade this extension to newer 13  * Do not edit or add to this file if you wish to upgrade this extension to newer
14  * version in the future. 14  * version in the future.
15  * 15  *
16  * @category    Mageplaza 16  * @category    Mageplaza
17  * @package     Mageplaza_AjaxLayer 17  * @package     Mageplaza_AjaxLayer
18  * @copyright   Copyright (c) Mageplaza (http://www.mageplaza.com/) 18  * @copyright   Copyright (c) Mageplaza (http://www.mageplaza.com/)
19  * @license     https://www.mageplaza.com/LICENSE.txt 19  * @license     https://www.mageplaza.com/LICENSE.txt
20  */ 20  */
21  21 
22 namespace Mageplaza\AjaxLayer\Helper; 22 namespace Mageplaza\AjaxLayer\Helper;
23  23 
    24 use Magento\Customer\Model\Session;
    25 use Magento\Framework\DataObject;
24 use Mageplaza\Core\Helper\AbstractData; 26 use Mageplaza\Core\Helper\AbstractData;
25  27 
26 /** 28 /**
27  * Class Data 29  * Class Data
28  * @package Mageplaza\LayeredNavigation\Helper 30  * @package Mageplaza\LayeredNavigation\Helper
29  */ 31  */
30 class Data extends AbstractData 32 class Data extends AbstractData
31 { 33 {
32     const CONFIG_MODULE_PATH = 'layered_navigation'; 34     const CONFIG_MODULE_PATH = 'layered_navigation';
33     const FILTER_TYPE_LIST   = 'list'; 35     const FILTER_TYPE_LIST   = 'list';
34  36 
35     /** @var \Mageplaza\LayeredNavigation\Model\Layer\Filter */    
36     protected $filterModel;    
37     
38     /** 37     /**
39      * @param null $storeId 38      * @param null $storeId
40      * 39      *
41      * @return mixed 40      * @return mixed
42      */ 41      */
43     public function ajaxEnabled($storeId = null) 42     public function ajaxEnabled($storeId = null)
44     { 43     {
45         return $this->getConfigGeneral('ajax_enable', $storeId) && $this->isModuleOutputEnabled(); 44         return $this->getConfigGeneral('ajax_enable', $storeId) && $this->isModuleOutputEnabled();
46     } 45     }
47  46 
48     /** 47     /**
49      * @param $filters 48      * @param $filters
    49      *
50      * @return mixed 50      * @return mixed
51      */ 51      */
52     public function getLayerConfiguration($filters) 52     public function getLayerConfiguration($filters)
53     { 53     {
54         $filterParams = $this->_getRequest()->getParams(); 54         $filterParams = $this->_getRequest()->getParams();
55         $config       = new \Magento\Framework\DataObject([ 55 
    56         $config = new 
DataObject([
56             'active'             => array_keys($filterParams), 57             'active'             => array_keys($filterParams),
57             'params'             => $filterParams, 58             'params'             => $filterParams,
58             'isCustomerLoggedIn' => $this->objectManager->create('Magento\Customer\Model\Session')->isLoggedIn() 59             'isCustomerLoggedIn' => $this->objectManager->create(
Session::class)->isLoggedIn()
59         ]); 60         ]);
60  61 
61         return self::jsonEncode($config->getData()); 62         return self::jsonEncode($config->getData());
62     } 63     }
63 } 64 }