Merge pull request #508 from adobe-commerce-tier-4/PR-10-04-24

[Support Tier-4 horytsky] 10-04-2024 Regular delivery of bugfixes and improvements

Author: dhorytskyi

InventoryInStorePickupSales/Model/ResourceModel/SourceSelection/GetActiveStorePickupOrdersBySource.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryInStorePickupSales\Model\ResourceModel\SourceSelection;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\InventoryInStorePickupApi\Api\Data\PickupLocationInterface;
+
+/**
+ * Get list of orders based on pickup location code
+ */
+class GetActiveStorePickupOrdersBySource
+{
+    private const ORDER_ID  = 'order_id';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @var array
+     */
+    private $statesToFilter;
+
+    /**
+     * @param ResourceConnection $connection
+     * @param array $statesToFilter
+     */
+    public function __construct(
+        ResourceConnection $connection,
+        array $statesToFilter = []
+    ) {
+        $this->connection = $connection;
+        $this->statesToFilter = $statesToFilter;
+    }
+
+    /**
+     * Gets list of orders ids placed by store pickup which are not complete yet.
+     *
+     * @param string $pickupLocationCode
+     * @return array
+     */
+    public function execute(string $pickupLocationCode): array
+    {
+        $connection = $this->connection->getConnection('sales');
+        $table1 = $this->connection->getTableName('sales_order', 'sales');
+        $table2 = $this->connection->getTableName('inventory_pickup_location_order', 'sales');
+        $select = $connection->select()
+            ->from($table1, 'entity_id')
+            ->joinLeft($table2, 'sales_order.entity_id = ' . self::ORDER_ID)
+            ->where(
+                'inventory_pickup_location_order.' . PickupLocationInterface::PICKUP_LOCATION_CODE . '= ?',
+                $pickupLocationCode
+            )
+            ->where(OrderInterface::STATE . ' NOT IN (?)', $this->statesToFilter);
+
+        return $connection->fetchAll($select);
+    }
+}

InventoryInStorePickupSales/Model/SourceSelection/GetActiveStorePickupOrdersBySource.php

