Merge remote-tracking branch 'git-36981/no-author/sales-03' into bluetooth_delivery

Author: engcom-Echo

app/code/Magento/Sales/Block/Items/AbstractItems.php

@@ -10,15 +10,14 @@
 /**
  * Abstract block for display sales (quote/order/invoice etc.) items
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
 class AbstractItems extends \Magento\Framework\View\Element\Template
 {
     /**
      * Block alias fallback
      */
-    const DEFAULT_TYPE = 'default';
+    public const DEFAULT_TYPE = 'default';
 
     /**
      * Retrieve item renderer block

app/code/Magento/Sales/Block/Order/Creditmemo.php

@@ -11,7 +11,6 @@
  * Sales order view block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Creditmemo extends \Magento\Sales\Block\Order\Creditmemo\Items
@@ -52,6 +51,8 @@ public function __construct(
     }
 
     /**
+     * Prepare Layout
+     *
      * @return void
      */
     protected function _prepareLayout()
@@ -62,6 +63,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Get payment info html
+     *
      * @return string
      */
     public function getPaymentInfoHtml()
@@ -106,6 +109,8 @@ public function getBackTitle()
     }
 
     /**
+     * Invoice URL getter
+     *
      * @param object $order
      * @return string
      */
@@ -115,6 +120,8 @@ public function getInvoiceUrl($order)
     }
 
     /**
+     * Shipment URL getter
+     *
      * @param object $order
      * @return string
      */
@@ -124,6 +131,8 @@ public function getShipmentUrl($order)
     }
 
     /**
+     * Get order view URL
+     *
      * @param object $order
      * @return string
      */
@@ -133,6 +142,8 @@ public function getViewUrl($order)
     }
 
     /**
+     * Get CreditMemo Print Url
+     *
      * @param object $creditmemo
      * @return string
      */
@@ -142,6 +153,8 @@ public function getPrintCreditmemoUrl($creditmemo)
     }
 
     /**
+     * Get PrintAll CreditMemos Url
+     *
      * @param object $order
      * @return string
      */

app/code/Magento/Sales/Block/Order/Email/Creditmemo/Items.php

@@ -16,7 +16,6 @@
  * Sales Order Email creditmemo items
  *
  * @api
- * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Items extends \Magento\Sales\Block\Items\AbstractItems

app/code/Magento/Sales/Block/Order/Email/Items.php

@@ -6,8 +6,6 @@
 
 /**
  * Sales Order Email order items
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Sales\Block\Order\Email;
 

app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php

@@ -17,7 +17,6 @@
  * Sales Order Email items default renderer
  *
  * @api
- * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class DefaultItems extends Template

app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php

@@ -12,7 +12,6 @@
  * Sales Order Email items default renderer
  *
  * @api
- * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class DefaultOrder extends \Magento\Framework\View\Element\Template

app/code/Magento/Sales/Block/Order/Info.php

@@ -5,17 +5,16 @@
  */
 namespace Magento\Sales\Block\Order;
 
-use Magento\Sales\Model\Order\Address;
-use Magento\Framework\View\Element\Template\Context as TemplateContext;
 use Magento\Framework\Registry;
+use Magento\Framework\View\Element\Template\Context as TemplateContext;
 use Magento\Payment\Helper\Data as PaymentHelper;
+use Magento\Sales\Model\Order\Address;
 use Magento\Sales\Model\Order\Address\Renderer as AddressRenderer;
 
 /**
  * Invoice view  comments form
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Info extends \Magento\Framework\View\Element\Template
@@ -26,8 +25,6 @@ class Info extends \Magento\Framework\View\Element\Template
     protected $_template = 'Magento_Sales::order/info.phtml';
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $coreRegistry = null;
@@ -64,6 +61,8 @@ public function __construct(
     }
 
     /**
+     * Prepare Layout
+     *
      * @return void
      */
     protected function _prepareLayout()
@@ -74,6 +73,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Get payment info html
+     *
      * @return string
      */
     public function getPaymentInfoHtml()

app/code/Magento/Sales/Block/Order/Invoice/Items.php

@@ -6,8 +6,6 @@
 
 /**
  * Sales order view items block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Sales\Block\Order\Invoice;
 
@@ -20,8 +18,6 @@
 class Items extends \Magento\Sales\Block\Items\AbstractItems
 {
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;

app/code/Magento/Sales/Block/Order/Items.php

@@ -4,9 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Sales\Block\Order;
 
 use Magento\Framework\App\ObjectManager;

app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php

@@ -14,7 +14,6 @@
 /**
  * Adminhtml sales orders creation process controller
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
@@ -344,7 +343,7 @@ protected function _processActionData($action = null)
                     $this->messageManager->addSuccessMessage(__('The coupon code has been accepted.'));
                 }
             }
-        } elseif (isset($data['coupon']['code']) && empty($couponCode)) {
+        } elseif (isset($data['coupon']['code']) && $couponCode=='') {
             $this->messageManager->addSuccessMessage(__('The coupon code has been removed.'));
         }