@fleetbase/fleetops-engine 0.6.50 → 0.6.51

package/server/src/Http/Resources/v1/Issue.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Resources\File;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Http\Resources\User;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
@@ -26,12 +27,15 @@ class Issue extends FleetbaseResource
             'driver_uuid'                 => $this->when(Http::isInternalRequest(), $this->driver_uuid),
             'company_uuid'                => $this->when(Http::isInternalRequest(), $this->company_uuid),
             'vehicle_uuid'                => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'order_uuid'                  => $this->when(Http::isInternalRequest(), $this->order_uuid ?? data_get($this, 'meta.order_uuid')),
             'assigned_to_uuid'            => $this->when(Http::isInternalRequest(), $this->assigned_to_uuid),
             'reported_by_uuid'            => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
             'assignee'                    => $this->whenLoaded('assignee', fn () => new User($this->assignee)),
             'reporter'                    => $this->whenLoaded('reporter', fn () => new User($this->reporter)),
             'vehicle'                     => $this->whenLoaded('vehicle', fn () => new Vehicle($this->vehicle)),
             'driver'                      => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
+            'order'                       => $this->when(Http::isInternalRequest(), fn () => $this->resolveLinkedOrder()),
+            'files'                       => $this->whenLoaded('files', fn () => File::collection($this->files)),
             'driver_name'                 => $this->driver_name,
             'vehicle_name'                => $this->vehicle_name,
             'vehicle_id'                  => $this->vehicle_id,
@@ -55,6 +59,27 @@ class Issue extends FleetbaseResource
         ]);
     }
 
+    protected function resolveLinkedOrder()
+    {
+        if ($this->relationLoaded('order') && $this->order) {
+            $this->order->loadMissing(['payload.pickup', 'payload.dropoff', 'trackingNumber', 'customer']);
+
+            return new Order($this->order);
+        }
+
+        $orderUuid = $this->order_uuid ?? data_get($this, 'meta.order_uuid');
+        if (!$orderUuid) {
+            return null;
+        }
+
+        $order = \Fleetbase\FleetOps\Models\Order::with(['payload.pickup', 'payload.dropoff', 'trackingNumber', 'customer'])
+            ->where('uuid', $orderUuid)
+            ->where('company_uuid', $this->company_uuid)
+            ->first();
+
+        return $order ? new Order($order) : null;
+    }
+
     /**
      * Transform the resource into an webhook payload.
      *

package/server/src/Http/Resources/v1/Order.php

@@ -73,24 +73,26 @@ class Order extends FleetbaseResource
             'tracking_statuses'    => $this->whenLoaded('trackingStatuses', function () {
                 return TrackingStatus::collection($this->trackingStatuses);
             }),
-            'tracking'             => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->tracking_number : null),
-            'barcode'              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->barcode : null),
-            'qr_code'              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->qr_code : null),
-            'comments'             => $this->when($isInternal, Comment::collection($this->comments)),
-            'files'                => $this->when($isInternal, $this->files, File::collection($this->files)),
-            'purchase_rate'        => new PurchaseRate($this->purchaseRate),
-            'notes'                => $this->notes,
-            'type'                 => $this->type,
-            'status'               => $this->status,
-            'pod_method'           => $this->pod_method,
-            'pod_required'         => (bool) data_get($this, 'pod_required', false),
-            'dispatched'           => (bool) data_get($this, 'dispatched', false),
-            'started'              => (bool) data_get($this, 'started', false),
-            'adhoc'                => (bool) data_get($this, 'adhoc', false),
-            'adhoc_distance'       => (int) $this->getAdhocDistance(),
-            'distance'             => (int) $this->distance,
-            'time'                 => (int) $this->time,
-            'tracker_data'         => $this->when($withTrackerData, function () use ($tracker) {
+            'tracking'                             => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->tracking_number : null),
+            'barcode'                              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->barcode : null),
+            'qr_code'                              => $this->when($isInternal, $this->trackingNumber ? $this->trackingNumber->qr_code : null),
+            'comments'                             => $this->when($isInternal, Comment::collection($this->comments)),
+            'files'                                => $this->when($isInternal, $this->files, File::collection($this->files)),
+            'purchase_rate'                        => new PurchaseRate($this->purchaseRate),
+            'notes'                                => $this->notes,
+            'type'                                 => $this->type,
+            'status'                               => $this->status,
+            'pod_method'                           => $this->pod_method,
+            'pod_required'                         => (bool) data_get($this, 'pod_required', false),
+            'dispatched'                           => (bool) data_get($this, 'dispatched', false),
+            'started'                              => (bool) data_get($this, 'started', false),
+            'adhoc'                                => (bool) data_get($this, 'adhoc', false),
+            'adhoc_distance'                       => (int) $this->getAdhocDistance(),
+            'distance'                             => (int) $this->distance,
+            'time'                                 => (int) $this->time,
+            'transaction_amount'                   => $this->transaction_amount,
+            'currency'                             => $this->transaction_currency,
+            'tracker_data'                         => $this->when($withTrackerData, function () use ($tracker) {
                 return $this->resource->tracker_data ?? ($tracker ? $tracker->toArray() : null);
             }),
             'eta'                  => $this->when($withEta, function () use ($tracker) {

package/server/src/Mail/CustomerCredentialsMail.php

@@ -45,7 +45,7 @@ class CustomerCredentialsMail extends Mailable
         $this->customer->loadMissing('company');
 
         return new Envelope(
-            subject: 'Your login credentials for ' . $this->customer->company->name . ' on ' . config('app.name'),
+            subject: 'Your ' . $this->customer->company->name . ' customer portal access is ready',
         );
     }
 
@@ -63,19 +63,18 @@ class CustomerCredentialsMail extends Mailable
                 'customer'          => $this->customer,
                 'plaintextPassword' => $this->plaintextPassword,
                 'customerPortalUrl' => $this->getCustomerPortalAccessUrl(),
-                'currentHour'       => now()->hour,
             ]
         );
     }
 
     /**
-     * Get the customer portal URL if available.
+     * Get the customer portal URL.
      */
