Merge pull request #12 from SysteembeheerEdg/feature/SEDG-413

Magento 2.4.6 compatible

Cron/API/AbstractCron.php

@@ -253,7 +253,6 @@ public function sendErrorMail(string $email, string $subject, string $content):
      * @param int $priority
      * @param array $params
      * @return void
-     * @throws Exception
      */
     protected function serviceLog($stream, $message, int $priority = Logger::INFO, array $params = [])
     {
@@ -271,7 +270,6 @@ protected function serviceLog($stream, $message, int $priority = Logger::INFO, a
     /**
      * @param $path
      * @return Logger
-     * @throws Exception
      */
     protected function addLogStreamToServiceLogger($path): Logger
     {

Cron/API/ArticleInfo.php

@@ -43,11 +43,6 @@ class ArticleInfo extends AbstractCron
      */
     protected TierPriceManagement $tierpriceManagement;
 
-    /**
-     * @var TransportBuilder
-     */
-    protected TransportBuilder $transportBuilder;
-
     /**
      * @var Job
      */
@@ -190,7 +185,7 @@ protected function processProduct(\Edg\ErpService\DataModel\ArticleInfo $article
         $prefix = $this->helper->getSkuPrefix();
 
         // Truncate prefix
-        $sku = substr($productdata['sku'], strlen($prefix));
+        $sku = substr($productdata['sku'], strlen((string)$prefix));
 
         try {
             $product = $this->productRepository->get($sku, true);

Cron/API/ArticleInfoUpdate.php

@@ -18,11 +18,6 @@
 
 class ArticleInfoUpdate extends ArticleInfo
 {
-    /**
-     * @var TransportBuilder
-     */
-    protected TransportBuilder $transportBuilder;
-
     /**
      * @param Data $helper
      * @param DirectoryList $directoryList

Cron/API/OrderExport.php

@@ -38,11 +38,6 @@ class OrderExport extends AbstractCron
      */
     protected OrderToDataModel $orderConverter;
 
-    /**
-     * @var TransportBuilder
-     */
-    protected TransportBuilder $transportBuilder;
-
     /**
      * @var OrderRepositoryInterface
      */
@@ -104,24 +99,23 @@ public function execute()
     {
         // TODO: Implement execute() method.
         if ($this->settings['force_order_upload'] === true) {
-            $this->prepareExport(true);
+            $this->prepareExport();
             return;
         }
         if ($this->helper->isUploadOrdersEnabled()) {
-            $this->prepareExport(false);
+            $this->prepareExport();
         } else {
             $this->moduleLog(__METHOD__ . '(); - isUploadOrdersEnabled setting disabled, skipping.', true);
         }
     }
 
     /**
-     * @param bool $force
      * @return $this
      * @throws LocalizedException
      * @throws NoSuchEntityException
      * @throws Exception
      */
-    protected function prepareExport(bool $force = false): OrderExport
+    protected function prepareExport(): OrderExport
     {
         $date = date("Y_m_d");
         $stream = $this->addLogStreamToServiceLogger($this->_exportDir . DIRECTORY_SEPARATOR . "log_{$date}.log");

Cron/API/OrderStatusImport.php

@@ -48,16 +48,6 @@ class OrderStatusImport extends AbstractCron
      */
     protected ShipmentSender $shipmentMailer;
 
-    /**
-     * @var Monolog
-     */
-    protected Monolog $monolog;
-
-    /**
-     * @var TransportBuilder
-     */
-    protected TransportBuilder $transportBuilder;
-
     /**
      * @var TrackFactory
      */
@@ -74,6 +64,7 @@ class OrderStatusImport extends AbstractCron
      * @param ShipmentFactory $shipmentFactory
      * @param Transaction $transaction
      * @param ShipmentSender $sender
+     * @param TrackFactory $trackFactory
      * @param array $settings
      * @throws FileSystemException
      */
@@ -279,8 +270,6 @@ protected function getItemsToShip(
 
         $itemsToShip = [];
 
-        $skuPrefix = $this->helper->getSkuPrefix();
-
         foreach ($magentoOrder->getAllItems() as $item) {
             $itemSku = $item->getSku();
 

Cron/API/StockMutations.php

@@ -18,11 +18,6 @@
 class StockMutations extends AbstractCron
 {
 
-    /**
-     * @var TransportBuilder
-     */
-    protected TransportBuilder $transportBuilder;
-
     /**
      * @var StockRegistryInterface
      */

Helper/Data.php

@@ -228,13 +228,11 @@ public function getFullSkusArray()
     public function log($msg, $debug = false)
     {
         if ($debug) {
-            if ($this->scopeConfig->isSetFlag(self::XML_CONFIG_PATH_SETTING_DEBUG_ENABLED,
-                ScopeInterface::SCOPE_STORE)
-            ) {
-                $this->moduleLog->addDebug($msg);
+            if ($this->scopeConfig->isSetFlag(self::XML_CONFIG_PATH_SETTING_DEBUG_ENABLED, ScopeInterface::SCOPE_STORE)) {
+                $this->moduleLog->debug($msg);
             }
         } else {
-            $this->moduleLog->addInfo($msg);
+            $this->moduleLog->info($msg);
         }
     }
 

Model/Convert/OrderToDataModel.php

@@ -160,7 +160,7 @@ protected function processStatusComments(Order $order, &$data): OrderToDataModel
                 }
             }
 
-            if (strlen($comment) > 0) {
+            if (strlen((string)$comment) > 0) {
                 $_buffer[] = $_historyItem->getData('comment');
             }
         }

Observer/Frontend/PreventDuplicateSkuInCheckout.php

@@ -3,6 +3,7 @@
 namespace Edg\Erp\Observer\Frontend;
 
 
+use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\ScopeInterface;
 
@@ -31,7 +32,12 @@ public function __construct(
         $this->actionFlag = $actionFlag;
     }
 
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    /**
+     * @param Observer $observer
+     * @return false|void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute(Observer $observer)
     {
         if (!$this->scopeConfig->isSetFlag('bold_orderexim/settings/block_duplicate_sku',
             ScopeInterface::SCOPE_STORE)
@@ -60,4 +66,4 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             }
         }
     }
-}
+}

Plugin/Block/Admin/Shipping/Tracking.php

@@ -5,22 +5,26 @@
 
 class Tracking
 {
+    /**
+     * @param \Magento\Shipping\Block\Adminhtml\Order\Tracking $subject
+     * @param $result
+     * @return array|mixed
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
     public function afterGetCarriers(
         \Magento\Shipping\Block\Adminhtml\Order\Tracking $subject,
         $result
     )
     {
-        if(!is_array($result)){
+        if (!is_array($result)) {
             return $result;
         }
 
-        foreach($result as $code=>$label){
-            if($code == 'PostNL'){
-                return $result;
-            }
+        if (array_key_exists('PostNL', $result)) {
+            return $result;
         }
 
         $result['PostNL'] = __('PostNL');
         return $result;
     }
-}
+}

Plugin/Helper/Shipping/Data.php

@@ -2,22 +2,26 @@
 
 namespace Edg\Erp\Plugin\Helper\Shipping;
 
+use Magento\Framework\Exception\LocalizedException;
 
 class Data
 {
     protected $helper;
-    
+
     public function __construct(
         \Edg\Erp\Helper\Tracktrace $helper
     )
     {
-        $this->helper = $helper;    
+        $this->helper = $helper;
     }
 
     /**
      * @param \Magento\Shipping\Helper\Data $subject
      * @param \Closure $proceed
      * @param $model
+     * @return mixed|string
+     * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundGetTrackingPopupUrlBySalesModel(
         \Magento\Shipping\Helper\Data $subject,
@@ -32,4 +36,4 @@ public function aroundGetTrackingPopupUrlBySalesModel(
 
         return $proceed($model);
     }
-}
+}

README.md

@@ -16,8 +16,8 @@ Delete the Bold_PIM and Bold_PIMService from the app/code directory
 - Run ```rm -rf app/code/Bold/PIMService``` from the root of the project
 
 Install the latest versions of the Edg_Erp and Edg_ErpService modules by adding the modules and the corresponding repositories to the composer.json file
-- ```“edg/module-erp-koppeling": “0.3.0”```
-- ```“edg/module-erp-service": “0.1.1”```
+- ```“edg/module-erp-koppeling": “0.4.0”```
+- ```“edg/module-erp-service": “0.1.2”```
 - ```
   "edg-erp": {
       "type": "git",

composer.json

@@ -4,7 +4,8 @@
   "require": {
     "php": "~8.1.0",
     "edg/module-erp-service": "*",
-    "magento/magento2-base": "^2.1.9"
+    "magento/magento2-base": "^2.1.9",
+    "monolog/monolog": "^2.0|^3.0"
   },
   "type": "magento2-module",
   "license": [