@fleetbase/storefront-engine 0.3.24 → 0.3.26

package/server/src/Models/FoodTruck.php

@@ -0,0 +1,182 @@
+<?php
+
+namespace Fleetbase\Storefront\Models;
+
+use Fleetbase\FleetOps\Models\ServiceArea;
+use Fleetbase\FleetOps\Models\Vehicle;
+use Fleetbase\FleetOps\Models\Zone;
+use Fleetbase\Storefront\Http\Resources\FoodTruck as FoodTruckResource;
+use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasPublicid;
+use Fleetbase\Traits\HasUuid;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Str;
+
+class FoodTruck extends StorefrontModel
+{
+    use HasUuid;
+    use HasPublicid;
+    use HasApiModelBehavior;
+    use SoftDeletes;
+
+    /**
+     * The default database connection to use.
+     *
+     * @var string
+     */
+    protected $connection = 'storefront';
+
+    protected $resource = FoodTruckResource::class;
+
+    /**
+     * The type of public ID to generate.
+     *
+     * @var string
+     */
+    protected $publicIdType = 'food_truck';
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'food_trucks';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'uuid',
+        'vehicle_uuid',
+        'store_uuid',
+        'company_uuid',
+        'created_by_uuid',
+        'service_area_uuid',
+        'zone_uuid',
+        'status',
+    ];
+
+    /**
+     * Get the store that owns this food truck.
+     */
+    public function store(): BelongsTo
+    {
+        return $this->belongsTo(Store::class, 'store_uuid', 'uuid');
+    }
+
+    /**
+     * Get the vehicle that is the food truck.
+     */
+    public function vehicle(): BelongsTo
+    {
+        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(Vehicle::class, 'vehicle_uuid', 'uuid');
+    }
+
+    /**
+     * Get the service area the food truck is assigned to.
+     */
+    public function serviceArea(): BelongsTo
+    {
+        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(ServiceArea::class, 'service_area_uuid', 'uuid');
+    }
+
+    /**
+     * Get the zone the food truck is assigned to.
+     */
+    public function zone(): BelongsTo
+    {
+        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(Zone::class, 'zone_uuid', 'uuid');
+    }
+
+    /**
+     * Polymorphic relationship to the CatalogSubject pivot.
+     * This allows you to retrieve all catalogs assigned to this food truck.
+     */
+    public function catalogAssignments(): MorphMany
+    {
+        return $this->morphMany(CatalogSubject::class, 'subject', 'subject_type', 'subject_uuid');
+    }
+
+    /**
+     * The catalogs assigned to this food truck.
+     */
+    public function catalogs(): MorphToMany
+    {
+        return $this->morphToMany(
+            Catalog::class,
+            'subject',
+            'catalog_subjects',
+            'subject_uuid',
+            'catalog_uuid',
+        )->using(CatalogSubject::class)
+        ->withTimestamps()
+        ->wherePivotNull('deleted_at');
+    }
+
+    /**
+     * Sync the given catalogs to this food truck by creating or deleting pivot rows
+     * in catalog_subjects. If pivot rows are polymorphic, also filter by subject_type.
+     *
+     * @return $this
+     */
+    public function setCatalogs(array $catalogs = []): FoodTruck
+    {
+        // Ensure 'catalogs' relationship is loaded
+        $this->loadMissing('catalogs');
+
+        // Collect existing catalogs
+        $existingCatalogs = $this->catalogs;
+
+        // Extract incoming UUIDs
+        $incomingUuids = collect($catalogs)
+        ->map(function ($item) {
+            // If it's already a Catalog model, use its uuid
+            if ($item instanceof Catalog) {
+                return $item->uuid;
+            }
+            // If it's a string UUID, return as is
+            if (is_string($item) && Str::isUuid($item)) {
+                return $item;
+            }
+
+            // If it's an array/object with a 'uuid' key, return that
+            return data_get($item, 'uuid');
+        })
+        ->filter(fn ($uuid) => Str::isUuid($uuid))
+        ->unique()
+        ->values();
+
+        // Remove pivot rows for catalogs not in incoming list
+        $existingCatalogs
+            ->whereNotIn('uuid', $incomingUuids)
+            ->each(function (Catalog $catalog) {
+                CatalogSubject::where([
+                    'catalog_uuid' => $catalog->uuid,
+                    'subject_uuid' => $this->uuid,
+                    'subject_type' => get_class($this),
+                ])->delete();
+            });
+
+        // Create or restore pivot rows for each incoming
+        foreach ($incomingUuids as $catalogUuid) {
+            CatalogSubject::firstOrCreate(
+                [
+                    'catalog_uuid'  => $catalogUuid,
+                    'subject_uuid'  => $this->uuid,
+                    'subject_type'  => get_class($this),
+                ],
+                [
+                    'company_uuid'   => $this->company_uuid,
+                    'created_by_uuid'=> session('user'),
+                ]
+            );
+        }
+
+        return $this;
+    }
+}

