Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branch_developer

app/code/Joshine/Review/Block/Images.php

@@ -59,7 +59,7 @@ class Images extends \Magento\Framework\View\Element\Template
     /**
     /**
      * @return int
      * @return int
      */
      */
-    public function getReviewId(): int
+    public function getReviewId()
     {
     {
         return $this->reviewId;
         return $this->reviewId;
     }
     }
@@ -69,13 +69,13 @@ class Images extends \Magento\Framework\View\Element\Template
      *
      *
      * @return $this
      * @return $this
      */
      */
-    public function setReviewId($reviewId): Images
+    public function setReviewId($reviewId)
     {
     {
         $this->reviewId = $reviewId;
         $this->reviewId = $reviewId;
         return $this;
         return $this;
     }
     }
 
 
-    public function setProductId($productId): Images
+    public function setProductId($productId)
     {
     {
         $this->productId = $productId;
         $this->productId = $productId;
         return $this;
         return $this;
@@ -96,7 +96,7 @@ class Images extends \Magento\Framework\View\Element\Template
     }
     }
 
 
 
 
-    public function getFullImagePath($item): string
+    public function getFullImagePath($item)
     {
     {
         return $this->imageHelper->getFullPath($item->getPath());
         return $this->imageHelper->getFullPath($item->getPath());
     }
     }
@@ -106,7 +106,7 @@ class Images extends \Magento\Framework\View\Element\Template
      * @return string
      * @return string
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
      */
-    public function getResizedImagePath($item): string
+    public function getResizedImagePath($item)
     {
     {
         return $this->imageHelper->resize($item->getPath(), self::REVIEW_COVER_WIDTH);
         return $this->imageHelper->resize($item->getPath(), self::REVIEW_COVER_WIDTH);
     }
     }
@@ -116,7 +116,7 @@ class Images extends \Magento\Framework\View\Element\Template
      * @return string
      * @return string
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
      */
-    public function getResizedImagePathByLimit($item, $width): string
+    public function getResizedImagePathByLimit($item, $width)
     {
     {
         return $this->imageHelper->resize($item->getPath(), $width);
         return $this->imageHelper->resize($item->getPath(), $width);
     }
     }

app/code/Joshine/Sales/Plugin/DefaultRendererPlugin.php

@@ -2,6 +2,7 @@
 namespace Joshine\Sales\Plugin;
 namespace Joshine\Sales\Plugin;
 
 
 use \Magento\Catalog\Helper\Image as ImageHelper;
 use \Magento\Catalog\Helper\Image as ImageHelper;
+use Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer;
 
 
 class DefaultRendererPlugin {
 class DefaultRendererPlugin {
 
 
@@ -40,4 +41,13 @@ class DefaultRendererPlugin {
 
 
         return $result;
         return $result;
     }
     }
+
+    public function afterGetColumns(DefaultRenderer $subject, $result)
+    {
+        if (isset($result['image'])) {
+            unset($result['image']);
+            $result = array_merge(['image'=>'col-image'], $result);
+        }
+        return $result;
+    }
 }
 }
\ No newline at end of file

app/code/Joshine/Sales/Plugin/ItemsSortPlugin.php

+<?php
+namespace Joshine\Sales\Plugin;
+
+use \Magento\Catalog\Helper\Image as ImageHelper;
+use Magento\Sales\Block\Adminhtml\Order\View\Items;
+class ItemsSortPlugin {
+    public function afterGetColumns(Items $subject, $result)
+    {
+        if (isset($result['image'])) {
+            unset($result['image']);
+            $result = array_merge(['image'=>'Product Image'], $result);
+        }
+        return $result;
+    }
+}

app/code/Joshine/Sales/etc/di.xml

@@ -3,4 +3,7 @@
     <type name="Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer">
     <type name="Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer">
         <plugin name="order-view-image" type="Joshine\Sales\Plugin\DefaultRendererPlugin" sortOrder="1" />
         <plugin name="order-view-image" type="Joshine\Sales\Plugin\DefaultRendererPlugin" sortOrder="1" />
     </type>
     </type>
+    <type name="\Magento\Sales\Block\Adminhtml\Order\View\Items">
+        <plugin name="order-item-sort" type="Joshine\Sales\Plugin\ItemsSortPlugin" sortOrder="1" />
+    </type>
 </config>
 </config>
\ No newline at end of file