Merge pull request #99 from fleetbase/dev-v0.4.22

v0.4.222

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.21",
+    "version": "0.4.22",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

extension.json

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

package.json

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

server/src/Console/Commands/FixInvalidPolymorphicRelationTypeNamespaces.php

@@ -36,6 +36,7 @@ public function handle()
             ['model' => \Fleetbase\FleetOps\Models\Order::class, 'columns' => ['customer_type', 'facilitator_type']],
             ['model' => \Fleetbase\FleetOps\Models\Place::class, 'columns' => ['owner_type']],
             ['model' => \Fleetbase\FleetOps\Models\Entity::class, 'columns' => ['customer_type']],
+            ['model' => \Fleetbase\FleetOps\Models\PurchaseRate::class, 'columns' => ['customer_type']],
         ];
 
         foreach ($models as $modelConfig) {

server/src/Console/Commands/TrackOrderDistanceAndTime.php

@@ -33,7 +33,10 @@ public function handle()
         date_default_timezone_set('UTC');
 
         // Determine the provider
-        $provider = $this->option('provider') ?? config('fleetops.distance_matrix.provider');
+        $provider = $this->option('provider');
+        if (!$provider) {
+            $provider = config('fleetops.distance_matrix.provider');
+        }
         $this->info("Using '{$provider}' as the provider for calculations.");
 
         // Get all active/ready orders
@@ -60,15 +63,30 @@ public function handle()
     }
 
     /**
-     * Fetches active orders.
+     * Retrieves active orders that meet specific criteria.
+     *
+     * This method returns a collection of active orders with the following conditions:
+     * - Not in 'completed' or 'canceled' status.
+     * - Not marked as deleted (`deleted_at` is null).
+     * - Associated with a company (`company_uuid` is not null).
+     * - The order process has started (`started` is not null).
+     * - Contains a payload (`payload` relationship exists).
+     * - Created within the past month.
      *
-     * @return \Illuminate\Database\Eloquent\Collection
+     * The result includes related payload data, waypoints, and information about pickup and dropoff points.
+     * Global scopes are not applied to this query.
+     *
+     * @return \Illuminate\Database\Eloquent\Collection collection of relevant Order objects
      */
     protected function getActiveOrders()
     {
+        $oneMonthAgo = Carbon::now()->subMonth();
+
         return Order::whereNotIn('status', ['completed', 'canceled'])
                     ->whereNull('deleted_at')
                     ->whereNotNull('company_uuid')
+                    ->whereNotNull('started')
+                    ->where('created_at', '>=', $oneMonthAgo)
                     ->whereHas('payload')
                     ->with(['payload', 'payload.waypoints', 'payload.pickup', 'payload.dropoff'])
                     ->withoutGlobalScopes()

server/src/Models/Place.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\Casts\PolymorphicType;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Geocoding;
 use Fleetbase\FleetOps\Support\Utils;
@@ -114,8 +115,9 @@ class Place extends Model
      * @var array
      */
     protected $casts = [
-        'meta'     => Json::class,
-        'location' => Point::class,
+        'meta'          => Json::class,
+        'location'      => Point::class,
+        'owner_type'    => PolymorphicType::class,
     ];
 
     /**

server/src/Models/PurchaseRate.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\Casts\PolymorphicType;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
@@ -57,7 +58,8 @@ class PurchaseRate extends Model
      * @var array
      */
     protected $casts = [
-        'meta' => Json::class,
+        'meta'             => Json::class,
+        'customer_type'    => PolymorphicType::class,
     ];
 
     /**