package/server/src/Models/Product.php

@@ -48,12 +48,19 @@ class Product extends StorefrontModel
      */
     protected $table = 'products';
 
+    /**
+     * The default database connection to use.
+     *
+     * @var string
+     */
+    protected $connection = 'storefront';
+
     /**
      * These attributes that can be queried.
      *
      * @var array
      */
-    protected $searchableColumns = ['name', 'description'];
+    protected $searchableColumns = ['name', 'description', 'tags'];
 
     /**
      * The attributes that are mass assignable.
@@ -224,6 +231,21 @@ class Product extends StorefrontModel
         return $this->belongsTo(Store::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
+    public function catalogCategories()
+    {
+        return $this->belongsToMany(
+            CatalogCategory::class,
+            'catalog_category_product',
+            'product_uuid',
+            'catalog_category_uuid'
+        )
+        ->using(CatalogProduct::class)
+        ->withTimestamps();
+    }
+
     /**
      * @return array
      */
@@ -368,6 +390,11 @@ class Product extends StorefrontModel
                                 $option['additional_cost'] = Utils::numbersOnly($option['additional_cost']);
                             }
 
+                            // additional cost can never be null
+                            if ($option['additional_cost'] === null) {
+                                $option['additional_cost'] = 0;
+                            }
+
                             $productVariantOptionInput = Arr::except($option, ['uuid', 'created_at', 'updated_at']);
                             ProductVariantOption::where('uuid', $option['uuid'])->update($productVariantOptionInput);
                             continue;
