@fleetbase/fleetops-engine 0.4.18 → 0.4.20

package/server/src/Support/Utils.php

@@ -633,13 +633,26 @@ class Utils extends FleetbaseUtils
                 ]
             );
         } else {
-            $point  = static::getPointFromMixed($origin);
-            $origin = static::createObject(
-                [
-                    'latitude'  => $point->getLat(),
-                    'longitude' => $point->getLng(),
-                ]
-            );
+            try {
+                $point  = static::getPointFromMixed($origin);
+                $origin = static::createObject(
+                    [
+                        'latitude'  => $point->getLat(),
+                        'longitude' => $point->getLng(),
+                    ]
+                );
+            } catch (\Throwable $e) {
+                if (app()->bound('sentry')) {
+                    app('sentry')->captureException($e);
+                }
+                // create dummy $origin
+                $origin = static::createObject(
+                    [
+                        'latitude'  => 0,
+                        'longitude' => 0,
+                    ]
+                );
+            }
         }
 
         if ($destination instanceof \Fleetbase\FleetOps\Models\Place) {
@@ -650,13 +663,26 @@ class Utils extends FleetbaseUtils
                 ]
             );
         } else {
-            $point       = static::getPointFromMixed($destination);
-            $destination = static::createObject(
-                [
-                    'latitude'  => $point->getLat(),
-                    'longitude' => $point->getLng(),
-                ]
-            );
+            try {
+                $point       = static::getPointFromMixed($destination);
+                $destination = static::createObject(
+                    [
+                        'latitude'  => $point->getLat(),
+                        'longitude' => $point->getLng(),
+                    ]
+                );
+            } catch (\Throwable $e) {
+                if (app()->bound('sentry')) {
+                    app('sentry')->captureException($e);
+                }
+                // create dummy $destination
+                $destination = static::createObject(
+                    [
+                        'latitude'  => 0,
+                        'longitude' => 0,
+                    ]
+                );
+            }
         }
 
         $cacheKey = $origin->latitude . ':' . $origin->longitude . ':' . $destination->latitude . ':' . $destination->longitude;

package/server/src/routes.php

@@ -84,6 +84,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                     $router->post('{id}/capture-photo/{subjectId?}', 'OrderController@capturePhoto');
                     $router->put('{id}', 'OrderController@update');
                     $router->delete('{id}', 'OrderController@delete');
+                    $router->get('{id}/editable-entity-fields', 'OrderController@getEditableEntityFields');
                 });
                 // entities routes
                 $router->group(['prefix' => 'entities'], function () use ($router) {
@@ -435,6 +436,8 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                                     function ($router) {
                                         $router->get('visibility', 'SettingController@getVisibilitySettings');
                                         $router->post('visibility', 'SettingController@saveVisibilitySettings');
+                                        $router->get('entity-editing-settings', 'SettingController@getEntityEditingSettings');
+                                        $router->post('entity-editing-settings', 'SettingController@saveEntityEditingSettings');
                                     }
                                 );
                                 $router->group(

package/translations/en-us.yaml

@@ -139,6 +139,11 @@ fleet-ops:
       code: Code
       status: Status
       details: Details
+      proof-of-delivery: Proof of Delivery
+      require-pod: Requires Proof of Delivery
+      require-pod-help-text: This activity requires a proof to be created before it can be applied to the order.
+      select-pod-method: Proof of Delivery Method
+      pod-method-placeholder: Select Proof of Delivery Method
       completes-order: Completes Order
       complete: Complete
       key-help: "Enter a key used for programmatic decision-making. This key can represent one or several activities with the same identifier. Note: This key is not required to be unique."
@@ -231,6 +236,9 @@ fleet-ops:
         title: Navigator App
         name: Instance Linking URL
         message: Use this URL to link the official Navigator app to this {companyName} instance. Opening this URL on a mobile device will open the Navigator app and update it's configuration and branding.
+        settings: Entity Settings
+        select-input: Allow driver to update entity details 
+
       visibility-controls:
         title: Visibility Controls
         message: Visibility controls allow you to disable sections of Fleet-Ops. Toggle the checkbox to enable or disable sections to hide in Fleet-ops.
@@ -1406,7 +1414,7 @@ fleet-ops:
           service-name: Service Name
           service-name-help-text: Display name for this service.
           service-order-label: Service Order Type
-          service-order-help-text: Restrict this service rate to an explicit `order type`.
+          service-order-help-text: Select an order configuration to which this service rate will be exclusively applied. This ensures that only orders created with the selected order configuration can utilize this specific service rate.
           service-order-placeholder: Select order type to restrict service to
           base-fee-label: Base Fee
           base-fee-help-text: Set a base fee which represents the minimum cost for this serice.

package/addon/utils/apply-context-component-arguments.js

@@ -1,33 +0,0 @@
-import getModelName from '@fleetbase/ember-core/utils/get-model-name';
-import isModel from '@fleetbase/ember-core/utils/is-model';
-import { camelize } from '@ember/string';
-
-/**
- * Applies context and dynamic arguments to a given component.
- *
- * @param {Component} component - The component to which context and arguments will be applied.
- */
-export default function applyContextComponentArguments(component) {
-    const { context, dynamicArgs = {} } = component.args;
-
-    // Apply context model if available
-    if (context && isModel(context)) {
-        const contextModelName = camelize(getModelName(context));
-        if (contextModelName) {
-            component[contextModelName] = context;
-        }
-    }
-
-    // Execute any apply callback present in dynamic arguments
-    const { applyCallback } = dynamicArgs;
-    if (typeof applyCallback === 'function') {
-        applyCallback(component);
-    }
-
-    // Apply other dynamic arguments to the component
-    for (const [key, value] of Object.entries(dynamicArgs)) {
-        if (key !== 'applyCallback') {
-            component[key] = value;
-        }
-    }
-}

package/addon/utils/context-component-callback.js

@@ -1,16 +0,0 @@
-export default function contextComponentCallback(component, name, ...params) {
-    let callbackInvoked = false;
-
-    if (typeof component.args[name] === 'function') {
-        component.args[name](...params);
-        callbackInvoked = true;
-    }
-
-    // now do for context options
-    if (typeof component.args.options === 'object' && typeof component.args.options[name] === 'function') {
-        component.args.options[name](...params);
-        callbackInvoked = true;
-    }
-
-    return callbackInvoked;
-}

package/app/utils/apply-context-component-arguments.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/utils/apply-context-component-arguments';

package/app/utils/context-component-callback.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/utils/context-component-callback';