Fix: Correct shipment resolving

2026-09-29 00:35:29 +03:00
parent 57d7a716bc
commit d6c6bf6a1c
12 changed files with 278 additions and 22 deletions
@@ -6,6 +6,7 @@ use Lunar\DataTypes\ShippingOption;
 use Lunar\Shipping\DataTransferObjects\ShippingOptionRequest;
 use Lunar\Shipping\Interfaces\ShippingRateInterface;
 use Lunar\Shipping\Models\ShippingRate;
+use Modules\Core\Shipping\Concerns\ExcludesRestrictedProducts;
 use Modules\Core\Shipping\Concerns\ResolvesFixedPricing;
 use Modules\Core\Shipping\Contracts\DeclaresFulfillmentType;

@@ -18,6 +19,7 @@ use Modules\Core\Shipping\Contracts\DeclaresFulfillmentType;
 class BoxNowRateDriver implements ShippingRateInterface, DeclaresFulfillmentType
 {
    use ResolvesFixedPricing;
+    use ExcludesRestrictedProducts;

    public ShippingRate $shippingRate;

@@ -38,6 +40,10 @@ class BoxNowRateDriver implements ShippingRateInterface, DeclaresFulfillmentType

    public function resolve(ShippingOptionRequest $shippingOptionRequest): ?ShippingOption
    {
+        if ($this->cartHasExcludedProducts($shippingOptionRequest->shippingRate, $shippingOptionRequest->cart)) {
+            return null;
+        }
+
        return $this->resolveFixedPrice(
            $shippingOptionRequest->shippingRate,
            $shippingOptionRequest->shippingRate->shippingMethod,