8. 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.

8.1 Files compared

#	Location	File	Last Modified
1	Porto v3.2.3/Magento 2.x/Porto Theme/app/code/Mageplaza/AjaxLayer/Plugin/Controller/Category	View.php	2018-10-10 20:33:22 +0000
2	Porto v3.2.4/Magento 2.x/Porto Theme/app/code/Mageplaza/AjaxLayer/Plugin/Controller/Category	View.php	2020-06-26 11:11:14 +0000

8.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	7	108
Changed	4	24
Inserted	2	3
Removed	0	0

8.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

8.4 Active regular expressions

No regular expressions were active.

8.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\Plugin\Controller\Category;	22	namespace Mageplaza\AjaxLayer\Plugin\Controller\Category;
23		23
		24	use Mageplaza\AjaxLayer\Helper\Data as LayerData;
		25
24	/**	26	/**
25	* Class View	27	* Class View
26	* @package Mageplaza\LayeredNavigation\Controller\Plugin\Category	28	* @package Mageplaza\LayeredNavigation\Controller\Plugin\Category
27	*/	29	*/
28	class View	30	class View
29	{	31	{
30	/** @var \Magento\Framework\Json\Helper\Data */	32	/**
31	protected $_jsonHelper;	33	* @var LayerData
32		34	*/
33	/** @var \Mageplaza\LayeredNavigation\Helper\Data */
34	protected $_moduleHelper;	35	protected $_moduleHelper;
35		36
36	/**	37	/**
37	* View constructor.	38	* View constructor.
38	* @param \Magento\Framework\Json\Helper\Data $jsonHelper	39	*
39	* @param \Mageplaza\AjaxLayer\Helper\Data $moduleHelper	40	* @param LayerData $moduleHelper
40	*/	41	*/
41	public function __construct(	42	public function __construct(
42	\Magento\Framework\Json\Helper\Data $jsonHelper,	43	LayerData $moduleHelper
43	\Mageplaza\AjaxLayer\Helper\Data $moduleHelper	44	) {
44	)
45	{
46	$this->_jsonHelper = $jsonHelper;
47	$this->_moduleHelper = $moduleHelper;	45	$this->_moduleHelper = $moduleHelper;
48	}	46	}
49		47
50	/**	48	/**
51	* @param \Magento\Catalog\Controller\Category\View $action	49	* @param \Magento\Catalog\Controller\Category\View $action
52	* @param $page	50	* @param $page
		51	*
53	* @return mixed	52	* @return mixed
54	*/	53	*/
55	public function afterExecute(\Magento\Catalog\Controller\Category\View $action, $page)	54	public function afterExecute(\Magento\Catalog\Controller\Category\View $action, $page)
56	{	55	{
57	if ($this->_moduleHelper->ajaxEnabled() && $action->getRequest()->isAjax()) {	56	if ($this->_moduleHelper->ajaxEnabled() && $action->getRequest()->isAjax()) {
58	$navigation = $page->getLayout()->getBlock('catalog.leftnav');	57	$navigation = $page->getLayout()->getBlock('catalog.leftnav');
59	$products = $page->getLayout()->getBlock('category.products');	58	$products = $page->getLayout()->getBlock('category.products');
60	$result = ['products' => $products->toHtml(), 'navigation' => $navigation->toHtml()];	59	$result = ['products' => $products->toHtml(), 'navigation' => $navigation->toHtml()];
61	$action->getResponse()->representJson($this->_jsonHelper->jsonEncode($result));	60	if ($this->_moduleHelper->getConfigValue('mpquickview/general/enabled')) {
		61	$quickView = $page->getLayout()->getBlock('mpquickview.quickview');
		62	$result['quickview'] = $quickView->toHtml();
		63	}
		64	$action->getResponse()->representJson(LayerData::jsonEncode($result));
62	} else {	65	} else {
63	return $page;	66	return $page;
64	}	67	}
65	}	68	}
66	}	69	}