Merge pull request #3 from AREA-NET-GmbH-Shopware-Agentur/main-6.7

Update auf Shopware 6.7

Author: areanet-schmid

CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this plugin will be documented in this file
 
 
+## [2.0.0] - 2025-11-19
+- Support for Shopware 6.7
+
 ## [1.2.1] - 2025-03-11
 - Bug: Incorrect service decoration: Shopware\Core\Checkout\Cart\Delivery\DeliveryBuilder
 

README.md

@@ -8,12 +8,11 @@ Delivery times are a decisive factor in your customers' purchasing decisions. In
 
 ## Unterstützte Shopware Versionen und Changelog
 
-Stand 07.03.2025:
-- **6.5.8(.18) - 6.6.10.2**
+Stand 19.11.2025:
+- **6.5.8 - 6.7.4**
 - [CHANGELOG](AreanetBetterDeliveryTime/CHANGELOG.md)
 - [Download](https://github.com/AREA-NET-GmbH-Shopware-Agentur/shopware6-plugin-better-delivery-time/releases/)
 
-Das Plugin wurde mit der letzten 6.5.8.18 getestet.
 
 ## Installation
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "areanet/betterdeliverytime",
     "description": "Better delivery time calculation",
-    "version": "1.2.1",
+    "version": "2.0.0",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "autoload": {
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "shopware/core": "~6.5.0 || ~6.6.0"
+        "shopware/core": "~6.5.0 || ~6.6.0 || ~6.7.0"
     },
     "extra": {
         "shopware-plugin-class": "AreanetBetterDeliveryTime\\AreanetBetterDeliveryTime",

src/Resources/config/services.xml

@@ -17,6 +17,7 @@
 
         <service id="AreanetBetterDeliveryTime\Subscriber\ProductSubscriber" public="true">
             <argument type="service" id="Shopware\Core\System\SystemConfig\SystemConfigService" />
+            <argument type="service" id="delivery_time.repository"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 

src/Subscriber/ProductSubscriber.php

@@ -2,16 +2,20 @@
 
 namespace AreanetBetterDeliveryTime\Subscriber;
 
+use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\System\SystemConfig\SystemConfigService;
 use Shopware\Storefront\Page\Product\ProductPageLoadedEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class ProductSubscriber implements EventSubscriberInterface
 {
     protected SystemConfigService $systemConfigService;
+    protected EntityRepository $deliveryTimeRepository;
 
-    public function __construct(SystemConfigService $systemConfigService){
-        $this->systemConfigService = $systemConfigService;
+    public function __construct(SystemConfigService $systemConfigService, EntityRepository $deliveryTimeRepository){
+        $this->systemConfigService      = $systemConfigService;
+        $this->deliveryTimeRepository   = $deliveryTimeRepository;
     }
 
     public static function getSubscribedEvents(): array
@@ -31,6 +35,11 @@ public function onProductPageLoaded(ProductPageLoadedEvent $event): void
         }
 
         $deliveryTime = $salesChannelContext->getShippingMethod()->getDeliveryTime();
+        if(!$deliveryTime){
+            $deliveryTimeId = $salesChannelContext->getShippingMethod()->getDeliveryTimeId();
+            $deliveryTime = $this->deliveryTimeRepository->search(new Criteria([$deliveryTimeId]), $salesChannelContext->getContext())->first();
+        }
+
         $page->getProduct()->setDeliveryTime($deliveryTime);
 
     }