90. Araxis Merge File Comparison Report

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

90.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/code/Smartwave/Dailydeals/Controller/Adminhtml/DailydealSave.php2018-03-14 03:45:10 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/code/Smartwave/Dailydeals/Controller/Adminhtml/DailydealSave.php2023-07-03 06:17:26 +0000

90.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged11322
Changed918
Inserted11
Removed00

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

90.4 Active regular expressions

No regular expressions were active.

90.5 Comparison detail

1 <?php 1 <?php
2 namespace Smartwave\Dailydeals\Controller\Adminhtml\Dailydeal; 2 namespace Smartwave\Dailydeals\Controller\Adminhtml\Dailydeal;
    3 use Magento\Framework\Filter\FilterInput;
3  4 
4 class Save extends \Smartwave\Dailydeals\Controller\Adminhtml\Dailydeal 5 class Save extends \Smartwave\Dailydeals\Controller\Adminhtml\Dailydeal
5 { 6 {
6     /** 7     /**
7      * Backend session 8      * Backend session
8      * 9      *
9      * @var \Magento\Backend\Model\Session 10      * @var \Magento\Backend\Model\Session
10      */ 11      */
11     protected $backendSession; 12     protected $backendSession;
12  13 
13     /** 14     /**
14      * Date filter 15      * Date filter
15      * 16      *
16      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date 17      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
17      */ 18      */
18     protected $dateFilter; 19     protected $dateFilter;
19  20 
20     protected $productFactory; 21     protected $productFactory;
21     /** 22     /**
22      * constructor 23      * constructor
23      * 24      *
24      * @param \Magento\Backend\Model\Session $backendSession 25      * @param \Magento\Backend\Model\Session $backendSession
25      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter 26      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
26      * @param \Smartwave\Dailydeals\Model\DailydealFactory $dailydealFactory 27      * @param \Smartwave\Dailydeals\Model\DailydealFactory $dailydealFactory
27      * @param \Magento\Framework\Registry $registry 28      * @param \Magento\Framework\Registry $registry
28      * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory 29      * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
29      * @param \Magento\Backend\App\Action\Context $context 30      * @param \Magento\Backend\App\Action\Context $context
30      */ 31      */
31     public function __construct( 32     public function __construct(
32         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter, 33         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
33         \Smartwave\Dailydeals\Model\DailydealFactory $dailydealFactory, 34         \Smartwave\Dailydeals\Model\DailydealFactory $dailydealFactory,
34         \Magento\Framework\Registry $registry, 35         \Magento\Framework\Registry $registry,
35         \Magento\Backend\App\Action\Context $context, 36         \Magento\Backend\App\Action\Context $context,
36         \Magento\Catalog\Model\ProductFactory $productFactory 37         \Magento\Catalog\Model\ProductFactory $productFactory
37     ) { 38     ) {
38      39 
39         parent::__construct($dailydealFactory, $registry, $context); 40         parent::__construct($dailydealFactory, $registry, $context);
40  41 
41         $this->backendSession = $context->getSession(); 42         $this->backendSession = $context->getSession();
42         $this->resultRedirectFactory=$context->getResultRedirectFactory(); 43         $this->resultRedirectFactory=$context->getResultRedirectFactory();
43         $this->productFactory = $productFactory; 44         $this->productFactory = $productFactory;
44         $this->dateFilter     = $dateFilter; 45         $this->dateFilter     = $dateFilter;
45     } 46     }
46  47 
47     /** 48     /**
48      * run the action 49      * run the action
49      * 50      *
50      * @return \Magento\Backend\Model\View\Result\Redirect 51      * @return \Magento\Backend\Model\View\Result\Redirect
51      */ 52      */
52     public function execute() 53     public function execute()
53     { 54     {
54         $data = $this->getRequest()->getPost('dailydeal'); 55         $data = $this->getRequest()->getPost('dailydeal');
55         if (isset($data["dailydeal_id"])) { 56         if (isset($data["dailydeal_id"])) {
56             $dailydealId=$data["dailydeal_id"]; 57             $dailydealId=$data["dailydeal_id"];
57         } 58         }
58         // Store the date from and to in to varaible 59         // Store the date from and to in to varaible
59         $fromdate=$data["sw_date_from"]; 60         $fromdate=$data["sw_date_from"];
60         $todate= $data["sw_date_to"]; 61         $todate= $data["sw_date_to"];
61  62 
62         $resultRedirect = $this->resultRedirectFactory->create(); 63         $resultRedirect = $this->resultRedirectFactory->create();
63         if ($data) { 64         if ($data) {
64             $data = $this->filterData($data); 65             $data = $this->filterData($data);
65             66 
66             $dailydeal = $this->initDailydeal(); 67             $dailydeal = $this->initDailydeal();
67             $dailydeal->setData($data); 68             $dailydeal->setData($data);
68              69 
69             $this->_eventManager->dispatch( 70             $this->_eventManager->dispatch(
70                 'sw_dailydeals_dailydeal_prepare_save', 71                 'sw_dailydeals_dailydeal_prepare_save',
71                 [ 72                 [
72                     'dailydeal' => $dailydeal, 73                     'dailydeal' => $dailydeal,
73                     'request' => $this->getRequest() 74                     'request' => $this->getRequest()
74                 ] 75                 ]
75             ); 76             );
76             try { 77             try {
77                 $dailydealCollection=$this->dailydealFactory->create()->getCollection(); 78                 $dailydealCollection=$this->dailydealFactory->create()->getCollection();
78         79 
79                 $dailydealCollection->addFieldToSelect('*'); 80                 $dailydealCollection->addFieldToSelect('*');
80                 $dailydealCollection->addFieldToFilter('sw_product_sku', ['eq'=>$data["sw_product_sku"]]); 81                 $dailydealCollection->addFieldToFilter('sw_product_sku', ['eq'=>$data["sw_product_sku"]]);
81                 if (isset($dailydealId)) { 82                 if (isset($dailydealId)) {
82                     $dailydealCollection->addFieldToFilter('dailydeal_id', ['eq'=>$dailydealId]); 83                     $dailydealCollection->addFieldToFilter('dailydeal_id', ['eq'=>$dailydealId]);
83                     if ($dailydealCollection->getSize()==1) { 84                     if ($dailydealCollection->getSize()==1) {
84                         $editaction=1; 85                         $editaction=1;
85                     } 86                     }
86                 } 87                 }
87                88 
88                 if ($dailydealCollection->getSize()== 0 || isset($editaction)) { 89                 if ($dailydealCollection->getSize()== 0 || isset($editaction)) {
89                     if ($data["sw_deal_enable"] == 1) { 90                     if ($data["sw_deal_enable"] == 1) {
90                         $productCollection=$this->productFactory->create()->getCollection(); 91                         $productCollection=$this->productFactory->create()->getCollection();
91                         $product=$productCollection->addAttributeToSelect('*'); 92                         $product=$productCollection->addAttributeToSelect('*');
92                         $product=$productCollection->addAttributeToFilter('sku', ['eq'=>$data["sw_product_sku"]]); 93                         $product=$productCollection->addAttributeToFilter('sku', ['eq'=>$data["sw_product_sku"]]);
93  94 
94                         $finalproductprice=$product->getFirstItem()->getFinalPrice(); 95                         $finalproductprice=$product->getFirstItem()->getFinalPrice();
95                         if ($product->getFirstItem()->getTypeId() != "bundle") { 96                         if ($product->getFirstItem()->getTypeId() != "bundle") {
96                             if ($data["sw_discount_type"] == 1) { // For Fixed 97                             if ($data["sw_discount_type"] == 1) { // For Fixed
97                            98 
98                                 $dailydeal->setSwProductPrice($finalproductprice - $data["sw_discount_amount"]); 99                                 $dailydeal->setSwProductPrice($finalproductprice - $data["sw_discount_amount"]);
99                             } elseif ($data["sw_discount_type"] == 2) { // For Percentage 100                             } elseif ($data["sw_discount_type"] == 2) { // For Percentage
100                                 $dailydeal->setSwProductPrice($finalproductprice  - (($finalproductprice * $data["sw_discount_amount"])/100)); 101                                 $dailydeal->setSwProductPrice($finalproductprice  - (($finalproductprice * $data["sw_discount_amount"])/100));
101                             } 102                             }
102                         } else { 103                         } else {
103                             $dailydeal->setSwProductPrice(1); 104                             $dailydeal->setSwProductPrice(1);
104                         } 105                         }
105                     } 106                     }
106  107 
107                     $dailydeal->setSwDateFrom($fromdate); 108                     $dailydeal->setSwDateFrom($fromdate);
108                     $dailydeal->setSwDateTo($todate); 109                     $dailydeal->setSwDateTo($todate);
109  110 
110                     $dailydeal->save(); 111                     $dailydeal->save();
111      112 
112                     $this->messageManager->addSuccess(__('The Dailydeal has been saved.')); 113                     $this->messageManager->addSuccess(__('The Dailydeal has been saved.'));
113                 } else { 114                 } else {
114                     $this->messageManager->addError("Already set dailydeal for this Product."); 115                     $this->messageManager->addError("Already set dailydeal for this Product.");
115                 } 116                 }
116   117 
117                 $this->backendSession->setSwDailydealsDailydealData(false); 118                 $this->backendSession->setSwDailydealsDailydealData(false);
118                 if ($this->getRequest()->getParam('back')) { 119                 if ($this->getRequest()->getParam('back')) {
119                     $resultRedirect->setPath( 120                     $resultRedirect->setPath(
120                         'sw_dailydeals/*/edit', 121                         'sw_dailydeals/*/edit',
121                         [ 122                         [
122                             'dailydeal_id' => $dailydeal->getId(), 123                             'dailydeal_id' => $dailydeal->getId(),
123                             '_current' => true 124                             '_current' => true
124                         ] 125                         ]
125                     ); 126                     );
126                     return $resultRedirect; 127                     return $resultRedirect;
127                 } 128                 }
128                 $resultRedirect->setPath('sw_dailydeals/*/'); 129                 $resultRedirect->setPath('sw_dailydeals/*/');
129                 return $resultRedirect; 130                 return $resultRedirect;
130             } catch (\Magento\Framework\Exception\LocalizedException $e) { 131             } catch (\Magento\Framework\Exception\LocalizedException $e) {
131                 $this->messageManager->addError($e->getMessage()); 132                 $this->messageManager->addError($e->getMessage());
132             } catch (\RuntimeException $e) { 133             } catch (\RuntimeException $e) {
133                 $this->messageManager->addError($e->getMessage()); 134                 $this->messageManager->addError($e->getMessage());
134             } catch (\Exception $e) { 135             } catch (\Exception $e) {
135                 $this->messageManager->addException($e, __('Something went wrong while saving the Dailydeal.')); 136                 $this->messageManager->addException($e, __('Something went wrong while saving the Dailydeal.'));
136             } 137             }
137             $this->_getSession()->setSwDailydealsDailydealData($data); 138             $this->_getSession()->setSwDailydealsDailydealData($data);
138             $resultRedirect->setPath( 139             $resultRedirect->setPath(
139                 'sw_dailydeals/*/edit', 140                 'sw_dailydeals/*/edit',
140                 [ 141                 [
141                     'dailydeal_id' => $dailydeal->getId(), 142                     'dailydeal_id' => $dailydeal->getId(),
142                     '_current' => true 143                     '_current' => true
143                 ] 144                 ]
144             ); 145             );
145             return $resultRedirect; 146             return $resultRedirect;
146         } 147         }
147         $resultRedirect->setPath('sw_dailydeals/*/'); 148         $resultRedirect->setPath('sw_dailydeals/*/');
148         return $resultRedirect; 149         return $resultRedirect;
149     } 150     }
150  151 
151     /** 152     /**
152      * filter values 153      * filter values
153      * 154      *
154      * @param array $data 155      * @param array $data
155      * @return array 156      * @return array
156      */ 157      */
157     protected function filterData($data) 158     protected function filterData($data)
158     { 159     {
159         $inputFilter = new \Zend_Filter_Input( 160         $inputFilter = new FilterInput(
160             [ 161             [
161                 'sw_date_from' => $this->dateFilter, 162                 'sw_date_from' => $this->dateFilter,
162                 'sw_date_to' => $this->dateFilter, 163                 'sw_date_to' => $this->dateFilter,
163             ], 164             ],
164             [], 165             [],
165             $data 166             $data
166         ); 167         );
167         $data = $inputFilter->getUnescaped(); 168         $data = $inputFilter->getUnescaped();
168         return $data; 169         return $data;
169     } 170     }
170 } 171 }

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.