-    private function getCustomerPortalAccessUrl(): ?string
+    private function getCustomerPortalAccessUrl(): string
     {
         $customerPortalConfig = Setting::lookupFromCompany('customer-portal-config');
-        $accessUrlSlug        = data_get($customerPortalConfig, 'accessUrlSlug');
+        $accessUrlSlug        = data_get($customerPortalConfig, 'accessUrlSlug', 'customer-portal');
 
-        return $accessUrlSlug ? Utils::consoleUrl($accessUrlSlug) : null;
+        return Utils::consoleUrl($accessUrlSlug ?: 'customer-portal');
     }
 }

package/server/src/Models/Contact.php

@@ -7,10 +7,8 @@ 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;
@@ -301,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
      *
@@ -379,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()) {
@@ -393,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;
@@ -491,21 +472,20 @@ 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
     {
@@ -525,8 +505,8 @@ class Contact extends Model
             }
         }
 
-        // 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);
@@ -538,23 +518,6 @@ 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;
@@ -657,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
      */
@@ -709,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/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.
      *

package/server/src/Models/Order.php

@@ -169,6 +169,7 @@ class Order extends Model
         'tracking',
         'total_entities',
         'transaction_amount',
+        'transaction_currency',
         'customer_name',
         'customer_phone',
         'facilitator_name',
@@ -508,6 +509,16 @@ class Order extends Model
         return data_get($this, 'transaction.amount');
     }
 
+    /**
+     * The transaction amount for the order.
+     *
+     * @return string
+     */
+    public function getTransactionCurrencyAttribute()
+    {
+        return data_get($this, 'transaction.currency');
+    }
+
     /**
      * The customer name for the order.
      *
@@ -1143,7 +1154,17 @@ class Order extends Model
             $this->setRelation('purchaseRate', $purchaseRate);
 
             if ($purchaseRate->transaction_uuid) {
-                $this->setRelation('transaction', Transaction::where('uuid', $purchaseRate->transaction_uuid)->first());
+                $transaction = Transaction::where('uuid', $purchaseRate->transaction_uuid)->first();
+                if ($transaction instanceof Transaction) {
+                    $transaction->update([
+                        'subject_uuid' => $this->uuid,
+                        'subject_type' => static::class,
+                        'context_uuid' => $purchaseRate->uuid,
+                        'context_type' => PurchaseRate::class,
+                        'direction'    => Transaction::DIRECTION_CREDIT,
+                    ]);
+                    $this->setRelation('transaction', $transaction);
+                }
             }
 
             if (
@@ -1176,12 +1197,17 @@ class Order extends Model
                 'company_uuid'           => session('company', $this->company_uuid),
                 'customer_uuid'          => $this->customer_uuid,
                 'customer_type'          => $this->customer_type,
+                'subject_uuid'           => $this->uuid,
+                'subject_type'           => static::class,
+                'context_uuid'           => $this->uuid,
+                'context_type'           => static::class,
                 'gateway_transaction_id' => Transaction::generateNumber(),
                 'gateway'                => 'internal',
                 'amount'                 => 0,
                 'currency'               => Utils::getCompanyTransactionCurrency($this->company ?? $this->company_uuid),
                 'description'            => 'Dispatch order',
                 'type'                   => 'dispatch',
+                'direction'              => Transaction::DIRECTION_CREDIT,
                 'status'                 => 'success',
             ]);
 
@@ -1379,8 +1405,9 @@ class Order extends Model
      *
      * The process involves the following steps:
      * 1. Creating a new Activity instance with the 'completed' code and relevant details.
-     * 2. Notifying that the order has been completed via `notifyCompleted`.
-     * 3. Updating the order's activity with the new 'completed' activity through `updateActivity`.
+     * 2. Updating the order's activity with the new 'completed' activity through `updateActivity`,
+     *    which applies and persists the 'completed' status.
+     * 3. Notifying that the order has been completed via `notifyCompleted`.
      *
      * @param Proof|null $proof Optional. Additional proof or details for the activity update.
      *
@@ -1388,15 +1415,15 @@ class Order extends Model
      */
     public function complete(?Proof $proof = null): self
     {
-        $this->notifyCompleted();
-
         $doesntHaveCompletedActivity = TrackingStatus::where(['tracking_number_uuid' => $this->tracking_number_uuid, 'code' => 'COMPLETED'])->doesntExist();
         if ($doesntHaveCompletedActivity) {
             $activity = $this->config()->getCompletedActivity();
 
-            return $this->updateActivity($activity, $proof);
+            $this->updateActivity($activity, $proof);
         }
 
+        $this->notifyCompleted();
+
         return $this;
     }
 

