#1759 Additional support for empty arrays and invalid Entity IDs

mailchimp · Aug 4, 2023 · 456fb13 · 456fb13
1 parent 81b8ec3
commit 456fb13
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Ui/Component/Listing/Column/Monkey.php b/Ui/Component/Listing/Column/Monkey.php
@@ -122,7 +122,8 @@ public function prepareDataSource(array $dataSource)
                 $sync = $item['mailchimp_sent'];
                 $error = $item['mailchimp_sync_error'];
 
-                $order = $this->_orderFactory->create()->loadByIncrementId($orderId);
+                $order = $orderMap[$orderId]
+                    ?? $this->_orderFactory->create()->loadByIncrementId($orderId); // Backwards Compatibility
                 $menu = false;
                 $params = ['_secure' => $this->_requestInterfase->isSecure()];
                 $storeId = $order->getStoreId();
@@ -239,7 +240,7 @@ private function getOrderIncrementIds(array $dataSource): array
             return [];
         }
 
-        return array_column($dataSource['data']['items'], 'increment_id');
+        return array_filter(array_unique(array_column($dataSource['data']['items'], 'increment_id')));
     }
 
     /**
@@ -248,6 +249,10 @@ private function getOrderIncrementIds(array $dataSource): array
      */
     private function getOrderDataForIncrementIds(array $incrementIds): array
     {
+        if (empty($incrementIds)) {
+            return [];
+        }
+
         $orderCollection = $this->orderCollectionFactory->create();
         $orderCollection->getSelect()->columns(['entity_id', 'increment_id', 'store_id']);
         $orderCollection->addAttributeToFilter(