@fleetbase/fleetops-engine 0.4.14 → 0.4.16

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.14",
+    "version": "0.4.16",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.7",
+        "fleetbase/core-api": "^1.4.10",
         "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.14",
+    "version": "0.4.16",
     "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.14",
+    "version": "0.4.16",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

package/server/src/Expansions/UserExpansion.php

@@ -21,7 +21,7 @@ class UserExpansion implements Expansion
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      */
-    public function driver()
+    public static function driver()
     {
         return function () {
             /* @var \Illuminate\Database\Eloquent\Model $this */
@@ -32,7 +32,7 @@ class UserExpansion implements Expansion
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      */
-    public function currentDriverSession()
+    public static function currentDriverSession()
     {
         return function () {
             /* @var \Illuminate\Database\Eloquent\Model $this */
@@ -43,7 +43,7 @@ class UserExpansion implements Expansion
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
-    public function driverProfiles()
+    public static function driverProfiles()
     {
         return function () {
             /* @var \Illuminate\Database\Eloquent\Model $this */
@@ -54,7 +54,7 @@ class UserExpansion implements Expansion
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      */
-    public function customer()
+    public static function customer()
     {
         return function () {
             /* @var \Illuminate\Database\Eloquent\Model $this */

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

@@ -144,15 +144,16 @@ class OrderController extends FleetOpsController
 
     /**
      *  Route which enables editing of an order route.
-     * 
-     * @param string $id - The order ID.
-     * @param Request $request
+     *
+     * @param string $id - The order ID
+     *
      * @return Response
      */
-    public function editOrderRoute(string $id, Request $request) {
-        $pickup = $request->input('pickup');
-        $dropoff = $request->input('dropoff');
-        $return = $request->input('return');
+    public function editOrderRoute(string $id, Request $request)
+    {
+        $pickup    = $request->input('pickup');
+        $dropoff   = $request->input('dropoff');
+        $return    = $request->input('return');
         $waypoints = $request->array('waypoints', []);
 
         // Get the order
@@ -160,7 +161,7 @@ class OrderController extends FleetOpsController
         if (!$order) {
             return response()->error('Unable to find order to update route for.');
         }
-        
+
         // Handle update of multiple waypoints
         if ($waypoints) {
             $order->payload->updateWaypoints($waypoints);
@@ -185,7 +186,7 @@ class OrderController extends FleetOpsController
             $order->payload->removeWaypoints();
         }
 
-        return ['order' => new $this->resource($order)]; 
+        return ['order' => new $this->resource($order)];
     }
 
     /**

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

@@ -48,7 +48,7 @@ class Payload extends FleetbaseResource
                 return $waypoint;
             });
         }
-        
+
         return [];
     }
 

package/server/src/Models/Payload.php

@@ -578,6 +578,7 @@ class Payload extends Model
         }
 
         $this->load('order');
+
         return $this->order;
     }
 
@@ -585,6 +586,7 @@ class Payload extends Model
     {
         Waypoint::where('payload_uuid', $this->uuid)->delete();
         $this->setRelation('waypoints', collect());
+
         return $this;
     }
 

package/server/src/Support/Utils.php

@@ -773,7 +773,7 @@ class Utils extends FleetbaseUtils
             }
         }
 
-        $response = Http::get(
+        $response = Http::withOptions(['verify' => false])->get(
             'https://maps.googleapis.com/maps/api/distancematrix/json',
             [
                 'origins'      => $originsString,