@fleetbase/storefront-engine 0.4.0 → 0.4.2

package/server/src/Http/Resources/Store.php

@@ -20,41 +20,42 @@ class Store extends FleetbaseResource
         $currency = $this->currency ?? 'USD';
 
         return [
-            'id'              => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'            => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'       => $this->when(Http::isInternalRequest(), $this->public_id),
-            'key'             => $this->when(Http::isInternalRequest(), $this->key),
-            'company_uuid'    => $this->when(Http::isInternalRequest(), $this->company_uuid),
-            'created_by_uuid' => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
-            'logo_uuid'       => $this->when(Http::isInternalRequest(), $this->logo_uuid),
-            'backdrop_uuid'   => $this->when(Http::isInternalRequest(), $this->backdrop_uuid),
-            'name'            => $this->name,
-            'description'     => $this->description,
-            'translations'    => $this->translations ?? [],
-            'website'         => $this->website,
-            'facebook'        => $this->facebook,
-            'instagram'       => $this->instagram,
-            'twitter'         => $this->twitter,
-            'email'           => $this->email,
-            'phone'           => $this->phone,
-            'tags'            => $this->tags ?? [],
-            'currency'        => $currency,
-            'country'         => Utils::getCountryCodeByCurrency($currency, 'US'),
-            'options'         => $this->formatOptions($this->options),
-            'logo_url'        => $this->logo_url,
-            'backdrop_url'    => $this->backdrop_url,
-            'rating'          => $this->rating,
-            'online'          => $this->online,
-            'alertable'       => $this->alertable,
-            'is_network'      => false,
-            'is_store'        => true,
-            'category'        => $this->when($request->filled('network') && ($request->has('with_category') || $request->inArray('with', 'category')), new Category($this->getNetworkCategoryUsingId($request->input('network')))),
-            'networks'        => $this->when($request->boolean('with_networks') || $request->inArray('with', 'networks'), Network::collection($this->networks)),
-            'locations'       => $this->when($request->boolean('with_locations') || $request->inArray('with', 'locations'), $this->locations->mapInto(StoreLocation::class)),
-            'media'           => $this->when($request->boolean('with_media') || $request->inArray('with', 'media'), Media::collection($this->media)),
-            'slug'            => $this->slug,
-            'created_at'      => $this->created_at,
-            'updated_at'      => $this->updated_at,
+            'id'                  => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'           => $this->when(Http::isInternalRequest(), $this->public_id),
+            'key'                 => $this->when(Http::isInternalRequest(), $this->key),
+            'company_uuid'        => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'created_by_uuid'     => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'logo_uuid'           => $this->when(Http::isInternalRequest(), $this->logo_uuid),
+            'backdrop_uuid'       => $this->when(Http::isInternalRequest(), $this->backdrop_uuid),
+            'order_config_uuid'   => $this->when(Http::isInternalRequest(), $this->order_config_uuid),
+            'name'                => $this->name,
+            'description'         => $this->description,
+            'translations'        => $this->translations ?? [],
+            'website'             => $this->website,
+            'facebook'            => $this->facebook,
+            'instagram'           => $this->instagram,
+            'twitter'             => $this->twitter,
+            'email'               => $this->email,
+            'phone'               => $this->phone,
+            'tags'                => $this->tags ?? [],
+            'currency'            => $currency,
+            'country'             => Utils::getCountryCodeByCurrency($currency, 'US'),
+            'options'             => $this->formatOptions($this->options),
+            'logo_url'            => $this->logo_url,
+            'backdrop_url'        => $this->backdrop_url,
+            'rating'              => $this->rating,
+            'online'              => $this->online,
+            'alertable'           => $this->alertable,
+            'is_network'          => false,
+            'is_store'            => true,
+            'category'            => $this->when($request->filled('network') && ($request->has('with_category') || $request->inArray('with', 'category')), new Category($this->getNetworkCategoryUsingId($request->input('network')))),
+            'networks'            => $this->when($request->boolean('with_networks') || $request->inArray('with', 'networks'), Network::collection($this->networks)),
+            'locations'           => $this->when($request->boolean('with_locations') || $request->inArray('with', 'locations'), $this->locations->mapInto(StoreLocation::class)),
+            'media'               => $this->when($request->boolean('with_media') || $request->inArray('with', 'media'), Media::collection($this->media)),
+            'slug'                => $this->slug,
+            'created_at'          => $this->created_at,
+            'updated_at'          => $this->updated_at,
         ];
     }
 

