Merge branch 'release/4.0.1'

postnl · Aug 1, 2024 · d08b290 · d08b290
2 parents 9852ddb + 66c5a0b
commit d08b290
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 4.0.1
+- Fix an issue when reinstalling the plugin after updating to 4.x
+
 # 4.0.0
 #### Shopware compatibility update
 - This version is compatible with Shopware 6.6.0 and higher.

diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md
@@ -1,3 +1,6 @@
+# 4.0.1
+- Behebung eines Problems bei der Neuinstallation des Plugins nach dem Update auf 4.x
+
 # 4.0.0
 #### Update der Shopware-Kompatibilität
 - Diese Version ist kompatibel mit Shopware 6.6.0 und höher.

diff --git a/CHANGELOG_nl-NL.md b/CHANGELOG_nl-NL.md
@@ -1,3 +1,6 @@
+# 4.0.1
+- Probleem opgelost bij het opnieuw installeren van de plugin na een update naar 4.x
+
 # 4.0.0
 #### Shopware compatibiliteit update
 - Deze versie is compatibel met Shopware 6.5.2 en hoger.

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "postnl/shopware6",
     "description": "PostNL",
     "type": "shopware-platform-plugin",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "license": "proprietary",
     "authors": [
         {

diff --git a/src/Service/Shopware/ShippingMethodService.php b/src/Service/Shopware/ShippingMethodService.php
@@ -131,7 +131,7 @@ public function createShippingMethod(
                 'availabilityRuleId' => $ruleId,
                 'deliveryTimeId' => $deliveryTimeId,
                 'mediaId' => $mediaId,
-                'technicalName' => 'postnl_'.strtolower($deliveryType),
+                'technicalName' => $this->getTechnicalName($deliveryType),
                 'prices' => [
                     [
                         'calculation' => 1,
@@ -154,6 +154,11 @@ public function createShippingMethod(
         return $id;
     }
 
+    private function getTechnicalName(string $deliveryType): string
+    {
+        return 'postnl_'.strtolower($deliveryType);
+    }
+
     /**
      * @param string  $deliveryType
      * @param Context $context
@@ -163,7 +168,7 @@ public function createShippingMethod(
     private function getShippingMethodForType(string $deliveryType, Context $context): ShippingMethodEntity
     {
         $criteria = new Criteria();
-        $criteria->addFilter(new EqualsFilter('customFields.' . Defaults::CUSTOM_FIELDS_KEY . '.deliveryType', $deliveryType));
+        $criteria->addFilter(new EqualsFilter('technicalName', $this->getTechnicalName($deliveryType)));
 
         $shippingMethod = $this->shippingMethodRepository->search($criteria, $context)->first();
 
@@ -274,16 +279,6 @@ private function getMediaId(string $pluginDir, Context $context): string
             return $icon->getId();
         }
 
-        // Add icon to the media library
-//        $iconMime = 'image/svg+xml';
-//        $iconExt = 'svg';
-//        $iconPath = realpath(implode(DIRECTORY_SEPARATOR, [
-//            $pluginDir,
-//            '..',
-//            'assets',
-//            'postnl-logo-vector.svg'
-//        ]));
-
         $iconMime = 'image/png';
         $iconExt = 'png';
         $iconPath = realpath(implode(DIRECTORY_SEPARATOR, [