@fleetbase/fleetops-engine 0.6.49 → 0.6.51

package/server/src/Models/Contact.php

@@ -3,13 +3,12 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Exceptions\CustomerUserConflictException;
 use Fleetbase\FleetOps\Exceptions\UserAlreadyExistsException;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\CompanyUser;
-use Fleetbase\Models\Invite;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
-use Fleetbase\Notifications\UserInvited;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasCustomFields;
@@ -300,15 +299,15 @@ class Contact extends Model
     }
 
     /**
-     * Creates a new user from the given contact and optionally sends an invitation.
+     * Creates a new user from the given contact without sending an organization invitation.
      *
      * This method first checks if a user with the same email or phone number as the contact already exists.
      * If such a user exists, it throws a UserAlreadyExistsException. Otherwise, it proceeds to create a new
      * user record using the contact's details, assigns the user to the contact's company, and links the
-     * user to the contact. Optionally, it sends an invitation to the newly created user via email.
+     * user to the contact.
      *
      * @param Contact $contact    the contact instance from which the user should be created
-     * @param bool    $sendInvite (optional) Whether to send an invitation to the newly created user. Default is false.
+     * @param bool    $sendInvite Deprecated and ignored. Contact and customer users do not receive organization invitations.
      *
      * @return User the newly created user instance
      *
@@ -319,7 +318,12 @@ class Contact extends Model
         // Check if user already exist with email or phone number
         $existingUser = null;
         if ($contact->email || $contact->phone) {
-            $existingUser = User::where('company_uuid', $contact->company_uuid)
+            $existingUser = User::where(function ($query) use ($contact) {
+                $query->where('company_uuid', $contact->company_uuid)
+                    ->orWhereHas('companyUsers', function ($query) use ($contact) {
+                        $query->where('company_uuid', $contact->company_uuid);
+                    });
+            })
                 ->where(function ($query) use ($contact) {
                     if ($contact->email) {
                         $query->where('email', $contact->email);
@@ -335,15 +339,15 @@ class Contact extends Model
         }
 
         if ($existingUser) {
+            if ($contact->isCustomer()) {
+                $contact->assertCustomerUserCanBeAssigned($existingUser);
+            }
+
             // Check if existing user belongs to another contact
             $existingUserContact = Contact::where(['user_uuid' => $existingUser->uuid, 'company_uuid' => $contact->company_uuid])->whereHas('user')->first();
             if ($existingUserContact) {
                 throw new UserAlreadyExistsException('User already exists, try to assigning the user to this contact.', $existingUser);
             } else {
-                if ($contact->isCustomer()) {
-                    $contact->normalizeCustomerUser($existingUser);
-                }
-
                 // Assign the user to this contact instead
                 $contact->setAttribute('user_uuid', $existingUser->uuid);
                 if ($update) {
@@ -373,8 +377,8 @@ class Contact extends Model
         // Set user type
         $user->setType($contact->type);
 
-        // Assing to company
-        $user->assignCompany($contact->company, $contact->isCustomer() ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
+        // Assign to company without triggering core organization invitations.
+        static::assignUserToContactCompany($contact, $user);
 
         // Assign customer role
         if ($contact->isCustomer()) {
@@ -387,23 +391,6 @@ class Contact extends Model
             $contact->update(['user_uuid' => $user->uuid]);
         }
 
-        // Optionally, send invite
-        if ($sendInvite) {
-            // send invitation to user
-            $invitation = Invite::create([
-                'company_uuid'    => $user->company_uuid,
-                'created_by_uuid' => session('user'),
-                'subject_uuid'    => $user->company_uuid,
-                'subject_type'    => Utils::getMutationType('company'),
-                'protocol'        => 'email',
-                'recipients'      => [$user->email],
-                'reason'          => 'join_company',
-            ]);
-
-            // notify user
-            $user->notify(new UserInvited($invitation));
-        }
-
         $contact->setRelation('user', $user);
 
         return $user;
@@ -423,13 +410,7 @@ class Contact extends Model
             return null;
         }
 
-        if ($user->type !== 'customer') {
-            if ($quiet) {
-                $user->forceFill(['type' => 'customer'])->saveQuietly();
-            } else {
-                $user->setType('customer');
-            }
-        }
+        $this->assertCustomerUserCanBeAssigned($user);
 
         $this->loadMissing('company');
         if ($this->company) {
@@ -463,7 +444,7 @@ class Contact extends Model
     public function repairCustomerTypeInvariant(bool $quiet = false): ?User
     {
         if (!$this->isCustomer()) {
-            $this->forceFill(['type' => 'customer'])->saveQuietly();
+            return $this->getUser();
         }
 
         $user = $this->getUser();
@@ -491,33 +472,41 @@ class Contact extends Model
     }
 
     /**
-     * Assigns a user to the company and optionally sends an invitation email.
+     * Assigns a user to the contact's company without sending an organization invitation.
      *
      * This method performs the following actions:
      * 1. Associates the provided user with the current company, assigning them a role based on the
      *    company's type (e.g., 'Fleet-Ops Customer' or 'Fleet-Ops Contact').
      * 2. If the user is of type 'customer', assigns the 'Fleet-Ops Customer' role specifically.
      * 3. Updates the current entity's `user_uuid` to reference the assigned user.
-     * 4. Optionally sends an invitation email to the user, inviting them to join the company.
      *
      * @param User $user       the user to be assigned to the company
-     * @param bool $sendInvite Determines whether to send an invitation email to the user. Defaults to false.
+     * @param bool $sendInvite Deprecated and ignored. Contact and customer users do not receive organization invitations.
      *
      * @return self returns the current instance to allow method chaining
      *
-     * @throws \Exception if an error occurs during user assignment or while sending the invitation
+     * @throws \Exception if an error occurs during user assignment
      */
     public function assignUser(User $user, bool $sendInvite = false): self
     {
         // Load company
         $this->loadMissing('company');
 
-        if ($this->isCustomer() && $user->type !== 'customer') {
-            $user->setType('customer');
+        if ($this->isCustomer()) {
+            $this->assertCustomerUserCanBeAssigned($user);
+
+            $existingUserContact = static::where(['user_uuid' => $user->uuid, 'company_uuid' => $this->company_uuid])
+                ->whereNot('uuid', $this->uuid)
+                ->whereHas('user')
+                ->first();
+
+            if ($existingUserContact) {
+                throw new UserAlreadyExistsException('User already exists, try to assigning the user to this contact.', $user);
+            }
         }
 
-        // Assing to company
-        $user->assignCompany($this->company, $this->isCustomer() ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact');
+        // Assign to company without triggering core organization invitations.
+        static::assignUserToContactCompany($this, $user);
 
         // Get the company user instance
         $companyUser = $user->getCompanyUser($this->company);
@@ -529,28 +518,79 @@ class Contact extends Model
         // Set user to contact
         $this->update(['user_uuid' => $user->uuid]);
 
-        // Optionally, send invite
-        if ($sendInvite) {
-            // send invitation to user
-            $invitation = Invite::create([
-                'company_uuid'    => $user->company_uuid,
-                'created_by_uuid' => session('user'),
-                'subject_uuid'    => $user->company_uuid,
-                'subject_type'    => Utils::getMutationType('company'),
-                'protocol'        => 'email',
-                'recipients'      => [$user->email],
-                'reason'          => 'join_company',
-            ]);
-
-            // notify user
-            $user->notify(new UserInvited($invitation));
-        }
-
         $this->setRelation('user', $user);
 
         return $this;
     }
 
+    public function assertCustomerIdentityIsAvailable(): void
+    {
+        if (!$this->isCustomer()) {
+            return;
+        }
+
+        $assignedUser = $this->getAssignedUserWithoutTypeScope();
+        if ($assignedUser) {
+            $this->assertCustomerUserCanBeAssigned($assignedUser);
+        }
+
+        $matchedUser = $this->findExistingUserByIdentity();
+        if ($matchedUser && $matchedUser->uuid !== $this->user_uuid) {
+            $this->assertCustomerUserCanBeAssigned($matchedUser);
+        }
+    }
+
+    public function assertCustomerUserCanBeAssigned(User $user): void
+    {
+        if ($user->type === 'customer') {
+            return;
+        }
+
+        throw new CustomerUserConflictException(static::customerUserConflictMessage($user), $user);
+    }
+
+    public static function customerUserConflictMessage(?User $user = null): string
+    {
+        $field = $user?->email ? 'email' : ($user?->phone ? 'phone number' : 'user account');
+
+        return 'This ' . $field . ' belongs to an existing staff user and cannot be used for a customer account.';
+    }
+
+    private function findExistingUserByIdentity(): ?User
+    {
+        if (!$this->email && !$this->phone) {
+            return null;
+        }
+
+        return User::where(function ($query) {
+            $query->where('company_uuid', $this->company_uuid)
+                ->orWhereHas('companyUsers', function ($query) {
+                    $query->where('company_uuid', $this->company_uuid);
+                });
+        })
+            ->where(function ($query) {
+                if ($this->email) {
+                    $query->where('email', $this->email);
+                }
+
+                if ($this->phone) {
+                    $method = $this->email ? 'orWhere' : 'where';
+                    $query->{$method}('phone', Utils::formatPhoneNumber($this->phone));
+                }
+            })
+            ->whereNull('deleted_at')
+            ->first();
+    }
+
+    private function getAssignedUserWithoutTypeScope(): ?User
+    {
+        if (!Str::isUuid($this->user_uuid)) {
+            return null;
+        }
+
+        return User::where('uuid', $this->user_uuid)->first();
+    }
+
     public function syncWithUser(): bool
     {
         $updates = [];
@@ -580,12 +620,11 @@ class Contact extends Model
     }
 
     /**
-     * Creates a new user from the current contact instance and optionally sends an invitation.
+     * Creates a new user from the current contact instance without sending an organization invitation.
      *
-     * This method is a wrapper around the createUserFromContact method. It allows creating a user directly
-     * from a contact instance and, optionally, sending an invitation to the newly created user.
+     * This method is a wrapper around the createUserFromContact method.
      *
-     * @param bool $sendInvite (optional) Whether to send an invitation to the newly created user. Default is false.
+     * @param bool $sendInvite Deprecated and ignored. Contact and customer users do not receive organization invitations.
      *
      * @return User the newly created user instance
      */
@@ -632,4 +671,21 @@ class Contact extends Model
     {
         return !$this->hasUser();
     }
+
+    private static function assignUserToContactCompany(Contact $contact, User $user): ?CompanyUser
+    {
+        $contact->loadMissing('company');
+
+        if (!$contact->company) {
+            return null;
+        }
+
+        $role        = $contact->isCustomer() ? 'Fleet-Ops Customer' : 'Fleet-Ops Contact';
+        $companyUser = $contact->company->addUser($user, $role);
+
+        $user->forceFill(['company_uuid' => $contact->company->uuid])->saveQuietly();
+        $user->setRelation('companyUser', $companyUser);
+
+        return $companyUser;
+    }
 }

package/server/src/Models/Customer.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Fleetbase\FleetOps\Models;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Str;
+
+/**
+ * Fleet-Ops customer.
+ *
+ * A thin specialization of {@see Contact} that is scoped to rows with
+ * `type='customer'` and forces that type on create. This is what the public
+ * customer API surface (`/v1/customers/...`) operates on.
+ *
+ * Mirrors {@see \Fleetbase\Storefront\Models\Customer} but lives directly in
+ * FleetOps so that customer auth + customer-scoped orders work without the
+ * Storefront publishable-key + Store/Network gating.
+ */
+class Customer extends Contact
+{
+    /**
+     * The key to use in the payload responses.
+     */
+    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) {
+            $builder->where('type', 'customer');
+        });
+    }
+
+    /**
+     * Orders owned by this customer.
+     */
+    public function orders(): HasMany
+    {
+        return $this->hasMany(Order::class, 'customer_uuid')
+            ->whereNull('deleted_at')
+            ->withoutGlobalScopes();
+    }
+
+    /**
+     * Find a customer by either a `customer_xxx` or `contact_xxx` public id.
+     */
+    public static function findFromCustomerId(string $publicId): ?self
+    {
+        if (Str::startsWith($publicId, 'customer')) {
+            $publicId = Str::replaceFirst('customer', 'contact', $publicId);
+        }
+
+        return static::where('public_id', $publicId)->first();
+    }
+}

