Compare commits

...

5 Commits

Author SHA1 Message Date
Ronald A. Richardson
f35dcb1544 fix: update package.json version v0.6.10
Some checks failed
Fleetbase CI / Build and Start Docker Services (push) Has been cancelled
2025-05-08 20:06:27 +08:00
Ron
29c8f4340d Merge pull request #382 from fleetbase/dev-v0.6.10
Some checks are pending
Fleetbase CI / Build and Start Docker Services (push) Waiting to run
v0.6.10 ~ Added Product Update/Create API, Added `FRONTEND_HOSTS` ENV…
2025-05-08 12:33:02 +08:00
Ronald A. Richardson
1cb833e407 v0.6.10 ~ Added Product Update/Create API, Added FRONTEND_HOSTS ENV variable, other minor patches 2025-05-08 12:24:54 +08:00
Ron
41bc6e39a7 Merge pull request #380 from fleetbase/dev-v0.6.9
Some checks failed
Fleetbase CI / Build and Start Docker Services (push) Has been cancelled
Enhancements and bug fixes for order workflow, labels, notifications,…
2025-05-01 12:15:36 +08:00
Ronald A. Richardson
5dbe2fb5bb Enhancements and bug fixes for order workflow, labels, notifications, and route optimization
- Added support for downloading labels and barcodes per package
- Fixed proof of delivery behavior to ensure accurate completion records
- Updated waypoint activity flow to rely on the `complete` flag
- Added support for setting waypoints as either pickup or dropoff
- Enabled sending notifications to order customer, driver, and facilitator
- Added events and notifications for `order.completed` and `order.failed` states
- Fixed route optimization logic and minor issues during order creation
- Normalized `meta` response structure to always return an object (never array)
- Patched issue with order config: deleting custom field categories no longer breaks config
2025-05-01 12:08:27 +08:00
12 changed files with 1845 additions and 1843 deletions

View File