@@ -16,6 +16,9 @@
 
 /**
  * Gets list of orders placed by store pickup which are not complete yet
+ *
+ * @deprecated
+ * @see Magento\InventoryInStorePickupSales\Model\ResourceModel\SourceSelection\GetActiveStorePickupOrdersBySource
  */
 class GetActiveStorePickupOrdersBySource
 {

InventoryInStorePickupSales/Model/SourceSelection/GetOrderItemsByOrdersListAndSku.php

@@ -46,7 +46,7 @@ public function __construct(
     /**
      * Get order items by the orders list provided and a certain order item`s SKU.
      *
-     * @param OrderInterface[] $orders
+     * @param array $orders
      * @param string $sku
      * @return OrderItemSearchResultInterface
      */
@@ -58,8 +58,8 @@ public function execute(array $orders, string $sku): OrderItemSearchResultInterf
                 implode(
                     ',',
                     array_map(
-                        function (OrderInterface $order) {
-                            return $order->getEntityId();
+                        function (array $row) {
+                            return $row['entity_id'];
                         },
                         $orders
                     )

InventoryInStorePickupSales/Model/SourceSelection/GetSourceItemQtyAvailableService.php

@@ -12,6 +12,7 @@
 use Magento\InventoryApi\Api\Data\SourceItemInterface;
 use Magento\InventoryApi\Api\SourceRepositoryInterface;
 use Magento\InventorySourceSelectionApi\Model\GetSourceItemQtyAvailableInterface;
+use Magento\InventoryInStorePickupSales\Model\ResourceModel\SourceSelection\GetActiveStorePickupOrdersBySource;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
 
@@ -102,8 +103,7 @@ private function getStorePickupOrdersBySourceItem(SourceItemInterface $sourceIte
 
         if ($source->getExtensionAttributes() && $source->getExtensionAttributes()->getIsPickupLocationActive()) {
             return $this->getSourceActiveStorePickupOrders
-                ->execute($source->getSourceCode())
-                ->getItems();
+                ->execute($source->getSourceCode());
         }
 
         return [];

InventoryInStorePickupSales/Test/Integration/SourceSelection/GetActiveStorePickupOrdersBySourceTest.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryInStorePickupSales\Test\Integration\SourceSelection;
+
+use Magento\InventoryInStorePickupSales\Model\ResourceModel\SourceSelection\GetActiveStorePickupOrdersBySource;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @inheritdoc
+ */
+class GetActiveStorePickupOrdersBySourceTest extends TestCase
+{
+    /**
+     * @var GetActiveStorePickupOrdersBySource
+     */
+    private $getActiveStorePickupOrdersBySource;
+
+    protected function setUp(): void
+    {
+        $om = Bootstrap::getObjectManager();
+        $this->getActiveStorePickupOrdersBySource = $om->get(GetActiveStorePickupOrdersBySource::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento_InventoryApi::Test/_files/products.php
+     * @magentoDataFixture Magento_InventoryApi::Test/_files/sources.php
+     * @magentoDataFixture Magento_InventoryApi::Test/_files/stocks.php
+     * @magentoDataFixture Magento_InventoryApi::Test/_files/stock_source_links.php
+     * @magentoDataFixture Magento_InventorySalesApi::Test/_files/websites_with_stores.php
+     * @magentoDataFixture Magento_InventorySalesApi::Test/_files/stock_website_sales_channels.php
+     * @magentoDataFixture Magento_InventoryInStorePickupApi::Test/_files/source_items.php
+     * @magentoDataFixture Magento_InventoryIndexer::Test/_files/reindex_inventory.php
+     * @magentoDataFixture Magento_InventoryInStorePickupApi::Test/_files/source_addresses.php
+     * @magentoDataFixture Magento_InventoryInStorePickupApi::Test/_files/source_pickup_location_attributes.php
+     * @magentoDataFixture Magento_InventoryInStorePickupSalesApi::Test/_files/create_in_store_pickup_quote_on_eu_website_guest.php
+     * @magentoDataFixture Magento_InventoryInStorePickupSalesApi::Test/_files/place_order.php
+     *
+     * @magentoConfigFixture store_for_eu_website_store carriers/instore/active 1
+     *
+     * @magentoDbIsolation disabled
+     */
+    public function testExecute() : void
+    {
+        $code = 'eu-1';
+        $result = $this->getActiveStorePickupOrdersBySource->execute($code);
+        $this->assertArrayHasKey('entity_id', $result[0]);
+        $this->assertArrayHasKey('pickup_location_code', $result[0]);
+        $this->assertEquals($code, $result[0]['pickup_location_code']);
+    }
+}

InventoryInStorePickupSales/etc/di.xml

@@ -26,6 +26,15 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\InventoryInStorePickupSales\Model\ResourceModel\SourceSelection\GetActiveStorePickupOrdersBySource">
+        <arguments>
+            <argument name="statesToFilter" xsi:type="array">
+                <item xsi:type="const" name="complete">Magento\Sales\Model\Order::STATE_COMPLETE</item>
+                <item xsi:type="const" name="closed">Magento\Sales\Model\Order::STATE_CLOSED</item>
+                <item xsi:type="const" name="canceled">Magento\Sales\Model\Order::STATE_CANCELED</item>
+            </argument>
+        </arguments>
+    </type>
     <preference for="Magento\InventorySourceSelectionApi\Model\GetSourceItemQtyAvailableInterface" type="Magento\InventoryInStorePickupSales\Model\SourceSelection\GetSourceItemQtyAvailableService"/>
     <preference for="Magento\InventoryInStorePickupSalesApi\Model\IsStorePickupOrderInterface" type="Magento\InventoryInStorePickupSales\Model\IsStorePickupOrder"/>
     <type name="Magento\InventoryInStorePickupSales\Observer\UpdateOrderGrid">

InventoryProductAlert/Test/_files/product_alert_customer.php

@@ -17,4 +17,5 @@
 $stock->setCustomerId(1)
     ->setProductId($product->getId())
     ->setWebsiteId(1)
+    ->setStoreId(1)
     ->save();

InventoryProductAlert/Test/_files/product_alert_eu_website_customer.php

@@ -21,4 +21,5 @@
 $stock->setCustomerId(2)
     ->setProductId($product->getId())
     ->setWebsiteId($website->getId())
+    ->setStoreId($website->getDefaultStore()->getId())
     ->save();