@fleetbase/fleetops-engine 0.4.0 → 0.4.2

package/server/resources/views/labels/waypoint-label.php

@@ -0,0 +1,126 @@
+<?php
+use Fleetbase\Support\Utils; 
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title><?= $company->name ?? ($waypoint->internal_id ?? $waypoint->public_id) ?> Waypoint Label</title>
+</head>
+
+<style>
+    .group:after {
+        content: "";
+        display: table;
+        clear: both;
+    }
+
+    .places--display-address {
+        display: block;
+    }
+
+    .places--display-address .line {
+        display: block;
+    }
+
+    .places--display-address .line:first-child {
+        display: block;
+        font-weight: 600;
+    }
+
+    .places--display-address .line .segment {
+        display: inline-block;
+        margin-right: 3px;
+    }
+
+    .places--display-address .line .segment:not(:last-child):after {
+        content: ", ";
+    }
+</style>
+
+<body bgcolor="#f7f7f7">
+    <div style="width: 420px; border: 2px #414141 solid; margin: auto;">
+        <div class="group" style="border-bottom: 1px #414141 solid; overflow: hidden;">
+            <div style="float: left; width: 130px; height: 120px; border-right: 1px #414141 solid; text-align: center; padding: 10px; box-sizing: border-box;">
+                <img src="data:image/png;base64,<?= Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $order->trackingNumber->qr_code ?>" style="width: 100%; height: 100%; object-fit: cover;">
+            </div>
+            <div style="margin-top: 10px;">
+                <span style="padding-left: 10px; font-size: 18px; font-weight: bold;"><?= strtoupper($company->name) ?></span>
+            </div>
+        </div>
+
+        <?php if ($dropoff) { ?>
+            <div class="group">
+                <div style="padding: 15px;" class="group" style="border-bottom: 1px #414141 solid; padding: 15px;">
+                    <div style="float: left; display: inline-block; margin-right: 15px; font-weight: bold;">
+                        ADDRESS:
+                    </div>
+                    <div class="places--display-address" style="float: left; display: inline-block">
+                        <div class="line"><strong><?= $dropoff->name ?></strong></div>
+                        <div class="line"><?= $dropoff->street1 ?></div>
+                        <?php if (!empty($dropoff->street2)) { ?>
+                            <div class="line"><?= $dropoff->street2 ?></div>
+                        <?php } ?>
+                        <div class="line">
+                            <?php if (!empty($dropoff->neighborhood)) { ?>
+                                <span class="segment"><?= $dropoff->neighborhood ?></span>
+                            <?php } ?>
+                            <?php if (!empty($dropoff->district)) { ?>
+                                <span class="segment"><?= $dropoff->district ?></span>
+                            <?php } ?>
+                        </div>
+                        <div class="line">
+                            <?php if (!empty($dropoff->postal_code)) { ?>
+                                <span class="segment"><?= $dropoff->postal_code ?></span>
+                            <?php } ?>
+                            <?php if (!empty($dropoff->city)) { ?>
+                                <span class="segment"><?= $dropoff->city ?></span>
+                            <?php } ?>
+                            <?php if (!empty($dropoff->province)) { ?>
+                                <span class="segment"><?= $dropoff->province ?></span>
+                            <?php } ?>
+                            <?php if (!empty($dropoff->country)) { ?>
+                                <span class="segment"><?= $dropoff->country ?></span>
+                            <?php } ?>
+                        </div>
+                        <?php if (!empty($dropoff->phone_number)) { ?>
+                            <div class="line"><?= $dropoff->phone_number ?></div>
+                        <?php } ?>
+                    </div>
+                </div>
+            </div>
+        <?php } ?>
+        <?php if ($entities) { ?>
+            <div class="group">
+                <div style="padding: 15px;" class="group" style="border-bottom: 1px #414141 solid; padding: 15px;">
+                    <div style="float: left; display: inline-block; margin-right: 15px">
+                        <?php foreach ($entities as $entity) { ?>
+                            <div class="line">
+                                <strong>
+                                    <?php
+                                    if (data_get($entity, 'name')) {
+                                        echo strtoupper(data_get($entity, 'name') . ' - ' . data_get($entity, 'internal_id', ''));
+                                    } else {
+                                        echo strtoupper('ITEM - ' . data_get($entity, 'internal_id', ''));
+                                    }
+                                    ?>
+                                </strong>
+                            </div>
+                        <?php } ?>
+                    </div>
+                </div>
+            </div>
+        <?php } ?>
+        <div class="group">
+            <div style="text-align: center; padding: 15px 0px; border-top: 1px #414141 solid;">
+                <img src="data:image/png;base64,<?= isset($trackingNumber) ? $trackingNumber->barcode : $order->trackingNumber->barcode ?>" style="height: 90px; margin-top: 10px;">
+                <div><?= strtoupper(isset($trackingNumber) ? $trackingNumber->tracking_number : $order->trackingNumber->tracking_number) ?></div>
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>