package/server/src/Models/Customer.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\Storefront\Models;
 
 use Fleetbase\FleetOps\Models\Contact;
+use Fleetbase\FleetOps\Models\Order;
 use Illuminate\Support\Str;
 
 class Customer extends Contact
@@ -12,6 +13,22 @@ class Customer extends Contact
      */
     protected string $payloadKey = 'customer';
 
+    /**
+     * Boot the model.
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            $model->type = 'customer';
+        });
+
+        static::addGlobalScope('type', function ($builder) {
+            $builder->where('type', 'customer');
+        });
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
@@ -61,10 +78,9 @@ class Customer extends Contact
      */
     public function countStorefrontOrdersFrom($id)
     {
-        return \Fleetbase\FleetOps\Models\Order::where(
+        return Order::where(
             [
                 'customer_uuid'       => $this->uuid,
-                'type'                => 'storefront',
                 'meta->storefront_id' => $id,
             ]
         )->count();

package/server/src/Models/FoodTruck.php

@@ -2,9 +2,11 @@
 
 namespace Fleetbase\Storefront\Models;
 
+use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\ServiceArea;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Models\Zone;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Storefront\Http\Resources\FoodTruck as FoodTruckResource;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicid;
@@ -61,6 +63,13 @@ class FoodTruck extends StorefrontModel
         'status',
     ];
 
+    /**
+     * Dynamic attributes that are appended to object.
+     *
+     * @var array
+     */
+    protected $appends = ['location'];
+
     /**
      * Get the store that owns this food truck.
      */
@@ -171,12 +180,30 @@ class FoodTruck extends StorefrontModel
                     'subject_type'  => get_class($this),
                 ],
                 [
-                    'company_uuid'   => $this->company_uuid,
-                    'created_by_uuid'=> session('user'),
+                    'company_uuid'    => $this->company_uuid,
+                    'created_by_uuid' => session('user'),
                 ]
             );
         }
 
         return $this;
     }
+
+    public function getLocationAttribute(): ?Point
+    {
+        $this->loadMissing('vehicle');
+
+        return $this->vehicle->location;
+    }
+
+    /**
+     * Get the driver assigned via the food truck relation.
+     */
+    public function getDriverAssigned(): ?Driver
+    {
+        // Ensure both relations are present without re-querying if already loaded
+        $this->loadMissing('vehicle.driver');
+
+        return $this->vehicle?->driver;
+    }
 }

package/server/src/Models/Network.php

@@ -3,12 +3,14 @@
 namespace Fleetbase\Storefront\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Models\OrderConfig;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Category;
 use Fleetbase\Models\Company;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
+use Fleetbase\Storefront\Support\Storefront;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasOptionsAttributes;
 use Fleetbase\Traits\HasPublicid;
@@ -53,7 +55,7 @@ class Network extends StorefrontModel
      *
      * @var array
      */
