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

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

-<?php
-
-namespace Joshine\Review\Block;
-
-use Joshine\Review\Model\ResourceModel\Images\Collection;
-use Joshine\Review\Helper\ImageHelper;
-use Magento\Framework\View\Element\Template;
-use Joshine\Review\Model\ResourceModel\Images\CollectionFactory;
-
-/**
- * Class Images
- * @package Amasty\AdvancedReview\Block
- */
-class Images extends \Magento\Framework\View\Element\Template
-{
-    //评论缩略图宽度
-    const REVIEW_COVER_WIDTH = 200;
-
-    /**
-     * @var string
-     */
-    protected $_template = 'Joshine_Review::images.phtml';
-
-    private $reviewId;
-
-    private $productId;
-
-    /**
-     * @var int
-     */
-
-    /**
-     * @var \Magento\Framework\Json\EncoderInterface
-     */
-    private $jsonEncoder;
-    /**
-     * @var CollectionFactory
-     */
-    private $collectionFactory;
-
-    /**
-     * @var ImageHelper
-     */
-    private $imageHelper;
-
-    public function __construct(
-        Template\Context $context,
-        CollectionFactory $collectionFactory,
-        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
-        ImageHelper $imageHelper,
-        array $data = []
-    ) {
-        parent::__construct($context, $data);
-        $this->jsonEncoder       = $jsonEncoder;
-        $this->collectionFactory = $collectionFactory;
-        $this->imageHelper       = $imageHelper;
-    }
-
-    /**
-     * @return int
-     */
-    public function getReviewId(): int
-    {
-        return $this->reviewId;
-    }
-
-    /**
-     * @param $reviewId
-     *
-     * @return $this
-     */
-    public function setReviewId($reviewId): Images
-    {
-        $this->reviewId = $reviewId;
-        return $this;
-    }
-
-    public function setProductId($productId): Images
-    {
-        $this->productId = $productId;
-        return $this;
-    }
-
-    public function getProductId()
-    {
-        return $this->productId;
-    }
-
-    public function getCollection() {
-        /** @var Collection $collection */
-        $collection = $this->collectionFactory->create()
-            ->addFieldToSelect('*')
-            ->addFieldToFilter('review_id', $this->getReviewId());
-
-        return $collection;
-    }
-
-
-    public function getFullImagePath($item): string
-    {
-        return $this->imageHelper->getFullPath($item->getPath());
-    }
-
-    /**
-     * @param $item
-     * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    public function getResizedImagePath($item): string
-    {
-        return $this->imageHelper->resize($item->getPath(), self::REVIEW_COVER_WIDTH);
-    }
-
-    /**
-     * @param $item
-     * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    public function getResizedImagePathByLimit($item, $width): string
-    {
-        return $this->imageHelper->resize($item->getPath(), $width);
-    }
-
-}
+<?php
+
+namespace Joshine\Review\Block;
+
+use Joshine\Review\Model\ResourceModel\Images\Collection;
+use Joshine\Review\Helper\ImageHelper;
+use Magento\Framework\View\Element\Template;
+use Joshine\Review\Model\ResourceModel\Images\CollectionFactory;
+
+/**
+ * Class Images
+ * @package Amasty\AdvancedReview\Block
+ */
+class Images extends \Magento\Framework\View\Element\Template
+{
+    //评论缩略图宽度
+    const REVIEW_COVER_WIDTH = 200;
+
+    /**
+     * @var string
+     */
+    protected $_template = 'Joshine_Review::images.phtml';
+
+    private $reviewId;
+
+    private $productId;
+
+    /**
+     * @var int
+     */
+
+    /**
+     * @var \Magento\Framework\Json\EncoderInterface
+     */
+    private $jsonEncoder;
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var ImageHelper
+     */
+    private $imageHelper;
+
+    public function __construct(
+        Template\Context $context,
+        CollectionFactory $collectionFactory,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
+        ImageHelper $imageHelper,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->jsonEncoder       = $jsonEncoder;
+        $this->collectionFactory = $collectionFactory;
+        $this->imageHelper       = $imageHelper;
+    }
+
+    /**
+     * @return int
+     */
+    public function getReviewId()
+    {
+        return $this->reviewId;
+    }
+
+    /**
+     * @param $reviewId
+     *
+     * @return $this
+     */
+    public function setReviewId($reviewId)
+    {
+        $this->reviewId = $reviewId;
+        return $this;
+    }
+
+    public function setProductId($productId)
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    public function getProductId()
+    {
+        return $this->productId;
+    }
+
+    public function getCollection() {
+        /** @var Collection $collection */
+        $collection = $this->collectionFactory->create()
+            ->addFieldToSelect('*')
+            ->addFieldToFilter('review_id', $this->getReviewId());
+
+        return $collection;
+    }
+
+
+    public function getFullImagePath($item)
+    {
+        return $this->imageHelper->getFullPath($item->getPath());
+    }
+
+    /**
+     * @param $item
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getResizedImagePath($item)
+    {
+        return $this->imageHelper->resize($item->getPath(), self::REVIEW_COVER_WIDTH);
+    }
+
+    /**
+     * @param $item
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getResizedImagePathByLimit($item, $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