Merge pull request #24 from mageplaza/2.4-develop

2.4 develop
mageplaza · Jul 17, 2023 · 583fd33 · 583fd33
2 parents 44bc6c2 + 9bc950d
commit 583fd33
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Console/Delete.php b/Console/Delete.php
@@ -120,6 +120,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->_helperData->deleteRecord($orderId);
 
             $output->writeln('<info>The delete order process has been successful!</info>');
+            return 0;
         } catch (Exception $e) {
             $output->writeln("<error>{$e->getMessage()}</error>");
         }

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -106,7 +106,8 @@ public function getMatchingOrders($storeId = null, $limit = 1000)
                     'main_table.entity_id = soa.parent_id',
                     []
                 )
-                ->where('soa.country_id IN (?)', $this->getCountriesConfig($storeId));
+                ->where('soa.country_id IN (?)', $this->getCountriesConfig($storeId))
+                ->where('soa.address_type IN (?)', 'shipping');
         }
 
         return $orderCollection;
@@ -167,7 +168,7 @@ public function getOrderStatusConfig($storeId = null)
      */
     public function getOrderCustomerGroupConfig($storeId = null)
     {
-        return explode(',', $this->getScheduleConfig('customer_groups', $storeId));
+        return explode(',', (string)$this->getScheduleConfig('customer_groups', $storeId));
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -2,10 +2,10 @@
   "name": "mageplaza/module-delete-orders",
   "description": "Magento 2 Delete Orders extension",
   "require": {
-    "mageplaza/module-core": "^1.4.5"
+    "mageplaza/module-core": "^1.5.3"
   },
   "type": "magento2-module",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "license": "proprietary",
   "authors": [
     {