MC-35416: It is not possible to Manage Shopping Cart from Customer edit page after adding product to Wish List

mastiuhin-olexandr · mastiuhin-olexandr · commit c0960da3827f · 2020-09-08T18:14:42.000+03:00
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
@@ -400,7 +400,7 @@ protected function _renderFiltersBefore()
                 ['cat_prod' => $this->getTable('catalog_product_entity')],
                 $this->getConnection()
                     ->quoteInto(
-                        'cat_prod.type_id IN (?) AND main_table.product_id = cat_prod.entity_id',
+                        "cat_prod.type_id IN (?) AND {$mainTableName}.product_id = cat_prod.entity_id",
                         $availableProductTypes
                     ),
                 []
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/ResourceModel/Item/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/ResourceModel/Item/CollectionTest.php
@@ -69,11 +69,14 @@ public function testLoadedProductAttributes()
      *
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     * @magentoDbIsolation disabled
      */
-    public function testGonnaCutYouDown()
+    public function testLoadWhenFewProductsPresent()
     {
         $this->itemCollection->setSalableFilter(true);
+        $this->itemCollection->addCustomerIdFilter(1);
         $this->itemCollection->load();
+        $this->assertCount(1, $this->itemCollection->getItems());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,14 @@ public function testLoadedProductAttributes()`
`69`	`69`	`*`
`70`	`70`	`* @magentoDataFixture Magento/Catalog/_files/second_product_simple.php`
`71`	`71`	`* @magentoDataFixture Magento/Wishlist/_files/wishlist.php`
	`72`	`+ * @magentoDbIsolation disabled`
`72`	`73`	`*/`
`73`		`- public function testGonnaCutYouDown()`
	`74`	`+ public function testLoadWhenFewProductsPresent()`
`74`	`75`	`{`
`75`	`76`	`$this->itemCollection->setSalableFilter(true);`
	`77`	`+ $this->itemCollection->addCustomerIdFilter(1);`
`76`	`78`	`$this->itemCollection->load();`
	`79`	`+ $this->assertCount(1, $this->itemCollection->getItems());`
`77`	`80`	`}`
`78`	`81`
`79`	`82`	`/**`