@fleetbase/fleetops-engine 0.6.48 → 0.6.50

package/server/config/telematics.php

@@ -106,6 +106,116 @@ return [
                 'pagination' => 'cursor',
             ],
         ],
+
+        [
+            'key' => 'afaqy',
+            'label' => 'AFAQY',
+            'type' => 'native',
+            'driver_class' => \Fleetbase\FleetOps\Support\Telematics\Providers\AfaqyProvider::class,
+            'icon' => 'https://api.afaqy.sa/docs/img/favicon.ico',
+            'description' => 'AFAQY AVL REST integration for unit discovery, live position, speed, heading, odometer, fuel, and signal data.',
+            'docs_url' => 'https://api.afaqy.sa/docs/',
+            'required_fields' => [
+                [
+                    'name' => 'base_url',
+                    'label' => 'Base URL',
+                    'type' => 'text',
+                    'placeholder' => 'https://api.afaqy.sa',
+                    'required' => false,
+                    'validation' => 'nullable|url',
+                ],
+                [
+                    'name' => 'username',
+                    'label' => 'Username',
+                    'type' => 'text',
+                    'placeholder' => 'Enter your AFAQY username',
+                    'required' => false,
+                    'validation' => 'required_without:token|string',
+                ],
+                [
+                    'name' => 'password',
+                    'label' => 'Password',
+                    'type' => 'password',
+                    'placeholder' => 'Enter your AFAQY password',
+                    'required' => false,
+                    'validation' => 'required_without:token|string',
+                ],
+                [
+                    'name' => 'token',
+                    'label' => 'Token',
+                    'type' => 'password',
+                    'placeholder' => 'Use an existing AFAQY token',
+                    'required' => false,
+                    'validation' => 'required_without:username|string',
+                ],
+            ],
+            'supports_webhooks' => false,
+            'supports_discovery' => true,
+            'metadata' => [
+                'rate_limit' => 60,
+                'pagination' => 'offset',
+                'capabilities' => ['tracking', 'speed', 'heading', 'odometer', 'fuel_level', 'ignition'],
+            ],
+        ],
+
+        [
+            'key' => 'safee',
+            'label' => 'Safee Tracking',
+            'type' => 'native',
+            'driver_class' => \Fleetbase\FleetOps\Support\Telematics\Providers\SafeeProvider::class,
+            'description' => 'Safee Tracking REST integration for vehicle discovery, last state, live positions, odometer, fuel, and sensor data.',
+            'required_fields' => [
+                [
+                    'name' => 'server_uri',
+                    'label' => 'Server URI',
+                    'type' => 'text',
+                    'placeholder' => 'https://tracking.example.com',
+                    'required' => true,
+                    'validation' => 'required|url',
+                ],
+                [
+                    'name' => 'realm_id',
+                    'label' => 'Realm ID',
+                    'type' => 'text',
+                    'placeholder' => 'Enter Safee realm ID',
+                    'required' => true,
+                ],
+                [
+                    'name' => 'client_id',
+                    'label' => 'Client ID',
+                    'type' => 'text',
+                    'placeholder' => 'Enter Safee client ID',
+                    'required' => true,
+                ],
+                [
+                    'name' => 'client_secret',
+                    'label' => 'Client Secret',
+                    'type' => 'password',
+                    'placeholder' => 'Enter Safee client secret',
+                    'required' => true,
+                ],
+                [
+                    'name' => 'username',
+                    'label' => 'Username',
+                    'type' => 'text',
+                    'placeholder' => 'Enter Safee username',
+                    'required' => true,
+                ],
+                [
+                    'name' => 'password',
+                    'label' => 'Password',
+                    'type' => 'password',
+                    'placeholder' => 'Enter Safee password',
+                    'required' => true,
+                ],
+            ],
+            'supports_webhooks' => false,
+            'supports_discovery' => true,
+            'metadata' => [
+                'rate_limit' => 3000,
+                'pagination' => 'none',
+                'capabilities' => ['tracking', 'speed', 'heading', 'odometer', 'fuel_level', 'ignition'],
+            ],
+        ],
     ]
 ];
-

package/server/migrations/2026_05_18_000001_add_license_expiry_to_drivers_table.php

