@fleetbase/fleetops-engine 0.3.4 → 0.3.6

package/server/migrations/2023_11_28_074244_add_supplier_uuid_column_to_entities_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddSupplierUuidColumnToEntitiesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('entities', function (Blueprint $table) {
+            $table->foreignUuid('supplier_uuid')->nullable()->after('driver_assigned_uuid')->references('uuid')->on('vendors');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('entities', function (Blueprint $table) {
+            $table->dropForeign(['supplier_uuid']);
+            $table->dropColumn(['supplier_uuid']);
+        });
+    }
+}

package/server/migrations/2023_12_14_100209_add_meta_column_on_driver_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddMetaColumnOnDriverTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('drivers', function (Blueprint $table) {
+            $table->json('meta')->nullable()->after('slug');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

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

@@ -431,7 +431,10 @@ class DriverController extends Controller
         }
 
         // check if user exists
-        $user = User::where('phone', $identity)->orWhere('email', $identity)->first();
+        $user = User::where('type', 'driver')->where(function ($query) use ($identity) {
+            $query->where('phone', $identity);
+            $query->orWhere('phone', $identity);
+        })->first();
 
         if (!$user) {
             return response()->error('Unable to verify code.');
@@ -456,9 +459,9 @@ class DriverController extends Controller
             [
                 'user_uuid'    => $user->uuid,
                 'company_uuid' => $company->uuid,
-                'name'         => $attrs['name'] ?? $user->name,
-                'phone'        => $attrs['phone'] ?? $user->phone,
-                'email'        => $attrs['email'] ?? $user->email,
+                'name'         => data_get($attrs, 'name', $user->name),
+                'phone'        => data_get($attrs, 'phone', $user->phone),
+                'email'        => data_get($attrs, 'email', $user->email),
                 'location'     => new Point(0, 0),
             ]
         );

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

@@ -41,6 +41,7 @@ class EntityController extends Controller
             'sku',
             'currency',
             'meta',
+            'supplier_uuid',
         ]);
 
         // payload assignment
@@ -126,6 +127,7 @@ class EntityController extends Controller
             'sku',
             'currency',
             'meta',
+            'supplier_uuid',
         ]);
 
         // payload assignment

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

@@ -33,7 +33,7 @@ class OrderController extends Controller
     /**
      * Creates a new Fleetbase Order resource.
      *
-     * @param \Fleetbase\Http\Requests\CreateOrderRequest $request
+     * @param \Illuminate\Http\Request|\Fleetbase\Http\Requests\CreateOrderRequest $request
      *
      * @return \Fleetbase\Http\Resources\Order
      */
