Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-94114

Author: DianaRusin

app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php

@@ -6,15 +6,21 @@
 
 namespace Magento\CatalogInventory\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
+use Magento\CatalogInventory\Model\Configuration;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Catalog inventory module observer
  */
 class CancelOrderItemObserver implements ObserverInterface
 {
+    /**
+     * @var \Magento\CatalogInventory\Model\Configuration
+     */
+    protected $configuration;
+
     /**
      * @var StockManagementInterface
      */
@@ -26,13 +32,16 @@ class CancelOrderItemObserver implements ObserverInterface
     protected $priceIndexer;
 
     /**
+     * @param Configuration $configuration
      * @param StockManagementInterface $stockManagement
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
      */
     public function __construct(
+        Configuration $configuration,
         StockManagementInterface $stockManagement,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
     ) {
+        $this->configuration = $configuration;
         $this->stockManagement = $stockManagement;
         $this->priceIndexer = $priceIndexer;
     }
@@ -49,7 +58,8 @@ public function execute(EventObserver $observer)
         $item = $observer->getEvent()->getItem();
         $children = $item->getChildrenItems();
         $qty = $item->getQtyOrdered() - max($item->getQtyShipped(), $item->getQtyInvoiced()) - $item->getQtyCanceled();
-        if ($item->getId() && $item->getProductId() && empty($children) && $qty) {
+        if ($item->getId() && $item->getProductId() && empty($children) && $qty && $this->configuration
+            ->getCanBackInStock()) {
             $this->stockManagement->backItemQty($item->getProductId(), $qty, $item->getStore()->getWebsiteId());
         }
         $this->priceIndexer->reindexRow($item->getProductId());

app/code/Magento/Quote/Model/Quote/Address/Total.php

@@ -6,6 +6,8 @@
 namespace Magento\Quote\Model\Quote\Address;
 
 /**
+ * Class Total
+ *
  * @method string getCode()
  *
  * @api
@@ -54,6 +56,8 @@ public function __construct(
      */
     public function setTotalAmount($code, $amount)
     {
+        $amount = is_float($amount) ? round($amount, 4) : $amount;
+
         $this->totalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
             $code = $code . '_amount';
@@ -72,6 +76,8 @@ public function setTotalAmount($code, $amount)
      */
     public function setBaseTotalAmount($code, $amount)
     {
+        $amount = is_float($amount) ? round($amount, 4) : $amount;
+
         $this->baseTotalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
             $code = $code . '_amount';
@@ -167,6 +173,7 @@ public function getAllBaseTotalAmounts()
 
     /**
      * Set the full info, which is used to capture tax related information.
+     *
      * If a string is used, it is assumed to be serialized.
      *
      * @param array|string $info

app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Reports\Model\ResourceModel\Order;
 
 use Magento\Framework\DB\Select;
@@ -81,7 +80,7 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Sales\Model\ResourceModel\Report\OrderFactory $reportOrderFactory
-     * @param null $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -825,7 +824,7 @@ protected function getTotalsExpression(
     ) {
         $template = ($storeId != 0)
             ? '(main_table.base_subtotal - %2$s - %1$s - ABS(main_table.base_discount_amount) - %3$s)'
-            : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) - %3$s) '
+            : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) + %3$s) '
                 . ' * main_table.base_to_global_rate)';
         return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountCanceled);
     }

app/code/Magento/Sales/Model/Order/CreditmemoFactory.php

@@ -200,6 +200,7 @@ protected function initData($creditmemo, $data)
     {
         if (isset($data['shipping_amount'])) {
             $creditmemo->setBaseShippingAmount((double)$data['shipping_amount']);
+            $creditmemo->setBaseShippingInclTax((double)$data['shipping_amount']);
         }
         if (isset($data['adjustment_positive'])) {
             $creditmemo->setAdjustmentPositive($data['adjustment_positive']);
@@ -210,6 +211,8 @@ protected function initData($creditmemo, $data)
     }
 
     /**
+     * Calculate product options.
+     *
      * @param Item $orderItem
      * @param int $parentQty
      * @return int

app/code/Magento/Ui/i18n/en_US.csv

@@ -202,3 +202,4 @@ CSV,CSV
 "Please enter at least {0} characters.","Please enter at least {0} characters."
 "Please enter a value between {0} and {1} characters long.","Please enter a value between {0} and {1} characters long."
 "Please enter a value between {0} and {1}.","Please enter a value between {0} and {1}."
+"The file upload field is disabled.","The file upload field is disabled."

app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js

@@ -13,8 +13,9 @@ define([
     'Magento_Ui/js/modal/alert',
     'Magento_Ui/js/lib/validation/validator',
     'Magento_Ui/js/form/element/abstract',
+    'mage/translate',
     'jquery/file-uploader'
-], function ($, _, utils, uiAlert, validator, Element) {
+], function ($, _, utils, uiAlert, validator, Element, $t) {
     'use strict';
 
     return Element.extend({
@@ -328,6 +329,12 @@ define([
                 allowed  = this.isFileAllowed(file),
                 target   = $(e.target);
 
+            if (this.disabled()) {
+                this.notifyError($t('The file upload field is disabled.'));
+
+                return;
+            }
+
             if (allowed.passed) {
                 target.on('fileuploadsend', function (event, postData) {
                     postData.data.append('param_name', this.paramName);