Feature: Minor Updates to Order Shipping And Order Statuses

src/Providers/OrderServiceProvider.php

@@ -8,7 +8,9 @@ use Lunar\Models\Order;
 use Lunar\Models\Transaction;
 use Modules\Core\Checkout\Events\OrderPlaced;
 use Modules\Core\Notification\NotificationRegistry;
+use Modules\Core\Order\Events\OrderDelivered;
 use Modules\Core\Order\Listeners\ApplyResolvedPaymentStatus;
+use Modules\Core\Order\Listeners\CompleteOrderOnDelivered;
 use Modules\Core\Order\Listeners\DecrementStockOnOrderPlaced;
 use Modules\Core\Order\Listeners\DeriveOrderDeliveredFromShipment;
 use Modules\Core\Order\Listeners\RecordPaymentTransaction;
@@ -37,6 +39,7 @@ class OrderServiceProvider extends ServiceProvider
         Order::macro('fulfillmentStatus', fn () => OrderStatus::fulfillment($this));
 
         Event::listen(ShipmentStatusUpdatedByCarrier::class, DeriveOrderDeliveredFromShipment::class);
+        Event::listen(OrderDelivered::class, CompleteOrderOnDelivered::class);
         Event::listen(PaymentCaptured::class, ApplyResolvedPaymentStatus::class);
         Event::listen(PaymentAuthorized::class, ApplyResolvedPaymentStatus::class);
         Event::listen(PaymentRefunded::class, ApplyResolvedPaymentStatus::class);

src/Providers/ShippingServiceProvider.php

@@ -69,6 +69,31 @@ class ShippingServiceProvider extends ServiceProvider
             return $order->hasMany(Shipment::class);
         });
 
+        // ShippingMethod.data['fulfillment_type'] — see
+        // ShippingMethodResourceExtension::fulfillmentTypeSelect() for
+        // where it's set. Defaults to 'carrier' (false here) for any row
+        // saved before this field existed.
+        ShippingMethod::macro('isStorePickup', function () {
+            /** @var ShippingMethod $this */
+            return ($this->data['fulfillment_type'] ?? 'carrier') === 'store_pickup';
+        });
+
+        // Order has no direct ShippingMethod relation — shippingAddress.
+        // shipping_option is only ever a code string (see
+        // Modules\Core\Shipping\Extensions\OrderViewExtension::
+        // resolveCarrier() for the same lookup pattern already used to
+        // resolve a carrier driver from it).
+        Order::macro('isStorePickupOrder', function () {
+            /** @var Order $this */
+            $code = $this->shippingAddress?->shipping_option;
+
+            if (! $code) {
+                return false;
+            }
+
+            return ShippingMethod::where('code', $code)->first()?->isStorePickup() ?? false;
+        });
+
         foreach ([CartLineAdded::class, CartLineUpdated::class, CartLineRemoved::class, CartCleared::class, ShippingAddressSet::class] as $event) {
             Event::listen($event, [InvalidateShippingOptions::class, 'handle']);
         }