@fleetbase/fleetops-engine 0.6.43 → 0.6.45

package/server/src/Models/ServiceRate.php

@@ -369,11 +369,37 @@ class ServiceRate extends Model
             return $this;
         }
 
+        // Normalize duplicate parcel rows by fee shape and keep the latest submitted value.
+        $serviceRateParcelFees = collect($serviceRateParcelFees)
+            ->filter(fn ($fee) => is_array($fee))
+            ->map(function ($fee) {
+                return collect($fee)->except(['created_at', 'updated_at'])->toArray();
+            })
+            ->keyBy(function ($fee) {
+                return implode(':', [
+                    data_get($fee, 'size'),
+                    data_get($fee, 'length'),
+                    data_get($fee, 'width'),
+                    data_get($fee, 'height'),
+                    data_get($fee, 'dimensions_unit'),
+                    data_get($fee, 'weight'),
+                    data_get($fee, 'weight_unit'),
+                ]);
+            })
+            ->values()
+            ->toArray();
+
+        $submittedUuids = collect($serviceRateParcelFees)
+            ->pluck('uuid')
+            ->filter()
+            ->values()
+            ->all();
+
         $iterate = count($serviceRateParcelFees);
 
         for ($i = 0; $i < $iterate; $i++) {
             // if already has uuid then we just update the record and remove from insert array
-            if (isset($serviceRateParcelFees[$i]['uuid'])) {
+            if (!empty($serviceRateParcelFees[$i]['uuid'])) {
                 $id                   = $serviceRateParcelFees[$i]['uuid'];
                 $updateableAttributes = collect($serviceRateParcelFees[$i])->except(['uuid', 'created_at', 'updated_at'])->toArray();
 
@@ -391,7 +417,18 @@ class ServiceRate extends Model
         }
 
         $serviceRateParcelFees = collect($serviceRateParcelFees)->filter()->values()->toArray();
-        ServiceRateParcelFee::bulkInsert($serviceRateParcelFees);
+
+        $existingParcelFeesQuery = ServiceRateParcelFee::where('service_rate_uuid', $this->uuid);
+
+        if (!empty($submittedUuids)) {
+            $existingParcelFeesQuery->whereNotIn('uuid', $submittedUuids)->delete();
+        } else {
+            $existingParcelFeesQuery->delete();
+        }
+
+        if (!empty($serviceRateParcelFees)) {
+            ServiceRateParcelFee::bulkInsert($serviceRateParcelFees);
+        }
 
         return $this;
     }
@@ -688,13 +725,13 @@ class ServiceRate extends Model
         }
 
         if ($this->isPerMeter()) {
-            $perMeterDistance = $this->per_meter_unit === 'km' ? round($totalDistance / 1000) : $totalDistance;
-            $rateFee          = $perMeterDistance * $this->per_meter_flat_rate_fee;
+            $perMeterDistance = $this->normalizeDistanceForUnit($totalDistance, $this->per_meter_unit);
+            $rateFee          = $this->normalizeCalculatedMoney($perMeterDistance * $this->per_meter_flat_rate_fee);
             $subTotal += $rateFee;
 
             $lines->push([
                 'details'          => 'Service Fee',
-                'amount'           => Utils::numbersOnly($rateFee),
+                'amount'           => $rateFee,
                 'formatted_amount' => Utils::moneyFormat($rateFee, $this->currency),
                 'currency'         => $this->currency,
                 'code'             => 'BASE_FEE',
@@ -702,20 +739,23 @@ class ServiceRate extends Model
         }
 
         if ($this->isAlgorithm()) {
-            $rateFee = Algo::exec(
+            $rateFee = $this->normalizeCalculatedMoney(Algo::exec(
                 $this->algorithm,
-                [
-                    'distance' => $totalDistance,
-                    'time'     => $totalTime,
-                ],
+                $this->buildAlgorithmVariables(
+                    $entities,
+                    $waypoints,
+                    $totalDistance,
+                    $totalTime,
+                    $this->inferEndpointCountFromStops($waypoints)
+                ),
                 true
-            );
+            ));
 
-            $subTotal += Utils::numbersOnly($rateFee);
+            $subTotal += $rateFee;
 
             $lines->push([
                 'details'          => 'Service Fee',
-                'amount'           => Utils::numbersOnly($rateFee),
+                'amount'           => $rateFee,
                 'formatted_amount' => Utils::moneyFormat($rateFee, $this->currency),
                 'currency'         => $this->currency,
                 'code'             => 'BASE_FEE',
@@ -758,9 +798,10 @@ class ServiceRate extends Model
                 }
 
                 $subTotal += $serviceParcelFee->fee;
+                $parcelFeeName = ucwords(str_replace(['_', '-'], ' ', data_get($serviceParcelFee, 'size', 'parcel')));
 
                 $lines->push([
-                    'details'          => $serviceParcelFee->name . ' parcel fee',
+                    'details'          => $parcelFeeName . ' parcel fee',
                     'amount'           => Utils::numbersOnly($serviceParcelFee->fee),
                     'formatted_amount' => Utils::moneyFormat($serviceParcelFee->fee, $this->currency),
                     'currency'         => $this->currency,
@@ -777,7 +818,7 @@ class ServiceRate extends Model
             if ($this->hasCodFlatFee()) {
                 $subTotal += $codFee = $this->cod_flat_fee;
             } elseif ($this->hasCodPercentageFee()) {
-                $subTotal += $codFee = Utils::calculatePercentage($this->cod_percent, $baseRate);
+                $subTotal += $codFee = $this->normalizeCalculatedMoney(Utils::calculatePercentage($this->cod_percent, $baseRate));
             }
 
             $lines->push([
@@ -794,7 +835,7 @@ class ServiceRate extends Model
             if ($this->hasPeakHoursFlatFee()) {
                 $subTotal += $peakHoursFee = $this->peak_hours_flat_fee;
             } elseif ($this->hasPeakHoursPercentageFee()) {
-                $subTotal += $peakHoursFee = Utils::calculatePercentage($this->peak_hours_percent, $baseRate);
+                $subTotal += $peakHoursFee = $this->normalizeCalculatedMoney(Utils::calculatePercentage($this->peak_hours_percent, $baseRate));
             }
 
             $lines->push([
@@ -872,13 +913,13 @@ class ServiceRate extends Model
         }
 
         if ($this->isPerMeter()) {
-            $perMeterDistance = $this->per_meter_unit === 'km' ? round($totalDistance / 1000) : $totalDistance;
-            $rateFee          = $perMeterDistance * $this->per_meter_flat_rate_fee;
+            $perMeterDistance = $this->normalizeDistanceForUnit($totalDistance, $this->per_meter_unit);
+            $rateFee          = $this->normalizeCalculatedMoney($perMeterDistance * $this->per_meter_flat_rate_fee);
             $subTotal += $rateFee;
 
             $lines->push([
                 'details'          => 'Service Fee',
-                'amount'           => Utils::numbersOnly($rateFee),
+                'amount'           => $rateFee,
                 'formatted_amount' => Utils::moneyFormat($rateFee, $this->currency),
                 'currency'         => $this->currency,
                 'code'             => 'BASE_FEE',
@@ -886,20 +927,23 @@ class ServiceRate extends Model
         }
 
         if ($this->isAlgorithm()) {
-            $rateFee = Algo::exec(
+            $rateFee = $this->normalizeCalculatedMoney(Algo::exec(
                 $this->algorithm,
-                [
-                    'distance' => $totalDistance,
-                    'time'     => $totalTime,
-                ],
+                $this->buildAlgorithmVariables(
+                    $payload->entities->all(),
+                    $waypoints->all(),
+                    $totalDistance,
+                    $totalTime,
+                    (int) ($payload->pickup ? 1 : 0) + (int) ($payload->dropoff ? 1 : 0)
+                ),
                 true
-            );
+            ));
 
-            $subTotal += Utils::numbersOnly($rateFee);
+            $subTotal += $rateFee;
 
             $lines->push([
                 'details'          => 'Service Fee',
-                'amount'           => Utils::numbersOnly($rateFee),
+                'amount'           => $rateFee,
                 'formatted_amount' => Utils::moneyFormat($rateFee, $this->currency),
                 'currency'         => $this->currency,
                 'code'             => 'BASE_FEE',
@@ -942,9 +986,10 @@ class ServiceRate extends Model
                 }
 
                 $subTotal += $serviceParcelFee->fee;
+                $parcelFeeName = ucwords(str_replace(['_', '-'], ' ', data_get($serviceParcelFee, 'size', 'parcel')));
 
                 $lines->push([
-                    'details'          => $serviceParcelFee->name . ' parcel fee',
+                    'details'          => $parcelFeeName . ' parcel fee',
                     'amount'           => Utils::numbersOnly($serviceParcelFee->fee),
                     'formatted_amount' => Utils::moneyFormat($serviceParcelFee->fee, $this->currency),
                     'currency'         => $this->currency,
@@ -961,7 +1006,7 @@ class ServiceRate extends Model
             if ($this->hasCodFlatFee()) {
                 $subTotal += $codFee = $this->cod_flat_fee;
             } elseif ($this->hasCodPercentageFee()) {
-                $subTotal += $codFee = Utils::calculatePercentage($this->cod_percent, $baseRate);
+                $subTotal += $codFee = $this->normalizeCalculatedMoney(Utils::calculatePercentage($this->cod_percent, $baseRate));
             }
 
             $lines->push([
@@ -978,7 +1023,7 @@ class ServiceRate extends Model
             if ($this->hasPeakHoursFlatFee()) {
                 $subTotal += $peakHoursFee = $this->peak_hours_flat_fee;
             } elseif ($this->hasPeakHoursPercentageFee()) {
-                $subTotal += $peakHoursFee = Utils::calculatePercentage($this->peak_hours_percent, $baseRate);
+                $subTotal += $peakHoursFee = $this->normalizeCalculatedMoney(Utils::calculatePercentage($this->peak_hours_percent, $baseRate));
             }
 
             $lines->push([
@@ -993,6 +1038,53 @@ class ServiceRate extends Model
         return [$subTotal, $lines];
     }
 
+    protected function normalizeDistanceForUnit(?int $distanceInMeters = 0, ?string $unit = 'm'): float|int
+    {
+        $distanceInMeters = (float) ($distanceInMeters ?? 0);
+
+        return match ($unit) {
+            'km'    => $distanceInMeters / 1000,
+            'ft'    => $distanceInMeters / 0.3048,
+            'yd'    => $distanceInMeters / 0.9144,
+            'mi'    => $distanceInMeters / 1609.344,
+            default => $distanceInMeters,
+        };
+    }
+
+    protected function normalizeCalculatedMoney($amount = 0): int
+    {
+        return (int) round((float) ($amount ?? 0));
+    }
+
+    protected function buildAlgorithmVariables($entities = [], $stops = [], ?int $totalDistance = 0, ?int $totalTime = 0, int $endpointCount = 0): array
+    {
+        $entityCollection = collect($entities)->filter();
+        $stopCount        = collect($stops)->filter()->count();
+        $endpointCount    = max(0, min($endpointCount, $stopCount));
+        $waypointCount    = max($stopCount - $endpointCount, 0);
+
+        return Algo::normalizeVariables([
+            'distance_m' => $totalDistance ?? 0,
+            'time_s'     => $totalTime ?? 0,
+            'stops'      => $stopCount,
+            'waypoints'  => $waypointCount,
+            'parcels'    => $entityCollection->where('type', 'parcel')->count(),
+            'entities'   => $entityCollection->count(),
+            'base_fee'   => Utils::numbersOnly($this->base_fee ?? 0),
+        ]);
+    }
+
+    protected function inferEndpointCountFromStops($stops = []): int
+    {
+        $stopCount = collect($stops)->filter()->count();
+
+        if ($stopCount <= 1) {
+            return $stopCount;
+        }
+
+        return 2;
+    }
+
     /**
      * Find the ServiceRateFee based on the total distance.
      *

package/server/src/Models/Zone.php

@@ -62,7 +62,21 @@ class Zone extends Model
      *
      * @var array
      */
-    protected $fillable = ['_key', 'company_uuid', 'service_area_uuid', 'name', 'description', 'border', 'color', 'stroke_color', 'status'];
+    protected $fillable = [
+        '_key',
+        'company_uuid',
+        'service_area_uuid',
+        'name',
+        'description',
+        'border',
+        'color',
+        'stroke_color',
+        'status',
+        'trigger_on_entry',
+        'trigger_on_exit',
+        'dwell_threshold_minutes',
+        'speed_limit_kmh',
+    ];
 
     /**
      * The attributes that should be cast to native types.
@@ -70,7 +84,11 @@ class Zone extends Model
      * @var array
      */
     protected $casts = [
-        'border' => PolygonCast::class,
+        'border'                  => PolygonCast::class,
+        'trigger_on_entry'        => 'boolean',
+        'trigger_on_exit'         => 'boolean',
+        'dwell_threshold_minutes' => 'integer',
+        'speed_limit_kmh'         => 'integer',
     ];
 
     /**

package/server/src/Notifications/DriverArrivedAtGeofence.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace Fleetbase\FleetOps\Notifications;
+
+use Fleetbase\FleetOps\Models\Order;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+/**
+ * DriverArrivedAtGeofence.
+ *
+ * Sent to the order customer when a driver enters the geofence associated
+ * with the order's current destination waypoint.
+ *
+ * Delivery channels: mail and database.
+ */
+class DriverArrivedAtGeofence extends Notification
+{
+    use Queueable;
+
+    /**
+     * The order associated with the arrival.
+     */
+    protected Order $order;
+
+    /**
+     * The geofence that was entered (Zone or ServiceArea).
+     */
+    protected $geofence;
+
+    /**
+     * Create a new DriverArrivedAtGeofence notification.
+     *
+     * @param mixed $geofence Zone or ServiceArea
+     */
+    public function __construct(Order $order, $geofence)
+    {
+        $this->order    = $order;
+        $this->geofence = $geofence;
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     */
+    public function via($notifiable): array
+    {
+        return ['mail', 'database'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     */
+    public function toMail($notifiable): MailMessage
+    {
+        $geofenceName = $this->geofence->name ?? 'your location';
+        $orderId      = $this->order->public_id ?? $this->order->uuid;
+
+        return (new MailMessage())
+            ->subject("Your driver has arrived — Order #{$orderId}")
+            ->greeting('Good news!')
+            ->line("Your driver has arrived at {$geofenceName} for order #{$orderId}.")
+            ->line('Please be ready to receive your delivery.')
+            ->action('Track Your Order', url("/tracking/{$this->order->tracking_number}"))
+            ->line('Thank you for using our service.');
+    }
+
+    /**
+     * Get the array representation of the notification (database channel).
+     */
+    public function toArray($notifiable): array
+    {
+        return [
+            'event'         => 'driver.arrived_at_geofence',
+            'order_id'      => $this->order->public_id,
+            'order_uuid'    => $this->order->uuid,
+            'geofence_id'   => $this->geofence->public_id ?? null,
+            'geofence_name' => $this->geofence->name ?? null,
+            'message'       => sprintf(
+                'Your driver has arrived at %s for order #%s.',
+                $this->geofence->name ?? 'your location',
+                $this->order->public_id
+            ),
+        ];
+    }
+}

package/server/src/Observers/PurchaseRateObserver.php

@@ -2,7 +2,6 @@
 
 namespace Fleetbase\FleetOps\Observers;
 
-use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\PurchaseRate;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Company;
@@ -25,7 +24,8 @@ class PurchaseRateObserver
         $company = Company::where('uuid', session('company', $purchaseRate->company_uuid))->first();
 
         // get currency to use
-        $currency = data_get($purchaseRate, 'serviceQuote.currency', $company->country ? Utils::getCurrenyFromCountryCode($company->country) : 'SGD');
+        $currency = data_get($purchaseRate, 'serviceQuote.currency')
+            ?: Utils::getCompanyTransactionCurrency($company ?? $purchaseRate->company_uuid);
 
         // create transaction and transaction items
         $transaction = Transaction::create([
@@ -41,9 +41,6 @@ class PurchaseRateObserver
             'status'                 => 'success',
         ]);
 
-        // Update order with transaction id
-        Order::where('payload_uuid', $purchaseRate->payload_uuid)->update(['transaction_uuid' => $transaction->uuid]);
-
         if (isset($purchaseRate->serviceQuote)) {
             $purchaseRate->serviceQuote->items->each(function ($serviceQuoteItem) use ($transaction, $currency) {
                 TransactionItem::create([
@@ -57,5 +54,6 @@ class PurchaseRateObserver
         }
 
         $purchaseRate->transaction_uuid = $transaction->uuid;
+        $purchaseRate->status           = $purchaseRate->status ?: Transaction::STATUS_SUCCESS;
     }
 }

package/server/src/Providers/EventServiceProvider.php

@@ -23,6 +23,25 @@ class EventServiceProvider extends ServiceProvider
         \Fleetbase\FleetOps\Events\OrderFailed::class         => [\Fleetbase\Listeners\SendResourceLifecycleWebhook::class, \Fleetbase\FleetOps\Listeners\NotifyOrderEvent::class],
         \Fleetbase\FleetOps\Events\OrderReady::class          => [\Fleetbase\FleetOps\Listeners\HandleOrderReady::class],
 
+        /*
+         * Geofence Events
+         *
+         * Each event is handled by a domain listener (business logic, event log)
+         * and the generic SendResourceLifecycleWebhook listener (webhook delivery).
+         */
+        \Fleetbase\FleetOps\Events\GeofenceEntered::class => [
+            \Fleetbase\FleetOps\Listeners\HandleGeofenceEntered::class,
+            \Fleetbase\Listeners\SendResourceLifecycleWebhook::class,
+        ],
+        \Fleetbase\FleetOps\Events\GeofenceExited::class  => [
+            \Fleetbase\FleetOps\Listeners\HandleGeofenceExited::class,
+            \Fleetbase\Listeners\SendResourceLifecycleWebhook::class,
+        ],
+        \Fleetbase\FleetOps\Events\GeofenceDwelled::class => [
+            \Fleetbase\FleetOps\Listeners\HandleGeofenceDwelled::class,
+            \Fleetbase\Listeners\SendResourceLifecycleWebhook::class,
+        ],
+
         /*
          * Core Events
          */

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -61,6 +61,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Console\Commands\PurgeUnpurchasedServiceQuotes::class,
         \Fleetbase\FleetOps\Console\Commands\SendDriverNotification::class,
         \Fleetbase\FleetOps\Console\Commands\ReplayVehicleLocations::class,
+        \Fleetbase\FleetOps\Console\Commands\SimulateGeofenceEvents::class,
         \Fleetbase\FleetOps\Console\Commands\TestEmail::class,
         \Fleetbase\FleetOps\Console\Commands\ProcessMaintenanceTriggers::class,
         \Fleetbase\FleetOps\Console\Commands\SendMaintenanceReminders::class,
@@ -84,6 +85,14 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         $this->app->register(CoreServiceProvider::class);
         $this->app->register(ReportSchemaServiceProvider::class);
 
+        // Register the GeofenceIntersectionService as a singleton so that
+        // the same instance is reused across the request lifecycle, avoiding
+        // repeated instantiation on high-frequency location update calls.
+        $this->app->singleton(
+            \Fleetbase\FleetOps\Support\GeofenceIntersectionService::class,
+            fn () => new \Fleetbase\FleetOps\Support\GeofenceIntersectionService()
+        );
+
         // Register the OrchestrationEngineRegistry as a singleton so that engines
         // registered from any service provider share the same instance.
         $this->app->singleton(
@@ -155,6 +164,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
             \Fleetbase\FleetOps\Notifications\OrderPing::class,
             \Fleetbase\FleetOps\Notifications\OrderFailed::class,
             \Fleetbase\FleetOps\Notifications\OrderCompleted::class,
+            \Fleetbase\FleetOps\Notifications\DriverArrivedAtGeofence::class,
         ]);
 
         // Register Notifiables

package/server/src/Rules/ComputableAlgo.php

@@ -16,9 +16,7 @@ class ComputableAlgo implements Rule
      */
     public function passes($attribute, $value)
     {
-        $distanceAndTime = Algo::calculateDrivingDistanceAndTime('1.3506853', '103.87199110000006', '1.3621663', '103.88450490000002');
-
-        return Algo::exec($value, $distanceAndTime) > 0;
+        return Algo::isComputable($value);
     }
 
     /**

package/server/src/Support/Algo.php

@@ -6,6 +6,8 @@ use Webit\Util\EvalMath\EvalMath;
 
 class Algo
 {
+    protected const FUNCTION_PATTERN = '/\b(max|min|ceil|floor|round)\(([^()]*)\)/';
+
     /**
      * Execute an algorithm strig.
      *
@@ -16,11 +18,18 @@ class Algo
         $m                  = new EvalMath();
         $m->suppress_errors = true;
 
+        $variables = static::normalizeVariables($variables);
+
         foreach ($variables as $key => $value) {
             $algorithm = str_replace('{' . $key . '}', $value, $algorithm);
         }
 
-        $result = $m->evaluate($algorithm);
+        $algorithm = static::evaluateFunctions($algorithm);
+        $result    = $m->evaluate($algorithm);
+
+        if ($result === false || $result === null || !is_numeric($result)) {
+            return null;
+        }
 
         if ($round) {
             return round($result, 2); // precision 2 cuz most likely dealing with $
@@ -28,4 +37,81 @@ class Algo
 
         return $result;
     }
+
+    public static function isComputable($algorithm): bool
+    {
+        $result = static::exec($algorithm, static::validationFixture(), true);
+
+        return $result !== null && is_numeric($result);
+    }
+
+    public static function normalizeVariables($variables = []): array
+    {
+        $variables = collect($variables)->all();
+
+        $distanceM = (float) ($variables['distance_m'] ?? $variables['distance'] ?? 0);
+        $timeS     = (float) ($variables['time_s'] ?? $variables['time'] ?? 0);
+
+        $normalized = [
+            'distance_m' => $distanceM,
+            'distance'   => $distanceM,
+            'distance_km'=> $distanceM / 1000,
+            'distance_mi'=> $distanceM / 1609.344,
+            'time_s'     => $timeS,
+            'time'       => $timeS,
+            'time_min'   => $timeS / 60,
+            'stops'      => (int) ($variables['stops'] ?? 0),
+            'waypoints'  => (int) ($variables['waypoints'] ?? 0),
+            'parcels'    => (int) ($variables['parcels'] ?? 0),
+            'entities'   => (int) ($variables['entities'] ?? 0),
+            'base_fee'   => (float) ($variables['base_fee'] ?? 0),
+        ];
+
+        return array_merge($normalized, $variables);
+    }
+
+    protected static function validationFixture(): array
+    {
+        return static::normalizeVariables([
+            'distance_m' => 25000,
+            'time_s'     => 5400,
+            'stops'      => 4,
+            'waypoints'  => 2,
+            'parcels'    => 3,
+            'entities'   => 5,
+            'base_fee'   => 100,
+        ]);
+    }
+
+    protected static function evaluateFunctions(string $algorithm): string
+    {
+        while (preg_match(static::FUNCTION_PATTERN, $algorithm)) {
+            $algorithm = preg_replace_callback(static::FUNCTION_PATTERN, function ($matches) {
+                $function           = $matches[1];
+                $args               = array_map('trim', explode(',', $matches[2]));
+                $m                  = new EvalMath();
+                $m->suppress_errors = true;
+                $numbers            = array_map(function ($arg) use ($m) {
+                    $result = $m->evaluate($arg);
+
+                    if ($result === false || $result === null || !is_numeric($result)) {
+                        return (float) $arg;
+                    }
+
+                    return (float) $result;
+                }, $args);
+
+                return match ($function) {
+                    'max'   => (string) max($numbers[0] ?? 0, $numbers[1] ?? 0),
+                    'min'   => (string) min($numbers[0] ?? 0, $numbers[1] ?? 0),
+                    'ceil'  => (string) ceil($numbers[0] ?? 0),
+                    'floor' => (string) floor($numbers[0] ?? 0),
+                    'round' => (string) round($numbers[0] ?? 0, (int) ($numbers[1] ?? 0)),
+                    default => $matches[0],
+                };
+            }, $algorithm);
+        }
+
+        return $algorithm;
+    }
 }