package/server/src/Http/Controllers/Api/v1/DriverController.php

@@ -422,7 +422,10 @@ class DriverController extends Controller
                 return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
             });
         } catch (\Throwable $e) {
-            return response()->apiError($e->getMessage());
+            if (app()->bound('sentry')) {
+                app('sentry')->captureException($e);
+            }
+            return response()->apiError('Unable to send SMS Verification code.');
         }
 
         return response()->json(['status' => 'OK']);

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

@@ -1114,7 +1114,7 @@ class OrderController extends Controller
     {
         $code    = $request->input('code');
         $data    = $request->input('data', []);
-        $rawData = $request->input('raw_data', []);
+        $rawData = $request->input('raw_data');
         $type    = $subjectId ? strtok($subjectId, '_') : null;
 
         try {

package/server/src/Http/Resources/v1/Entity.php

@@ -31,8 +31,8 @@ class Entity extends FleetbaseResource
             'internal_id'      => $this->internal_id,
             'name'             => $this->name,
             'type'             => $this->type,
-            'payload'          => $this->when(Http::isPublicRequest(), data_get($this, 'payload.public_id'), null),
-            'destination'      => $this->when(Http::isPublicRequest(), data_get($this, 'destination.public_id'), null),
+            'payload'          => $this->when(Http::isPublicRequest(), data_get($this, 'payload.public_id')),
+            'destination'      => $this->when(Http::isPublicRequest(), data_get($this, 'destination.public_id')),
             'customer'         => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),
             'supplier'         => $this->whenLoaded('supplier', $this->supplier),
             'tracking_number'  => new TrackingNumber($this->trackingNumber),

package/server/src/Http/Resources/v1/Payload.php

@@ -2,7 +2,6 @@
 
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
-use Fleetbase\FleetOps\Models\Waypoint;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
 
@@ -25,12 +24,12 @@ class Payload extends FleetbaseResource
             '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'), null),
+            'current_waypoint'      => $this->when(!Http::isInternalRequest() && $this->currentWaypoint, data_get($this, 'currentWaypoint.public_id')),
             'pickup'                => new Place($this->pickup),
             'dropoff'               => new Place($this->dropoff),
             'return'                => new Place($this->return),
-            'waypoints'             => $this->waypoints($this->waypoints),
-            'entities'              => Entity::collection($this->entities ?? []),
+            'waypoints'             => Waypoint::collection($this->getWaypoints()),
+            'entities'              => Entity::collection($this->entities),
             'cod_amount'            => $this->cod_amount ?? null,
             'cod_currency'          => $this->cod_currency ?? null,
             'cod_payment_method'    => $this->cod_payment_method ?? null,
@@ -40,6 +39,14 @@ class Payload extends FleetbaseResource
         ];
     }
 
+    private function getWaypoints(): ?\Illuminate\Support\Collection
+    {
+        return $this->waypoints->map(function ($waypoint) {
+            $waypoint->payload_uuid = $this->uuid;
+            return $waypoint;
+        });
+    }
+
     /**
      * Transform the resource into an webhook payload.
      *
@@ -62,30 +69,4 @@ class Payload extends FleetbaseResource
             'created_at'         => $this->created_at,
         ];
     }
-
-    /**
-     * Returns the correct pickup resource if applicable.
-     *
-     * @param \Illuminate\Support\Collection $waypoints
-     *
-     * @return Illuminate\Http\Resources\Json\JsonResource|null
-     */
-    public function waypoints($waypoints)
-    {
-        if (empty($waypoints)) {
-            return [];
-        }
-
-        $waypoints = $waypoints->map(
-            function ($place) {
-                $waypoint               = Waypoint::where(['payload_uuid' => $this->uuid, 'place_uuid' => $place->uuid])->without(['place'])->with(['trackingNumber'])->first();
-                $place->tracking_number = new TrackingNumber($waypoint->trackingNumber);
-                $place->order           = $waypoint->order;
-
-                return $place;
-            }
-        )->sortBy('order');
-
-        return Place::collection($waypoints ?? []);
-    }
 }

package/server/src/Http/Resources/v1/Place.php

@@ -23,7 +23,7 @@ class Place extends FleetbaseResource
             'uuid'                 => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'            => $this->when(Http::isInternalRequest(), $this->public_id),
             'name'                 => $this->name,
-            'location'             => $this->location ?? new Point(0, 0),
+            'location'             => data_get($this, 'location', new Point(0, 0)),
             'address'              => $this->address,
             'address_html'         => $this->when(Http::isInternalRequest(), $this->address_html),
             'street1'              => $this->street1 ?? null,