@@ -10,10 +10,10 @@
"require": { "require": {
"php": "^8.0", "php": "^8.0",
"appstract/laravel-opcache": "^4.0", "appstract/laravel-opcache": "^4.0",
"fleetbase/core-api": "^1.6.2", "fleetbase/core-api": "^1.6.4",
"fleetbase/fleetops-api": "^0.6.5", "fleetbase/fleetops-api": "^0.6.7",
"fleetbase/registry-bridge": "^0.0.18", "fleetbase/registry-bridge": "^0.0.19",
"fleetbase/storefront-api": "^0.3.30", "fleetbase/storefront-api": "^0.3.31",
"guzzlehttp/guzzle": "^7.0.1", "guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^10.0", "laravel/framework": "^10.0",
"laravel/octane": "^2.3", "laravel/octane": "^2.3",

645
api/composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -21,7 +21,7 @@ return [
'allowed_methods' => ['*'], 'allowed_methods' => ['*'],
'allowed_origins' => array_filter(['http://localhost:4200', env('CONSOLE_HOST'), Utils::addWwwToUrl(env('CONSOLE_HOST'))]), 'allowed_origins' => array_filter(['http://localhost:4200', env('CONSOLE_HOST'), Utils::addWwwToUrl(env('CONSOLE_HOST')), ...Utils::arrayFrom(env('FRONTEND_HOSTS', ''))]),
'allowed_origins_patterns' => [], 'allowed_origins_patterns' => [],

View File

@@ -1,10 +1,12 @@
<div class="bg-white dark:bg-gray-800 py-5 px-4 shadow rounded-lg w-full"> <div class="bg-white dark:bg-gray-800 py-5 px-4 shadow rounded-lg w-full">
<div class="mb-4"> <div class="mb-4">
<Image src={{@model.logo_url}} @fallbackSrc="/images/fleetbase-logo-svg.svg" alt={{t "app.name"}} width="160" height="56" class="w-40 h-14 mx-auto" /> <Image src={{@model.logo_url}} @fallbackSrc="/images/fleetbase-logo-svg.svg" alt={{t "app.name"}} height="56" class="h-10 object-contain mx-auto" />
<div class="mt-2">
<h2 class="text-center text-lg font-extrabold text-gray-900 dark:text-white truncate"> <h2 class="text-center text-lg font-extrabold text-gray-900 dark:text-white truncate">
{{t "onboard.index.title"}} {{t "onboard.index.title"}}
</h2> </h2>
</div> </div>
</div>
<div class="flex px-3 py-2 mb-4 rounded-md shadow-sm bg-blue-200"> <div class="flex px-3 py-2 mb-4 rounded-md shadow-sm bg-blue-200">
<div> <div>

View File

@@ -1,6 +1,6 @@
{ {
"name": "@fleetbase/console", "name": "@fleetbase/console",
"version": "0.6.8", "version": "0.6.10",
"private": true, "private": true,
"description": "Modular logistics and supply chain operating system (LSOS)", "description": "Modular logistics and supply chain operating system (LSOS)",
"repository": "https://github.com/fleetbase/fleetbase", "repository": "https://github.com/fleetbase/fleetbase",
@@ -33,11 +33,11 @@
"@fleetbase/ember-core": "latest", "@fleetbase/ember-core": "latest",
"@fleetbase/ember-ui": "latest", "@fleetbase/ember-ui": "latest",
"@fleetbase/fleetops-data": "latest", "@fleetbase/fleetops-data": "latest",
"@fleetbase/fleetops-engine": "^0.6.5", "@fleetbase/fleetops-engine": "^0.6.7",
"@fleetbase/iam-engine": "^0.1.3", "@fleetbase/iam-engine": "^0.1.3",
"@fleetbase/leaflet-routing-machine": "^3.2.16", "@fleetbase/leaflet-routing-machine": "^3.2.16",
"@fleetbase/registry-bridge-engine": "^0.0.18", "@fleetbase/registry-bridge-engine": "^0.0.19",
"@fleetbase/storefront-engine": "^0.3.30", "@fleetbase/storefront-engine": "^0.3.31",
"@fortawesome/ember-fontawesome": "^2.0.0", "@fortawesome/ember-fontawesome": "^2.0.0",
"ember-changeset": "4.1.2", "ember-changeset": "4.1.2",
"ember-changeset-validations": "4.1.2", "ember-changeset-validations": "4.1.2",

2985
console/pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.2 # syntax = docker/dockerfile:1.2
# Base stage # Base stage
FROM dunglas/frankenphp:1.5.0-php8.2-bookworm as base FROM dunglas/frankenphp:1.5.0-php8.2-bookworm AS base
# Install packages # Install packages
RUN apt-get update && apt-get install -y git bind9-utils mycli nodejs npm nano \ RUN apt-get update && apt-get install -y git bind9-utils mycli nodejs npm nano \
@@ -62,10 +62,10 @@ COPY --from=ghcr.io/springload/ssm-parent:1.8 /usr/bin/ssm-parent /sbin/ssm-pare
# Create the pnpm directory and set the PNPM_HOME environment variable # Create the pnpm directory and set the PNPM_HOME environment variable
RUN mkdir -p ~/.pnpm RUN mkdir -p ~/.pnpm
ENV PNPM_HOME /root/.pnpm ENV PNPM_HOME=/root/.pnpm
# Add the pnpm global bin to the PATH # Add the pnpm global bin to the PATH
ENV PATH /root/.pnpm/bin:$PATH ENV PATH=/root/.pnpm/bin:$PATH
# Set some build ENV variables # Set some build ENV variables
ENV LOG_CHANNEL=stdout ENV LOG_CHANNEL=stdout
@@ -123,7 +123,7 @@ RUN chmod -R 755 /fleetbase/api/storage
RUN chmod +x /fleetbase/api/deploy.sh RUN chmod +x /fleetbase/api/deploy.sh
# Scheduler base stage # Scheduler base stage
FROM base as scheduler-base FROM base AS scheduler-base
# Install go-crond # Install go-crond
RUN curl -L https://github.com/webdevops/go-crond/releases/download/23.12.0/go-crond.linux.amd64 > /usr/local/bin/go-crond && chmod +x /usr/local/bin/go-crond RUN curl -L https://github.com/webdevops/go-crond/releases/download/23.12.0/go-crond.linux.amd64 > /usr/local/bin/go-crond && chmod +x /usr/local/bin/go-crond
@@ -131,31 +131,31 @@ COPY docker/crontab ./crontab
RUN chmod 0600 ./crontab RUN chmod 0600 ./crontab
# Scheduler dev stage # Scheduler dev stage
FROM scheduler-base as scheduler-dev FROM scheduler-base AS scheduler-dev
ENTRYPOINT [] ENTRYPOINT []
CMD ["go-crond", "--verbose", "root:./crontab"] CMD ["go-crond", "--verbose", "root:./crontab"]
# Scheduler stage # Scheduler stage
FROM scheduler-base as scheduler FROM scheduler-base AS scheduler
ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--"] ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--"]
CMD ["go-crond", "--verbose", "root:./crontab"] CMD ["go-crond", "--verbose", "root:./crontab"]
# Events stage # Events stage
FROM base as events FROM base AS events
ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"] ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"]
CMD ["php", "artisan", "queue:work"] CMD ["php", "artisan", "queue:work"]
# Events stage # Events stage
FROM base as events-dev FROM base AS events-dev
ENTRYPOINT [] ENTRYPOINT []
CMD ["php", "artisan", "queue:work"] CMD ["php", "artisan", "queue:work"]
# Application dev stage # Application dev stage
FROM base as app-dev FROM base AS app-dev
ENTRYPOINT ["docker-php-entrypoint"] ENTRYPOINT ["docker-php-entrypoint"]
CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=250 --port=8000 --host=0.0.0.0 --watch"] CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=250 --port=8000 --host=0.0.0.0 --watch"]
# Application stage # Application stage
FROM base as app FROM base AS app
ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"] ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"]
CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=250 --port=8000 --host=0.0.0.0"] CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=250 --port=8000 --host=0.0.0.0"]