package/server/src/Models/ServiceArea.php

@@ -123,7 +123,7 @@ class ServiceArea extends Model
      */
     public function zones()
     {
-        return $this->hasMany(Zone::class)->without(['serviceArea']);
+        return $this->hasMany(Zone::class, 'service_area_uuid', 'uuid')->without(['serviceArea']);
     }
 
     /**

package/server/src/Models/VendorPersonnel.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Models\Model;
+use Fleetbase\Models\User;
 use Fleetbase\Traits\HasUuid;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
@@ -22,7 +23,7 @@ class VendorPersonnel extends Model
      *
      * @var array
      */
-    protected $fillable = ['vendor_uuid', 'contact_uuid'];
+    protected $fillable = ['vendor_uuid', 'contact_uuid', 'role', 'status', 'invited_by_uuid'];
 
     /**
      * These attributes that can be queried.
@@ -60,4 +61,12 @@ class VendorPersonnel extends Model
     {
         return $this->belongsTo(Contact::class);
     }
+
+    /**
+     * The Fleetbase user who invited this personnel.
+     */
+    public function invitedBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'invited_by_uuid');
+    }
 }

package/server/src/Models/Zone.php

@@ -118,7 +118,7 @@ class Zone extends Model
      */
     public function serviceArea()
     {
-        return $this->belongsTo(ServiceArea::class);
+        return $this->belongsTo(ServiceArea::class, 'service_area_uuid', 'uuid');
     }
 
     /**

package/server/src/Observers/PurchaseRateObserver.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Observers;
 
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\PurchaseRate;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Company;
@@ -18,7 +19,12 @@ class PurchaseRateObserver
      */
     public function creating(PurchaseRate $purchaseRate)
     {
+        if (!$purchaseRate->uuid) {
+            $purchaseRate->uuid = PurchaseRate::generateUuid();
+        }
+
         $purchaseRate->load(['serviceQuote.items', 'serviceQuote.serviceRate']);
+        $order = $this->resolveOrder($purchaseRate);
 
         // get company
         $company = Company::where('uuid', session('company', $purchaseRate->company_uuid))->first();
@@ -32,12 +38,17 @@ class PurchaseRateObserver
             'company_uuid'           => session('company', $purchaseRate->company_uuid),
             'customer_uuid'          => $purchaseRate->customer_uuid,
             'customer_type'          => $purchaseRate->customer_type,
+            'subject_uuid'           => $order?->uuid,
+            'subject_type'           => $order ? Order::class : null,
+            'context_uuid'           => $purchaseRate->uuid,
+            'context_type'           => PurchaseRate::class,
             'gateway_transaction_id' => $purchaseRate->getMeta('transaction_id', Transaction::generateNumber()),
             'gateway'                => 'internal',
             'amount'                 => data_get($purchaseRate, 'serviceQuote.amount', 0),
             'currency'               => $currency,
             'description'            => 'Dispatch order',
             'type'                   => 'dispatch',
+            'direction'              => Transaction::DIRECTION_CREDIT,
             'status'                 => 'success',
         ]);
 
@@ -56,4 +67,13 @@ class PurchaseRateObserver
         $purchaseRate->transaction_uuid = $transaction->uuid;
         $purchaseRate->status           = $purchaseRate->status ?: Transaction::STATUS_SUCCESS;
     }
+
+    protected function resolveOrder(PurchaseRate $purchaseRate): ?Order
+    {
+        if (!$purchaseRate->payload_uuid) {
+            return null;
+        }
+
+        return Order::where('payload_uuid', $purchaseRate->payload_uuid)->first();
+    }
 }