🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento-engcom/magento2ce#967: #7720: Product Repository saves attribute values for existing product always on "Default Store Level"  (by @p-bystritsky)
 - #13956: Use event object in 'ajax:addToCart' trigger when adding a product to the cart (by @koenner01)
 - #13898: Send order email for Braintree Paypal orders (by @pmclain)


Fixed GitHub Issues:
 - #7720: Product Repository saves attribute values for existing product always on "Default Store Level" (reported by @itaymesh) has been fixed in magento-engcom/magento2ce#967 by @p-bystritsky in 2.2-develop branch
   Related commits:
     1. a2ae375
     2. 64a5161

 - #12186: Custom attributes values not updated (reported by @danyvega1990) has been fixed in magento-engcom/magento2ce#967 by @p-bystritsky in 2.2-develop branch
   Related commits:
     1. a2ae375
     2. 64a5161

 - #12395: Custom Magento CLI command has incorrect current store id. (reported by @Cinawork) has been fixed in magento-engcom/magento2ce#967 by @p-bystritsky in 2.2-develop branch
   Related commits:
     1. a2ae375
     2. 64a5161

 - #12792: [2.1.10] No order confirmation email after paying with PayPal Express (reported by @aeu) has been fixed in #13898 by @pmclain in 2.2-develop branch
   Related commits:
     1. 975137b
     2. aec7af9

 - #13778: Braintree Paypal Method No Order Confirmation Email Sent (reported by @snoroozi) has been fixed in #13898 by @pmclain in 2.2-develop branch
   Related commits:
     1. 975137b
     2. aec7af9

Author: magento-engcom-team

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -467,7 +467,9 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
         if (!$ignoreLinksFlag && $ignoreLinksFlag !== null) {
             $productLinks = $product->getProductLinks();
         }
-        $productDataArray['store_id'] = (int)$this->storeManager->getStore()->getId();
+        if (!isset($productDataArray['store_id'])) {
+            $productDataArray['store_id'] = (int)$this->storeManager->getStore()->getId();
+        }
         $product = $this->initializeProductData($productDataArray, empty($existingProduct));
 
         $this->processLinks($product, $productLinks);

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -97,7 +97,11 @@ define([
                 success: function (res) {
                     var eventData, parameters;
 
-                    $(document).trigger('ajax:addToCart', form.data().productSku, form, res);
+                    $(document).trigger('ajax:addToCart', {
+                        'sku': form.data().productSku,
+                        'form': form,
+                        'response': res
+                    });
 
                     if (self.isLoaderEnabled()) {
                         $('body').trigger(self.options.processStop);

app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php renamed to app/code/Magento/Quote/Observer/SubmitObserver.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Quote\Observer\Webapi;
+namespace Magento\Quote\Observer;
 
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 use Magento\Framework\Event\ObserverInterface;
@@ -13,12 +13,12 @@ class SubmitObserver implements ObserverInterface
     /**
      * @var \Psr\Log\LoggerInterface
      */
-    protected $logger;
+    private $logger;
 
     /**
      * @var OrderSender
      */
-    protected $orderSender;
+    private $orderSender;
 
     /**
      * @param \Psr\Log\LoggerInterface $logger

app/code/Magento/Quote/Test/Unit/Observer/Webapi/SubmitObserverTest.php renamed to app/code/Magento/Quote/Test/Unit/Observer/SubmitObserverTest.php

@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Quote\Test\Unit\Observer\Webapi;
+namespace Magento\Quote\Test\Unit\Observer;
 
 class SubmitObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Quote\Observer\Webapi\SubmitObserver
+     * @var \Magento\Quote\Observer\SubmitObserver
      */
     protected $model;
 
@@ -59,7 +59,7 @@ protected function setUp()
         $eventMock->expects($this->once())->method('getQuote')->willReturn($this->quoteMock);
         $eventMock->expects($this->once())->method('getOrder')->willReturn($this->orderMock);
         $this->quoteMock->expects($this->once())->method('getPayment')->willReturn($this->paymentMock);
-        $this->model = new \Magento\Quote\Observer\Webapi\SubmitObserver(
+        $this->model = new \Magento\Quote\Observer\SubmitObserver(
             $this->loggerMock,
             $this->orderSenderMock
         );

app/code/Magento/Quote/etc/frontend/events.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="sales_model_service_quote_submit_success">
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
+    </event>
+</config>

app/code/Magento/Quote/etc/webapi_rest/events.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="sales_model_service_quote_submit_success">
-        <observer name="sendEmail" instance="Magento\Quote\Observer\Webapi\SubmitObserver" />
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
     </event>
 </config>

app/code/Magento/Quote/etc/webapi_soap/events.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="sales_model_service_quote_submit_success">
-        <observer name="sendEmail" instance="Magento\Quote\Observer\Webapi\SubmitObserver" />
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
     </event>
 </config>

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php

@@ -12,6 +12,9 @@
 
 /**
  * Provide tests for ProductRepository model.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
  */
 class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
 {
@@ -122,4 +125,23 @@ public function testCreateWithoutSpecifiedType()
         self::assertSame('1.2300', $product->getWeight());
         self::assertSame('simple', $product->getTypeId());
     }
+
+    /**
+     * Tests product repository update should use provided store code.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testProductUpdate()
+    {
+        $sku = 'simple';
+        $nameUpdated = 'updated';
+        $product = $this->productRepository->get($sku, false, 0);
+        $product->setName($nameUpdated);
+        $this->productRepository->save($product);
+        $product = $this->productRepository->get($sku, false, 0);
+        self::assertEquals(
+            $nameUpdated,
+            $product->getName()
+        );
+    }
 }