-    protected $fillable = ['created_by_uuid', 'company_uuid', 'logo_uuid', 'backdrop_uuid', 'key', 'online', 'name', 'description', 'website', 'facebook', 'instagram', 'twitter', 'email', 'phone', 'translations', 'tags', 'currency', 'timezone', 'pod_method', 'options', 'alertable', 'slug'];
+    protected $fillable = ['created_by_uuid', 'company_uuid', 'logo_uuid', 'backdrop_uuid', 'order_config_uuid', 'key', 'online', 'name', 'description', 'website', 'facebook', 'instagram', 'twitter', 'email', 'phone', 'translations', 'tags', 'currency', 'timezone', 'pod_method', 'options', 'alertable', 'slug'];
 
     /**
      * The attributes that should be cast to native types.
@@ -133,6 +135,14 @@ class Network extends StorefrontModel
         return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(File::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function orderConfig()
+    {
+        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(OrderConfig::class);
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
@@ -287,4 +297,56 @@ class Network extends StorefrontModel
 
         return $this->createCategory($name, $description, $meta, $translations, $parent, $icon, $iconColor);
     }
+
+    /**
+     * Get the effective OrderConfig for this model.
+     *
+     * Loads the related `orderConfig` if missing and returns it.
+     * If no specific config is set, it falls back to the global default
+     * and memoizes that default into the relation (no DB write; just the relation cache)
+     * to avoid repeat lookups in the same request lifecycle.
+     *
+     * @throws \RuntimeException if no default OrderConfig is available (should not happen in a healthy install)
+     */
+    public function getOrderConfig(): OrderConfig
+    {
+        // Ensure relation is loaded once
+        $this->loadMissing('orderConfig');
+
+        if ($this->orderConfig instanceof OrderConfig) {
+            return $this->orderConfig;
+        }
+
+        // Fallback to default (must exist in your environment)
+        $default = Storefront::getDefaultOrderConfig();
+
+        if (!$default instanceof OrderConfig) {
+            // Keep your hard return type contract honest
+            throw new \RuntimeException('No default OrderConfig is configured.');
+        }
+
+        // Memoize the fallback in the in-memory relation to avoid repeated lookups
+        $this->setRelation('orderConfig', $default);
+
+        return $default;
+    }
+
+    /**
+     * Get the UUID of the effective OrderConfig for this model.
+     *
+     * Tries to use the local FK if present to avoid loading the relation;
+     * otherwise, resolves via getOrderConfig() (which memoizes).
+     *
+     * @return string non-empty UUID of the effective order config
+     */
+    public function getOrderConfigId(): string
+    {
+        // Fast path: if the FK column is set, use it directly
+        if (!empty($this->order_config_uuid)) {
+            return (string) $this->order_config_uuid;
+        }
+
+        // Otherwise rely on the resolved config (relation or default)
+        return (string) $this->getOrderConfig()->uuid;
+    }
 }

package/server/src/Models/Store.php

@@ -3,11 +3,13 @@
 namespace Fleetbase\Storefront\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Models\OrderConfig;
 use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\Models\Category;
 use Fleetbase\Models\Company;
 use Fleetbase\Models\File;
 use Fleetbase\Models\User;
+use Fleetbase\Storefront\Support\Storefront;
 use Fleetbase\Support\Utils as FleetbaseUtils;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
@@ -56,7 +58,7 @@ class Store extends StorefrontModel
      *
      * @var array
      */