@@ -40,8 +40,8 @@ class Place extends FleetbaseResource
             'phone'                => $this->phone ?? null,
             'owner'                => $this->when(!Http::isInternalRequest(), Resolve::resourceForMorph($this->owner_type, $this->owner_uuid)),
             'tracking_number'      => $this->whenLoaded('trackingNumber', $this->trackingNumber),
-            'type'                 => $this->type ?? null,
-            'meta'                 => $this->meta ?? [],
+            'type'                 => $this->type,
+            'meta'                 => data_get($this, 'meta', []),
             'updated_at'           => $this->updated_at,
             'created_at'           => $this->created_at,
         ];

package/server/src/Http/Resources/v1/Waypoint.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Resources\v1;
+
+use Fleetbase\FleetOps\Models\Waypoint as WaypointModel;
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+use Fleetbase\Support\Resolve;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
+
+class Waypoint extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $waypoint               = $this->getWaypoint();
+
+        return [
+            'id'                   => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                 => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'            => $this->when(Http::isInternalRequest(), $this->public_id),
+            'waypoint_public_id'   => $this->when(Http::isInternalRequest(), $waypoint->public_id),
+            'order'                => $waypoint->order,
+            'tracking'             => $waypoint->tracking,
+            'status'               => $waypoint->status,
+            'status_code'          => $waypoint->status_code,
+            'name'                 => $this->name,
+            'location'             => data_get($this, 'location', new Point(0, 0)),
+            'address'              => $this->address,
+            'address_html'         => $this->when(Http::isInternalRequest(), $this->address_html),
+            'street1'              => $this->street1 ?? null,
+            'street2'              => $this->street2 ?? null,
+            'city'                 => $this->city ?? null,
+            'province'             => $this->province ?? null,
+            'postal_code'          => $this->postal_code ?? null,
+            'neighborhood'         => $this->neighborhood ?? null,
+            'district'             => $this->district ?? null,
+            'building'             => $this->building ?? null,
+            'security_access_code' => $this->security_access_code ?? null,
+            'country'              => $this->country ?? null,
+            'country_name'         => $this->when(Http::isInternalRequest(), $this->country_name),
+            'phone'                => $this->phone ?? null,
+            'owner'                => $this->when(!Http::isInternalRequest(), Resolve::resourceForMorph($this->owner_type, $this->owner_uuid)),
+            'tracking_number'      => $this->whenLoaded('trackingNumber', $waypoint->trackingNumber),
+            'type'                 => $this->type,
+            'meta'                 => data_get($this, 'meta', []),
+            'updated_at'           => $this->updated_at,
+            'created_at'           => $this->created_at,
+        ];
+    }
+
+    /**
+     * Finds the waypoint got a payload and place
+     *
+     * @return WaypointModel|null
+     */
+    private function getWaypoint(): ?WaypointModel
+    {
+        return WaypointModel::where(['payload_uuid' => $this->payload_uuid, 'place_uuid' => $this->uuid])->without(['place'])->with(['trackingNumber'])->first();
+    }
+
+    /**
+     * Transform the resource into an webhook payload.
+     *
+     * @return array
+     */
+    public function toWebhookPayload()
+    {
+        return [
+            'id'              => $this->public_id,
+            'internal_id'     => $this->internal_id,
+            'name'            => $this->name,
+            'type'            => data_get($this, 'type'),
+            'destination'     => $this->destination ? $this->destination->public_id : null,
+            'customer'        => Resolve::resourceForMorph($this->customer_type, $this->customer_uuid),
+            'tracking_number' => new TrackingNumber($this->trackingNumber),
+            'description'     => data_get($this, 'description'),
+            'photo_url'       => data_get($this, 'photo_url'),
+            'length'          => data_get($this, 'length'),
+            'width'           => data_get($this, 'width'),
+            'height'          => data_get($this, 'height'),
+            'dimensions_unit' => data_get($this, 'dimensions_unit'),
+            'weight'          => data_get($this, 'weight'),
+            'weight_unit'     => data_get($this, 'weight_unit'),
+            'declared_value'  => data_get($this, 'declared_value'),
+            'price'           => data_get($this, 'price'),
+            'sale_price'      => data_get($this, 'sale_price'),
+            'sku'             => data_get($this, 'sku'),
+            'currency'        => data_get($this, 'currency'),
+            'meta'            => $this->meta ?? [],
+            'updated_at'      => $this->updated_at,
+            'created_at'      => $this->created_at,
+        ];
+    }
+}

package/server/src/Models/Entity.php