@@ -61,18 +61,36 @@ class OrderController extends Controller
 
         // create payload
         if ($request->has('payload') && $request->isArray('payload')) {
-            $payloadInput = $request->input('payload');
             $payload      = new Payload();
+            $payloadInput = $request->input('payload');
+            $entities     = data_get($payloadInput, 'entities', []);
+            $waypoints    = data_get($payloadInput, 'waypoints', []);
+            $pickup       = data_get($payloadInput, 'pickup');
+            $dropoff      = data_get($payloadInput, 'dropoff');
+            $return       = data_get($payloadInput, 'return');
+
+            // if no pickup and dropoff extract from waypoints
+            if (empty($pickup) && empty($dropoff) && count($waypoints)) {
+                $pickup  = array_shift($waypoints);
+                $dropoff = array_pop($waypoints);
+            }
 
-            $payload->setPickup($payloadInput['pickup']);
-            $payload->setDropoff($payloadInput['dropoff']);
-            if ($request->has('payload.return')) {
-                $payload->setReturn($payloadInput['return']);
+            $payload->setPickup($pickup, [
+                'callback' => function ($pickup, $payload) {
+                    $payload->setCurrentWaypoint($pickup);
+                },
+            ]);
+            $payload->setDropoff($dropoff);
+            if ($return) {
+                $payload->setReturn($return);
             }
-            $payload->setWaypoints($payloadInput['waypoints'] ?? []);
-            $payload->setEntities($payloadInput['entities'] ?? []);
+
             $payload->save();
 
+            // set waypoints and entities after payload is saved
+            $payload->setWaypoints($waypoints);
+            $payload->setEntities($entities);
+
             $input['payload_uuid'] = $payload->uuid;
         } elseif ($request->isString('payload')) {
             $input['payload_uuid'] = Utils::getUuid('payloads', [
@@ -84,19 +102,40 @@ class OrderController extends Controller
 
         // create a payload if missing payload[] but has pickup/dropoff/etc
         if ($request->missing('payload')) {
-            $payloadInput = $request->only(['pickup', 'dropoff', 'return', 'waypoints', 'entities']);
             $payload      = new Payload();
+            $payloadInput = $request->only(['pickup', 'dropoff', 'return', 'waypoints', 'entities']);
+            $entities     = data_get($payloadInput, 'entities', []);
+            $waypoints    = data_get($payloadInput, 'waypoints', []);
+            $pickup       = data_get($payloadInput, 'pickup');
+            $dropoff      = data_get($payloadInput, 'dropoff');
+            $return       = data_get($payloadInput, 'return');
+
+            // if no pickup and dropoff extract from waypoints
+            if (empty($pickup) && empty($dropoff) && count($waypoints)) {
+                $pickup  = array_shift($waypoints);
+                $dropoff = array_pop($waypoints);
+            }
 
-            $payload->setPickup($payloadInput['pickup']);
-            $payload->setDropoff($payloadInput['dropoff']);
-            if ($request->has('return')) {
-                $payload->setReturn($payloadInput['return']);
+            $payload->setPickup($pickup, [
+                'callback' => function ($pickup, $payload) {
+                    $payload->setCurrentWaypoint($pickup);
+                },
+            ]);
+            $payload->setDropoff($dropoff);
+            if ($return) {
+                $payload->setReturn($return);
             }
-            $payload->setWaypoints($payloadInput['waypoints'] ?? []);
-            $payload->setEntities($payloadInput['entities'] ?? []);
+
             $payload->save();
 
+            // set waypoints and entities after payload is saved
+            $payload->setWaypoints($waypoints);
+            $payload->setEntities($entities);
+
             $input['payload_uuid'] = $payload->uuid;
+
+            // set the first / current waypoint
+            $payload->setCurrentWaypoint($payload->pickup);
         }
 
         // driver assignment
@@ -218,18 +257,43 @@ class OrderController extends Controller
 
         // update payload if new input or change payload by id
         if ($request->isArray('payload')) {
+            $payload      = data_get($order, 'payload', new Payload());
             $payloadInput = $request->input('payload');
-            $payload      = new Payload();
+            $entities     = data_get($payloadInput, 'entities', []);
+            $waypoints    = data_get($payloadInput, 'waypoints', []);
+            $pickup       = data_get($payloadInput, 'pickup');
+            $dropoff      = data_get($payloadInput, 'dropoff');
+            $return       = data_get($payloadInput, 'return');
+
+            // if no pickup and dropoff extract from waypoints
+            if (empty($pickup) && empty($dropoff) && count($waypoints)) {
+                $pickup  = array_shift($waypoints);
+                $dropoff = array_pop($waypoints);
+            }
+
+            if ($pickup) {
+                $payload->setPickup($pickup);
+            }
+
+            if ($dropoff) {
+                $payload->setDropoff($dropoff);
+            }
 
-            $payload->setPickup($payloadInput['pickup']);
-            $payload->setDropoff($payloadInput['dropoff']);
-            if ($request->has('payload.return')) {
-                $payload->setReturn($payloadInput['return']);
+            if ($return) {
+                $payload->setReturn($return);
             }
-            $payload->setWaypoints($payloadInput['waypoints'] ?? []);
-            $payload->setEntities($payloadInput['entities'] ?? []);
+
             $payload->save();
 
+            // set waypoints and entities after payload is saved
+            if ($waypoints) {
+                $payload->setWaypoints($waypoints);
+            }
+
+            if ($entities) {
+                $payload->setEntities($entities);
+            }
+
             $input['payload_uuid'] = $payload->uuid;
         } elseif ($request->has('payload')) {
             $input['payload_uuid'] = Utils::getUuid('payloads', [
@@ -239,34 +303,46 @@ class OrderController extends Controller
             unset($input['payload']);
         }
 
-        // update payload properties if applicable
-        if ($request->has('pickup')) {
-            if ($order->payload) {
-                $order->payload->setPickup($request->input('pickup'));
+        // create a payload if missing payload[] but has pickup/dropoff/etc
+        if ($request->missing('payload')) {
+            $payload      = data_get($order, 'payload', new Payload());
+            $payloadInput = $request->only(['pickup', 'dropoff', 'return', 'waypoints', 'entities']);
+            $entities     = data_get($payloadInput, 'entities', []);
+            $waypoints    = data_get($payloadInput, 'waypoints', []);
+            $pickup       = data_get($payloadInput, 'pickup');
+            $dropoff      = data_get($payloadInput, 'dropoff');
+            $return       = data_get($payloadInput, 'return');
+
+            // if no pickup and dropoff extract from waypoints
+            if (empty($pickup) && empty($dropoff) && count($waypoints)) {
+                $pickup  = array_shift($waypoints);
+                $dropoff = array_pop($waypoints);
             }
-        }
-        if ($request->has('dropoff')) {
-            if ($order->payload) {
-                $order->payload->setDropoff($request->input('dropoff'));
+
+            if ($pickup) {
+                $payload->setPickup($pickup);
             }
-        }
 
-        if ($request->has('return')) {
-            if ($order->payload) {
-                $order->payload->setReturn($request->input('return'));
+            if ($dropoff) {
+                $payload->setDropoff($dropoff);
             }
-        }
 
-        if ($request->has('waypoints')) {
-            if ($order->payload) {
-                $order->payload->setWaypoints($request->input('waypoints'));
+            if ($return) {
+                $payload->setReturn($return);
             }
-        }
 
-        if ($request->has('entities')) {
-            if ($order->payload) {
-                $order->payload->setEntities($request->input('entities'));
+            $payload->save();
+
+            // set waypoints and entities after payload is saved
+            if ($waypoints) {
+                $payload->setWaypoints($waypoints);
             }
+
+            if ($entities) {
+                $payload->setEntities($entities);
+            }
+
+            $input['payload_uuid'] = $payload->uuid;
         }
 
         // driver assignment

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

@@ -7,10 +7,9 @@ use Fleetbase\FleetOps\Http\Requests\UpdatePayloadRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Payload as PayloadResource;
 use Fleetbase\FleetOps\Models\Payload;
-use Fleetbase\FleetOps\Models\Place;
-use Fleetbase\FleetOps\Models\Waypoint;
 use Fleetbase\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 
 // use Fleetbase\FleetOps\Support\Utils;
 
@@ -25,41 +24,42 @@ class PayloadController extends Controller
      */
     public function create(CreatePayloadRequest $request)
     {
-        // get request input
-        $input = $request->only(['pickup', 'dropoff', 'type', 'return', 'waypoints', 'customer', 'meta', 'cod_amount', 'cod_currency', 'cod_payment_method']);
+        $input     = $request->all();
+        $entities  = data_get($input, 'entities', []);
+        $waypoints = data_get($input, 'waypoints', []);
+        $pickup    = data_get($input, 'pickup');
+        $dropoff   = data_get($input, 'dropoff');
+        $return    = data_get($input, 'return');
 
         // make sure company is set
         $input['company_uuid'] = session('company');
 
         // create the payload
-        $payload = new Payload($input);
+        $payload = new Payload(Arr::only($input, ['type', 'provider', 'meta', 'cod_amount', 'cod_currency', 'cod_payment_method']));
+
+        // if no pickup and dropoff extract from waypoints
+        if (empty($pickup) && empty($dropoff) && count($waypoints)) {
+            $pickup  = array_shift($waypoints);
+            $dropoff = array_pop($waypoints);
+        }
 
         // set pickup point
-        $payload->setPickup($request->input('pickup'));
+        $payload->setPickup($pickup);
 
         // set dropoff point
-        $payload->setDropoff($request->input('dropoff'));
+        $payload->setDropoff($dropoff);
 
         // set return point
-        $payload->setReturn($request->input('return'));
+        $payload->setReturn($return);
 
         // save payload
         $payload->save();
 
         // set waypoints
-        if ($request->has('waypoints') && is_array($request->input('waypoints'))) {
-            foreach ($request->input('waypoints') as $index => $place) {
-                // get place
-                $id = Place::createFromMixed($place);
-
-                // create waypoint
-                Waypoint::create([
-                    'place_uuid'   => $id,
-                    'payload_uuid' => $payload->uuid,
-                    'order'        => $index,
-                ]);
-            }
-        }
+        $payload->setWaypoints($waypoints);
+
+        // set entities
+        $payload->setEntities($entities);
 
         // response the driver resource
         return new PayloadResource($payload);
@@ -88,42 +88,40 @@ class PayloadController extends Controller
         }
 
         // get request input
-        $input = $request->only(['pickup', 'dropoff', 'type', 'return', 'waypoints', 'customer', 'meta', 'cod_amount', 'cod_currency', 'cod_payment_method']);
+        $input     = $request->all();
+        $entities  = data_get($input, 'entities', []);
+        $waypoints = data_get($input, 'waypoints', []);
+        $pickup    = data_get($input, 'pickup');
+        $dropoff   = data_get($input, 'dropoff');
+        $return    = data_get($input, 'return');
 
         // pickup assignment
-        if ($request->has('pickup')) {
-            $payload->setPickup($request->input('pickup'));
+        if ($pickup) {
+            $payload->setPickup($pickup);
         }
 
         // dropoff assignment
-        if ($request->has('dropoff')) {
-            $payload->setDropoff($request->input('dropoff'));
+        if ($dropoff) {
+            $payload->setDropoff($dropoff);
         }
 
         // return assignment
-        if ($request->has('return')) {
-            $payload->setReturn($request->input('return'));
+        if ($return) {
+            $payload->setReturn($return);
         }
 
         // set waypoints
-        if ($request->has('waypoints') && is_array($request->input('waypoints'))) {
-            $waypointCount = $payload->waypoints->count() ?? 0;
-
-            foreach ($request->input('waypoints') as $index => $place) {
-                // get place
-                $id = Place::createFromMixed($place);
-
-                // create waypoint
-                Waypoint::create([
-                    'place_uuid'   => $id,
-                    'payload_uuid' => $payload->uuid,
-                    'order'        => $index + $waypointCount,
-                ]);
-            }
+        if ($waypoints) {
+            $payload->setWaypoints($waypoints);
+        }
+
+        // set entities
+        if ($entities) {
+            $payload->setEntities($entities);
         }
 
         // update the payload
-        $payload->fill($input);
+        $payload->fill(array_filter(Arr::only($input, ['type', 'provider', 'meta', 'cod_amount', 'cod_currency', 'cod_payment_method'])));
 
         // save the payload
         $payload->save();

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

@@ -6,9 +6,11 @@ use Fleetbase\FleetOps\Http\Requests\CreateTrackingStatusRequest;
 use Fleetbase\FleetOps\Http\Requests\UpdateTrackingStatusRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\TrackingStatus as TrackingStatusResource;
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\TrackingStatus;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 
 class TrackingStatusController extends Controller
@@ -23,7 +25,24 @@ class TrackingStatusController extends Controller
     public function create(CreateTrackingStatusRequest $request)
     {
         // get request input
-        $input = $request->only(['status', 'details', 'code', 'city', 'province', 'postal_code', 'country', 'latitude', 'longitude']);
+        $input = $request->only(['status', 'details', 'code', 'city', 'province', 'postal_code', 'country', 'location', 'latitude', 'longitude']);
+
+        // if no location provided but latitude/longitude
+        if (empty($input['location']) && isset($input['latitude']) && isset($input['longitude'])) {
+            $latitude  = data_get($input, 'latitude');
+            $longitude = data_get($input, 'longitude');
+
+            // unset latitude and longitude
+            unset($input['latitude'], $input['longitude']);
+
+            // create location
+            $input['location'] = new Point($latitude, $longitude);
+        }
+
+        // if no code set create a code from the status
+        if (empty($input['code'])) {
+            $input['code'] = TrackingStatus::prepareCode($input['status']);
+        }
 
         // make sure company is set
         $input['company_uuid'] = session('company');
@@ -36,6 +55,11 @@ class TrackingStatusController extends Controller
             ]);
         }
 
+        // tracking number assignment
+        if ($request->has('order')) {
+            $input['tracking_number_uuid'] = Order::where('public_id', $request->input('order'))->value('tracking_number_uuid');
+        }
+
         // create the trackingStatus
         $trackingStatus = TrackingStatus::create($input);
 
@@ -66,7 +90,24 @@ class TrackingStatusController extends Controller
         }
 
         // get request input
-        $input = $request->only(['status', 'details', 'code', 'city', 'province', 'postal_code', 'country', 'latitude', 'longitude']);
+        $input = $request->only(['status', 'details', 'code', 'city', 'province', 'postal_code', 'country', 'location', 'latitude', 'longitude']);
+
+        // if no location provided but latitude/longitude
+        if (empty($input['location']) && isset($input['latitude']) && isset($input['longitude'])) {
+            $latitude  = data_get($input, 'latitude');
+            $longitude = data_get($input, 'longitude');
+
+            // unset latitude and longitude
+            unset($input['latitude'], $input['longitude']);
+
+            // create location
+            $input['location'] = new Point($latitude, $longitude);
+        }
+
+        // if no code set create a code from the status
+        if (empty($input['code'])) {
+            $input['code'] = TrackingStatus::prepareCode($input['status']);
+        }
 
         // update the trackingStatus
         $trackingStatus->update($input);

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

@@ -13,7 +13,6 @@ use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
 use Fleetbase\Notifications\UserInvited;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;

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

@@ -2,12 +2,16 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\FleetOps\Http\Filter\ContactFilter;
+use Fleetbase\FleetOps\Http\Filter\VendorFilter;
 use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\IntegratedVendor;
 use Fleetbase\FleetOps\Models\Vendor;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Str;
 
 class MorphController extends Controller
@@ -21,18 +25,26 @@ class MorphController extends Controller
     {
         $query        = $request->input('query');
         $limit        = $request->input('limit', 12);
+        $page         = $request->input('page', 1);
         $type         = Str::lower($request->segment(4));
         $resourceType = Str::lower(Utils::singularize($type));
 
-        $contacts = Contact::searchWhere('name', $query)
+        $contactsQuery = Contact::searchWhere('name', $query)
             ->where('company_uuid', session('company'))
-            ->limit($limit)
-            ->get();
+            ->filter(new ContactFilter($request));
 
-        $vendors = Vendor::searchWhere('name', $query)
+        $vendorsQuery = Vendor::searchWhere('name', $query)
             ->where('company_uuid', session('company'))
-            ->limit($limit)
-            ->get();
+            ->filter(new VendorFilter($request));
+
+        // Get total count for pagination
+        $totalContacts = $contactsQuery->count();
+        $totalVendors  = $vendorsQuery->count();
+        $total         = $totalContacts + $totalVendors;
+
+        // Get paginated items
+        $contacts = $contactsQuery->limit($limit)->get();
+        $vendors  = $vendorsQuery->limit($limit)->get();
 
         $results = collect([...$contacts, ...$vendors])
             ->sortBy('name')
@@ -59,19 +71,39 @@ class MorphController extends Controller
             }
         }
 
-        // convert to array
-        $results = $results->toArray();
-
         // set resource type
-        $results = array_map(
-            function ($attributes) use ($resourceType) {
-                $attributes['type'] = $resourceType;
+        $results = $results->map(
+            function ($item) use ($resourceType) {
+                $item['type'] = $resourceType;
 
-                return $attributes;
-            },
-            $results
+                return $item;
+            }
         );
 
-        return response()->json([$type => $results]);
+        // Create a LengthAwarePaginator instance
+        $results = new LengthAwarePaginator(
+            $results->forPage($page, $limit),
+            $total,
+            $limit,
+            $page,
+            ['path' => URL::current()]
+        );
+
+        // Manually structure the response
+        $response = [
+            $type  => $results->items(),
+            'meta' => [
+                'total'         => $results->total(),
+                'per_page'      => $results->perPage(),
+                'current_page'  => $results->currentPage(),
+                'last_page'     => $results->lastPage(),
+                'next_page_url' => $results->nextPageUrl(),
+                'prev_page_url' => $results->previousPageUrl(),
+                'from'          => $results->firstItem(),
+                'to'            => $results->lastItem(),
+            ],
+        ];
+
+        return response()->json($response);
     }
 }