-    protected $fillable = ['created_by_uuid', 'company_uuid', 'logo_uuid', 'backdrop_uuid', 'key', 'online', 'name', 'description', 'translations', 'website', 'facebook', 'instagram', 'twitter', 'email', 'phone', 'tags', 'currency', 'meta', 'timezone', 'pod_method', 'options', 'alertable', 'slug'];
+    protected $fillable = ['created_by_uuid', 'company_uuid', 'logo_uuid', 'backdrop_uuid', 'order_config_uuid', 'key', 'online', 'name', 'description', 'translations', 'website', 'facebook', 'instagram', 'twitter', 'email', 'phone', 'tags', 'currency', 'meta', 'timezone', 'pod_method', 'options', 'alertable', 'slug'];
 
     /**
      * The attributes that should be cast to native types.
@@ -137,6 +139,22 @@ class Store extends StorefrontModel
         return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(File::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function backdrop()
+    {
+        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(File::class);
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function orderConfig()
+    {
+        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(OrderConfig::class);
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
@@ -167,14 +185,6 @@ class Store extends StorefrontModel
             )->where('type', 'storefront_store_media');
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function backdrop()
-    {
-        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(File::class);
-    }
-
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
@@ -460,4 +470,56 @@ class Store extends StorefrontModel
 
         return null;
     }
+
+    /**
+     * Get the effective OrderConfig for this model.
+     *
+     * Loads the related `orderConfig` if missing and returns it.
+     * If no specific config is set, it falls back to the global default
+     * and memoizes that default into the relation (no DB write; just the relation cache)
+     * to avoid repeat lookups in the same request lifecycle.
+     *
+     * @throws \RuntimeException if no default OrderConfig is available (should not happen in a healthy install)
+     */
+    public function getOrderConfig(): OrderConfig
+    {
+        // Ensure relation is loaded once
+        $this->loadMissing('orderConfig');
+
+        if ($this->orderConfig instanceof OrderConfig) {
+            return $this->orderConfig;
+        }
+
+        // Fallback to default (must exist in your environment)
+        $default = Storefront::getDefaultOrderConfig();
+
+        if (!$default instanceof OrderConfig) {
+            // Keep your hard return type contract honest
+            throw new \RuntimeException('No default OrderConfig is configured.');
+        }
+
+        // Memoize the fallback in the in-memory relation to avoid repeated lookups
+        $this->setRelation('orderConfig', $default);
+
+        return $default;
+    }
+
+    /**
+     * Get the UUID of the effective OrderConfig for this model.
+     *
+     * Tries to use the local FK if present to avoid loading the relation;
+     * otherwise, resolves via getOrderConfig() (which memoizes).
+     *
+     * @return string non-empty UUID of the effective order config
+     */
+    public function getOrderConfigId(): string
+    {
+        // Fast path: if the FK column is set, use it directly
+        if (!empty($this->order_config_uuid)) {
+            return (string) $this->order_config_uuid;
+        }
+
+        // Otherwise rely on the resolved config (relation or default)
+        return (string) $this->getOrderConfig()->uuid;
+    }
 }

package/server/src/Notifications/StorefrontOrderAccepted.php

@@ -0,0 +1,164 @@
+<?php
+
+namespace Fleetbase\Storefront\Notifications;
+
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Storefront\Models\Network;
+use Fleetbase\Storefront\Models\Store;
+use Fleetbase\Storefront\Support\PushNotification;
+use Fleetbase\Storefront\Support\Storefront;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+use NotificationChannels\Apn\ApnChannel;
+use NotificationChannels\Fcm\FcmChannel;
+
+class StorefrontOrderAccepted extends Notification
+{
+    use Queueable;
+
+    /**
+     * The order instance this notification is for.
+     */
+    public Order $order;
+
+    /**
+     * The order instance this notification is for.
+     */
+    public Store|Network $storefront;
+
+    /**
+     * The time the notification was sent.
+     */
+    public string $sentAt;
+
+    /**
+     * The ID of the notification.
+     */
+    public string $notificationId;
+
+    /**
+     * The notification subject.
+     */
+    public string $subject;
+
+    /**
+     * The notification body.
+     */
+    public string $body;
+
+    /**
+     * The notification order status.
+     */
+    public string $status;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+    public function __construct(Order $order)
+    {
+        $this->order          = $order;
+        $this->storefront     = Storefront::findAbout($order->getMeta('storefront_id'));
+        $this->sentAt         = now()->toDateTimeString();
+        $this->notificationId = uniqid('notification_');
+
+        $this->subject = 'Your order from ' . $this->storefront->name . ' has been accepted.';
+        $this->body    = 'Your order was accepted.';
+        $this->status  = 'order_accepted';
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @return array
+     */
+    public function via($notifiable): array
+    {
+        $channels = ['mail', 'database'];
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
+            $channels[] = ApnChannel::class;
+        }
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
+            $channels[] = FcmChannel::class;
+        }
+        
+        return $channels;
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @return MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        $message = (new MailMessage())
+            ->subject($this->subject)
+            ->line($this->body);
+
+        // $message->action('View Details', Utils::consoleUrl('', ['shift' => 'fleet-ops/orders/view/' . $this->order->public_id]));
+
+        return $message;
+    }
+
+    /**
+     * Get the firebase cloud message representation of the notification.
+     *
+     * @return \NotificationChannels\Fcm\FcmMessage
+     */
+    public function toFcm($notifiable)
+    {
+        return PushNotification::createFcmMessage(
+            $this->order,
+            $this->subject,
+            $this->body,
+            $this->status,
+            $notifiable
+        );
+    }
+
+    /**
+     * Get the apns message representation of the notification.
+     *
+     * @return \NotificationChannels\Apn\ApnMessage
+     */
+    public function toApn($notifiable)
+    {
+        return PushNotification::createApnMessage(
+            $this->order,
+            $this->subject,
+            $this->body,
+            $this->status,
+            $notifiable
+        );
+    }
+
+    /**
+     * Get the array representation of the notification.
+     */
+    public function toArray($notifiable): array
+    {
+        $this->order->loadMissing(['customer', 'company']);
+        $customer = $this->order->customer;
+        $company  = $this->order->company;
+
+        return [
+            'notifiable'      => $notifiable->public_id,
+            'notification_id' => $this->notificationId,
+            'sent_at'         => $this->sentAt,
+            'subject'         => $this->subject,
+            'message'         => $this->status,
+            'storefront'      => $this->storefront->name,
+            'storefront_id'   => $this->storefront->public_id,
+            'id'              => $customer->public_id,
+            'email'           => $customer->email,
+            'phone'           => $customer->phone,
+            'companyId'       => $company->public_id,
+            'company'         => $company->name,
+        ];
+    }
+}

