{{#if @model.payload.isMultiDrop}}
-
{{else}}
diff --git a/addon/templates/settings/notifications.hbs b/addon/templates/settings/notifications.hbs
index 28e2b4784..b57b07502 100644
--- a/addon/templates/settings/notifications.hbs
+++ b/addon/templates/settings/notifications.hbs
@@ -1,5 +1,13 @@
-
diff --git a/composer.json b/composer.json
index 3dcdce2fb..1be21c417 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
"name": "fleetbase/fleetops-api",
- "version": "0.6.8",
+ "version": "0.6.9",
"description": "Fleet & Transport Management Extension for Fleetbase",
"keywords": [
"fleetbase-extension",
diff --git a/extension.json b/extension.json
index 8ab8c1fc3..671efa190 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Fleet-Ops",
- "version": "0.6.8",
+ "version": "0.6.9",
"description": "Fleet & Transport Management Extension for Fleetbase",
"repository": "https://github.com/fleetbase/fleetops",
"license": "AGPL-3.0-or-later",
diff --git a/package.json b/package.json
index bc84ac7f6..554bd698a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@fleetbase/fleetops-engine",
- "version": "0.6.8",
+ "version": "0.6.9",
"description": "Fleet & Transport Management Extension for Fleetbase",
"fleetbase": {
"route": "fleet-ops"
diff --git a/server/src/Console/Commands/TrackOrderDistanceAndTime.php b/server/src/Console/Commands/TrackOrderDistanceAndTime.php
index c6523033b..cc212938b 100644
--- a/server/src/Console/Commands/TrackOrderDistanceAndTime.php
+++ b/server/src/Console/Commands/TrackOrderDistanceAndTime.php
@@ -69,7 +69,7 @@ public function handle()
* - Not in 'completed' or 'canceled' status.
* - Not marked as deleted (`deleted_at` is null).
* - Associated with a company (`company_uuid` is not null).
- * - The order process has started (`started` is not null).
+ * - The order process has started (`started_at` is not null).
* - Contains a payload (`payload` relationship exists).
* - Created within the past month.
*
@@ -85,7 +85,7 @@ protected function getActiveOrders()
return Order::whereNotIn('status', ['completed', 'canceled'])
->whereNull('deleted_at')
->whereNotNull('company_uuid')
- ->whereNotNull('started')
+ ->whereNotNull('started_at')
->where('created_at', '>=', $oneMonthAgo)
->whereHas('payload')
->with(['payload', 'payload.waypoints', 'payload.pickup', 'payload.dropoff'])
diff --git a/server/src/Events/OrderCanceled.php b/server/src/Events/OrderCanceled.php
index 267ecf74a..719682929 100644
--- a/server/src/Events/OrderCanceled.php
+++ b/server/src/Events/OrderCanceled.php
@@ -4,6 +4,7 @@
use Fleetbase\Events\ResourceLifecycleEvent;
use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Models\Waypoint;
class OrderCanceled extends ResourceLifecycleEvent
{
@@ -18,4 +19,9 @@ class OrderCanceled extends ResourceLifecycleEvent
* Assosciated activity which triggered the event.
*/
public ?Activity $activity;
+
+ /**
+ * Assosciated order waypoint which event is for.
+ */
+ public ?Waypoint $waypoint;
}
diff --git a/server/src/Events/OrderCompleted.php b/server/src/Events/OrderCompleted.php
index a7bd3420f..90dc4532a 100644
--- a/server/src/Events/OrderCompleted.php
+++ b/server/src/Events/OrderCompleted.php
@@ -4,6 +4,7 @@
use Fleetbase\Events\ResourceLifecycleEvent;
use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Models\Waypoint;
class OrderCompleted extends ResourceLifecycleEvent
{
@@ -18,4 +19,9 @@ class OrderCompleted extends ResourceLifecycleEvent
* Assosciated activity which triggered the event.
*/
public ?Activity $activity;
+
+ /**
+ * Assosciated order waypoint which event is for.
+ */
+ public ?Waypoint $waypoint;
}
diff --git a/server/src/Events/OrderDispatched.php b/server/src/Events/OrderDispatched.php
index 30907505d..c90f9e98f 100644
--- a/server/src/Events/OrderDispatched.php
+++ b/server/src/Events/OrderDispatched.php
@@ -4,6 +4,7 @@
use Fleetbase\Events\ResourceLifecycleEvent;
use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Models\Waypoint;
class OrderDispatched extends ResourceLifecycleEvent
{
@@ -18,4 +19,9 @@ class OrderDispatched extends ResourceLifecycleEvent
* Assosciated activity which triggered the event.
*/
public ?Activity $activity;
+
+ /**
+ * Assosciated order waypoint which event is for.
+ */
+ public ?Waypoint $waypoint;
}
diff --git a/server/src/Events/OrderFailed.php b/server/src/Events/OrderFailed.php
index b543cf71a..df76a1051 100644
--- a/server/src/Events/OrderFailed.php
+++ b/server/src/Events/OrderFailed.php
@@ -4,6 +4,7 @@
use Fleetbase\Events\ResourceLifecycleEvent;
use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\FleetOps\Models\Waypoint;
class OrderFailed extends ResourceLifecycleEvent
{
@@ -18,4 +19,9 @@ class OrderFailed extends ResourceLifecycleEvent
* Assosciated activity which triggered the event.
*/
public ?Activity $activity;
+
+ /**
+ * Assosciated order waypoint which event is for.
+ */
+ public ?Waypoint $waypoint;
}
diff --git a/server/src/Events/WaypointActivityChanged.php b/server/src/Events/WaypointActivityChanged.php
new file mode 100644
index 000000000..660d2f231
--- /dev/null
+++ b/server/src/Events/WaypointActivityChanged.php
@@ -0,0 +1,119 @@
+waypoint = $waypoint;
+ $this->activity = $activity;
+ $this->eventId = uniqid('event_');
+ $this->sentAt = Carbon::now()->toDateTimeString();
+ }
+
+ /**
+ * Get the channels the event should broadcast on.
+ *
+ * @return Channel|array
+ */
+ public function broadcastOn()
+ {
+ $channels = [
+ new Channel('api.' . session('api_credential')),
+ new Channel('waypoint.' . $this->waypoint->public_id),
+ new Channel('waypoint.' . $this->waypoint->uuid),
+ ];
+
+ $order = $this->getModelRecord();
+ if ($order) {
+ $channels[] = new Channel('company.' . session('company', data_get($order, 'company.uuid')));
+ $channels[] = new Channel('company.' . data_get($order, 'company.public_id'));
+ $channels[] = new Channel('order.' . $order->uuid);
+ $channels[] = new Channel('order.' . $order->public_id);
+ }
+
+ return $channels;
+ }
+
+ /**
+ * The event's broadcast name.
+ *
+ * @return string
+ */
+ public function broadcastAs()
+ {
+ return 'waypoint.activity';
+ }
+
+ /**
+ * Get the data to broadcast.
+ *
+ * @return array
+ */
+ public function broadcastWith()
+ {
+ return [
+ 'id' => $this->eventId,
+ 'api_version' => config('api.version'),
+ 'event' => $this->broadcastAs(),
+ 'created_at' => $this->sentAt,
+ 'data' => [
+ 'waypoint' => $this->waypoint->public_id,
+ 'place' => data_get($this->waypoint, 'place.public_id'),
+ 'activity' => $this->activity->toArray(),
+ ],
+ ];
+ }
+
+ /**
+ * Get the assosciated order model record for this waypoint.
+ */
+ public function getModelRecord(): ?Order
+ {
+ return Order::where('payload_uuid', $this->waypoint->payload_uuid)->first();
+ }
+}
diff --git a/server/src/Events/WaypointCompleted.php b/server/src/Events/WaypointCompleted.php
new file mode 100644
index 000000000..e233fb5ed
--- /dev/null
+++ b/server/src/Events/WaypointCompleted.php
@@ -0,0 +1,119 @@
+waypoint = $waypoint;
+ $this->activity = $activity;
+ $this->eventId = uniqid('event_');
+ $this->sentAt = Carbon::now()->toDateTimeString();
+ }
+
+ /**
+ * Get the channels the event should broadcast on.
+ *
+ * @return Channel|array
+ */
+ public function broadcastOn()
+ {
+ $channels = [
+ new Channel('api.' . session('api_credential')),
+ new Channel('waypoint.' . $this->waypoint->public_id),
+ new Channel('waypoint.' . $this->waypoint->uuid),
+ ];
+
+ $order = $this->getModelRecord();
+ if ($order) {
+ $channels[] = new Channel('company.' . session('company', data_get($order, 'company.uuid')));
+ $channels[] = new Channel('company.' . data_get($order, 'company.public_id'));
+ $channels[] = new Channel('order.' . $order->uuid);
+ $channels[] = new Channel('order.' . $order->public_id);
+ }
+
+ return $channels;
+ }
+
+ /**
+ * The event's broadcast name.
+ *
+ * @return string
+ */
+ public function broadcastAs()
+ {
+ return 'waypoint.completed';
+ }
+
+ /**
+ * Get the data to broadcast.
+ *
+ * @return array
+ */
+ public function broadcastWith()
+ {
+ return [
+ 'id' => $this->eventId,
+ 'api_version' => config('api.version'),
+ 'event' => $this->broadcastAs(),
+ 'created_at' => $this->sentAt,
+ 'data' => [
+ 'waypoint' => $this->waypoint->public_id,
+ 'place' => data_get($this->waypoint, 'place.public_id'),
+ 'activity' => $this->activity->toArray(),
+ ],
+ ];
+ }
+
+ /**
+ * Get the assosciated order model record for this waypoint.
+ */
+ public function getModelRecord(): ?Order
+ {
+ return Order::where('payload_uuid', $this->waypoint->payload_uuid)->first();
+ }
+}
diff --git a/server/src/Flow/Activity.php b/server/src/Flow/Activity.php
index a5c517349..86502b5d6 100644
--- a/server/src/Flow/Activity.php
+++ b/server/src/Flow/Activity.php
@@ -3,6 +3,7 @@
namespace Fleetbase\FleetOps\Flow;
use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Waypoint;
use Fleetbase\FleetOps\Support\Utils;
class Activity extends FlowResource
@@ -100,10 +101,10 @@ public function passes(Order $order)
*
* @param Order $order the order object to be passed to each event
*/
- public function fireEvents(Order $order)
+ public function fireEvents(Order $order, ?Waypoint $waypoint = null)
{
foreach ($this->events as $event) {
- $event->fire($order, $this);
+ $event->fire($order, $this, $waypoint);
}
}
@@ -112,12 +113,22 @@ public function fireEvents(Order $order)
*
* @return \Illuminate\Support\Collection a collection of child activities
*/
- public function getChildActivities()
+ public function getChildActivities(Order|Waypoint|null $context = null)
{
- $children = collect();
- if (is_array($this->activities)) {
- foreach ($this->activities as $childActivityCode) {
+ $children = collect();
+ $activities = $this->activities;
+
+ // if waypoint provided
+ $waypointContext = $context instanceof Waypoint;
+
+ if (is_array($activities)) {
+ foreach ($activities as $childActivityCode) {
$childActivity = $this->flow->getActivity($childActivityCode);
+ // if waypoint context skip `created` - `started` - `dispatched`
+ if ($waypointContext && in_array($childActivity->code, ['created', 'started', 'dispatched'])) {
+ return $childActivity->getChildActivities($context);
+ }
+
if ($childActivity) {
$children->push($childActivity);
}
@@ -158,15 +169,19 @@ function ($activity) use ($code) {
/**
* Determines the next set of activities based on the provided Order.
*
- * @param Order $order the order to determine the next activities for
- *
* @return \Illuminate\Support\Collection a collection of the next activities
*/
- public function getNext(Order $order)
+ public function getNext(Order|Waypoint $context)
{
- $children = $this->getChildActivities();
+ $children = $this->getChildActivities($context);
$nextActivities = collect();
+ // if context is a waypoint get the waypoint order
+ $order = $context;
+ if ($context instanceof Waypoint) {
+ $order = Order::where('payload_uuid', $context->payload_uuid)->first();
+ }
+
foreach ($children as $childActivity) {
if ($childActivity->passes($order)) {
$nextActivities->push($childActivity);
@@ -237,6 +252,9 @@ public function completesOrder(): bool
return $this->complete();
}
+ /**
+ * Checks if this activiy has been completed within the order already.
+ */
public function isCompleted(Order $order): bool
{
return $order->hasCompletedActivity($this);
diff --git a/server/src/Flow/Event.php b/server/src/Flow/Event.php
index 64ed11326..55d1c5c62 100644
--- a/server/src/Flow/Event.php
+++ b/server/src/Flow/Event.php
@@ -3,6 +3,7 @@
namespace Fleetbase\FleetOps\Flow;
use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Waypoint;
use Fleetbase\FleetOps\Support\Utils;
use Illuminate\Support\Str;
@@ -18,6 +19,11 @@ class Event
*/
public ?Order $order = null;
+ /**
+ * The waypoint associated with the event, if any.
+ */
+ public ?Waypoint $waypoint = null;
+
/**
* The activity for the order event.
*/
@@ -29,11 +35,12 @@ class Event
* @param string $name the name of the event
* @param ?Order $order the associated order, if any
*/
- public function __construct(string $name, ?Order $order = null, ?Activity $activity = null)
+ public function __construct(string $name, ?Order $order = null, ?Activity $activity = null, ?Waypoint $waypoint = null)
{
$this->name = $name;
$this->order = $order;
$this->activity = $activity;
+ $this->waypoint = $waypoint;
}
/**
@@ -60,6 +67,18 @@ public function setActivity(Activity $activity)
return $this;
}
+ /**
+ * Sets the waypoint for the order event.
+ *
+ * @param Waypoint $waypoint the waypoint assosciated to this event
+ */
+ public function setWaypoint(Waypoint $waypoint)
+ {
+ $this->waypoint = $waypoint;
+
+ return $this;
+ }
+
/**
* Triggers the event, optionally setting the order if not already set.
*
@@ -69,7 +88,7 @@ public function setActivity(Activity $activity)
* @param ?Order $order optional order to associate with the event
* @param ?Activity $activity optional activity which triggered the event
*/
- public function fire(?Order $order = null, ?Activity $activity = null)
+ public function fire(?Order $order = null, ?Activity $activity = null, ?Waypoint $waypoint = null)
{
if (!$this->order && $order instanceof Order) {
$this->setOrder($order);
@@ -79,10 +98,15 @@ public function fire(?Order $order = null, ?Activity $activity = null)
$this->setActivity($activity);
}
+ if ($waypoint) {
+ $this->setWaypoint($waypoint);
+ }
+
$eventClass = $this->resolve();
if ($eventClass) {
$event = new $eventClass($this->order);
$event->activity = $activity;
+ $event->waypoint = $waypoint;
event($event);
}
}
diff --git a/server/src/Http/Controllers/Api/v1/DriverController.php b/server/src/Http/Controllers/Api/v1/DriverController.php
index 5c775a8f3..e85869fec 100644
--- a/server/src/Http/Controllers/Api/v1/DriverController.php
+++ b/server/src/Http/Controllers/Api/v1/DriverController.php
@@ -535,15 +535,32 @@ public function loginWithPhone()
return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
},
]);
+
+ return response()->json(['status' => 'OK', 'method' => 'sms']);
} catch (\Throwable $e) {
if (app()->bound('sentry')) {
app('sentry')->captureException($e);
}
- return response()->apiError('Unable to send SMS Verification code.');
+ // SEND VERIFICATION CODE BY EMAIL IF DRIVER HAS EMAIL ADDRESS
+ if ($user->email) {
+ try {
+ VerificationCode::generateEmailVerificationFor($user, 'driver_login', [
+ 'messageCallback' => function ($verification) use ($company) {
+ return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
+ },
+ ]);
+
+ return response()->json(['status' => 'OK', 'method' => 'email']);
+ } catch (\Throwable $e) {
+ if (app()->bound('sentry')) {
+ app('sentry')->captureException($e);
+ }
+ }
+ }
}
- return response()->json(['status' => 'OK']);
+ return response()->apiError('Unable to send SMS Verification code.');
}
/**
diff --git a/server/src/Http/Controllers/Api/v1/OrderController.php b/server/src/Http/Controllers/Api/v1/OrderController.php
index 82a9d4706..455d8a247 100644
--- a/server/src/Http/Controllers/Api/v1/OrderController.php
+++ b/server/src/Http/Controllers/Api/v1/OrderController.php
@@ -32,10 +32,12 @@
use Fleetbase\Support\Auth;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
+use Illuminate\Http\UploadedFile;
use Illuminate\Support\Arr;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
+use Illuminate\Validation\ValidationException;
class OrderController extends Controller
{
@@ -295,15 +297,6 @@ public function create(CreateOrderRequest $request)
// create the order
$order = Order::create($input);
- // notify driver if assigned
- $order->notifyDriverAssigned();
-
- // set driving distance and time
- $order->setPreliminaryDistanceAndTime();
-
- // if service quote attached purchase
- $order->purchaseServiceQuote($serviceQuote);
-
// if it's integrated vendor order apply to meta
if ($integratedVendorOrder) {
$order->updateMeta([
@@ -312,16 +305,32 @@ public function create(CreateOrderRequest $request)
]);
}
- // dispatch if flagged true
- if ($request->boolean('dispatch') && $integratedVendorOrder === null) {
- $order->dispatchWithActivity();
- }
-
// load required relations
$order->load(['trackingNumber', 'driverAssigned', 'purchaseRate', 'customer', 'facilitator']);
- // Trigger order created event
- event(new OrderReady($order));
+ // Determine if order should be dispatched on creation
+ $shouldDispatch = $request->boolean('dispatch') && $integratedVendorOrder === null;
+
+ // Run background processes on queue
+ dispatch(function () use ($order, $serviceQuote, $shouldDispatch): void {
+ // notify driver if assigned
+ $order->notifyDriverAssigned();
+
+ // set driving distance and time
+ $order->setPreliminaryDistanceAndTime();
+
+ // if service quote attached purchase
+ $order->purchaseServiceQuote($serviceQuote);
+
+ // dispatch if flagged true
+ if ($shouldDispatch) {
+ $order->dispatchWithActivity();
+ }
+
+ // Trigger order created event
+ event(new OrderReady($order));
+ })
+ ->afterCommit();
// response the driver resource
return new OrderResource($order);
@@ -934,18 +943,13 @@ public function updateActivity($id, Request $request)
try {
$order = Order::findRecordOrFail($id, ['driverAssigned', 'payload.entities', 'payload.currentWaypoint', 'payload.waypoints']);
} catch (ModelNotFoundException $exception) {
- return response()->json(
- [
- 'error' => 'Order resource not found.',
- ],
- 404
- );
+ return response()->apiError('Order resource not found.', 404);
}
}
// if no order found
if (!$order) {
- return response()->apiError('No resource not found.');
+ return response()->apiError('Order resource not found.', 404);
}
// if order is still status of `created` trigger started flag
@@ -988,13 +992,17 @@ public function updateActivity($id, Request $request)
/** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
$location = $order->getLastLocation();
+ // Check if multiple waypoint order to update activity for
+ $isMultipleWaypointOrder = (bool) $order->payload->isMultipleDropOrder;
+
// if is multi drop order and no current destination set it
- if ($order->payload->isMultipleDropOrder && !$order->payload->current_waypoint_uuid) {
+ if ($isMultipleWaypointOrder && !$order->payload->current_waypoint_uuid) {
$order->payload->setFirstWaypoint($activity, $location);
}
- if (Utils::isActivity($activity) && $activity->completesOrder() && $order->payload->isMultipleDropOrder) {
- // confirm every waypoint is completed
+ // Handle multiple dropoff waypoint activity
+ if (Utils::isActivity($activity) && $activity->completesOrder() && $isMultipleWaypointOrder) {
+ // Check if every waypoint is completed
$isCompleted = $order->payload->waypointMarkers->every(function ($waypoint) {
return $waypoint->complete;
});
@@ -1016,17 +1024,22 @@ public function updateActivity($id, Request $request)
}
}
- // Update activity
- $order->updateActivity($activity, $proof);
-
// also update for each order entities if not multiple drop order
// all entities will share the same activity status as is one drop order
- if (!$order->payload->isMultipleDropOrder) {
+ if (!$isMultipleWaypointOrder) {
+ // Update order activity
+ $order->updateActivity($activity, $proof);
+
// Only update entities belonging to the waypoint
foreach ($order->payload->entities as $entity) {
$entity->insertActivity($activity, $location, $proof);
}
} else {
+ // Update parent order when status is `dispatched` or `started`
+ if (in_array($activity->code, ['started', 'dispatched'])) {
+ $order->updateActivity($activity, $proof);
+ }
+
$order->payload->updateWaypointActivity($activity, $location);
}
@@ -1045,8 +1058,10 @@ public function updateActivity($id, Request $request)
*
* @return \Illuminate\Http\Response
*/
- public function getNextActivity(string $id)
+ public function getNextActivity(string $id, Request $request)
{
+ $waypointId = $request->input('waypoint');
+
try {
$order = Order::findRecordOrFail($id, ['payload']);
} catch (ModelNotFoundException $exception) {
@@ -1058,7 +1073,15 @@ public function getNextActivity(string $id)
);
}
- $activities = $order->config()->nextActivity();
+ // Get waypoint record if available
+ $waypoint = null;
+ if ($waypointId) {
+ $waypoint = Waypoint::where('payload_uuid', $order->payload_uuid)->whereHas('place', function ($query) use ($waypointId) {
+ $query->where('public_id', $waypointId);
+ })->first();
+ }
+
+ $activities = $order->config()->nextActivity($waypoint);
// If activity is to complete order add proof of delivery properties if required
// This is a temporary fix until activity is updated to handle POD on it's own
@@ -1149,11 +1172,14 @@ public function cancelOrder(string $id)
public function setDestination(string $id, string $placeId)
{
try {
- $order = Order::with(['payload.waypoints', 'payload.pickup', 'payload.dropoff'])->findRecordOrFail($id);
+ $order = Order::findRecordOrFail($id);
} catch (ModelNotFoundException $exception) {
return response()->apiError('Order resource not found.', 404);
}
+ // Load required relations
+ $order->loadMissing(['payload.waypoints', 'payload.pickup', 'payload.dropoff']);
+
// Get the order payload
$payload = $order->payload;
@@ -1246,39 +1272,19 @@ public function captureQrScan(Request $request, string $id, ?string $subjectId =
$rawData = $request->input('raw_data');
$type = $subjectId ? strtok($subjectId, '_') : null;
- try {
- $order = Order::findRecordOrFail($id);
- } catch (ModelNotFoundException $e) {
- return response()->apiError('Order resource not found.', 404);
- }
-
if (!$code) {
return response()->apiError('No QR code data to capture.');
}
- $subject = $type === null ? $order : null;
-
- switch ($type) {
- case 'place':
- case 'waypoint':
- $subject = Waypoint::where('payload_uuid', $order->payload_uuid)->where(function ($q) use ($code) {
- $q->whereHas('place', function ($q) use ($code) {
- $q->where('uuid', $code);
- });
- $q->orWhere('uuid', $code);
- })->withoutGlobalScopes()->first();
- break;
-
- case 'entity':
- $subject = Entity::where('uuid', $code)->withoutGlobalScopes()->first();
- break;
-
- case 'order':
- default:
- $subject = $order;
- break;
+ // Load Order
+ try {
+ $order = Order::findRecordOrFail($id);
+ } catch (ModelNotFoundException $e) {
+ return response()->apiError('Order resource not found.', 404);
}
+ // Resolve subject
+ $subject = $this->resolveSubject($order, $type, $subjectId);
if (!$subject) {
return response()->apiError('Unable to capture QR code data.');
}
@@ -1316,39 +1322,19 @@ public function captureSignature(Request $request, string $id, ?string $subjectI
$remarks = $request->input('remarks', 'Verified by Signature');
$type = $subjectId ? strtok($subjectId, '_') : null;
- try {
- $order = Order::findRecordOrFail($id);
- } catch (ModelNotFoundException $e) {
- return response()->apiError('Order resource not found.', 404);
- }
-
if (!$signature) {
return response()->apiError('No signature data to capture.');
}
- $subject = $type === null ? $order : null;
-
- switch ($type) {
- case 'place':
- case 'waypoint':
- $subject = Waypoint::where('payload_uuid', $order->payload_uuid)->where(function ($q) use ($subjectId) {
- $q->whereHas('place', function ($q) use ($subjectId) {
- $q->where('public_id', $subjectId);
- });
- $q->orWhere('public_id', $subjectId);
- })->withoutGlobalScopes()->first();
- break;
-
- case 'entity':
- $subject = Entity::where('public_id', $subjectId)->withoutGlobalScopes()->first();
- break;
-
- case 'order':
- default:
- $subject = $order;
- break;
+ // Load Order
+ try {
+ $order = Order::findRecordOrFail($id);
+ } catch (ModelNotFoundException $e) {
+ return response()->apiError('Order resource not found.', 404);
}
+ // Resolve subject
+ $subject = $this->resolveSubject($order, $type, $subjectId);
if (!$subject) {
return response()->apiError('Unable to capture signature data.');
}
@@ -1392,94 +1378,220 @@ public function captureSignature(Request $request, string $id, ?string $subjectI
}
/**
- * Validate a photo.
+ * Capture one or more photos for an order (as proof) and persist them.
*
- * @return void
+ * This endpoint supports **both**:
+ * - `multipart/form-data` uploads (key: `photos[]`)
+ * - JSON payload with Base64-encoded images (key: `photos`: [string…])
+ *
+ * It will:
+ * 1. Validate that `photos` is a non-empty array of files or strings.
+ * 2. Resolve the target Order and optional subject (waypoint/place/entity).
+ * 3. Loop through each upload or blob, create a Proof record, decode/store the image,
+ * then create a File record and link it to the Proof.
+ *
+ * @param string $id UUID or primary key of the Order
+ * @param string|null $subjectId Optional “subject” identifier (e.g. waypoint_publicId)
+ *
+ * @return \Fleetbase\FleetOps\Http\Resources\ProofResource
+ *
+ * @throws ValidationException
+ * @throws ModelNotFoundException
*/
public function capturePhoto(Request $request, string $id, ?string $subjectId = null)
{
- $disk = $request->input('disk', config('filesystems.default'));
- $bucket = $request->input('bucket', config('filesystems.disks.' . $disk . '.bucket', config('filesystems.disks.s3.bucket')));
- $photo = $request->input('photo');
- $photos = $request->array('photos');
- $data = $request->input('data', []);
- $remarks = $request->input('remarks', 'Verified by Photo');
- $type = $subjectId ? strtok($subjectId, '_') : null;
- $photos = array_filter([$photo, ...$photos]);
-
+ // Validate incoming payload
try {
- $order = Order::findRecordOrFail($id);
- } catch (ModelNotFoundException $e) {
- return response()->apiError('Order resource not found.', 404);
- }
+ $request->validate([
+ 'photos' => 'required|array|min:1',
+ 'photos.*' => [
+ function ($attribute, $value, $fail) {
+ // 1) If it’s a file, ensure it’s an image ≤ 10 MB
+ if ($value instanceof UploadedFile) {
+ if (!$value->isValid()
+ || !in_array($value->extension(), ['jpg', 'jpeg', 'png', 'gif'])
+ || $value->getSize() > 10 * 1024 * 1024
+ ) {
+ $fail("{$attribute} must be a valid image file ≤ 10 MB.");
+ }
+
+ return;
+ }
- if (!$photos) {
- return response()->apiError('No photo data to capture.');
- }
+ // 2) Otherwise it must be a valid Base64 string
+ if (is_string($value)) {
+ // strict decode check
+ if (base64_decode($value, true) === false) {
+ $fail("{$attribute} is not a valid Base64 string.");
+ }
- $subject = $type === null ? $order : null;
+ return;
+ }
- switch ($type) {
- case 'place':
- case 'waypoint':
- $subject = Waypoint::where('payload_uuid', $order->payload_uuid)->where(function ($q) use ($subjectId) {
- $q->whereHas('place', function ($q) use ($subjectId) {
- $q->where('public_id', $subjectId);
- });
- $q->orWhere('public_id', $subjectId);
- })->withoutGlobalScopes()->first();
- break;
+ // 3) Anything else is invalid
+ $fail("{$attribute} must be an image file or a Base64 string.");
+ },
+ ],
+ 'remarks' => 'sometimes|string|max:255',
+ 'data' => 'sometimes|array',
+ ]);
+ } catch (ValidationException $e) {
+ $errorMessage = collect($e->errors())->flatten()->first();
+
+ return response()->apiError($errorMessage, 422);
+ }
+
+ // Determine storage disk & bucket
+ $disk = $request->input('disk', config('filesystems.default'));
+ $bucket = $request->input(
+ "filesystems.disks.{$disk}.bucket",
+ config('filesystems.disks.s3.bucket')
+ );
+
+ // Collect uploads & Base64 strings
+ /** @var UploadedFile[] $rawInputs */
+ $rawInputs = $request->file('photos', []);
+ /** @var string[] $base64Inputs */
+ $base64Inputs = array_filter(
+ $request->input('photos', []),
+ function ($value) {
+ // must be a string AND strictly decodable as Base64
+ return is_string($value) && base64_decode($value, true) !== false;
+ }
+ );
+
+ $remarks = $request->input('remarks', 'Verified by Photo');
+ $data = $request->input('data', []);
+ $type = $subjectId ? strtok($subjectId, '_') : null;
+
+ // Normalize into one array
+ $incoming = array_merge($rawInputs, $base64Inputs);
- case 'entity':
- $subject = Entity::where('public_id', $subjectId)->withoutGlobalScopes()->first();
- break;
+ if (empty($incoming)) {
+ return response()->apiError('No photo data to capture.');
+ }
- case 'order':
- default:
- $subject = $order;
- break;
+ // Load Order
+ try {
+ $order = Order::findRecordOrFail($id);
+ } catch (ModelNotFoundException $e) {
+ return response()->apiError('Order resource not found.', 404);
}
+ // Resolve subject
+ $subject = $this->resolveSubject($order, $type, $subjectId);
if (!$subject) {
return response()->apiError('Unable to capture photo as proof.');
}
- foreach ($photos as $photo) {
- // create proof instance
+ // 5) Loop through each item, create Proof + File
+ foreach ($incoming as $item) {
$proof = Proof::create([
'company_uuid' => session('company'),
'order_uuid' => $order->uuid,
'subject_uuid' => $subject->uuid,
'subject_type' => Utils::getModelClassName($subject),
'remarks' => $remarks,
- 'raw_data' => $photo,
+ 'raw_data' => $item instanceof UploadedFile ? null : $item,
'data' => $data,
]);
- $path = implode('/', ['uploads', session('company'), 'photos', $proof->public_id . '.png']);
- // $path = 'uploads/' . session('company') . '/photos/' . $proof->public_id . '.png';
- Storage::disk($disk)->put($path, base64_decode($photo));
- $file = File::create([
- 'company_uuid' => session('company'),
- 'uploader_uuid' => session('user'),
- 'name' => basename($path),
- 'original_filename' => basename($path),
- 'extension' => 'png',
- 'content_type' => 'image/png',
- 'path' => $path,
- 'bucket' => $bucket,
- 'type' => 'photo',
- 'size' => Utils::getBase64ImageSize($photo),
- ])->setKey($proof);
-
- // set file to proof
- $proof->file_uuid = $file->uuid;
- $proof->save();
+ $file = $this->storeProofPhoto(
+ proof: $proof,
+ photo: $item,
+ disk: $disk,
+ bucket: $bucket
+ );
+
+ $proof->update(['file_uuid' => $file->uuid]);
}
+ // Return the last Proof resource created
return new ProofResource($proof);
}
+ /**
+ * Decode and store a single proof image, then create its File record.
+ *
+ * @param UploadedFile|string $photo UploadedFile instance or Base64 string
+ * @param string $disk Filesystem disk name
+ * @param string $bucket Storage bucket/key prefix
+ *
+ * @return \Feetbase\Models\File
+ */
+ protected function storeProofPhoto(
+ Proof $proof,
+ UploadedFile|string $photo,
+ string $disk,
+ string $bucket,
+ ): File {
+ $isFile = $photo instanceof UploadedFile;
+ $contents = $isFile
+ ? file_get_contents($photo->getRealPath())
+ : base64_decode($photo);
+ $extension = $isFile
+ ? $photo->getClientOriginalExtension()
+ : 'png';
+ $contentType = $isFile
+ ? $photo->getClientMimeType()
+ : 'image/png';
+
+ $company = session('company');
+ $path = "uploads/{$company}/photos/{$proof->public_id}.{$extension}";
+
+ Storage::disk($disk)->put($path, $contents);
+
+ return File::create([
+ 'company_uuid' => $company,
+ 'uploader_uuid' => session('user'),
+ 'name' => basename($path),
+ 'original_filename' => basename($path),
+ 'extension' => $extension,
+ 'content_type' => $contentType,
+ 'path' => $path,
+ 'bucket' => $bucket,
+ 'type' => 'photo',
+ 'size' => strlen($contents),
+ ])->setKey($proof);
+ }
+
+ /**
+ * Resolve the “subject” model based on type and public ID.
+ *
+ * Supported types:
+ * - null → the Order itself
+ * - 'place', 'waypoint' → a Waypoint matching payload_uuid & public_id
+ * - 'entity' → an Entity by public_id
+ * - 'order' or any other → the Order
+ *
+ * @param string|null $type Type prefix extracted from subjectId
+ * @param string|null $subjectId Full public_id of the subject
+ *
+ * @return Order|Waypoint|Entity|null
+ */
+ protected function resolveSubject(Order $order, ?string $type, ?string $subjectId)
+ {
+ if (!$type) {
+ return $order;
+ }
+
+ return match ($type) {
+ 'place', 'waypoint' => Waypoint::withoutGlobalScopes()
+ ->where('payload_uuid', $order->payload_uuid)
+ ->where(fn ($q) => $q
+ ->whereHas('place', fn ($q) => $q->where('public_id', $subjectId))
+ ->orWhere('public_id', $subjectId)
+ )
+ ->first(),
+
+ 'entity' => Entity::withoutGlobalScopes()
+ ->where('public_id', $subjectId)
+ ->first(),
+
+ default => $order,
+ };
+ }
+
/**
* Retrieve proof of delivery resources associated with a given order and optional subject.
*
@@ -1503,34 +1615,27 @@ public function proofs(Request $request, string $id, ?string $subjectId = null)
}
$subject = $order;
-
if ($subjectId) {
- $type = strtok($subjectId, '_');
-
- $subject = match ($type) {
- 'place', 'waypoint' => Waypoint::where('payload_uuid', $order->payload_uuid)
- ->where(function ($query) use ($subjectId) {
- $query->whereHas('place', fn ($q) => $q->where('public_id', $subjectId))
- ->orWhere('public_id', $subjectId);
- })
- ->withoutGlobalScopes()
- ->first(),
-
- 'entity' => Entity::where('public_id', $subjectId)->withoutGlobalScopes()->first(),
-
- default => $order,
- };
+ $type = strtok($subjectId, '_');
+ $subject = $this->resolveSubject($order, $type, $subjectId);
}
if (!$subject) {
return response()->apiError('Unable to retrieve proof of delivery for subject.');
}
- $proofs = Proof::where([
+ $proofsQuery = Proof::where([
'company_uuid' => session('company'),
'order_uuid' => $order->uuid,
- 'subject_uuid' => $subject->uuid,
- ])->get();
+ ]);
+
+ // if subject is not the order then filter by subject
+ if ($order->uuid !== $subject->uuid) {
+ $proofsQuery->where('subject_uuid', $subject->uuid);
+ }
+
+ // get proofs
+ $proofs = $proofsQuery->get();
return ProofResource::collection($proofs);
}
@@ -1574,6 +1679,11 @@ public function getEditableEntityFields(string $id, Request $request)
return response()->json($entityEditingSettings);
}
+ /**
+ * Get all order comments.
+ *
+ * @return \Illuminate\Http\JsonResponse
+ */
public function orderComments(string $id)
{
try {
diff --git a/server/src/Http/Controllers/Internal/v1/OrderController.php b/server/src/Http/Controllers/Internal/v1/OrderController.php
index b7d90fda0..c25040173 100644
--- a/server/src/Http/Controllers/Internal/v1/OrderController.php
+++ b/server/src/Http/Controllers/Internal/v1/OrderController.php
@@ -328,7 +328,7 @@ public function bulkDelete(BulkDeleteRequest $request)
return response()->error('Nothing to delete.');
}
- /** @var \Fleetbase\Models\Order */
+ /** @var Order */
$count = Order::whereIn('uuid', $ids)->count();
$deleted = Order::whereIn('uuid', $ids)->delete();
@@ -351,7 +351,7 @@ public function bulkDelete(BulkDeleteRequest $request)
*/
public function bulkCancel(BulkActionRequest $request)
{
- /** @var \Fleetbase\Models\Order */
+ /** @var Order */
$orders = Order::whereIn('uuid', $request->input('ids'))->get();
$count = $orders->count();
@@ -392,7 +392,7 @@ public function bulkCancel(BulkActionRequest $request)
*/
public function bulkDispatch(BulkDispatchRequest $request)
{
- /** @var \Fleetbase\Models\Order */
+ /** @var Order */
$orders = Order::whereIn('uuid', $request->input('ids'))->get();
$count = $orders->count();
@@ -512,7 +512,7 @@ public function bulkAssignDriver(BulkActionRequest $request)
*/
public function cancel(CancelOrderRequest $request)
{
- /** @var \Fleetbase\Models\Order */
+ /** @var Order */
$order = Order::where('uuid', $request->input('order'))->first();
$order->cancel();
@@ -534,7 +534,7 @@ public function cancel(CancelOrderRequest $request)
public function dispatchOrder(Request $request)
{
/**
- * @var \Fleetbase\Models\Order
+ * @var Order
*/
$order = Order::select(['uuid', 'driver_assigned_uuid', 'order_config_uuid', 'adhoc', 'dispatched', 'dispatched_at'])->where('uuid', $request->input('order'))->withoutGlobalScopes()->first();
if (!$order) {
@@ -909,11 +909,18 @@ public function proofs(Request $request, string $id, ?string $subjectId = null)
return response()->error('Unable to retrieve proof of delivery for subject.');
}
- $proofs = Proof::where([
+ $proofsQuery = Proof::where([
'company_uuid' => session('company'),
'order_uuid' => $order->uuid,
- 'subject_uuid' => $subject->uuid,
- ])->get();
+ ]);
+
+ // if subject is not the order then filter by subject
+ if ($order->uuid !== $subject->uuid) {
+ $proofsQuery->where('subject_uuid', $subject->uuid);
+ }
+
+ // get proofs
+ $proofs = $proofsQuery->get();
return ProofResource::collection($proofs);
}
diff --git a/server/src/Http/Filter/OrderFilter.php b/server/src/Http/Filter/OrderFilter.php
index 036c69b48..7dd87ff09 100644
--- a/server/src/Http/Filter/OrderFilter.php
+++ b/server/src/Http/Filter/OrderFilter.php
@@ -340,8 +340,8 @@ public function bulkQuery($ids)
{
$ids = Utils::arrayFrom($ids);
$firstId = Arr::first($ids);
- $this->builder->where(function ($query) use ($ids, $firstId) {
- if ($firstId) {
+ if ($firstId) {
+ $this->builder->where(function ($query) use ($ids, $firstId) {
if (Utils::isPublicId($firstId)) {
return $query->whereIn('public_id', $ids);
}
@@ -354,8 +354,8 @@ public function bulkQuery($ids)
$query->orWhereHas('trackingNumber', function ($query) use ($ids) {
$query->whereIn('tracking_number', $ids);
});
- }
- });
+ });
+ }
}
public function createdAt($createdAt)
diff --git a/server/src/Http/Resources/v1/Payload.php b/server/src/Http/Resources/v1/Payload.php
index 32f74a189..09a81e42a 100644
--- a/server/src/Http/Resources/v1/Payload.php
+++ b/server/src/Http/Resources/v1/Payload.php
@@ -29,7 +29,7 @@ public function toArray($request)
'pickup_uuid' => $this->when(Http::isInternalRequest(), $this->pickup_uuid),
'dropoff_uuid' => $this->when(Http::isInternalRequest(), $this->dropoff_uuid),
'return_uuid' => $this->when(Http::isInternalRequest(), $this->return_uuid),
- 'current_waypoint' => $this->when(!Http::isInternalRequest() && $this->currentWaypoint, data_get($this, 'currentWaypoint.public_id')),
+ 'current_waypoint' => $this->when(Http::isPublicRequest() && $this->currentWaypoint, data_get($this, 'currentWaypoint.public_id')),
'pickup' => $this->getPlace($this->pickup),
'dropoff' => $this->getPlace($this->dropoff),
'return' => new Place($this->return),
diff --git a/server/src/Listeners/HandleOrderCanceled.php b/server/src/Listeners/HandleOrderCanceled.php
index aaa5682c1..40c57c5a7 100644
--- a/server/src/Listeners/HandleOrderCanceled.php
+++ b/server/src/Listeners/HandleOrderCanceled.php
@@ -3,7 +3,6 @@
namespace Fleetbase\FleetOps\Listeners;
use Fleetbase\FleetOps\Events\OrderCanceled;
-use Fleetbase\FleetOps\Flow\Activity;
use Fleetbase\FleetOps\Models\Driver;
use Fleetbase\FleetOps\Notifications\OrderCanceled as OrderCanceledNotification;
use Illuminate\Contracts\Queue\ShouldQueue;
@@ -24,15 +23,6 @@ public function handle(OrderCanceled $event)
{
/** @var \Fleetbase\FleetOps\Models\Order $order */
$order = $event->getModelRecord();
- $location = $order->getLastLocation();
-
- // Create order cancel activity
- $activity = $order->config()->getCanceledActivity();
-
- // Update order activity
- $order->setStatus($activity->status);
- $order->createActivity($activity, $location);
-
if ($order->isIntegratedVendorOrder()) {
$order->facilitator->provider()->callback('onCanceled', $order);
}
diff --git a/server/src/Listeners/NotifyOrderEvent.php b/server/src/Listeners/NotifyOrderEvent.php
index 8da88f6bc..65b9370b9 100644
--- a/server/src/Listeners/NotifyOrderEvent.php
+++ b/server/src/Listeners/NotifyOrderEvent.php
@@ -32,15 +32,15 @@ public function handle($event)
// Send a notification for order events
if ($event instanceof \Fleetbase\FleetOps\Events\OrderCanceled) {
$reason = $event->activity ? $event->activity->get('details') : '';
- NotificationRegistry::notify(OrderCanceled::class, $order);
+ NotificationRegistry::notify(OrderCanceled::class, $order, $reason, $event->waypoint);
}
if ($event instanceof \Fleetbase\FleetOps\Events\OrderCompleted) {
- NotificationRegistry::notify(OrderCompleted::class, $order);
+ NotificationRegistry::notify(OrderCompleted::class, $order, $event->waypoint);
}
if ($event instanceof \Fleetbase\FleetOps\Events\OrderFailed) {
$reason = $event->activity ? $event->activity->get('details') : '';
- NotificationRegistry::notify(OrderFailed::class, $order, $reason);
+ NotificationRegistry::notify(OrderFailed::class, $order, $reason, $event->waypoint);
}
if ($event instanceof \Fleetbase\FleetOps\Events\OrderDispatchFailed) {
@@ -48,7 +48,7 @@ public function handle($event)
}
if ($event instanceof \Fleetbase\FleetOps\Events\OrderDispatched) {
- NotificationRegistry::notify(OrderDispatched::class, $order);
+ NotificationRegistry::notify(OrderDispatched::class, $order, $event->waypoint);
}
if ($event instanceof \Fleetbase\FleetOps\Events\OrderDriverAssigned) {
diff --git a/server/src/Models/OrderConfig.php b/server/src/Models/OrderConfig.php
index 6bc2d628f..53a1c295c 100644
--- a/server/src/Models/OrderConfig.php
+++ b/server/src/Models/OrderConfig.php
@@ -209,18 +209,25 @@ public function setOrderContext(Order $order): self
/**
* Retrieves the current order context, setting it if not already set.
*
- * @param Order|null $order the order to use as context if no current context is set
- *
* @return Order|null the current order context
*
* @throws \Exception if no order context is found and none is provided
*/
- public function getOrderContext(?Order $order = null): ?Order
+ public function getOrderContext(Order|Waypoint|null $context = null): ?Order
{
- if (!$this->orderContext && $order instanceof Order) {
- $this->setOrderContext($order);
+ if (!$this->orderContext && $context instanceof Order) {
+ $this->setOrderContext($context);
+
+ return $context;
+ }
- return $order;
+ if (!$this->orderContext && $context instanceof Waypoint) {
+ $order = Order::where('payload_uuid', $context->payload_uuid)->first();
+ if ($order) {
+ $this->setOrderContext($order);
+
+ return $order;
+ }
}
if (!$this->orderContext) {
@@ -268,30 +275,35 @@ public function getDispatchActivity(): ?Activity
/**
* Determines the current activity based on the order's status.
*
- * @param Order|null $order the order to evaluate
- *
* @return Activity|null the current Activity object or null if not found
*/
- public function currentActivity(?Order $order = null): ?Activity
+ public function currentActivity(Order|Waypoint|null $context = null): ?Activity
{
- $order = $this->getOrderContext($order);
+ if ($context === null) {
+ $context = $this->getOrderContext($context);
+ }
+
+ if ($context instanceof Waypoint) {
+ return $this->activities()->firstWhere('code', strtolower($context->status_code));
+ }
- return $this->activities()->firstWhere('code', $order->status);
+ return $this->activities()->firstWhere('code', $context->status);
}
/**
* Determines the next set of activities based on the current activity.
*
- * @param Order|null $order the order to evaluate
- *
* @return Collection a collection of the next activities
*/
- public function nextActivity(?Order $order = null): Collection
+ public function nextActivity(Order|Waypoint|null $context = null): Collection
{
- $order = $this->getOrderContext($order);
- $currentActivity = $this->currentActivity($order);
+ if ($context === null) {
+ $context = $this->getOrderContext($context);
+ }
+
+ $currentActivity = $this->currentActivity($context);
if ($currentActivity) {
- return $currentActivity->getNext($order);
+ return $currentActivity->getNext($context);
}
return collect();
@@ -300,17 +312,18 @@ public function nextActivity(?Order $order = null): Collection
/**
* Retrieves the first activity in the next set of activities.
*
- * @param Order|null $order the order to evaluate
- *
* @return Activity|null the first Activity object in the next set or null if not found
*/
- public function nextFirstActivity(?Order $order = null): ?Activity
+ public function nextFirstActivity(Order|Waypoint|null $context = null): ?Activity
{
+ if ($context === null) {
+ $context = $this->getOrderContext($context);
+ }
+
$next = collect();
- $order = $this->getOrderContext($order);
- $currentActivity = $this->currentActivity($order);
+ $currentActivity = $this->currentActivity($context);
if ($currentActivity) {
- $next = $currentActivity->getNext($order);
+ $next = $currentActivity->getNext($context);
}
return $next->first();
@@ -319,17 +332,18 @@ public function nextFirstActivity(?Order $order = null): ?Activity
/**
* Retrieves the activity that follows after the next activity.
*
- * @param Order|null $order the order to evaluate
- *
* @return Activity|null the Activity object that follows after the next or null if not found
*/
- public function afterNextActivity(?Order $order = null): ?Activity
+ public function afterNextActivity(Order|Waypoint|null $context = null): ?Activity
{
+ if ($context === null) {
+ $context = $this->getOrderContext($context);
+ }
+
$afterNext = collect();
- $order = $this->getOrderContext($order);
- $nextActivity = $this->nextFirstActivity($order);
+ $nextActivity = $this->nextFirstActivity($context);
if ($nextActivity) {
- $afterNext = $nextActivity->getNext($order);
+ $afterNext = $nextActivity->getNext($context);
}
return $afterNext->first();
@@ -338,16 +352,17 @@ public function afterNextActivity(?Order $order = null): ?Activity
/**
* Retrieves the previous activities based on the current activity.
*
- * @param Order|null $order the order to evaluate
- *
* @return Collection a collection of previous activities
*/
- public function previousActivity(?Order $order = null): Collection
+ public function previousActivity(Order|Waypoint|null $context = null): Collection
{
- $order = $this->getOrderContext($order);
- $currentActivity = $this->currentActivity($order);
+ if ($context === null) {
+ $context = $this->getOrderContext($context);
+ }
+
+ $currentActivity = $this->currentActivity($context);
if ($currentActivity) {
- return $currentActivity->getPrevious($order);
+ return $currentActivity->getPrevious($context);
}
return collect();
diff --git a/server/src/Models/Payload.php b/server/src/Models/Payload.php
index 2e87dab79..b685cc417 100644
--- a/server/src/Models/Payload.php
+++ b/server/src/Models/Payload.php
@@ -3,6 +3,8 @@
namespace Fleetbase\FleetOps\Models;
use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Events\WaypointActivityChanged;
+use Fleetbase\FleetOps\Events\WaypointCompleted;
use Fleetbase\FleetOps\Flow\Activity;
use Fleetbase\FleetOps\Http\Resources\v1\Payload as PayloadResource;
use Fleetbase\FleetOps\Support\Utils;
@@ -282,10 +284,13 @@ public function insertEntities($entities = [])
return $this;
}
- public function setCurrentWaypoint(Place $destination, bool $save = true): Payload
+ public function setCurrentWaypoint(Place|Waypoint $destination, bool $save = true): Payload
{
- $this->current_waypoint_uuid = $destination->uuid;
+ if ($destination instanceof Waypoint) {
+ $destination = $destination->getPlace();
+ }
+ $this->current_waypoint_uuid = $destination->uuid;
if ($save) {
DB::table($this->getTable())->where('uuid', $this->uuid)->update(['current_waypoint_uuid' => $destination->uuid]);
}
@@ -772,7 +777,7 @@ public function updateWaypointActivity(?Activity $activity = null, $location = n
$currentWaypoint = $this->waypointMarkers->firstWhere('place_uuid', $this->current_waypoint_uuid);
if ($currentWaypoint) {
$currentWaypoint->insertActivity($activity, $location, $proof);
- $activity->fireEvents($this->order);
+ $activity->fireEvents($this->order, $currentWaypoint);
}
// update activity for all entities for this destination/waypoint
@@ -780,6 +785,13 @@ public function updateWaypointActivity(?Activity $activity = null, $location = n
foreach ($entities as $entity) {
$entity->insertActivity($activity, $location, $proof);
}
+
+ // if this activity completes the waypoint notify waypoint customer
+ if ($activity && $activity->complete()) {
+ event(new WaypointCompleted($currentWaypoint, $activity));
+ } else {
+ event(new WaypointActivityChanged($currentWaypoint, $activity));
+ }
}
return $this;
@@ -792,16 +804,23 @@ public function updateWaypointActivity(?Activity $activity = null, $location = n
*/
public function setNextWaypointDestination()
{
- $nextWaypoint = $this->waypointMarkers->filter(function ($waypoint) {
+ $nextWaypoint = $this->waypointMarkers->first(function ($waypoint) {
return !$waypoint->complete && $waypoint->place_uuid !== $this->current_waypoint_uuid;
- })->first();
+ });
if (!$nextWaypoint || $this->current_waypoint_uuid === $nextWaypoint->place_uuid) {
return $this;
}
- $this->setRelation('currentWaypoint', $nextWaypoint);
- $this->update(['current_waypoint_uuid' => $nextWaypoint->place_uuid]);
+ // if next waypoint is waypoint get the place record
+ $destination = $nextWaypoint;
+ if ($nextWaypoint instanceof Waypoint) {
+ $destination = $nextWaypoint->getPlace();
+ }
+
+ // Always set the destination using a place model
+ $this->setCurrentWaypoint($destination);
+ $this->setRelation('currentWaypoint', $destination);
return $this;
}
diff --git a/server/src/Models/Waypoint.php b/server/src/Models/Waypoint.php
index 50b7b5194..7d3d4ce5f 100644
--- a/server/src/Models/Waypoint.php
+++ b/server/src/Models/Waypoint.php
@@ -224,4 +224,14 @@ public static function insertGetUuid($values = [], ?Payload $payload = null)
return $result ? $uuid : false;
}
+
+ /**
+ * Get this waypoint place record.
+ */
+ public function getPlace(): ?Place
+ {
+ $this->loadMissing('place');
+
+ return $this->place ?? Place::where('uuid', $this->place_uuid)->first();
+ }
}
diff --git a/server/src/Notifications/OrderAssigned.php b/server/src/Notifications/OrderAssigned.php
index 159e1a8f3..ea3bcf82b 100644
--- a/server/src/Notifications/OrderAssigned.php
+++ b/server/src/Notifications/OrderAssigned.php
@@ -21,7 +21,7 @@ class OrderAssigned extends Notification implements ShouldQueue
/**
* The order instance this notification is for.
*
- * @var \Fleetbase\Models\Order
+ * @var Order
*/
public $order;
@@ -106,12 +106,10 @@ public function toArray()
$order = new OrderResource($this->order);
return [
+ 'event' => 'order.assigned_notification',
'title' => $this->title,
'body' => $this->message,
- 'data' => [
- ...$this->data,
- 'order' => $order->toWebhookPayload(),
- ],
+ 'data' => $this->data,
];
}
diff --git a/server/src/Notifications/OrderCanceled.php b/server/src/Notifications/OrderCanceled.php
index 6c054b222..3641f0c02 100644
--- a/server/src/Notifications/OrderCanceled.php
+++ b/server/src/Notifications/OrderCanceled.php
@@ -4,6 +4,7 @@
use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Waypoint;
use Fleetbase\FleetOps\Support\Utils;
use Fleetbase\Support\PushNotification;
use Illuminate\Broadcasting\Channel;
@@ -21,10 +22,17 @@ class OrderCanceled extends Notification implements ShouldQueue
/**
* The order instance this notification is for.
*
- * @var \Fleetbase\Models\Order
+ * @var Order
*/
public $order;
+ /**
+ * The waypoint instance this notification is for.
+ *
+ * @var Waypoint
+ */
+ public $waypoint;
+
/**
* Notification name.
*/
@@ -65,13 +73,14 @@ class OrderCanceled extends Notification implements ShouldQueue
*
* @return void
*/
- public function __construct(Order $order, string $reason = '')
+ public function __construct(Order $order, string $reason = '', ?Waypoint $waypoint = null)
{
- $this->order = $order;
- $this->reason = $reason;
- $this->title = 'Order ' . $this->order->trackingNumber->tracking_number . ' was canceled';
- $this->message = 'Order ' . $this->order->trackingNumber->tracking_number . ' has been canceled.';
- $this->data = ['id' => $this->order->public_id, 'type' => 'order_canceled'];
+ $this->order = $order;
+ $this->waypoint = $waypoint;
+ $this->reason = $reason;
+ $this->title = 'Order ' . $this->getTrackingNumber() . ' was canceled';
+ $this->message = 'Order ' . $this->getTrackingNumber() . ' has been canceled.';
+ $this->data = ['id' => $this->order->public_id, 'type' => 'order_canceled'];
}
/**
@@ -110,12 +119,10 @@ public function toArray()
$order = new OrderResource($this->order);
return [
+ 'event' => 'order.canceled_notification',
'title' => $this->title,
'body' => $this->message . ' ' . $this->reason,
- 'data' => [
- ...$this->data,
- 'order' => $order->toWebhookPayload(),
- ],
+ 'data' => $this->data,
];
}
@@ -131,7 +138,7 @@ public function toMail($notifiable)
->line($this->message)
->line($this->reason)
->line('No further action is necessary.')
- ->action('Track Order', Utils::consoleUrl('track-order', ['order' => $this->order->trackingNumber->tracking_number]));
+ ->action('Track Order', Utils::consoleUrl('track-order', ['order' => $this->getTrackingNumber()]));
}
/**
@@ -153,4 +160,17 @@ public function toApn($notifiable)
{
return PushNotification::createApnMessage($this->title, $this->message, $this->data, 'view_order');
}
+
+ /**
+ * Get the tracking number which should be used for this event.
+ * In the case that the order has a currentWaypoint attached use its tracking number otherwise use the orders.
+ */
+ private function getTrackingNumber(): ?string
+ {
+ if ($this->waypoint instanceof Waypoint) {
+ return $this->waypoint->tracking;
+ }
+
+ return $this->order->tracking;
+ }
}
diff --git a/server/src/Notifications/OrderCompleted.php b/server/src/Notifications/OrderCompleted.php
index d4fa9823f..b6c2401e4 100644
--- a/server/src/Notifications/OrderCompleted.php
+++ b/server/src/Notifications/OrderCompleted.php
@@ -4,6 +4,7 @@
use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Waypoint;
use Fleetbase\FleetOps\Support\Utils;
use Fleetbase\Support\PushNotification;
use Illuminate\Broadcasting\Channel;
@@ -21,10 +22,17 @@ class OrderCompleted extends Notification implements ShouldQueue
/**
* The order instance this notification is for.
*
- * @var \Fleetbase\Models\Order
+ * @var Order
*/
public $order;
+ /**
+ * The waypoint instance this notification is for.
+ *
+ * @var Waypoint
+ */
+ public $waypoint;
+
/**
* Notification name.
*/
@@ -60,12 +68,13 @@ class OrderCompleted extends Notification implements ShouldQueue
*
* @return void
*/
- public function __construct(Order $order)
+ public function __construct(Order $order, ?Waypoint $waypoint = null)
{
- $this->order = $order;
- $this->title = 'Order ' . $this->order->trackingNumber->tracking_number . ' has been completed.';
- $this->message = 'Order ' . $this->order->trackingNumber->tracking_number . ' has been completed by agent.';
- $this->data = ['id' => $this->order->public_id, 'type' => 'order_completed'];
+ $this->order = $order;
+ $this->waypoint = $waypoint;
+ $this->title = 'Order ' . $this->getTrackingNumber() . ' has been completed.';
+ $this->message = 'Order ' . $this->getTrackingNumber() . ' has been completed by agent.';
+ $this->data = ['id' => $this->order->public_id, 'type' => 'order_completed'];
}
/**
@@ -104,12 +113,10 @@ public function toArray()
$order = new OrderResource($this->order);
return [
+ 'event' => 'order.completed_notification',
'title' => $this->title,
'body' => $this->message,
- 'data' => [
- ...$this->data,
- 'order' => $order->toWebhookPayload(),
- ],
+ 'data' => $this->data,
];
}
@@ -124,7 +131,7 @@ public function toMail($notifiable)
->subject($this->title)
->line($this->message)
->line('No further action is necessary.')
- ->action('Track Order', Utils::consoleUrl('track-order', ['order' => $this->order->trackingNumber->tracking_number]));
+ ->action('Track Order', Utils::consoleUrl('track-order', ['order' => $this->getTrackingNumber()]));
}
/**
@@ -146,4 +153,17 @@ public function toApn($notifiable)
{
return PushNotification::createApnMessage($this->title, $this->message, $this->data, 'view_order');
}
+
+ /**
+ * Get the tracking number which should be used for this event.
+ * In the case that the order has a currentWaypoint attached use its tracking number otherwise use the orders.
+ */
+ private function getTrackingNumber(): ?string
+ {
+ if ($this->waypoint instanceof Waypoint) {
+ return $this->waypoint->tracking;
+ }
+
+ return $this->order->tracking;
+ }
}
diff --git a/server/src/Notifications/OrderDispatchFailed.php b/server/src/Notifications/OrderDispatchFailed.php
index 697fc612e..cd7e92b52 100644
--- a/server/src/Notifications/OrderDispatchFailed.php
+++ b/server/src/Notifications/OrderDispatchFailed.php
@@ -19,7 +19,7 @@ class OrderDispatchFailed extends Notification implements ShouldQueue
/**
* The order instance this notification is for.
*
- * @var \Fleetbase\Models\Order
+ * @var Order
*/
public $order;
@@ -110,12 +110,10 @@ public function toArray()
$order = new OrderResource($this->order);
return [
+ 'event' => 'order.assigned_failed_notification',
'title' => $this->title,
'body' => $this->message,
- 'data' => [
- ...$this->data,
- 'order' => $order->toWebhookPayload(),
- ],
+ 'data' => $this->data,
];
}
diff --git a/server/src/Notifications/OrderDispatched.php b/server/src/Notifications/OrderDispatched.php
index 2dd67b554..af260fb4a 100644
--- a/server/src/Notifications/OrderDispatched.php
+++ b/server/src/Notifications/OrderDispatched.php
@@ -5,6 +5,7 @@
use Fleetbase\Events\ResourceLifecycleEvent;
use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Waypoint;
use Fleetbase\FleetOps\Support\Utils;
use Fleetbase\Support\PushNotification;
use Illuminate\Broadcasting\Channel;
@@ -23,10 +24,17 @@ class OrderDispatched extends Notification implements ShouldQueue
/**
* The order instance this notification is for.
*
- * @var \Fleetbase\Models\Order
+ * @var Order
*/
public $order;
+ /**
+ * The waypoint instance this notification is for.
+ *
+ * @var Waypoint
+ */
+ public $waypoint;
+
/**
* Notification name.
*/
@@ -62,12 +70,13 @@ class OrderDispatched extends Notification implements ShouldQueue
*
* @return void
*/
- public function __construct(Order $order)
+ public function __construct(Order $order, ?Waypoint $waypoint = null)
{
- $this->order = $order;
- $this->title = 'Order ' . $this->order->trackingNumber->tracking_number . ' has been dispatched!';
- $this->message = 'An order has just been dispatched to you and is ready to be started.';
- $this->data = ['id' => $this->order->public_id, 'type' => 'order_dispatched'];
+ $this->order = $order;
+ $this->waypoint = $waypoint;
+ $this->title = 'Order ' . $this->getTrackingNumber() . ' has been dispatched!';
+ $this->message = 'An order has just been dispatched to you and is ready to be started.';
+ $this->data = ['id' => $this->order->public_id, 'type' => 'order_dispatched'];
}
/**
@@ -118,12 +127,10 @@ public function toArray()
$order = new OrderResource($this->order);
return [
+ 'event' => 'order.dispatched_notification',
'title' => $this->title,
'body' => $this->message,
- 'data' => [
- ...$this->data,
- 'order' => $order->toWebhookPayload(),
- ],
+ 'data' => $this->data,
];
}
@@ -169,7 +176,7 @@ public function toMail($notifiable)
return (new MailMessage())
->subject($this->title)
->line($this->message)
- ->action('Track Order', Utils::consoleUrl('track-order', ['order' => $this->order->trackingNumber->tracking_number]));
+ ->action('Track Order', Utils::consoleUrl('track-order', ['order' => $this->getTrackingNumber()]));
}
/**
@@ -191,4 +198,17 @@ public function toApn($notifiable)
{
return PushNotification::createApnMessage($this->title, $this->message, $this->data, 'view_order');
}
+
+ /**
+ * Get the tracking number which should be used for this event.
+ * In the case that the order has a currentWaypoint attached use its tracking number otherwise use the orders.
+ */
+ private function getTrackingNumber(): ?string
+ {
+ if ($this->waypoint instanceof Waypoint) {
+ return $this->waypoint->tracking;
+ }
+
+ return $this->order->tracking;
+ }
}
diff --git a/server/src/Notifications/OrderFailed.php b/server/src/Notifications/OrderFailed.php
index ff2c9fa45..e44da70cf 100644
--- a/server/src/Notifications/OrderFailed.php
+++ b/server/src/Notifications/OrderFailed.php
@@ -4,6 +4,7 @@
use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Waypoint;
use Fleetbase\FleetOps\Support\Utils;
use Fleetbase\Support\PushNotification;
use Illuminate\Broadcasting\Channel;
@@ -21,10 +22,17 @@ class OrderFailed extends Notification implements ShouldQueue
/**
* The order instance this notification is for.
*
- * @var \Fleetbase\Models\Order
+ * @var Order
*/
public $order;
+ /**
+ * The waypoint instance this notification is for.
+ *
+ * @var Waypoint
+ */
+ public $waypoint;
+
/**
* Notification name.
*/
@@ -65,13 +73,14 @@ class OrderFailed extends Notification implements ShouldQueue
*
* @return void
*/
- public function __construct(Order $order, string $reason = '')
+ public function __construct(Order $order, string $reason = '', ?Waypoint $waypoint = null)
{
- $this->order = $order;
- $this->reason = $reason;
- $this->title = 'Order ' . $this->order->trackingNumber->tracking_number . ' delivery has has failed';
- $this->message = 'Order ' . $this->order->trackingNumber->tracking_number . ' delivery has failed.';
- $this->data = ['id' => $this->order->public_id, 'type' => 'order_canceled'];
+ $this->order = $order;
+ $this->reason = $reason;
+ $this->waypoint = $waypoint;
+ $this->title = 'Order ' . $this->getTrackingNumber() . ' delivery has has failed';
+ $this->message = 'Order ' . $this->getTrackingNumber() . ' delivery has failed.';
+ $this->data = ['id' => $this->order->public_id, 'type' => 'order_canceled'];
}
/**
@@ -110,12 +119,10 @@ public function toArray()
$order = new OrderResource($this->order);
return [
+ 'event' => 'order.failed_notification',
'title' => $this->title,
'body' => $this->message . ' ' . $this->reason,
- 'data' => [
- ...$this->data,
- 'order' => $order->toWebhookPayload(),
- ],
+ 'data' => $this->data,
];
}
@@ -131,7 +138,7 @@ public function toMail($notifiable)
->line($this->message)
->line($this->reason)
->line('No further action is necessary.')
- ->action('Track Order', Utils::consoleUrl('track-order', ['order' => $this->order->trackingNumber->tracking_number]));
+ ->action('Track Order', Utils::consoleUrl('track-order', ['order' => $this->getTrackingNumber()]));
}
/**
@@ -153,4 +160,17 @@ public function toApn($notifiable)
{
return PushNotification::createApnMessage($this->title, $this->message, $this->data, 'view_order');
}
+
+ /**
+ * Get the tracking number which should be used for this event.
+ * In the case that the order has a currentWaypoint attached use its tracking number otherwise use the orders.
+ */
+ private function getTrackingNumber(): ?string
+ {
+ if ($this->waypoint instanceof Waypoint) {
+ return $this->waypoint->tracking;
+ }
+
+ return $this->order->tracking;
+ }
}
diff --git a/server/src/Notifications/OrderPing.php b/server/src/Notifications/OrderPing.php
index 368a7ff00..190ce1bb7 100644
--- a/server/src/Notifications/OrderPing.php
+++ b/server/src/Notifications/OrderPing.php
@@ -133,15 +133,11 @@ public function broadcastOn()
*/
public function toArray()
{
- $order = new OrderResource($this->order);
-
return [
+ 'event' => 'order.ping_notification',
'title' => $this->title,
'body' => $this->message,
- 'data' => [
- ...$this->data,
- 'order' => $order->toWebhookPayload(),
- ],
+ 'data' => $this->data,
];
}
diff --git a/server/src/Notifications/OrderSplit.php b/server/src/Notifications/OrderSplit.php
index ca3c4dd78..8155df036 100644
--- a/server/src/Notifications/OrderSplit.php
+++ b/server/src/Notifications/OrderSplit.php
@@ -14,7 +14,7 @@ class OrderSplit extends Notification
/**
* The order instance this notification is for.
*
- * @var \Fleetbase\Models\Order
+ * @var \Fleetbase\FleetOps\Models\Order
*/
public $order;
diff --git a/server/src/Notifications/WaypointCompleted.php b/server/src/Notifications/WaypointCompleted.php
new file mode 100644
index 000000000..233318ea6
--- /dev/null
+++ b/server/src/Notifications/WaypointCompleted.php
@@ -0,0 +1,157 @@
+waypoint = $waypoint;
+ $this->activity = $activity;
+ $this->title = 'Order ' . $this->waypoint->trackingNumber->tracking_number . ' ' . strtolower($activity->details);
+ $this->message = $activity->details;
+ $this->data = ['id' => $this->waypoint->public_id, 'type' => 'waypoint_completed'];
+ }
+
+ /**
+ * Get the notification's delivery channels.
+ *
+ * @return array
+ */
+ public function via($notifiable)
+ {
+ return ['broadcast', 'mail', FcmChannel::class, ApnChannel::class];
+ }
+
+ /**
+ * Get the channels the event should broadcast on.
+ *
+ * @return Channel|array
+ */
+ public function broadcastOn()
+ {
+ $channels = [new Channel('api.' . session('api_credential'))];
+ $order = Order::where('payload_uuid', $this->waypoint->payload_uuid)->first();
+ if ($order) {
+ $channels[] = new Channel('company.' . session('company', data_get($order, 'company.uuid')));
+ $channels[] = new Channel('company.' . data_get($order, 'company.public_id'));
+ $channels[] = new Channel('order.' . $order->uuid);
+ $channels[] = new Channel('order.' . $order->public_id);
+ }
+
+ return $channels;
+ }
+
+ /**
+ * Get notification as array.
+ *
+ * @return void
+ */
+ public function toArray()
+ {
+ return [
+ 'event.waypoint_completed_notification',
+ 'title' => $this->title,
+ 'body' => $this->message,
+ 'data' => $this->data,
+ ];
+ }
+
+ /**
+ * Get the mail representation of the notification.
+ *
+ * @return MailMessage
+ */
+ public function toMail($notifiable)
+ {
+ return (new MailMessage())
+ ->subject($this->title)
+ ->line($this->message)
+ ->line('No further action is necessary.')
+ ->action('Track Order', Utils::consoleUrl('track-order', ['order' => $this->waypoint->trackingNumber->tracking_number]));
+ }
+
+ /**
+ * Get the firebase cloud message representation of the notification.
+ *
+ * @return array
+ */
+ public function toFcm($notifiable)
+ {
+ return PushNotification::createFcmMessage($this->title, $this->message, $this->data);
+ }
+
+ /**
+ * Get the apns message representation of the notification.
+ *
+ * @return array
+ */
+ public function toApn($notifiable)
+ {
+ return PushNotification::createApnMessage($this->title, $this->message, $this->data, 'view_order');
+ }
+}