@fleetbase/fleetops-engine 0.6.44 → 0.6.45

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

@@ -321,7 +321,7 @@ class OrderController extends Controller
         }
 
         // load required relations
-        $order->load(['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
+        $order->load(['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate.serviceQuote.items', 'customer', 'facilitator']);
 
         // Determine if order should be dispatched on creation
         $shouldDispatch = $request->boolean('dispatch') && $integratedVendorOrder === null;
@@ -364,7 +364,7 @@ class OrderController extends Controller
 
         // find for the order
         try {
-            $order = Order::findRecordOrFail($id, ['trackingNumber', 'driverAssigned', 'purchaseRate', 'customer', 'facilitator']);
+            $order = Order::findRecordOrFail($id, ['trackingNumber', 'driverAssigned', 'purchaseRate.serviceQuote.items', 'customer', 'facilitator']);
         } catch (ModelNotFoundException $exception) {
             return response()->json(
                 [
@@ -549,7 +549,7 @@ class OrderController extends Controller
         $order->flushAttributesCache();
 
         // load required relations
-        $order->load(['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
+        $order->load(['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate.serviceQuote.items', 'customer', 'facilitator']);
 
         // response the order resource
         return new OrderResource($order);
@@ -759,7 +759,7 @@ class OrderController extends Controller
     {
         // find for the order
         try {
-            $order = Order::findRecordOrFail($id, ['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
+            $order = Order::findRecordOrFail($id, ['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate.serviceQuote.items', 'customer', 'facilitator']);
         } catch (ModelNotFoundException $exception) {
             return response()->json(
                 [
@@ -839,7 +839,7 @@ class OrderController extends Controller
     public function dispatchOrder(string $id)
     {
         try {
-            $order = Order::findRecordOrFail($id, ['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate', 'customer', 'facilitator']);
+            $order = Order::findRecordOrFail($id, ['trackingNumber', 'trackingStatuses', 'driverAssigned', 'vehicleAssigned', 'purchaseRate.serviceQuote.items', 'customer', 'facilitator']);
         } catch (ModelNotFoundException $exception) {
             return response()->json(
                 [

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

@@ -41,10 +41,19 @@ class PurchaseRateController extends Controller
 
         // order assignment
         if ($request->has('order')) {
-            $input['order_uuid'] = Utils::getUuid('orders', [
+            $orderUuid = Utils::getUuid('orders', [
                 'public_id'    => $request->input('order'),
                 'company_uuid' => session('company'),
             ]);
+
+            $order = Order::where('uuid', $orderUuid)->first();
+
+            if ($order instanceof Order) {
+                $input['payload_uuid']   = $order->payload_uuid;
+                $input['customer_uuid']  = $order->customer_uuid;
+                $input['customer_type']  = $order->customer_type;
+                $input['company_uuid']   = $order->company_uuid ?? $input['company_uuid'];
+            }
         } elseif ($createOrder) {
             // create order from service quote
             $serviceQuote = ServiceQuote::where('uuid', $input['service_quote_uuid'])->orWhere('public_id', $request->input('service_quote'))->first();
@@ -70,9 +79,8 @@ class PurchaseRateController extends Controller
         // create the purchaseRate
         $purchaseRate = PurchaseRate::create($input);
 
-        // set purchase rate to order
         if ($order instanceof Order) {
-            $order->update(['purchase_rate_uuid' => $purchaseRate->uuid]);
+            $order->attachPurchaseRate($purchaseRate);
         }
 
         // response the driver resource

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

@@ -98,6 +98,7 @@ class ServiceQuoteController extends Controller
                     'amount'            => $subTotal,
                     'currency'          => $serviceRate->currency,
                 ]);
+                $quote->setRelation('serviceRate', $serviceRate);
 
                 $items = $lines->map(function ($line) use ($quote) {
                     return ServiceQuoteItem::create([
@@ -143,6 +144,7 @@ class ServiceQuoteController extends Controller
                 'amount'            => $subTotal,
                 'currency'          => $serviceRate->currency,
             ]);
+            $quote->setRelation('serviceRate', $serviceRate);
 
             $items = $lines->map(function ($line) use ($quote) {
                 return ServiceQuoteItem::create([
@@ -288,6 +290,7 @@ class ServiceQuoteController extends Controller
                     'amount'            => $subTotal,
                     'currency'          => $serviceRate->currency,
                 ]);
+                $quote->setRelation('serviceRate', $serviceRate);
 
                 // set preliminary data to meta
                 $quote->updateMeta('preliminary_data', $preliminaryData);
@@ -335,6 +338,7 @@ class ServiceQuoteController extends Controller
                 'amount'            => $subTotal,
                 'currency'          => $serviceRate->currency,
             ]);
+            $quote->setRelation('serviceRate', $serviceRate);
 
             // set preliminary data to meta
             $quote->updateMeta('preliminary_data', $preliminaryData);

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

@@ -30,6 +30,8 @@ class ServiceRateController extends Controller
             'rate_calculation_method',
             'currency',
             'base_fee',
+            'max_distance_unit',
+            'max_distance',
             'per_meter_unit',
             'per_meter_flat_rate_fee',
             'meter_fees',
@@ -119,7 +121,10 @@ class ServiceRateController extends Controller
             'rate_calculation_method',
             'currency',
             'base_fee',
-            'per_km_flat_rate_fee',
+            'max_distance_unit',
+            'max_distance',
+            'per_meter_unit',
+            'per_meter_flat_rate_fee',
             'meter_fees',
             'meter_fees.*.distance',
             'meter_fees.*.fee',

package/server/src/Http/Requests/CreateServiceRateRequest.php

@@ -31,10 +31,10 @@ class CreateServiceRateRequest extends FleetbaseRequest
             'service_type'                  => [Rule::requiredIf($this->isMethod('POST')), 'string'],
             'service_area'                  => [Rule::exists('service_areas', 'public_id')->whereNull('deleted_at')],
             'zone'                          => [Rule::exists('zones', 'public_id')->whereNull('deleted_at')],
-            'rate_calculation_method'       => [Rule::requiredIf($this->isMethod('POST')), 'string', 'in:fixed_meter,fixed_rate,per_meter,per_drop,algo'],
+            'rate_calculation_method'       => [Rule::requiredIf($this->isMethod('POST')), 'string', 'in:fixed_meter,fixed_rate,per_meter,per_drop,algo,parcel'],
             'currency'                      => ['required', 'size:3'],
             'base_fee'                      => ['numeric'],
-            'per_meter_unit'                => ['required_if:rate_calculation_method,per_meter', 'string', 'in:km,m'],
+            'per_meter_unit'                => ['required_if:rate_calculation_method,per_meter', 'string', 'in:km,m,ft,yd,mi'],
             'per_meter_flat_rate_fee'       => ['required_if:rate_calculation_method,per_meter', 'numeric'],
             'meter_fees'                    => [Rule::requiredIf(function () {
                 return in_array($this->input('rate_calculation_method'), ['fixed_meter', 'fixed_rate']);

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

@@ -45,7 +45,6 @@ class Order extends FleetbaseResource
             'tracking_number_uuid' => $this->when($isInternal, $this->tracking_number_uuid),
             'driver_assigned_uuid' => $this->when($isInternal, $this->driver_assigned_uuid),
             'vehicle_assigned_uuid'=> $this->when($isInternal, $this->vehicle_assigned_uuid),
-            'service_quote_uuid'   => $this->when($isInternal, $this->service_quote_uuid),
             'has_driver_assigned'  => $this->when($isInternal, $this->has_driver_assigned),
             'is_scheduled'         => $this->when($isInternal, $this->is_scheduled),
             'order_config_uuid'    => $this->when($isInternal, $this->order_config_uuid),

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

@@ -23,8 +23,8 @@ class ServiceQuote extends FleetbaseResource
             'public_id'         => $this->when(Http::isInternalRequest(), $this->public_id),
             'service_rate_uuid' => $this->when(Http::isInternalRequest(), $this->service_rate_uuid),
             'payload_uuid'      => $this->when(Http::isInternalRequest(), $this->payload_uuid),
-            'service_rate_name' => data_get($this, 'serviceRate.name'),
-            'service_name'      => data_get($this, 'serviceRate.name'),
+            'service_rate_name' => data_get($this, 'serviceRate.service_name'),
+            'service_name'      => data_get($this, 'serviceRate.service_name'),
             'service_rate'      => $this->when(Http::isPublicRequest(), data_get($this, 'serviceRate.public_id')),
             'facilitator'       => $this->when(Http::isPublicRequest(), data_get($this, 'integratedVendor.public_id')),
             'items'             => ServiceQuoteItem::collection($this->items),

package/server/src/Models/Entity.php

@@ -168,6 +168,13 @@ class Entity extends Model
         ])->render();
     }
 
+    public function setTypeAttribute(?string $type = null): void
+    {
+        $type = is_string($type) ? trim($type) : $type;
+
+        $this->attributes['type'] = filled($type) ? Str::snake($type) : null;
+    }
+
     /**
      * @var BelongsTo
      */

package/server/src/Models/Order.php

@@ -1055,9 +1055,7 @@ class Order extends Model
             'meta'               => $meta,
         ]);
 
-        $this->purchase_rate_uuid = $purchasedRate->uuid;
-
-        return $this->save();
+        return $this->attachPurchaseRate($purchasedRate);
     }
 
     /**
@@ -1096,14 +1094,48 @@ class Order extends Model
                 'meta'               => $meta,
             ]);
 
-            return $this->updateQuietly([
-                'purchase_rate_uuid' => $purchasedRate->uuid,
-            ]);
+            return $this->attachPurchaseRate($purchasedRate);
         }
 
         return false;
     }
 
+    /**
+     * Attach a purchase rate to the order and void any superseded transaction.
+     */
+    public function attachPurchaseRate(PurchaseRate $purchaseRate): bool
+    {
+        $oldTransaction = $this->transaction_uuid
+            ? Transaction::where('uuid', $this->transaction_uuid)->first()
+            : null;
+
+        $attached = (bool) $this->updateQuietly([
+            'purchase_rate_uuid' => $purchaseRate->uuid,
+            'transaction_uuid'   => $purchaseRate->transaction_uuid,
+        ]);
+
+        if ($attached) {
+            $this->setRelation('purchaseRate', $purchaseRate);
+
+            if ($purchaseRate->transaction_uuid) {
+                $this->setRelation('transaction', Transaction::where('uuid', $purchaseRate->transaction_uuid)->first());
+            }
+
+            if (
+                $oldTransaction instanceof Transaction
+                && $oldTransaction->uuid !== $purchaseRate->transaction_uuid
+                && !$oldTransaction->trashed()
+            ) {
+                $oldTransaction->update([
+                    'status'    => Transaction::STATUS_VOIDED,
+                    'voided_at' => now(),
+                ]);
+            }
+        }
+
+        return $attached;
+    }
+
     /**
      * Creates a transaction for the order without a service quote.
      * This method is used when an order is made without selecting a specific service quote.
@@ -1122,7 +1154,7 @@ class Order extends Model
                 'gateway_transaction_id' => Transaction::generateNumber(),
                 'gateway'                => 'internal',
                 'amount'                 => 0,
-                'currency'               => data_get($this->company, 'country') ? Utils::getCurrenyFromCountryCode(data_get($this->company, 'country')) : 'SGD',
+                'currency'               => Utils::getCompanyTransactionCurrency($this->company ?? $this->company_uuid),
                 'description'            => 'Dispatch order',
                 'type'                   => 'dispatch',
                 'status'                 => 'success',

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/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/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);
     }
 
     /**