@@ -494,7 +521,7 @@ class Product extends StorefrontModel
      */
     public function createAsEntity(array $additionalAttributes = []): Entity
     {
-        $entity = $this->toEntity();
+        $entity = $this->toEntity($additionalAttributes);
         $entity->save();
 
         return $entity;

package/server/src/Models/Review.php

@@ -2,8 +2,8 @@
 
 namespace Fleetbase\Storefront\Models;
 
-use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\Models\File;
+use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicid;
 use Fleetbase\Traits\HasUuid;
@@ -84,7 +84,7 @@ class Review extends StorefrontModel
      */
     public function customer()
     {
-        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(Contact::class);
+        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(Customer::class);
     }
 
     /**

package/server/src/Notifications/StorefrontOrderCanceled.php

@@ -3,23 +3,15 @@
 namespace Fleetbase\Storefront\Notifications;
 
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\FleetOps\Support\Utils;
-use Fleetbase\Storefront\Models\NotificationChannel;
+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\Apn\ApnMessage;
 use NotificationChannels\Fcm\FcmChannel;
-use NotificationChannels\Fcm\FcmMessage;
-use NotificationChannels\Fcm\Resources\AndroidConfig;
-use NotificationChannels\Fcm\Resources\AndroidFcmOptions;
-use NotificationChannels\Fcm\Resources\AndroidNotification;
-use NotificationChannels\Fcm\Resources\ApnsConfig;
-use NotificationChannels\Fcm\Resources\ApnsFcmOptions;
-use Pushok\AuthProvider\Token as PuskOkToken;
-use Pushok\Client as PushOkClient;
 
 class StorefrontOrderCanceled extends Notification
 {
@@ -27,17 +19,38 @@ class StorefrontOrderCanceled extends Notification
 
     /**
      * The order instance this notification is for.
-     *
-     * @var Order
      */
-    public $order;
+    public Order $order;
 
     /**
      * The order instance this notification is for.
-     *
-     * @var \Fleetbase\Storefront\Models\Store|\Fleetbase\Storefront\Models\Network
      */
-    public $storefront;
+    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.
@@ -46,18 +59,22 @@ class StorefrontOrderCanceled extends Notification
      */
     public function __construct(Order $order)
     {
-        $this->order      = $order->setRelations([]);
-        $this->storefront = Storefront::findAbout($this->order->getMeta('storefront_id'));
+        $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 . ' was canceled';
+        $this->body    = 'Your order from ' . $this->storefront->name . ' has been canceled, if your card has been charged you will be refunded.';
+        $this->status  = 'order_canceled';
     }
 
     /**
      * Get the notification's delivery channels.
-     *
-     * @return array
      */
-    public function via($notifiable)
+    public function via($notifiable): array
     {
-        return ['mail', FcmChannel::class, ApnChannel::class];
+        return ['mail', 'database', FcmChannel::class, ApnChannel::class];
     }
 
     /**
@@ -68,125 +85,67 @@ class StorefrontOrderCanceled extends Notification
     public function toMail($notifiable)
     {
         $message = (new MailMessage())
-            ->subject('Your order from ' . $this->storefront->name . ' was canceled')
-            ->line('Your order from ' . $this->storefront->name . ' has been canceled, if your card has been charged you will be refunded.')
+            ->subject($this->subject)
+            ->line($this->body)
             ->line('No further action is necessary.');
 
-        // $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 array
+     * @return \NotificationChannels\Fcm\FcmMessage
      */
     public function toFcm($notifiable)
     {
-        $notification = \NotificationChannels\Fcm\Resources\Notification::create()
-            ->setTitle('Your order from ' . $this->storefront->name . ' was canceled')
-            ->setBody('Your order from ' . $this->storefront->name . ' has been canceled, if your card has been charged you will be refunded.');
-
-        $message = FcmMessage::create()
-            ->setData(['order' => $this->order->uuid, 'id' => $this->order->public_id, 'type' => 'order_canceled'])
-            ->setNotification($notification)
-            ->setAndroid(
-                AndroidConfig::create()
-                    ->setFcmOptions(AndroidFcmOptions::create()->setAnalyticsLabel('analytics'))
-                    ->setNotification(AndroidNotification::create()->setColor('#4391EA'))
-            )->setApns(
-                ApnsConfig::create()
-                    ->setFcmOptions(ApnsFcmOptions::create()->setAnalyticsLabel('analytics_ios'))
-            );
-
-        return $message;
+        return PushNotification::createFcmMessage(
+            $this->order,
+            $this->subject,
+            $this->body,
+            $this->status,
+            $notifiable
+        );
     }
 
     /**
      * Get the apns message representation of the notification.
      *
-     * @return array
+     * @return \NotificationChannels\Apn\ApnMessage
      */
     public function toApn($notifiable)
     {
-        $about = Storefront::findAbout($this->order->getMeta('storefront_id'));
-
-        if ($this->order->hasMeta('storefront_notification_channel')) {
-            $notificationChannel = NotificationChannel::where([
-                'owner_uuid' => $about->uuid,
-                'app_key'    => $this->order->getMeta('storefront_notification_channel'),
-                'scheme'     => 'apn',
-            ])->first();
-        } else {
-            $notificationChannel = NotificationChannel::where([
-                'owner_uuid' => $about->uuid,
-                'scheme'     => 'apn',
-            ])->first();
-        }
-
-        $config = (array) $notificationChannel->config;
-
-        try {
-            $channelClient = new PushOkClient(PuskOkToken::create($config));
-        } catch (\Exception $e) {
-            app('sentry')->captureException($e);
-
-            return;
-        }
-
-        $message = ApnMessage::create()
-            ->badge(1)
-            ->title('Your order from ' . $this->storefront->name . ' was canceled')
-            ->body('Your order from ' . $this->storefront->name . ' has been canceled, if your card has been charged you will be refunded.')
-            ->custom('type', 'order_canceled')
-            ->custom('order', $this->order->uuid)
-            ->custom('id', $this->order->public_id)
-            ->action('view_order', ['id' => $this->order->public_id])
-            ->via($channelClient);
-
-        return $message;
-    }
-
-    public function fcmProject($notifiable, $message)
-    {
-        $about = Storefront::findAbout($this->order->getMeta('storefront_id'));
-
-        if ($this->order->hasMeta('storefront_notification_channel')) {
-            $notificationChannel = NotificationChannel::where([
-                'owner_uuid' => $about->uuid,
-                'app_key'    => $this->order->getMeta('storefront_notification_channel'),
-                'scheme'     => 'fcm',
-            ])->first();
-        } else {
-            $notificationChannel = NotificationChannel::where([
-                'owner_uuid' => $about->uuid,
-                'scheme'     => 'fcm',
-            ])->first();
-        }
-
-        if (!$notificationChannel) {
-            return 'app';
-        }
-
-        $this->configureFcm($notificationChannel);
-
-        return $notificationChannel->app_key;
+        return PushNotification::createApnMessage(
+            $this->order,
+            $this->subject,
+            $this->body,
+            $this->status,
+            $notifiable
+        );
     }
 
-    public function configureFcm($notificationChannel)
+    /**
+     * Get the array representation of the notification.
+     */
+    public function toArray($notifiable): array
     {
-        $config    = (array) $notificationChannel->config;
-        $fcmConfig = config('firebase.projects.app');
-
-        // set credentials
-        Utils::set($fcmConfig, 'credentials.file', $config['firebase_credentials_json']);
-
-        // set db url
-        Utils::set($fcmConfig, 'database.url', $config['firebase_database_url']);
-
-        config('firebase.projects.' . $notificationChannel->app_key, $fcmConfig);
-
-        return $fcmConfig;
+        $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->body,
+            '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,
+        ];
     }
 }