@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up()
+    {
+        Schema::table('drivers', function (Blueprint $table) {
+            if (!Schema::hasColumn('drivers', 'license_expiry')) {
+                $table->date('license_expiry')->nullable()->after('drivers_license_number')->index();
+            }
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('drivers', function (Blueprint $table) {
+            if (Schema::hasColumn('drivers', 'license_expiry')) {
+                $table->dropColumn('license_expiry');
+            }
+        });
+    }
+};

package/server/migrations/2026_05_21_000001_add_geographic_rules_to_service_rate_fees_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('service_rate_fees', function (Blueprint $table) {
+            $table->uuid('service_area_uuid')->nullable()->index()->after('service_rate_uuid');
+            $table->uuid('zone_uuid')->nullable()->index()->after('service_area_uuid');
+            $table->string('label')->nullable()->after('zone_uuid');
+            $table->integer('priority')->default(0)->after('label');
+            $table->boolean('is_fallback')->default(false)->after('priority');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('service_rate_fees', function (Blueprint $table) {
+            $table->dropIndex(['service_area_uuid']);
+            $table->dropIndex(['zone_uuid']);
+            $table->dropColumn(['service_area_uuid', 'zone_uuid', 'label', 'priority', 'is_fallback']);
+        });
+    }
+};

package/server/migrations/2026_05_25_000001_add_endpoint_tracking_refs_to_payloads_table.php

@@ -0,0 +1,50 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('payloads', function (Blueprint $table) {
+            if (!Schema::hasColumn('payloads', 'pickup_tracking_number_uuid')) {
+                $table->uuid('pickup_tracking_number_uuid')->nullable()->index('payloads_pickup_tracking_number_uuid_index')->after('pickup_uuid');
+            }
+
+            if (!Schema::hasColumn('payloads', 'dropoff_tracking_number_uuid')) {
+                $table->uuid('dropoff_tracking_number_uuid')->nullable()->index('payloads_dropoff_tracking_number_uuid_index')->after('dropoff_uuid');
+            }
+
+            if (!Schema::hasColumn('payloads', 'return_tracking_number_uuid')) {
+                $table->uuid('return_tracking_number_uuid')->nullable()->index('payloads_return_tracking_number_uuid_index')->after('return_uuid');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('payloads', function (Blueprint $table) {
+            if (Schema::hasColumn('payloads', 'pickup_tracking_number_uuid')) {
+                $table->dropIndex('payloads_pickup_tracking_number_uuid_index');
+                $table->dropColumn('pickup_tracking_number_uuid');
+            }
+
+            if (Schema::hasColumn('payloads', 'dropoff_tracking_number_uuid')) {
+                $table->dropIndex('payloads_dropoff_tracking_number_uuid_index');
+                $table->dropColumn('dropoff_tracking_number_uuid');
+            }
+
+            if (Schema::hasColumn('payloads', 'return_tracking_number_uuid')) {
+                $table->dropIndex('payloads_return_tracking_number_uuid_index');
+                $table->dropColumn('return_tracking_number_uuid');
+            }
+        });
+    }
+};

package/server/migrations/2026_05_27_000001_default_driver_vehicle_statuses_to_available.php

@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::table('drivers')->where(function ($query) {
+            $query->where('status', 'active')->orWhereNull('status');
+        })->update(['status' => 'available']);
+
+        DB::table('vehicles')->where(function ($query) {
+            $query->where('status', 'active')->orWhereNull('status');
+        })->update(['status' => 'available']);
+
+        Schema::table('drivers', function (Blueprint $table) {
+            $table->string('status', 191)->nullable()->default('available')->change();
+        });
+
+        Schema::table('vehicles', function (Blueprint $table) {
+            $table->string('status')->nullable()->default('available')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('drivers', function (Blueprint $table) {
+            $table->string('status', 191)->nullable()->default(null)->change();
+        });
+
+        Schema::table('vehicles', function (Blueprint $table) {
+            $table->string('status')->nullable()->default(null)->change();
+        });
+    }
+};

package/server/resources/views/labels/default.php

@@ -1,17 +1,25 @@
 <?php
 
 use Fleetbase\Fleetops\Models\Order;
-use Fleetbase\Support\Utils; ?>
+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 ?? ($order->internal_id ?? $order->public_id) ?> Label</title>
+	<title><?php echo e($company->name ?? ($order->internal_id ?? $order->public_id)); ?> Label</title>
 </head>
 
 <style>
+	body {
+		font-family: "DejaVu Sans", "Noto Sans", "Noto Sans Arabic", "Noto Sans CJK SC", "Noto Sans CJK JP", sans-serif;
+		font-size: 12px;
+		line-height: 1.35;
+	}
+
 	.group:after {
 		content: "";
 		display: table;
@@ -45,33 +53,33 @@ use Fleetbase\Support\Utils; ?>
 	<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;">
+				<img src="data:image/png;base64,<?php echo Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $order->trackingNumber->qr_code; ?>" style="width: 100%; height: 100%; object-fit: cover;">
 			</div>
 			<div style="margin-top: 10px; padding-left: 10px;">
-				<div style="font-size: 18px; font-weight: bold;"><?= strtoupper($company->name) ?></div>
+				<div style="font-size: 18px; font-weight: bold;"><?php echo e($company->name); ?></div>
 				<div style="font-size: 16px; font-weight: 300; color: #000;">
 					<?php
-					if ($order && $order instanceof Order) {
-						$order->load('purchaseRate.serviceQuote.serviceRate');
-						$serviceName = data_get($order, 'purchaseRate.serviceQuote.serviceRate.service_name');
-						if ($serviceName) {
-							echo strtoupper($serviceName);
-						}
-					}
-					?>
+                    if ($order && $order instanceof Order) {
+                        $order->load('purchaseRate.serviceQuote.serviceRate');
+                        $serviceName = data_get($order, 'purchaseRate.serviceQuote.serviceRate.service_name');
+                        if ($serviceName) {
+                            echo e($serviceName);
+                        }
+                    }
+?>
 				</div>
 			</div>
 		</div>
 
 		<?php
-		// load payload locations
-		if ($order) {
-			$order->load('payload.pickup', 'payload.dropoff', 'payload.entities');
-			$pickup = $pickup ?? $order->payload->pickup;
-			$dropoff = $dropoff ?? $order->payload->dropoff;
-			$entities = $entities ?? ($order->payload['entities'] ?? []);
-		}
-		?>
+        // load payload locations
+        if ($order) {
+            $order->load('payload.pickup', 'payload.dropoff', 'payload.entities');
+            $pickup   = $pickup ?? $order->payload->pickup;
+            $dropoff  = $dropoff ?? $order->payload->dropoff;
+            $entities = $entities ?? ($order->payload['entities'] ?? []);
+        }
+?>
 		<?php if ($pickup) { ?>
 			<div class="group">
 				<div class="group" style="border-bottom: 1px #414141 solid; padding: 15px;">
@@ -79,35 +87,35 @@ use Fleetbase\Support\Utils; ?>
 						PICKUP:
 					</div>
 					<div class="places--display-address" style="float: left; display: inline-block">
-						<div class="line"><strong><?= $pickup->name ?></strong></div>
-						<div class="line"><?= $pickup->street1 ?></div>
+						<div class="line"><strong><?php echo e($pickup->name); ?></strong></div>
+						<div class="line"><?php echo e($pickup->street1); ?></div>
 						<?php if (!empty($pickup->street2)) { ?>
-							<div class="line"><?= $pickup->street2 ?></div>
+							<div class="line"><?php echo e($pickup->street2); ?></div>
 						<?php } ?>
 						<div class="line">
 							<?php if (!empty($pickup->neighborhood)) { ?>
-								<span class="segment"><?= $pickup->neighborhood ?></span>
+								<span class="segment"><?php echo e($pickup->neighborhood); ?></span>
 							<?php } ?>
 							<?php if (!empty($pickup->district)) { ?>
-								<span class="segment"><?= $pickup->district ?></span>
+								<span class="segment"><?php echo e($pickup->district); ?></span>
 							<?php } ?>
 						</div>
 						<div class="line">
 							<?php if (!empty($pickup->postal_code)) { ?>
-								<span class="segment"><?= $pickup->postal_code ?></span>
+								<span class="segment"><?php echo e($pickup->postal_code); ?></span>
 							<?php } ?>
 							<?php if (!empty($pickup->city)) { ?>
-								<span class="segment"><?= $pickup->city ?></span>
+								<span class="segment"><?php echo e($pickup->city); ?></span>
 							<?php } ?>
 							<?php if (!empty($pickup->province)) { ?>
-								<span class="segment"><?= $pickup->province ?></span>
+								<span class="segment"><?php echo e($pickup->province); ?></span>
 							<?php } ?>
 							<?php if (!empty($pickup->country)) { ?>
-								<span class="segment"><?= $pickup->country ?></span>
+								<span class="segment"><?php echo e($pickup->country); ?></span>
 							<?php } ?>
 						</div>
 						<?php if (!empty($pickup->phone_number)) { ?>
-							<div class="line"><?= $pickup->phone_number ?></div>
+							<div class="line"><?php echo e($pickup->phone_number); ?></div>
 						<?php } ?>
 					</div>
 				</div>
@@ -120,35 +128,35 @@ use Fleetbase\Support\Utils; ?>
 						DROPOFF:
 					</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>
+						<div class="line"><strong><?php echo e($dropoff->name); ?></strong></div>
+						<div class="line"><?php echo e($dropoff->street1); ?></div>
 						<?php if (!empty($dropoff->street2)) { ?>
-							<div class="line"><?= $dropoff->street2 ?></div>
+							<div class="line"><?php echo e($dropoff->street2); ?></div>
 						<?php } ?>
 						<div class="line">
 							<?php if (!empty($dropoff->neighborhood)) { ?>
-								<span class="segment"><?= $dropoff->neighborhood ?></span>
+								<span class="segment"><?php echo e($dropoff->neighborhood); ?></span>
 							<?php } ?>
 							<?php if (!empty($dropoff->district)) { ?>
-								<span class="segment"><?= $dropoff->district ?></span>
+								<span class="segment"><?php echo e($dropoff->district); ?></span>
 							<?php } ?>
 						</div>
 						<div class="line">
 							<?php if (!empty($dropoff->postal_code)) { ?>
-								<span class="segment"><?= $dropoff->postal_code ?></span>
+								<span class="segment"><?php echo e($dropoff->postal_code); ?></span>
 							<?php } ?>
 							<?php if (!empty($dropoff->city)) { ?>
-								<span class="segment"><?= $dropoff->city ?></span>
+								<span class="segment"><?php echo e($dropoff->city); ?></span>
 							<?php } ?>
 							<?php if (!empty($dropoff->province)) { ?>
-								<span class="segment"><?= $dropoff->province ?></span>
+								<span class="segment"><?php echo e($dropoff->province); ?></span>
 							<?php } ?>
 							<?php if (!empty($dropoff->country)) { ?>
-								<span class="segment"><?= $dropoff->country ?></span>
+								<span class="segment"><?php echo e($dropoff->country); ?></span>
 							<?php } ?>
 						</div>
 						<?php if (!empty($dropoff->phone_number)) { ?>
-							<div class="line"><?= $dropoff->phone_number ?></div>
+							<div class="line"><?php echo e($dropoff->phone_number); ?></div>
 						<?php } ?>
 					</div>
 				</div>
@@ -162,12 +170,12 @@ use Fleetbase\Support\Utils; ?>
 							<div class="line">
 								<strong>
 									<?php
-									if (isset($entity['name']) && !empty($entity['name'])) {
-										echo strtoupper($entity['name']) . ' - ' . ($entity['internal_id'] ?? '');
-									} else {
-										echo 'ITEM -' . ($entity['internal_id'] ?? '');
-									}
-									?>
+                            if (isset($entity['name']) && !empty($entity['name'])) {
+                                echo e($entity['name'] . ' - ' . ($entity['internal_id'] ?? ''));
+                            } else {
+                                echo e('ITEM -' . ($entity['internal_id'] ?? ''));
+                            }
+						    ?>
 								</strong>
 							</div>
 						<?php } ?>
@@ -177,11 +185,11 @@ use Fleetbase\Support\Utils; ?>
 		<?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>
+				<img src="data:image/png;base64,<?php echo isset($trackingNumber) ? $trackingNumber->barcode : $order->trackingNumber->barcode; ?>" style="height: 90px; margin-top: 10px;">
+				<div><?php echo e(strtoupper(isset($trackingNumber) ? $trackingNumber->tracking_number : $order->trackingNumber->tracking_number)); ?></div>
 			</div>
 		</div>
 	</div>
 </body>
 
-</html>
+</html>

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

@@ -1,5 +1,6 @@
 <?php
-use Fleetbase\Support\Utils; 
+use Fleetbase\Support\Utils;
+
 ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -8,10 +9,16 @@ use Fleetbase\Support\Utils;
 <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>
+    <title><?php echo e($company->name ?? ($waypoint->internal_id ?? $waypoint->public_id)); ?> Waypoint Label</title>
 </head>
 
 <style>
+    body {
+        font-family: "DejaVu Sans", "Noto Sans", "Noto Sans Arabic", "Noto Sans CJK SC", "Noto Sans CJK JP", sans-serif;
+        font-size: 12px;
+        line-height: 1.35;
+    }
+
     .group:after {
         content: "";
         display: table;
@@ -45,10 +52,10 @@ use Fleetbase\Support\Utils;
     <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;">
+                <img src="data:image/png;base64,<?php echo 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>
+                <span style="padding-left: 10px; font-size: 18px; font-weight: bold;"><?php echo e($company->name); ?></span>
             </div>
         </div>
 
@@ -59,35 +66,35 @@ use Fleetbase\Support\Utils;
                         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>
+                        <div class="line"><strong><?php echo e($dropoff->name); ?></strong></div>
+                        <div class="line"><?php echo e($dropoff->street1); ?></div>
                         <?php if (!empty($dropoff->street2)) { ?>
-                            <div class="line"><?= $dropoff->street2 ?></div>
+                            <div class="line"><?php echo e($dropoff->street2); ?></div>
                         <?php } ?>
                         <div class="line">
                             <?php if (!empty($dropoff->neighborhood)) { ?>
-                                <span class="segment"><?= $dropoff->neighborhood ?></span>
+                                <span class="segment"><?php echo e($dropoff->neighborhood); ?></span>
                             <?php } ?>
                             <?php if (!empty($dropoff->district)) { ?>
-                                <span class="segment"><?= $dropoff->district ?></span>
+                                <span class="segment"><?php echo e($dropoff->district); ?></span>
                             <?php } ?>
                         </div>
                         <div class="line">
                             <?php if (!empty($dropoff->postal_code)) { ?>
-                                <span class="segment"><?= $dropoff->postal_code ?></span>
+                                <span class="segment"><?php echo e($dropoff->postal_code); ?></span>
                             <?php } ?>
                             <?php if (!empty($dropoff->city)) { ?>
-                                <span class="segment"><?= $dropoff->city ?></span>
+                                <span class="segment"><?php echo e($dropoff->city); ?></span>
                             <?php } ?>
                             <?php if (!empty($dropoff->province)) { ?>
-                                <span class="segment"><?= $dropoff->province ?></span>
+                                <span class="segment"><?php echo e($dropoff->province); ?></span>
                             <?php } ?>
                             <?php if (!empty($dropoff->country)) { ?>
-                                <span class="segment"><?= $dropoff->country ?></span>
+                                <span class="segment"><?php echo e($dropoff->country); ?></span>
                             <?php } ?>
                         </div>
                         <?php if (!empty($dropoff->phone_number)) { ?>
-                            <div class="line"><?= $dropoff->phone_number ?></div>
+                            <div class="line"><?php echo e($dropoff->phone_number); ?></div>
                         <?php } ?>
                     </div>
                 </div>
@@ -102,11 +109,11 @@ use Fleetbase\Support\Utils;
                                 <strong>
                                     <?php
                                     if (data_get($entity, 'name')) {
-                                        echo strtoupper(data_get($entity, 'name') . ' - ' . data_get($entity, 'internal_id', ''));
+                                        echo e(data_get($entity, 'name') . ' - ' . data_get($entity, 'internal_id', ''));
                                     } else {
-                                        echo strtoupper('ITEM - ' . data_get($entity, 'internal_id', ''));
+                                        echo e('ITEM - ' . data_get($entity, 'internal_id', ''));
                                     }
-                                    ?>
+                            ?>
                                 </strong>
                             </div>
                         <?php } ?>
@@ -116,11 +123,11 @@ use Fleetbase\Support\Utils;
         <?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>
+                <img src="data:image/png;base64,<?php echo isset($trackingNumber) ? $trackingNumber->barcode : $order->trackingNumber->barcode; ?>" style="height: 90px; margin-top: 10px;">
+                <div><?php echo e(strtoupper(isset($trackingNumber) ? $trackingNumber->tracking_number : $order->trackingNumber->tracking_number)); ?></div>
             </div>
         </div>
     </div>
 </body>
 
-</html>
+</html>