@fleetbase/fleetops-engine 0.6.46 → 0.6.47

package/addon/components/order/form/details.hbs

@@ -43,8 +43,7 @@
                 @renderInPlace={{true}}
                 @allowClear={{true}}
                 @disabled={{or @resource.hasWaypoints (cannot-write @resource)}}
-                @onChange={{fn (mut @resource.customer)}}
-                @onChangeId={{fn (mut @resource.customer_uuid)}}
+                @onChange={{this.selectCustomer}}
                 as |model|
             >
                 <div class="flex items-center">

package/addon/components/order/form/details.js

@@ -25,6 +25,12 @@ export default class OrderFormDetailsComponent extends Component {
         this.args.resource.set('driver', null);
     }
 
+    @action selectCustomer(model) {
+        this.args.resource.set('customer', model);
+        this.args.resource.set('customer_uuid', model?.uuid ?? model?.id ?? null);
+        this.args.resource.set('customer_type', model?.customer_type ? `fleet-ops:${model.customer_type}` : null);
+    }
+
     @task *selectOrderConfig(orderConfig) {
         if (!orderConfig) return;
         this.args.resource.setProperties({

package/addon/components/order/form/route.js

@@ -113,7 +113,15 @@ export default class OrderFormRouteComponent extends Component {
         if (!this.args.resource.payload.waypoints[index]) return;
 
         this.args.resource.payload.waypoints[index].place = place;
-        this.args.resource.payload.waypoints[index]?.setProperties(place.serialize());
+        this.args.resource.payload.waypoints[index]?.setProperties({
+            street1: place.street1,
+            street2: place.street2,
+            city: place.city,
+            province: place.province,
+            postal_code: place.postal_code,
+            country: place.country,
+            location: place.location,
+        });
         this.previewRoute();
     }
 

package/addon/controllers/settings/payments/index.js

@@ -46,7 +46,7 @@ export default class SettingsPaymentsIndexController extends Controller {
     ];
 
     get isStripeEnabled() {
-        return window.stripeInstance !== undefined || !isEmpty(config.stripe.publishableKey);
+        return !isEmpty(config.stripe.publishableKey);
     }
 
     @task *lookupStripeConnectAccount() {

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.46",
+    "version": "0.6.47",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.46",
+    "version": "0.6.47",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,9 +42,9 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.3.18",
+        "@fleetbase/ember-core": "^0.3.19",
         "@fleetbase/ember-ui": "^0.3.29",
-        "@fleetbase/fleetops-data": "^0.1.31",
+        "@fleetbase/fleetops-data": "^0.1.32",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",

package/pnpm-workspace.yaml

@@ -0,0 +1,7 @@
+allowBuilds:
+  '@fortawesome/fontawesome-common-types': false
+  '@fortawesome/fontawesome-svg-core': false
+  '@fortawesome/free-brands-svg-icons': false
+  '@fortawesome/free-solid-svg-icons': false
+  core-js: false
+  fsevents: false

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

@@ -97,6 +97,8 @@ class OrderController extends FleetOpsController
                 function ($request, &$input) {
                     $serviceQuote = ServiceQuote::resolveFromRequest($request);
 
+                    $this->normalizeCustomerType($input);
+
                     // if service quote is applied, resolve it
                     if ($serviceQuote instanceof ServiceQuote && $serviceQuote->fromIntegratedVendor()) {
                         // create order with integrated vendor, then resume fleetbase order creation
@@ -218,6 +220,33 @@ class OrderController extends FleetOpsController
         }
     }
 
+    /**
+     * Resolve the concrete polymorphic customer type from the submitted UUID.
+     */
+    protected function normalizeCustomerType(array &$input): void
+    {
+        $customerUuid = data_get($input, 'customer_uuid') ?? data_get($input, 'customer.uuid');
+        if (!$customerUuid) {
+            return;
+        }
+
+        $customer = Utils::getUuid(
+            ['contacts', 'vendors'],
+            [
+                'uuid'         => $customerUuid,
+                'company_uuid' => session('company'),
+            ],
+            [
+                'with_table' => true,
+            ]
+        );
+
+        if (is_array($customer)) {
+            $input['customer_uuid'] = Utils::get($customer, 'uuid');
+            $input['customer_type'] = Utils::getModelClassName(Utils::get($customer, 'table'));
+        }
+    }
+
     /**
      *  Route which enables editing of an order route.
      *