@fleetbase/fleetops-engine 0.4.8 → 0.4.10

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.8",
+    "version": "0.4.10",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.1",
+        "fleetbase/core-api": "^1.4.4",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.4.8",
+    "version": "0.4.10",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.4.8",
+    "version": "0.4.10",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

package/server/src/Casts/Point.php

@@ -106,8 +106,6 @@ class Point implements CastsAttributes
 
     /**
      * Check if the given data is a raw Point object.
-     *
-     * @return bool
      */
     public static function isRawPoint($data): bool
     {

package/server/src/Exceptions/IntegratedVendorException.php

@@ -32,7 +32,7 @@ class IntegratedVendorException extends \Exception implements Responsable
      * @param int                   $code             the exception code
      * @param \Throwable|null       $previous         the previous throwable used for the exception chaining
      */
-    public function __construct(string $message = '', IntegratedVendor $integratedVendor = null, string $triggerMethod = null, int $code = 400, \Throwable $previous = null)
+    public function __construct(string $message = '', ?IntegratedVendor $integratedVendor = null, ?string $triggerMethod = null, int $code = 400, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
         $this->integratedVendor = $integratedVendor;
@@ -44,7 +44,7 @@ class IntegratedVendorException extends \Exception implements Responsable
      *
      * @param \Illuminate\Http\Request $request
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function toResponse($request)
     {

package/server/src/Flow/Activity.php

@@ -1,12 +1,13 @@
-<?php 
+<?php
 
 namespace Fleetbase\FleetOps\Flow;
 
 use Fleetbase\Models\Model;
 
-class Activity {
+class Activity
+{
     protected string $status;
     protected string $code;
     protected string $details;
     protected Model $owner;
-}
+}

package/server/src/Flow/Config.php

@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 namespace Fleetbase\FleetOps\Flow;
 
-class Config {
-    
-}
+class Config
+{
+}

package/server/src/Flow/Logic.php

@@ -1,7 +1,7 @@
-<?php 
+<?php
 
 namespace Fleetbase\FleetOps\Flow;
 
-class Logic {
-    
-}
+class Logic
+{
+}

package/server/src/Http/Controllers/Api/v1/DriverController.php

@@ -46,15 +46,26 @@ class DriverController extends Controller
         $input = $request->except(['name', 'password', 'email', 'phone', 'location', 'altitude', 'heading', 'speed', 'meta']);
 
         // get user details for driver
-        $userDetails                 = $request->only(['name', 'password', 'email', 'phone']);
-        $userDetails['company_uuid'] = session('company');
+        $userDetails                 = $request->only(['name', 'password', 'email', 'phone', 'timezone']);
+
+        // Get current company session
+        $company                   = Auth::getCompany();
+
+        // Apply user infos
+        $userDetails = User::applyUserInfoFromRequest($request, $userDetails);
 
         // create user account for driver
         $user = User::create($userDetails);
 
+        // Assign company
+        $user->assignCompany($company);
+
+        // Set user type
+        $user->setUserType('driver');
+
         // set user id
         $input['user_uuid']    = $user->uuid;
-        $input['company_uuid'] = session('company');
+        $input['company_uuid'] = $company->uuid;
 
         // vehicle assignment public_id -> uuid
         if ($request->has('vehicle')) {
@@ -354,7 +365,7 @@ class DriverController extends Controller
     /**
      * Authenticates customer using login credentials and returns with auth token.
      *
-     * @return \Fleetbase\FleetOps\Http\Resources\v1\Driver
+     * @return DriverResource
      */
     public function login(Request $request)
     {
@@ -418,9 +429,11 @@ class DriverController extends Controller
 
         // generate verification token
         try {
-            VerificationCode::generateSmsVerificationFor($user, 'driver_login', function ($verification) use ($company) {
-                return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
-            });
+            VerificationCode::generateSmsVerificationFor($user, 'driver_login', [
+                'messageCallback' => function ($verification) use ($company) {
+                    return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
+                },
+            ]);
         } catch (\Throwable $e) {
             if (app()->bound('sentry')) {
                 app('sentry')->captureException($e);
@@ -435,7 +448,7 @@ class DriverController extends Controller
     /**
      * Verifys SMS code and sends auth token with customer resource.
      *
-     * @return \Fleetbase\FleetOps\Http\Resources\v1\Driver
+     * @return DriverResource
      */
     public function verifyCode(Request $request)
     {
@@ -489,11 +502,9 @@ class DriverController extends Controller
     }
 
     /**
-     * Gets the current organization/company for the driver
+     * Gets the current organization/company for the driver.
      *
-     * @param string $id
-     * @param \Illuminate\Http\Request $request
-     * @return \Fleetbase\Http\Resources\Organization
+     * @return Organization
      */
     public function currentOrganization(string $id, Request $request)
     {
@@ -521,7 +532,7 @@ class DriverController extends Controller
     /**
      * List organizations that driver is apart of.
      *
-     * @return \Fleetbase\Http\Resources\Organization
+     * @return Organization
      */
     public function listOrganizations(string $id, Request $request)
     {
@@ -546,7 +557,7 @@ class DriverController extends Controller
     /**
      * Allow driver to switch organization.
      *
-     * @return \Fleetbase\Http\Resources\Organization
+     * @return Organization
      */
     public function switchOrganization(string $id, SwitchOrganizationRequest $request)
     {
@@ -604,7 +615,7 @@ class DriverController extends Controller
         $order = $request->input('order');
 
         try {
-            /** @var \Fleetbase\FleetOps\Models\Driver $driver */
+            /** @var Driver $driver */
             $driver = Driver::findRecordOrFail($id, ['user']);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
             return response()->json(
@@ -617,7 +628,7 @@ class DriverController extends Controller
 
         if ($order) {
             try {
-                /** @var \Fleetbase\FleetOps\Models\Order $order */
+                /** @var Order $order */
                 $order = Order::findRecordOrFail($order, ['payload']);
             } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
                 return response()->json(
@@ -720,9 +731,6 @@ class DriverController extends Controller
 
     /**
      * Get the drivers current company using their user account.
-     *
-     * @param \Fleetbase\Models\User $user
-     * @return \Fleetbase\Models\Company|null
      */
     private static function getDriverCompanyFromUser(User $user): ?Company
     {
@@ -747,7 +755,7 @@ class DriverController extends Controller
     /**
      * Patches phone number with international code.
      */
-    private static function phone(string $phone = null): string
+    private static function phone(?string $phone = null): string
     {
         if ($phone === null) {
             $phone = request()->input('phone');

package/server/src/Http/Controllers/Api/v1/OrderController.php

@@ -423,7 +423,7 @@ class OrderController extends Controller
     {
         $results = Order::queryWithRequest($request, function (&$query, $request) {
             $query->where('company_uuid', session('company'));
-            
+
             if ($request->has('payload')) {
                 $query->whereHas('payload', function ($q) use ($request) {
                     $q->where('public_id', $request->input('payload'));
@@ -691,7 +691,7 @@ class OrderController extends Controller
     /**
      * Schedules an order using date and time.
      *
-     * @param \Fleetbase\FleetOps\Http\Requests\ScheduleOrderRequest
+     * @param ScheduleOrderRequest
      *
      * @return \Fleetbase\Http\Resources\v1\Order
      */
@@ -835,7 +835,7 @@ class OrderController extends Controller
 
         // if instance of order is passed directly to this method
         if ($id instanceof Order) {
-            /** @var \Fleetbase\FleetOps\Models\Order $order */
+            /** @var Order $order */
             $order = $id;
         }
 
@@ -1112,7 +1112,7 @@ class OrderController extends Controller
      *
      * @return void
      */
-    public function captureQrScan(string $id, string $subjectId = null, Request $request)
+    public function captureQrScan(string $id, ?string $subjectId = null, Request $request)
     {
         $code    = $request->input('code');
         $data    = $request->input('data', []);
@@ -1183,7 +1183,7 @@ class OrderController extends Controller
      *
      * @return void
      */
-    public function captureSignature(string $id, string $subjectId = null, Request $request)
+    public function captureSignature(string $id, ?string $subjectId = null, Request $request)
     {
         $disk         = $request->input('disk', config('filesystems.default'));
         $bucket       = $request->input('bucket', config('filesystems.disks.' . $disk . '.bucket', config('filesystems.disks.s3.bucket')));

package/server/src/Http/Controllers/Api/v1/TrackingNumberController.php

@@ -115,7 +115,7 @@ class TrackingNumberController extends Controller
     /**
      * Take the uuid value of an entity QR code and return the object.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */

package/server/src/Http/Controllers/Internal/v1/DriverController.php

@@ -111,13 +111,6 @@ class DriverController extends FleetOpsController
                     // Assign user to company
                     if ($company) {
                         $existingUser->assignCompany($company);
-
-                        // create company user
-                        CompanyUser::create([
-                            'user_uuid'    => $existingUser->uuid,
-                            'company_uuid' => $company->uuid,
-                            'status'       => $isOrganizationMember ? 'active' : 'pending'
-                        ]);
                     }
 
                     if (!$isOrganizationMember) {
@@ -174,6 +167,9 @@ class DriverController extends FleetOpsController
                     $company                   = Auth::getCompany();
                     $userInput['company_uuid'] = session('company', $company->uuid);
 
+                    // Apply user infos
+                    $userInput = User::applyUserInfoFromRequest($request, $userInput);
+
                     // Create user account
                     $user = User::create($userInput);
 
@@ -397,9 +393,11 @@ class DriverController extends FleetOpsController
         }
 
         // Generate verification token
-        VerificationCode::generateSmsVerificationFor($user, 'driver_login', function ($verification) {
-            return 'Your ' . config('app.name') . ' verification code is ' . $verification->code;
-        });
+        VerificationCode::generateSmsVerificationFor($user, 'driver_login', [
+            'messageCallback' => function ($verification) {
+                return 'Your ' . config('app.name') . ' verification code is ' . $verification->code;
+            },
+        ]);
 
         return response()->json(['status' => 'OK']);
     }
@@ -453,7 +451,7 @@ class DriverController extends FleetOpsController
     /**
      * Patches phone number with international code.
      */
-    public static function phone(string $phone = null): string
+    public static function phone(?string $phone = null): string
     {
         if ($phone === null) {
             $phone = request()->input('phone');

package/server/src/Http/Controllers/Internal/v1/FleetOpsLookupController.php

@@ -16,7 +16,7 @@ class FleetOpsLookupController extends Controller
     /**
      * Returns a collection of polymorphic resources as JSON.
      *
-     * @param \Illuminate\Http\Request $request the HTTP request object
+     * @param Request $request the HTTP request object
      *
      * @return \Illuminate\Http\Response the JSON response with the polymorphic resources
      */

package/server/src/Http/Controllers/Internal/v1/GeocoderController.php

@@ -13,7 +13,7 @@ class GeocoderController extends Controller
     /**
      * Reverse geocodes the given coordinates and returns the results as JSON.
      *
-     * @param \Illuminate\Http\Request $request the HTTP request object
+     * @param Request $request the HTTP request object
      *
      * @return \Illuminate\Http\Response the JSON response with the geocoded results
      */
@@ -57,7 +57,7 @@ class GeocoderController extends Controller
     /**
      * Geocodes the given query and returns the results as JSON.
      *
-     * @param \Illuminate\Http\Request $request the HTTP request object
+     * @param Request $request the HTTP request object
      *
      * @return \Illuminate\Http\Response the JSON response with the geocoded results
      */

package/server/src/Http/Controllers/Internal/v1/MetricsController.php

@@ -11,7 +11,6 @@ class MetricsController extends Controller
     /**
      * Gets all key metrics for the current session.
      *
-     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     public function all(Request $request)

package/server/src/Http/Controllers/Internal/v1/OrderController.php

@@ -94,7 +94,7 @@ class OrderController extends FleetOpsController
 
                     // If order creation includes files assosciate each to this order
                     if ($uploads) {
-                        $ids = collect($uploads)->pluck('uuid');
+                        $ids   = collect($uploads)->pluck('uuid');
                         $files = File::whereIn('uuid', $ids)->get();
 
                         foreach ($files as $file) {
@@ -339,7 +339,7 @@ class OrderController extends FleetOpsController
     public function start(Request $request)
     {
         /**
-         * @var \Fleetbase\FleetOps\Models\Order
+         * @var Order
          */
         $order = Order::where('uuid', $request->input('order'))->withoutGlobalScopes()->first();
 
@@ -352,12 +352,12 @@ class OrderController extends FleetOpsController
         }
 
         /**
-         * @var \Fleetbase\FleetOps\Models\Driver
+         * @var Driver
          */
         $driver = Driver::where('uuid', $order->driver_assigned_uuid)->withoutGlobalScopes()->first();
 
         /**
-         * @var \Fleetbase\FleetOps\Models\Payload
+         * @var Payload
          */
         $payload = Payload::where('uuid', $order->payload_uuid)->withoutGlobalScopes()->with(['waypoints', 'waypointMarkers', 'entities'])->first();
 

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

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
-use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Http\Resources\Comment;
+use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\Resolve;
 

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

@@ -17,13 +17,13 @@ class ServiceQuoteItem extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'                => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'              => $this->when(Http::isInternalRequest(), $this->uuid),
+            'id'                 => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'               => $this->when(Http::isInternalRequest(), $this->uuid),
             'service_quote_uuid' => $this->when(Http::isInternalRequest(), $this->service_quote_uuid),
-            'amount'       => $this->amount,
-            'currency'     => $this->currency,
-            'details'      => $this->details,
-            'code'         => $this->code,
+            'amount'             => $this->amount,
+            'currency'           => $this->currency,
+            'details'            => $this->details,
+            'code'               => $this->code,
         ];
     }
 }

package/server/src/Imports/OrdersImport.php

@@ -9,7 +9,7 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 class OrdersImport implements ToCollection, WithHeadingRow
 {
     /**
-     * @return \Illuminate\Support\Collection
+     * @return Collection
      */
     public function collection(Collection $rows)
     {

package/server/src/Integrations/Lalamove/Lalamove.php

@@ -76,7 +76,7 @@ class Lalamove
      */
     private ?IntegratedVendor $integratedVendor = null;
 
-    public function __construct(string $apiKey = null, string $apiSecret = null, bool $sandbox = false, $market = null)
+    public function __construct(?string $apiKey = null, ?string $apiSecret = null, bool $sandbox = false, $market = null)
     {
         if ($apiKey === null) {
             $apiKey = config('services.lalamove.key');
@@ -109,7 +109,7 @@ class Lalamove
         );
     }
 
-    public static function instance(string $apiKey = null, string $apiSecret = null, bool $sandbox = false, $market = null): Lalamove
+    public static function instance(?string $apiKey = null, ?string $apiSecret = null, bool $sandbox = false, $market = null): Lalamove
     {
         return new static($apiKey, $apiSecret, $market, $sandbox);
     }
@@ -169,7 +169,7 @@ class Lalamove
         return $this;
     }
 
-    public static function createServiceQuoteFromQuotation($quotation, $requestId = null, $integratedVendor = null, Payload $payload = null): ServiceQuote
+    public static function createServiceQuoteFromQuotation($quotation, $requestId = null, $integratedVendor = null, ?Payload $payload = null): ServiceQuote
     {
         $serviceQuote = static::serviceQuoteFromQuotation($quotation, $requestId, $integratedVendor, $payload);
         $serviceQuote->save();
@@ -182,7 +182,7 @@ class Lalamove
         return $serviceQuote->load(['items']);
     }
 
-    public static function serviceQuoteFromQuotation($quotation = null, $requestId = null, $integratedVendor = null, Payload $payload = null): ServiceQuote
+    public static function serviceQuoteFromQuotation($quotation = null, $requestId = null, $integratedVendor = null, ?Payload $payload = null): ServiceQuote
     {
         if (!$quotation) {
             return null;
@@ -651,7 +651,7 @@ class Lalamove
         return $this->createOrder($quotationId, $sender, $recipients, false, $isPODEnabled, $metadata);
     }
 
-    public function setWebhook(string $webhookUrl = null)
+    public function setWebhook(?string $webhookUrl = null)
     {
         if (!is_string($webhookUrl)) {
             return;

package/server/src/Jobs/SimulateDrivingRoute.php

@@ -48,8 +48,8 @@ class SimulateDrivingRoute implements ShouldQueue
     /**
      * Create a new job instance.
      *
-     * @param \Fleetbase\FleetOps\Models\Driver $driver    the driver for whom the route is being simulated
-     * @param array                             $waypoints the waypoints that make up the route
+     * @param Driver $driver    the driver for whom the route is being simulated
+     * @param array  $waypoints the waypoints that make up the route
      */
     public function __construct(Driver $driver, array $waypoints = [])
     {

package/server/src/Jobs/SimulateWaypointReached.php

@@ -23,12 +23,12 @@ class SimulateWaypointReached implements ShouldQueue
     use SerializesModels;
 
     /**
-     * @var \Fleetbase\FleetOps\Models\Driver the driver for whom the waypoint is being simulated
+     * @var Driver the driver for whom the waypoint is being simulated
      */
     public Driver $driver;
 
     /**
-     * @var \Fleetbase\LaravelMysqlSpatial\Types\Point the waypoint that the driver is simulated to have reached
+     * @var Point the waypoint that the driver is simulated to have reached
      */
     public Point $waypoint;
 

package/server/src/Listeners/HandleOrderDispatchFailed.php

@@ -24,7 +24,7 @@ class HandleOrderDispatchFailed implements ShouldQueue
         /** @var \Fleetbase\FleetOps\Models\Order $order */
         $order = $event->getModelRecord();
 
-        /** @var \Fleetbase\Models\User */
+        /** @var User */
         $createdBy = User::where('uuid', $order->created_by_uuid)->first();
 
         // notify driver assigned order was canceled

package/server/src/Listeners/HandleOrderDriverAssigned.php

@@ -22,7 +22,7 @@ class HandleOrderDriverAssigned implements ShouldQueue
      */
     public function handle(OrderDriverAssigned $event)
     {
-        /** @var \Fleetbase\FleetOps\Models\Order $order */
+        /** @var Order $order */
         $order = $event->getModelRecord();
 
         // halt if unable to resolve order record from event
@@ -30,7 +30,7 @@ class HandleOrderDriverAssigned implements ShouldQueue
             return;
         }
 
-        /** @var \Fleetbase\FleetOps\Models\Driver */
+        /** @var Driver */
         $driver = Driver::where('uuid', $order->driver_assigned_uuid)->withoutGlobalScopes()->first();
         $order->setRelation('driverAssigned', $driver);
 

package/server/src/Models/Driver.php

@@ -498,9 +498,9 @@ class Driver extends Model
      *
      * @param Order|null $order The order to consider when updating the position (default: null)
      *
-     * @return \Fleetbase\FleetOps\Models\Position|null The created Position object, or null if no new position was created
+     * @return Position|null The created Position object, or null if no new position was created
      */
-    public function updatePosition(Order $order = null): ?Position
+    public function updatePosition(?Order $order = null): ?Position
     {
         $position     = null;
         $lastPosition = $this->positions()->whereCompanyUuid(session('company'))->latest()->first();

package/server/src/Models/Entity.php

@@ -273,7 +273,7 @@ class Entity extends Model
     /**
      * The length the entity belongs to.
      *
-     * @var \PhpUnitsOfMeasure\PhysicalQuantity\Length
+     * @var Length
      */
     public function getLengthUnitAttribute()
     {
@@ -283,7 +283,7 @@ class Entity extends Model
     /**
      * The width the entity belongs to.
      *
-     * @var \PhpUnitsOfMeasure\PhysicalQuantity\Length
+     * @var Length
      */
     public function getWidthUnitAttribute()
     {
@@ -416,7 +416,7 @@ class Entity extends Model
         return $this;
     }
 
-    public static function insertGetUuid($values = [], Payload $payload = null)
+    public static function insertGetUuid($values = [], ?Payload $payload = null)
     {
         if (is_array($values) && isset($values['uuid'])) {
             Entity::where('uuid', $values['uuid'])->update([

package/server/src/Models/Order.php

@@ -244,7 +244,7 @@ class Order extends Model
      */
     public function transaction()
     {
-        return $this->belongsTo(\Fleetbase\Models\Transaction::class);
+        return $this->belongsTo(Transaction::class);
     }
 
     /**
@@ -586,7 +586,7 @@ class Order extends Model
     /**
      * Set the order type attribute, which defaults to `default`.
      */
-    public function setTypeAttribute(string $type = null): void
+    public function setTypeAttribute(?string $type = null): void
     {
         $this->attributes['type'] = is_string($type) ? Str::slug($type) : 'default';
     }
@@ -594,7 +594,7 @@ class Order extends Model
     /**
      * Set the order status attribute, which defaults to `created`.
      */
-    public function setStatusAttribute(string $status = null): void
+    public function setStatusAttribute(?string $status = null): void
     {
         $this->attributes['status'] = is_string($status) ? Str::snake($status) : 'created';
     }
@@ -979,7 +979,7 @@ class Order extends Model
         }
     }
 
-    public function updateActivity(array $activity = null, $proof = null): Order
+    public function updateActivity(?array $activity = null, $proof = null): Order
     {
         $status   = data_get($activity, 'status');
         $details  = data_get($activity, 'details', '');