@@ -247,7 +247,7 @@ class Entity extends Model
      */
     public function getPhotoUrlAttribute()
     {
-        return data_get($this, 'photo.s3url', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/parcels/medium.png');
+        return data_get($this, 'photo.url', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/parcels/medium.png');
     }
 
     /**

package/server/src/Models/Payload.php

@@ -216,6 +216,14 @@ class Payload extends Model
                 }
             }
 
+            // Validate destination actually exists
+            if (isset($attributes['destination_uuid']) && Place::where('uuid', $attributes['destination_uuid'])->doesntExist()) {
+                $validDestination = $this->_findCorrectDestinationForEntity($attributes);
+                if ($validDestination) {
+                    $attributes['destination_uuid'] = $validDestination->uuid;
+                }
+            }
+
             $entity = new Entity($attributes);
             $this->entities()->save($entity);
         }
@@ -249,6 +257,14 @@ class Payload extends Model
                 }
             }
 
+            // Validate destination actually exists
+            if (isset($attributes['destination_uuid']) && Place::where('uuid', $attributes['destination_uuid'])->doesntExist()) {
+                $validDestination = $this->_findCorrectDestinationForEntity($attributes);
+                if ($validDestination) {
+                    $attributes['destination_uuid'] = $validDestination->uuid;
+                }
+            }
+
             Entity::insertGetUuid($attributes, $this);
         }
 
@@ -334,7 +350,9 @@ class Payload extends Model
                 if (Str::isUuid($placeUuid) && isset($attributes['uuid']) && $placeUuid !== $attributes['uuid']) {
                     $place = Place::where('uuid', $placeUuid)->first();
 
+                    // set the original destination uuid in meta
                     if ($place instanceof Place) {
+                        $place->updateMeta('_console_destination_uuid', $attributes['uuid']);
                         $place->updateMeta('search_uuid', $attributes['uuid']);
                     }
                 }
@@ -399,6 +417,18 @@ class Payload extends Model
         return $this->refresh()->load(['waypoints']);
     }
 
+    public function _findCorrectDestinationForEntity($entityAttributes = []): ?Place
+    {
+        $destinationId = Utils::get($entityAttributes, 'destination_uuid');
+
+        $destination = Place::where('meta->search_uuid', $destinationId)->first();
+        if (!$destination) {
+            $destination = Place::where('meta->_console_destination_uuid', $destinationId)->first();
+        }
+
+        return $destination;
+    }
+
     /**
      * Get the payload pickup point or the first waypoint.
      *
@@ -783,6 +813,15 @@ class Payload extends Model
             }
         }
 
+        // Validate destination actually exists
+        if (isset($attributes['destination_uuid']) && Place::where('uuid', $attributes['destination_uuid'])->doesntExist()) {
+            $destination = $this->_findCorrectDestinationForEntity($attributes);
+
+            if ($destination instanceof Place) {
+                return $destination;
+            }
+        }
+
         return null;
     }
 }

package/server/src/Models/Place.php

@@ -447,9 +447,12 @@ class Place extends Model
                 return static::createFromCoordinates($place, $attributes, $saveInstance);
             }
 
+            // Get uuid if set
+            $uuid = data_get($place, 'uuid');
+
             // If $place has a valid uuid and a matching Place object exists, return the uuid
-            if (isset($place['uuid']) && Str::isUuid($place['uuid']) && Place::where('uuid', $place['uuid'])->exists()) {
-                return $place['uuid'];
+            if (Str::isUuid($uuid) && $place = Place::where('uuid', $uuid)->first()) {
+                return $place;
             }
 
             // Otherwise, create a new Place object with the given attributes

package/server/src/Models/Proof.php

@@ -81,7 +81,7 @@ class Proof extends Model
      */
     public function getFileUrlAttribute()
     {
-        return $this->fromCache('file.s3url', null);
+        return $this->fromCache('file.url', null);
     }
 
     /**

package/server/src/Models/Waypoint.php

@@ -83,16 +83,28 @@ class Waypoint extends Model
         return $this->pdfLabel()->stream();
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function entities() 
+    {
+        return $this->hasMany(Entity::class, 'destination_uuid', 'place_uuid')->where('payload_uuid', $this->payload_uuid);
+    }
+
     /**
      * The html for the shipment label.
      */
     public function label()
     {
-        $this->load(['trackingNumber', 'company', 'place']);
+        $this->load(['trackingNumber', 'company', 'place', 'entities']);
+        
+        // $entities = Entity::where(['payload_uuid' => $this->payload_uuid, 'destination_uuid' => $this->place_uuid])->get();
+        // dd($entities, );
 
-        return view('labels/default', [
-            'order'          => $this,
+        return view('fleetops::labels/waypoint-label', [
+            'waypoint'          => $this,
             'dropoff'        => $this->place,
+            'entities'        => $this->entities()->get(),
             'trackingNumber' => $this->trackingNumber,
             'company'        => $this->company,
         ])->render();