package/server/src/Models/Driver.php

@@ -119,6 +119,15 @@ class Driver extends Model
         'time_window_end',
     ];
 
+    /**
+     * Set attributes and defaults.
+     *
+     * @var array
+     */
+    protected $attributes = [
+        'status' => 'available',
+    ];
+
     /**
      * The attributes that are guarded and not mass assignable.
      *
@@ -595,9 +604,9 @@ class Driver extends Model
     /**
      * Set the driver status attribute.
      */
-    public function setStatusAttribute(?string $status = 'active'): void
+    public function setStatusAttribute(?string $status = 'available'): void
     {
-        $this->attributes['status'] = $status;
+        $this->attributes['status'] = $status === null || $status === 'active' ? 'available' : $status;
     }
 
     /**
@@ -854,7 +863,7 @@ class Driver extends Model
             'user_uuid'              => $user->uuid,
             'drivers_license_number' => $driversLicenseNumber,
             'country'                => $country,
-            'status'                 => 'active',
+            'status'                 => 'available',
             'location'               => Utils::parsePointToWkt(new Point(0, 0)),
         ]);
 

package/server/src/Models/Entity.php

@@ -2,9 +2,9 @@
 
 namespace Fleetbase\FleetOps\Models;
 
-use Barryvdh\DomPDF\Facade\Pdf;
 use Fleetbase\Casts\Json;
 use Fleetbase\Casts\PolymorphicType;
+use Fleetbase\FleetOps\Support\LabelPdf;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Traits\HasTrackingNumber;
 use Fleetbase\FleetOps\Traits\PayloadAccessors;
@@ -142,7 +142,7 @@ class Entity extends Model
      */
     public function pdfLabel()
     {
-        return Pdf::loadHTML($this->label());
+        return LabelPdf::fromHtml($this->label());
     }
 
     /**

package/server/src/Models/Issue.php

@@ -14,7 +14,11 @@ use Fleetbase\Traits\HasCustomFields;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Str;
+use Spatie\Activitylog\LogOptions;
+use Spatie\Activitylog\Traits\LogsActivity;
 
 class Issue extends Model
 {
@@ -24,6 +28,7 @@ class Issue extends Model
     use SpatialTrait;
     use HasApiModelBehavior;
     use HasApiModelCache;
+    use LogsActivity;
     use HasCustomFields;
 
     /**
@@ -60,6 +65,7 @@ class Issue extends Model
         'assigned_to_uuid',
         'vehicle_uuid',
         'driver_uuid',
+        'order_uuid',
         'issue_id',
         'location',
         'category',
@@ -106,6 +112,31 @@ class Issue extends Model
      */
     protected $appends = ['driver_name', 'vehicle_name', 'assignee_name', 'reporter_name'];
 
