Support for Magento 2.2

Zasilkovna · Apr 27, 2020 · 4e1fcec · 4e1fcec
1 parent b8dc9c8
commit 4e1fcec
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 30 deletions.
diff --git a/Packetery/Checkout/Block/Adminhtml/Order/Renderer/CreatedDate.php b/Packetery/Checkout/Block/Adminhtml/Order/Renderer/CreatedDate.php
@@ -6,21 +6,17 @@
 
 class CreatedDate extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
-    /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface */
-    private $timezone;
 
     /** @var \Magento\Sales\Model\OrderFactory */
     private $orderFactory;
 
     public function __construct(
         \Magento\Backend\Block\Context $context,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone,
         \Magento\Sales\Model\OrderFactory $orderFactory,
         array $data = []
     )
     {
         parent::__construct($context, $data);
-        $this->timezone = $timezone;
         $this->orderFactory = $orderFactory;
     }
 
@@ -30,6 +26,6 @@ public function render(DataObject $row)
         $order = $this->orderFactory->create()->loadByIncrementId($orderNumber);
         $created_at = $order->getCreatedAt();
 
-        return $this->timezone->formatDate($created_at, \IntlDateFormatter::MEDIUM, TRUE);
+        return $this->formatDate($created_at, \IntlDateFormatter::MEDIUM, TRUE);
     }
 }
diff --git a/Packetery/Checkout/Block/Adminhtml/Order/Renderer/ExportTime.php b/Packetery/Checkout/Block/Adminhtml/Order/Renderer/ExportTime.php
@@ -6,17 +6,13 @@
 
 class ExportTime extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
-    /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface */
-    private $timezone;
 
     public function __construct(
         \Magento\Backend\Block\Context $context,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone,
         array $data = []
     )
     {
         parent::__construct($context, $data);
-        $this->timezone = $timezone;
     }
 
     // Here we create a link to point the Order View page for the current value
@@ -25,6 +21,6 @@ public function render(DataObject $row)
         $exportedAt = $row->getData('exported_at');
         $isExported = $row->getData('exported');
 
-        return ($isExported && !is_null($exportedAt) ? $this->timezone->formatDate($exportedAt, \IntlDateFormatter::MEDIUM, TRUE) : "");
+        return ($isExported && !is_null($exportedAt) ? $this->formatDate($exportedAt, \IntlDateFormatter::MEDIUM, TRUE) : "");
     }
 }
diff --git a/Packetery/Checkout/Controller/Adminhtml/Order/ExportMass.php b/Packetery/Checkout/Controller/Adminhtml/Order/ExportMass.php
@@ -12,23 +12,22 @@ class ExportMass extends \Magento\Backend\App\Action
     protected $resultPageFactory;
     protected $directory_list;
 
-    /** @var \Magento\Framework\App\Response\RedirectInterface */
-    private $redirect;
-
     /** @var \Packetery\Checkout\Helper\Data */
     private $data;
 
+    /** @var \Magento\Backend\App\Action\Context */
+    private $context;
+
     public function __construct(
         \Magento\Backend\App\Action\Context  $context,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Framework\App\Response\RedirectInterface $redirect,
         \Packetery\Checkout\Helper\Data $data
     ) {
         parent::__construct($context);
 
-        $this->redirect = $redirect;
         $this->resultPageFactory  = $resultPageFactory;
         $this->data = $data;
+        $this->context = $context;
     }
     public function execute()
     {
@@ -37,7 +36,7 @@ public function execute()
         if (empty($orderIds))
         {
             $this->messageManager->addError(__('No orders to export.'));
-            $this->_redirect($this->redirect->getRefererUrl());
+            $this->_redirect($this->_redirect->getRefererUrl());
 
             return;
         }
@@ -47,7 +46,7 @@ public function execute()
         if (!$content)
         {
             $this->messageManager->addError(__('Error! No export data found.'));
-            $this->_redirect($this->redirect->getRefererUrl());
+            $this->_redirect($this->_redirect->getRefererUrl());
 
             return;
         }

diff --git a/Packetery/Checkout/Controller/Adminhtml/Order/ExportPacketeryCsv.php b/Packetery/Checkout/Controller/Adminhtml/Order/ExportPacketeryCsv.php
@@ -12,22 +12,17 @@ class ExportPacketeryCsv extends \Magento\Backend\App\Action
     protected $resultPageFactory;
     protected $directory_list;
 
-    /** @var \Magento\Framework\App\Response\RedirectInterface */
-    private $redirect;
-
     /** @var \Packetery\Checkout\Helper\Data */
     private $data;
 
     public function __construct(
         \Magento\Backend\App\Action\Context  $context,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Framework\App\Response\RedirectInterface $redirect,
         \Packetery\Checkout\Helper\Data $data
     ) {
         parent::__construct($context);
 
         $this->resultPageFactory  = $resultPageFactory;
-        $this->redirect = $redirect;
         $this->data = $data;
     }
     public function execute()
@@ -38,7 +33,7 @@ public function execute()
         if (!$content)
         {
             $this->messageManager->addError(__('Error! No export data found.'));
-            $this->_redirect($this->redirect->getRefererUrl());
+            $this->_redirect($this->_redirect->getRefererUrl());
 
             return;
         }

diff --git a/Packetery/Checkout/Controller/Adminhtml/Order/ExportPacketeryCsvAll.php b/Packetery/Checkout/Controller/Adminhtml/Order/ExportPacketeryCsvAll.php
@@ -12,22 +12,17 @@ class ExportPacketeryCsvAll extends \Magento\Backend\App\Action
     protected $resultPageFactory;
     protected $directory_list;
 
-    /** @var \Magento\Framework\App\Response\RedirectInterface */
-    private $redirect;
-
     /** @var \Packetery\Checkout\Helper\Data */
     private $data;
 
     public function __construct(
         \Magento\Backend\App\Action\Context  $context,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Framework\App\Response\RedirectInterface $redirect,
         \Packetery\Checkout\Helper\Data $data
     ) {
         parent::__construct($context);
 
         $this->resultPageFactory  = $resultPageFactory;
-        $this->redirect = $redirect;
         $this->data = $data;
     }
     public function execute()
@@ -38,7 +33,7 @@ public function execute()
         if (!$content)
         {
             $this->messageManager->addError(__('Error! No export data found.'));
-            $this->_redirect($this->redirect->getRefererUrl());
+            $this->_redirect($this->_redirect->getRefererUrl());
 
             return;
         }

diff --git a/Packetery/Checkout/etc/module.xml b/Packetery/Checkout/etc/module.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Packetery_Checkout" setup_version="2.0.1"/>
+	<module name="Packetery_Checkout" setup_version="2.0.2"/>
 </config>