100. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-07-12 04:42:39 +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.

100.1 Files compared

#	Location	File	Last Modified
1	Porto v4.0.5/Theme Files/Porto Theme/app/code/Smartwave/Dailydeals/Model/ResourceModel/Dailydeal	Collection.php	2018-03-14 03:57:32 +0000
2	Porto v4.0.6/Theme Files/Porto Theme/app/code/Smartwave/Dailydeals/Model/ResourceModel/Dailydeal	Collection.php	2023-06-10 07:35:52 +0000

100.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	8	104
Changed	5	15
Inserted	2	2
Removed	0	0

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

100.4 Active regular expressions

No regular expressions were active.

100.5 Comparison detail

1	<?php	1	<?php
2	namespace Smartwave\Dailydeals\Model\ResourceModel\Dailydeal;	2	namespace Smartwave\Dailydeals\Model\ResourceModel\Dailydeal;
3		3
4	class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection	4	class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
5	{	5	{
6	/**	6	/**
7	* ID Field Name	7	* ID Field Name
8	*	8	*
9	* @var string	9	* @var string
10	*/	10	*/
11	protected $_idFieldName = 'dailydeal_id';	11	protected $_idFieldName = 'dailydeal_id';
12		12
13	/**	13	/**
14	* Event prefix	14	* Event prefix
15	*	15	*
16	* @var string	16	* @var string
17	*/	17	*/
18	protected $_eventPrefix = 'sw_dailydeals_dailydeal_collection';	18	protected $_eventPrefix = 'sw_dailydeals_dailydeal_collection';
19		19
20	/**	20	/**
21	* Event object	21	* Event object
22	*	22	*
23	* @var string	23	* @var string
24	*/	24	*/
25	protected $_eventObject = 'dailydeal_collection';	25	protected $_eventObject = 'dailydeal_collection';
26		26
27	/**	27	/**
28	* Define resource model	28	* Define resource model
29	*	29	*
30	* @return void	30	* @return void
31	*/	31	*/
		32
32	protected function _construct()	33	protected function _construct()
33	{	34	{
34	$this->_init('Smartwave\Dailydeals\Model\Dailydeal', 'Smartwave\Dailydeals\Model\ResourceModel\Dailydeal');	35	$this->_init(\Smartwave\Dailydeals\Model\Dailydeal::class, \Smartwave\Dailydeals\Model\ResourceModel\Dailydeal::class);
		36	$this->_map['fields']['dailydeal_id'] = 'main_table.dailydeal_id';
35	}	37	}
36		38
37	/**	39	/**
38	* Get SQL for get record count.	40	* Get SQL for get record count.
39	* Extra GROUP BY strip added.	41	* Extra GROUP BY strip added.
40	*	42	*
41	* @return \Magento\Framework\DB\Select	43	* @return \Magento\Framework\DB\Select
42	*/	44	*/
43	public function getSelectCountSql()	45	public function getSelectCountSql()
44	{	46	{
45	$countSelect = parent::getSelectCountSql();	47	$countSelect = parent::getSelectCountSql();
46	$countSelect->reset(\Zend_Db_Select::GROUP);	48	$countSelect->reset(\Magento\Framework\DB\Select::GROUP);
		49
47	return $countSelect;	50	return $countSelect;
48	}	51	}
49	/**	52	/**
50	* @param string $valueField	53	* Returns pairs dailydeal_id - title
51	* @param string $labelField	54	*
52	* @param array $additional
53	* @return array	55	* @return array
54	*/	56	*/
55	protected function _toOptionArray($valueField = 'dailydeal_id', $labelField = 'sw_product_sku', $additional = [])	57	public function toOptionArray()
56	{	58	{
57	return parent::_toOptionArray($valueField, $labelField, $additional);	59	return $this->_toOptionArray('dailydeal_id', 'sw_product_sku');
58	}	60	}
		61
59	}	62	}