Merge remote-tracking branch 'firedrakes/bugfixes' into PRS

slavvka · slavvka · commit d6a8eabfe585 · 2017-07-05T12:10:16.000+03:00
diff --git a/app/code/Magento/Analytics/README.md b/app/code/Magento/Analytics/README.md
diff --git a/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml b/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
@@ -14,11 +14,6 @@
         <div class="dashboard-advanced-reports-content">
             <?= $block->escapeHtml(__('Gain new insights and take command of your business\' performance,' .
                 ' using our dynamic product, order, and customer reports tailored to your customer data.')) ?>
-            <a href="<?= $block->escapeUrl($block->getUrl('analytics/reports/show')) ?>"
-               target="_blank"
-               data-index="analytics-service-info-link">
-                <?= $block->escapeHtml(__('View details')) ?>
-            </a>
         </div>
     </div>
     <div class="dashboard-advanced-reports-actions">
diff --git a/app/code/Magento/CatalogAnalytics/README.md b/app/code/Magento/CatalogAnalytics/README.md
@@ -1,4 +1,3 @@
-## Overview
+# Magento_CatalogAnalytics module
 
-The Magento_CatalogAnalytics module provides products data for integration with
-[Magento Business Intelligence](https://magento.com/products/business-intelligence).
+The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/CustomerAnalytics/README.md b/app/code/Magento/CustomerAnalytics/README.md
@@ -1,4 +1,3 @@
-## Overview
+# Magento_CustomerAnalytics module
 
-The Magento_CustomerAnalytics module provides customers data for integration with
-[Magento Business Intelligence](https://magento.com/products/business-intelligence).
+The Magento_CustomerAnalytics module configures data definitions for a data collection related to the Customer module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/QuoteAnalytics/README.md b/app/code/Magento/QuoteAnalytics/README.md
@@ -1,4 +1,3 @@
-## Overview
+# Magento_QuoteAnalytics
 
-The Magento_QuoteAnalytics module provides quotes data for integration with
-[Magento Business Intelligence](https://magento.com/products/business-intelligence).
+The Magento_QuoteAnalytics module configures data definitions for a data collection related to the Quote module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/ReviewAnalytics/README.md b/app/code/Magento/ReviewAnalytics/README.md
@@ -1,4 +1,3 @@
-## Overview
+# Magento_ReviewAnalytics module
 
-The Magento_ReviewAnalytics module provides reviews data for integration with
-[Magento Business Intelligence](https://magento.com/products/business-intelligence).
+The Magento_ReviewAnalytics module configures data definitions for a data collection related to the Review module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/SalesAnalytics/README.md b/app/code/Magento/SalesAnalytics/README.md
@@ -1,4 +1,3 @@
-## Overview
+# Magento_SalesAnalytics module
 
-The Magento_SalesAnalytics module provides orders data for integration with
-[Magento Business Intelligence](https://magento.com/products/business-intelligence).
+The Magento_SalesAnalytics module configures data definitions for a data collection related to the Sales module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockInvoice.php b/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockInvoice.php
@@ -81,10 +81,6 @@ public function afterExecute(
         \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface $comment = null,
         \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface $arguments = null
     ) {
-        if ($this->stockConfiguration->isAutoReturnEnabled()) {
-            return $resultEntityId;
-        }
-
         $invoice = $this->invoiceRepository->get($invoiceId);
         $order = $this->orderRepository->get($invoice->getOrderId());
 
@@ -95,10 +91,11 @@ public function afterExecute(
         ) {
             $returnToStockItems = $arguments->getExtensionAttributes()->getReturnToStockItems();
         }
-
-        $creditmemo = $this->creditmemoRepository->get($resultEntityId);
-        $this->returnProcessor->execute($creditmemo, $order, $returnToStockItems);
-
+        $isAutoReturn = $this->stockConfiguration->isAutoReturnEnabled();
+        if ($isAutoReturn || !empty($returnToStockItems)) {
+            $creditmemo = $this->creditmemoRepository->get($resultEntityId);
+            $this->returnProcessor->execute($creditmemo, $order, $returnToStockItems, $isAutoReturn);
+        }
         return $resultEntityId;
     }
 }
diff --git a/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php b/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php
@@ -78,10 +78,6 @@ public function afterExecute(
         \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface $comment = null,
         \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface $arguments = null
     ) {
-        if ($this->stockConfiguration->isAutoReturnEnabled()) {
-            return $resultEntityId;
-        }
-
         $order = $this->orderRepository->get($orderId);
 
         $returnToStockItems = [];
@@ -91,10 +87,11 @@ public function afterExecute(
         ) {
             $returnToStockItems = $arguments->getExtensionAttributes()->getReturnToStockItems();
         }
-
-        $creditmemo = $this->creditmemoRepository->get($resultEntityId);
-        $this->returnProcessor->execute($creditmemo, $order, $returnToStockItems);
-
+        $isAutoReturn = $this->stockConfiguration->isAutoReturnEnabled();
+        if ($isAutoReturn || !empty($returnToStockItems)) {
+            $creditmemo = $this->creditmemoRepository->get($resultEntityId);
+            $this->returnProcessor->execute($creditmemo, $order, $returnToStockItems, $isAutoReturn);
+        }
         return $resultEntityId;
     }
 }
diff --git a/app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php b/app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php
@@ -90,11 +90,8 @@ public function execute(EventObserver $observer)
                 $returnToStockItems[] = $item->getOrderItemId();
             }
         }
-        $this->returnProcessor->execute(
-            $creditmemo,
-            $order,
-            $returnToStockItems,
-            $this->stockConfiguration->isAutoReturnEnabled()
-        );
+        if (!empty($returnToStockItems)) {
+            $this->returnProcessor->execute($creditmemo, $order, $returnToStockItems);
+        }
     }
 }
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php b/app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php
@@ -156,7 +156,6 @@ public function testRefundOrderInventory()
     {
         $ids = ['1', '14'];
         $items = [];
-        $isAutoReturnEnabled = true;
 
         $creditMemo = $this->getMock(\Magento\Sales\Model\Order\Creditmemo::class, [], [], '', false);
 
@@ -168,11 +167,6 @@ public function testRefundOrderInventory()
         $creditMemo->expects($this->once())
             ->method('getItems')
             ->will($this->returnValue($items));
-
-        $this->stockConfiguration->expects($this->any())
-            ->method('isAutoReturnEnabled')
-            ->will($this->returnValue($isAutoReturnEnabled));
-
         $this->event->expects($this->once())
             ->method('getCreditmemo')
             ->will($this->returnValue($creditMemo));
@@ -183,7 +177,7 @@ public function testRefundOrderInventory()
 
         $this->returnProcessorMock->expects($this->once())
             ->method('execute')
-            ->with($creditMemo, $this->orderMock, $ids, $isAutoReturnEnabled);
+            ->with($creditMemo, $this->orderMock, $ids);
 
         $this->observer->execute($this->eventObserver);
     }
diff --git a/app/code/Magento/WishlistAnalytics/README.md b/app/code/Magento/WishlistAnalytics/README.md
@@ -1,4 +1,3 @@
-## Overview
+# Magento_WishlistAnalytics module
 
-The Magento_WishlistAnalytics module provides wishlists data for integration with
-[Magento Business Intelligence](https://magento.com/products/business-intelligence).
+The Magento_WishlistAnalytics module configures data definitions for a data collection related to the Wishlist module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).

Original file line number	Diff line number	Diff line change
`@@ -90,11 +90,8 @@ public function execute(EventObserver $observer)`
`90`	`90`	`$returnToStockItems[] = $item->getOrderItemId();`
`91`	`91`	`}`
`92`	`92`	`}`
`93`		`- $this->returnProcessor->execute(`
`94`		`- $creditmemo,`
`95`		`- $order,`
`96`		`- $returnToStockItems,`
`97`		`- $this->stockConfiguration->isAutoReturnEnabled()`
`98`		`- );`
	`93`	`+ if (!empty($returnToStockItems)) {`
	`94`	`+ $this->returnProcessor->execute($creditmemo, $order, $returnToStockItems);`
	`95`	`+ }`
`99`	`96`	`}`
`100`	`97`	`}`