Merge pull request #243 from magmodules/release/1.21.1

Release/1.21.1

Author: Marvin-Magmodules

Service/Order/Import.php

@@ -10,6 +10,7 @@
 use Exception;
 use Magento\CatalogInventory\Observer\ItemsForReindex;
 use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Quote\Api\CartRepositoryInterface;
@@ -125,6 +126,11 @@ class Import
      */
     protected $quoteRepository;
 
+    /**
+     * @var ManagerInterface
+     */
+    private $eventManager;
+
     /**
      * @var LoggerRepository
      */
@@ -149,6 +155,7 @@ public function __construct(
         Process\GetCustomIncrementId $getCustomIncrementId,
         ChannableOrderRepository $channableOrderRepository,
         CartRepositoryInterface $quoteRepository,
+        ManagerInterface $eventManager,
         LoggerRepository $logger
     ) {
         $this->configProvider = $configProvider;
@@ -169,6 +176,7 @@ public function __construct(
         $this->getCustomIncrementId = $getCustomIncrementId;
         $this->channableOrderRepository = $channableOrderRepository;
         $this->quoteRepository = $quoteRepository;
+        $this->eventManager = $eventManager;
         $this->logger = $logger;
     }
 
@@ -212,14 +220,16 @@ public function execute(ChannableOrderData $orderData): OrderInterface
             if ($customIncrementId = $this->getCustomIncrementId->execute($orderData, $store)) {
                 $quote->setReservedOrderId($customIncrementId);
             }
-
+            
             $this->quoteRepository->save($quote);
 
             if ($lvbOrder && $this->configProvider->disableStockMovementForLvbOrders($storeId)) {
                 $quote->setInventoryProcessed(true);
                 $this->itemsForReindex->clear();
             }
 
+            $this->eventManager->dispatch('checkout_submit_before', ['quote' => $quote]);
+
             $order = $this->quoteManagement->submit($quote);
             $order->setTransactionFee($quote->getTransactionFee());
 
@@ -242,6 +252,9 @@ public function execute(ChannableOrderData $orderData): OrderInterface
             $this->afterOrderImport($order, $storeId, $lvbOrder);
             $this->setChannableOrderImportSuccess($channableOrder, $order);
             $this->orderRepository->save($order);
+
+            $this->eventManager->dispatch('checkout_submit_all_after', ['order' => $order, 'quote' => $quote]);
+
             return $order;
         } catch (Exception $exception) {
             $couldNotImportMsg = self::COULD_NOT_IMPORT_ORDER;

Service/Order/Process/CreateInvoice.php

@@ -8,6 +8,7 @@
 namespace Magmodules\Channable\Service\Order\Process;
 
 use Magento\Framework\DB\Transaction;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Api\Data\InvoiceInterface;
@@ -55,6 +56,11 @@ class CreateInvoice
      */
     private $orderConfig;
 
+    /**
+     * @var ManagerInterface
+     */
+    private $eventManager;
+
     /**
      * CreateInvoice constructor.
      *
@@ -70,14 +76,16 @@ public function __construct(
         InvoiceSender $invoiceSender,
         OrderCommentHistory $orderCommentHistory,
         ConfigProvider $configProvider,
-        OrderConfig $orderConfig
+        OrderConfig $orderConfig,
+        ManagerInterface $eventManager
     ) {
         $this->invoiceService = $invoiceService;
         $this->transaction = $transaction;
         $this->invoiceSender = $invoiceSender;
         $this->orderCommentHistory = $orderCommentHistory;
         $this->configProvider = $configProvider;
         $this->orderConfig = $orderConfig;
+        $this->eventManager = $eventManager;
     }
 
     /**
@@ -116,6 +124,7 @@ public function execute(OrderInterface $order)
 
             $this->transaction->addObject($order)->save();
             $this->sendInvoice($invoice, $order);
+            $this->eventManager->dispatch('sales_order_payment_pay', ['payment' => $order->getPayment(), 'invoice' => $invoice]);
         }
     }
 

Service/Product/InventoryData.php

@@ -165,13 +165,15 @@ public function getLinkedSimpleProductsFromBundle(array $skus): void
     public function load(array $skus, array $config): void
     {
         if (isset($config['inventory']['stock_id'])) {
-            $this->getInventoryData($skus, (int)$config['inventory']['stock_id']);
-            $this->getReservations($skus, (int)$config['inventory']['stock_id']);
-
             if ($this->configProvider->isBundleStockCalculationEnabled((int)$config['store_id'])) {
                 $this->getLinkedSimpleProductsFromBundle($skus);
+                $skus += array_column(
+                    array_merge(...array_values($this->bundleParentSimpleRelation)), 'sku'
+                );
             }
-
+            
+            $this->getInventoryData($skus, (int)$config['inventory']['stock_id']);
+            $this->getReservations($skus, (int)$config['inventory']['stock_id']);
             if (!empty($config['inventory']['inventory_source_items'])) {
                 $this->getInventorySourceItems($skus);
             }
@@ -277,4 +279,4 @@ private function getStockDataBySku(string $sku, array $config): array
             'source_item' => $sourceItems,
         ];
     }
-}
+}

Service/Returns/GetSkuFromGtin.php

@@ -8,41 +8,34 @@
 namespace Magmodules\Channable\Service\Returns;
 
 use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magmodules\Channable\Api\Config\RepositoryInterface as ConfigProvider;
 use Magmodules\Channable\Api\Log\RepositoryInterface as LogRepository;
 
 class GetSkuFromGtin
 {
-    /**
-     * @var string
-     */
     private $gtinAttribute;
-    /**
-     * @var ProductFactory
-     */
-    private $productFactory;
-    /**
-     * @var ConfigProvider
-     */
-    private $configProvider;
-    /**
-     * @var LogRepository
-     */
-    private $logRepository;
+    private ProductFactory $productFactory;
+    private ConfigProvider $configProvider;
+    private LogRepository $logRepository;
+    private ProductCollectionFactory $productCollectionFactory;
 
     /**
      * @param ProductFactory $productFactory
      * @param ConfigProvider $configProvider
      * @param LogRepository $logRepository
+     * @param ProductCollectionFactory $productCollectionFactory
      */
     public function __construct(
         ProductFactory $productFactory,
         ConfigProvider $configProvider,
-        LogRepository $logRepository
+        LogRepository $logRepository,
+        ProductCollectionFactory $productCollectionFactory
     ) {
         $this->productFactory = $productFactory;
         $this->configProvider = $configProvider;
         $this->logRepository = $logRepository;
+        $this->productCollectionFactory = $productCollectionFactory;
     }
 
     /**
@@ -63,7 +56,14 @@ public function execute(?string $gtin, int $storeId): ?string
                     return $product->getSku();
                 }
             }
-            if ($product = $this->productFactory->create()->loadByAttribute($gtinAttribute, $gtin)) {
+            $product = $this->productCollectionFactory->create()
+                ->setStoreId($storeId)
+                ->addAttributeToSelect(['sku', $gtinAttribute])
+                ->addAttributeToFilter($gtinAttribute, $gtin)
+                ->setPageSize(1)
+                ->getFirstItem();
+
+            if ($product && $product->getId()) {
                 return $product->getSku();
             }
         } catch (\Exception $exception) {

composer.json

@@ -2,7 +2,7 @@
     "name": "magmodules/magento2-channable",
     "description": "Channable integration for Magento 2",
     "type": "magento2-module",
-    "version": "1.21.0",
+    "version": "1.21.1",
     "license": "BSD-2-Clause",
     "homepage": "https://github.com/magmodules/magento2-channable",
     "require": {

etc/config.xml

@@ -12,7 +12,7 @@
             <general>
                 <enable>0</enable>
                 <limit>250</limit>
-                <version>v1.21.0</version>
+                <version>v1.21.1</version>
             </general>
             <data>
                 <name_attribute>name</name_attribute>