Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions .github/workflows/ember.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,20 @@ on:
pull_request:
branches: [ main ]

env:
NODE_VERSION: 22.x

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x] # Build on Node.js 18

steps:
- uses: actions/checkout@v2

- name: Setup Node.js ${{ matrix.node-version }}
- name: Setup Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
node-version: ${{ env.NODE_VERSION }}

- name: Setup pnpm
uses: pnpm/action-setup@v2.0.1
Expand All @@ -45,10 +44,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Setup Node.js 18.x
- name: Setup Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
with:
node-version: 18.x
node-version: ${{ env.NODE_VERSION }}

- name: Setup pnpm
uses: pnpm/action-setup@v2.0.1
Expand All @@ -74,10 +73,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Setup Node.js 18.x
- name: Setup Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
with:
node-version: 18.x
node-version: ${{ env.NODE_VERSION }}

- name: Setup pnpm
uses: pnpm/action-setup@v2.0.1
Expand Down
3 changes: 1 addition & 2 deletions addon/components/order/form/details.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
6 changes: 6 additions & 0 deletions addon/components/order/form/details.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
10 changes: 9 additions & 1 deletion addon/components/order/form/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion addon/controllers/settings/payments/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion extension.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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",
Expand Down
Loading
Loading