@fleetbase/fleetops-engine 0.4.3 → 0.4.4

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

@@ -21,13 +21,14 @@ class PurchaseRate extends FleetbaseResource
             'id'            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'          => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'     => $this->when(Http::isInternalRequest(), $this->public_id),
-            'service_quote' => $this->service_quote_id,
+            'service_quote' => $this->when(Http::isInternalRequest(), $this->serviceQuote(), $this->service_quote_id),
             'order'         => $this->order_id,
             'customer'      => $this->customer_id,
             'transaction'   => $this->transaction_id,
             'amount'        => $this->amount,
             'currency'      => $this->currency,
             'status'        => $this->status,
+            // 'type'          => $this->when(Http::isInternalRequest(), 'service-rate'),
             'updated_at'    => $this->updated_at,
             'created_at'    => $this->created_at,
         ];

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

@@ -25,6 +25,7 @@ class ServiceQuote extends FleetbaseResource
             'service_rate_name' => $this->when(Http::isInternalRequest(), data_get($this, 'serviceRate.name')),
             'service_rate'      => $this->when(Http::isPublicRequest(), data_get($this, 'serviceRate.public_id')),
             'facilitator'       => $this->when(Http::isPublicRequest(), data_get($this, 'integratedVendor.public_id')),
+            'items'             => ServiceQuoteItem::collection($this->items),
             'request_id'        => $this->request_id,
             'amount'            => $this->amount,
             'currency'          => $this->currency,

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

@@ -0,0 +1,29 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class ServiceQuoteItem extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            '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,
+        ];
+    }
+}

package/server/src/Models/Driver.php

@@ -203,7 +203,7 @@ class Driver extends Model
      */
     public function user()
     {
-        return $this->belongsTo(\Fleetbase\Models\User::class)->select(['uuid', 'avatar_uuid', 'name', 'phone', 'email'])->without(['driver'])->withTrashed();
+        return $this->belongsTo(\Fleetbase\Models\User::class)->select(['uuid', 'company_uuid', 'avatar_uuid', 'name', 'phone', 'email'])->without(['driver'])->withTrashed();
     }
 
     /**

package/server/src/Models/Order.php

@@ -323,6 +323,22 @@ class Order extends Model
         return $this->belongsTo(Driver::class)->without(['devices', 'vendor']);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function comments()
+    {
+        return $this->hasMany(\Fleetbase\Models\Comment::class, 'subject_uuid')->whereNull('parent_comment_uuid')->latest();
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function files()
+    {
+        return $this->hasMany(\Fleetbase\Models\File::class, 'subject_uuid')->latest();
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
      */

package/server/src/Models/Place.php

@@ -451,8 +451,8 @@ class Place extends Model
             $uuid = data_get($place, 'uuid');
 
             // If $place has a valid uuid and a matching Place object exists, return the uuid
-            if (Str::isUuid($uuid) && $place = Place::where('uuid', $uuid)->first()) {
-                return $place;
+            if (Str::isUuid($uuid) && $existingPlace = Place::where('uuid', $uuid)->first()) {
+                return $existingPlace;
             }
 
             // Otherwise, create a new Place object with the given attributes

package/server/src/Observers/DriverObserver.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Observers;
 
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Models\CompanyUser;
 use Fleetbase\Models\User;
 use Grimzy\LaravelMysqlSpatial\Types\Point;
 
@@ -41,7 +42,11 @@ class DriverObserver
     public function deleted(Driver $driver)
     {
         // if the driver is deleted, delete their user account assosciated as well
-        User::where(['uuid' => $driver->user_uuid, 'type' => 'driver'])->delete();
+        if ($driver->user->companies()->count() === 1) {
+            User::where(['uuid' => $driver->user_uuid, 'type' => 'driver'])->delete();
+        } else {
+            CompanyUser::where(['user_uuid' => $driver->user_uuid, 'company_uuid' => session('company')])->delete();
+        }
 
         // also unassign them from any order they are assigned to
         Order::where(['driver_assigned_uuid' => $driver->uuid])->update(['driver_assigned_uuid' => null]);

package/server/src/routes.php

@@ -40,6 +40,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                     $router->get('/', 'DriverController@query');
                     $router->get('{id}', 'DriverController@find');
                     $router->get('{id}/organizations', 'DriverController@listOrganizations');
+                    $router->get('{id}/current-organization', 'DriverController@currentOrganization');
                     $router->put('{id}', 'DriverController@update');
                     $router->delete('{id}', 'DriverController@delete');
                 });

package/translations/en-us.yaml

@@ -8,6 +8,7 @@ fleet-ops:
     avatar: Avatar
     building: Building
     bulk-action: Bulk Action
+    cancel: Cancel
     category: Category
     city: City
     coordinates: Coordinates
@@ -185,8 +186,8 @@ fleet-ops:
         create-zone: Create zone inside...
       toolbar:
         create: Create Order
-        view: View Orders
-        service: Service Areas
+        view-order: View Orders
+        view-service-area: View Service Areas
         visibility: Visibility Controls
         scope: Scope
     modals:
@@ -1157,6 +1158,12 @@ fleet-ops:
           edit-field-title: Edit custom field
           edit-metadata: Edit Metadata
         view:
+          purchase-rate-panel-title: Purchase Rate
+          documents-panel-title: Documents & Files
+          route-panel-title: Route
+          currency: Currency
+          comments-title: Comments
+          notes-title: Notes
           dispatch: Dispatch
           order-actions: Order Actions
           edit-details: Edit Details