package/server/src/Notifications/StorefrontOrderCanceled.php

@@ -74,7 +74,17 @@ class StorefrontOrderCanceled extends Notification
      */
     public function via($notifiable): array
     {
-        return ['mail', 'database', FcmChannel::class, ApnChannel::class];
+        $channels = ['mail', 'database'];
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
+            $channels[] = ApnChannel::class;
+        }
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
+            $channels[] = FcmChannel::class;
+        }
+
+        return $channels;
     }
 
     /**

package/server/src/Notifications/StorefrontOrderCompleted.php

@@ -74,7 +74,17 @@ class StorefrontOrderCompleted extends Notification
      */
     public function via($notifiable): array
     {
-        return ['mail', 'database', FcmChannel::class, ApnChannel::class];
+        $channels = ['mail', 'database'];
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
+            $channels[] = ApnChannel::class;
+        }
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
+            $channels[] = FcmChannel::class;
+        }
+
+        return $channels;
     }
 
     /**

package/server/src/Notifications/StorefrontOrderDriverAssigned.php

@@ -78,12 +78,20 @@ class StorefrontOrderDriverAssigned extends Notification
 
     /**
      * Get the notification's delivery channels.
-     *
-     * @return array
      */
-    public function via($notifiable)
+    public function via($notifiable): array
     {
-        return ['mail', 'database', FcmChannel::class, ApnChannel::class];
+        $channels = ['mail', 'database'];
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
+            $channels[] = ApnChannel::class;
+        }
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
+            $channels[] = FcmChannel::class;
+        }
+
+        return $channels;
     }
 
     /**

package/server/src/Notifications/StorefrontOrderEnroute.php

@@ -71,12 +71,20 @@ class StorefrontOrderEnroute extends Notification
 
     /**
      * Get the notification's delivery channels.
-     *
-     * @return array
      */
-    public function via($notifiable)
+    public function via($notifiable): array
     {
-        return ['mail', 'database', FcmChannel::class, ApnChannel::class];
+        $channels = ['mail', 'database'];
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
+            $channels[] = ApnChannel::class;
+        }
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
+            $channels[] = FcmChannel::class;
+        }
+
+        return $channels;
     }
 
     /**

package/server/src/Notifications/StorefrontOrderNearby.php

@@ -84,12 +84,20 @@ class StorefrontOrderNearby extends Notification
 
     /**
      * Get the notification's delivery channels.
-     *
-     * @return array
      */
-    public function via($notifiable)
+    public function via($notifiable): array
     {
-        return ['mail', 'database', FcmChannel::class, ApnChannel::class];
+        $channels = ['mail', 'database'];
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
+            $channels[] = ApnChannel::class;
+        }
+
+        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
+            $channels[] = FcmChannel::class;
+        }
+
+        return $channels;
     }
 
     /**