+    /**
+     * Get the activity log options for the model.
+     */
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logOnly([
+                'title',
+                'report',
+                'status',
+                'priority',
+                'assigned_to_uuid',
+                'vehicle_uuid',
+                'driver_uuid',
+                'order_uuid',
+                'type',
+                'category',
+                'tags',
+                'resolved_at',
+                'meta',
+            ])
+            ->logOnlyDirty()
+            ->dontSubmitEmptyLogs();
+    }
+
     /**
      * The attributes excluded from the model's JSON form.
      *
@@ -114,7 +145,7 @@ class Issue extends Model
     protected $hidden = [];
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function reportedBy()
     {
@@ -122,7 +153,7 @@ class Issue extends Model
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function reporter()
     {
@@ -130,7 +161,7 @@ class Issue extends Model
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function assignedTo()
     {
@@ -138,7 +169,7 @@ class Issue extends Model
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function assignee()
     {
@@ -146,7 +177,7 @@ class Issue extends Model
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function vehicle()
     {
@@ -154,13 +185,23 @@ class Issue extends Model
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function driver()
     {
         return $this->belongsTo(Driver::class);
     }
 
+    public function order(): BelongsTo
+    {
+        return $this->belongsTo(Order::class, 'order_uuid', 'uuid')->without(['comments', 'files']);
+    }
+
+    public function files(): HasMany
+    {
+        return $this->hasMany(\Fleetbase\Models\File::class, 'subject_uuid', 'uuid')->latest();
+    }
+
     /**
      * Set the title attribute for the Issue model.
      *