@fleetbase/fleetops-engine 0.3.9 → 0.4.1

package/server/src/Models/Payload.php

@@ -216,6 +216,14 @@ class Payload extends Model
                 }
             }
 
+            // Validate destination actually exists
+            if (isset($attributes['destination_uuid']) && Place::where('uuid', $attributes['destination_uuid'])->doesntExist()) {
+                $validDestination = $this->_findCorrectDestinationForEntity($attributes);
+                if ($validDestination) {
+                    $attributes['destination_uuid'] = $validDestination->uuid;
+                }
+            }
+
             $entity = new Entity($attributes);
             $this->entities()->save($entity);
         }
@@ -249,6 +257,14 @@ class Payload extends Model
                 }
             }
 
+            // Validate destination actually exists
+            if (isset($attributes['destination_uuid']) && Place::where('uuid', $attributes['destination_uuid'])->doesntExist()) {
+                $validDestination = $this->_findCorrectDestinationForEntity($attributes);
+                if ($validDestination) {
+                    $attributes['destination_uuid'] = $validDestination->uuid;
+                }
+            }
+
             Entity::insertGetUuid($attributes, $this);
         }
 
@@ -334,7 +350,9 @@ class Payload extends Model
                 if (Str::isUuid($placeUuid) && isset($attributes['uuid']) && $placeUuid !== $attributes['uuid']) {
                     $place = Place::where('uuid', $placeUuid)->first();
 
+                    // set the original destination uuid in meta
                     if ($place instanceof Place) {
+                        $place->updateMeta('_console_destination_uuid', $attributes['uuid']);
                         $place->updateMeta('search_uuid', $attributes['uuid']);
                     }
                 }
@@ -399,6 +417,18 @@ class Payload extends Model
         return $this->refresh()->load(['waypoints']);
     }
 
+    public function _findCorrectDestinationForEntity($entityAttributes = []): ?Place
+    {
+        $destinationId = Utils::get($entityAttributes, 'destination_uuid');
+
+        $destination = Place::where('meta->search_uuid', $destinationId)->first();
+        if (!$destination) {
+            $destination = Place::where('meta->_console_destination_uuid', $destinationId)->first();
+        }
+
+        return $destination;
+    }
+
     /**
      * Get the payload pickup point or the first waypoint.
      *
@@ -783,6 +813,15 @@ class Payload extends Model
             }
         }
 
+        // Validate destination actually exists
+        if (isset($attributes['destination_uuid']) && Place::where('uuid', $attributes['destination_uuid'])->doesntExist()) {
+            $destination = $this->_findCorrectDestinationForEntity($attributes);
+
+            if ($destination instanceof Place) {
+                return $destination;
+            }
+        }
+
         return null;
     }
 }

package/server/src/Models/Place.php

@@ -447,9 +447,12 @@ class Place extends Model
                 return static::createFromCoordinates($place, $attributes, $saveInstance);
             }
 
+            // Get uuid if set
+            $uuid = data_get($place, 'uuid');
+
             // If $place has a valid uuid and a matching Place object exists, return the uuid
-            if (isset($place['uuid']) && Str::isUuid($place['uuid']) && Place::where('uuid', $place['uuid'])->exists()) {
-                return $place['uuid'];
+            if (Str::isUuid($uuid) && $place = Place::where('uuid', $uuid)->first()) {
+                return $place;
             }
 
             // Otherwise, create a new Place object with the given attributes

package/server/src/Models/Waypoint.php

@@ -83,16 +83,28 @@ class Waypoint extends Model
         return $this->pdfLabel()->stream();
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function entities() 
+    {
+        return $this->hasMany(Entity::class, 'destination_uuid', 'place_uuid')->where('payload_uuid', $this->payload_uuid);
+    }
+
     /**
      * The html for the shipment label.
      */
     public function label()
     {
-        $this->load(['trackingNumber', 'company', 'place']);
+        $this->load(['trackingNumber', 'company', 'place', 'entities']);
+        
+        // $entities = Entity::where(['payload_uuid' => $this->payload_uuid, 'destination_uuid' => $this->place_uuid])->get();
+        // dd($entities, );
 
-        return view('labels/default', [
-            'order'          => $this,
+        return view('fleetops::labels/waypoint-label', [
+            'waypoint'          => $this,
             'dropoff'        => $this->place,
+            'entities'        => $this->entities()->get(),
             'trackingNumber' => $this->trackingNumber,
             'company'        => $this->company,
         ])->render();

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -44,6 +44,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Console\Commands\DispatchAdhocOrders::class,
         \Fleetbase\FleetOps\Console\Commands\DispatchOrders::class,
         \Fleetbase\FleetOps\Console\Commands\TrackOrderDistanceAndTime::class,
+        \Fleetbase\FleetOps\Console\Commands\FixDriverCompanies::class,
     ];
 
     /**

package/server/src/Support/Flow.php

@@ -6,6 +6,7 @@ use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Waypoint;
 use Fleetbase\Models\Company;
+use Fleetbase\Models\CompanyUser;
 use Fleetbase\Models\Extension;
 use Fleetbase\Models\ExtensionInstall;
 use Fleetbase\Models\User;
@@ -550,9 +551,25 @@ class Flow
         return Company::currentSession();
     }
 
-    public static function getCompanySessionForUser(User $user)
+    public static function getCompanySessionForUser(User $user): ?Company
     {
-        return Company::where('uuid', $user->company_uuid)->first();
+        if (Str::isUuid($user->company_uuid)) {
+            $company = Company::where('uuid', $user->company_uuid)->first();
+            if ($company) {
+                return $company;
+            }
+        }
+
+        // fallback to get user's first company
+        $userCompany = CompanyUser::where('user_uuid', $user->uuid)->first();
+        if ($userCompany) {
+            $company = Company::where('uuid', $userCompany->company_uuid)->first();
+            if ($company) {
+                return $company;
+            }
+        }
+
+        return null;
     }
 
     public static function getDefaultOrderFlow()