@fleetbase/storefront-engine 0.2.11 → 0.3.1

package/addon/controllers/networks/index/network/index.js

@@ -89,7 +89,7 @@ export default class NetworksIndexNetworkIndexController extends Controller {
         this.model
             .save()
             .then(() => {
-                this.notifications.success(this.intl.t('storefront.controllers.networks.index.change-network-saved'));
+                this.notifications.success(this.intl.t('storefront.networks.index.network.index.change-network-saved'));
             })
             .catch((error) => {
                 this.notifications.serverError(error);

package/addon/controllers/products/index/category/new.js

@@ -140,10 +140,10 @@ export default class ProductsIndexCategoryNewController extends BaseController {
 
     @action makePrimaryFile(file) {
         if (file.isNotImage) {
-            return this.notifications.warning(this.intl.t('storefront.products.index.category.new.warning-only-select-an-image-file-to-be-primary'));
+            return this.notifications.warning(this.intl.t('storefront.products.index.new.warning-only-select-an-image-file-to-be-primary'));
         }
 
-        this.notifications.success(this.intl.t('storefront.products.index.category.new.made-the-primary-success-image', { fileName: file.original_filename }));
+        this.notifications.success(this.intl.t('storefront.products.index.new.made-the-primary-success-image', { fileName: file.original_filename }));
         this.product.primary_image_uuid = file.id;
         this.product.primary_image_url = file.url;
         this.product.primary_image = file;

package/addon/templates/networks/index/network/index.hbs

@@ -183,7 +183,10 @@
                             }}</span>
                     </Toggle>
                     {{#if @model.options.require_pod}}
-                        <InputGroup @wrapperClass="mb-0 mt-2" @name={{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.proof-of-delivery-method"}}>
+                        <InputGroup
+                            @wrapperClass="mb-0 mt-2"
+                            @name={{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.proof-of-delivery-method-label"}}
+                        >
                             <Select
                                 @options={{this.podMethods}}
                                 @optionValue="value"

package/addon/templates/settings/gateways.hbs

@@ -15,7 +15,7 @@
                 </div>
             </div>
 
-            {{#each this.gateways as |gateway|}}
+            {{#each this.model as |gateway|}}
                 <ContentPanel @title={{gateway.name}} @open={{true}} @pad={{true}}>
                     <InputGroup @name={{t "storefront.settings.gateways.gateway-name"}} @value={{gateway.name}} @helpText={{t "storefront.settings.gateways.helpText"}} />
                     <InputGroup @name={{t "storefront.settings.gateways.gateway-code"}} @value={{gateway.code}} @disabled={{true}} @helpText={{t "storefront.settings.gateways.gateway-code-help-text"}} />

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.2.11",
+    "version": "0.3.1",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,8 +22,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.0",
-        "fleetbase/fleetops-api": "^0.4.6",
+        "fleetbase/core-api": "^1.4.7",
+        "fleetbase/fleetops-api": "^0.4.13",
         "geocoder-php/google-maps-places-provider": "^1.4",
         "laravel-notification-channels/apn": "^5.0",
         "laravel-notification-channels/fcm": "^4.1",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.2.11",
+    "version": "0.3.1",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.2.11",
+    "version": "0.3.1",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
@@ -44,8 +44,8 @@
     },
     "dependencies": {
         "@fleetbase/ember-core": "^0.2.4",
-        "@fleetbase/ember-ui": "^0.2.10",
-        "@fleetbase/fleetops-data": "^0.1.8",
+        "@fleetbase/ember-ui": "^0.2.11",
+        "@fleetbase/fleetops-data": "^0.1.9",
         "@babel/core": "^7.23.2",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",

package/server/src/Http/Controllers/MetricsController.php

@@ -9,9 +9,8 @@ use Illuminate\Http\Request;
 class MetricsController extends Controller
 {
     /**
-     * Get all key metrics for a companies storefront
+     * Get all key metrics for a companies storefront.
      *
-     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     public function all(Request $request)

package/server/src/Http/Controllers/v1/CustomerController.php

@@ -9,7 +9,6 @@ use Fleetbase\FleetOps\Http\Resources\v1\Place as PlaceResource;
 use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Place;
-use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Models\User;
 use Fleetbase\Models\UserDevice;
@@ -18,6 +17,7 @@ use Fleetbase\Storefront\Http\Requests\CreateCustomerRequest;
 use Fleetbase\Storefront\Http\Requests\VerifyCreateCustomerRequest;
 use Fleetbase\Storefront\Http\Resources\Customer;
 use Fleetbase\Storefront\Support\Storefront;
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
@@ -136,13 +136,19 @@ class CustomerController extends Controller
         $meta     = ['identity' => $identity];
 
         if ($isEmail) {
-            VerificationCode::generateEmailVerificationFor($customer, 'storefront_create_customer', function ($verification) use ($about) {
-                return "Your {$about->name} verification code is {$verification->code}";
-            }, $meta);
+            VerificationCode::generateEmailVerificationFor($customer, 'storefront_create_customer', [
+                'messageCallback' => function ($verification) use ($about) {
+                    return "Your {$about->name} verification code is {$verification->code}";
+                },
+                'meta' => $meta,
+            ]);
         } else {
-            VerificationCode::generateSmsVerificationFor($customer, 'storefront_create_customer', function ($verification) use ($about) {
-                return "Your {$about->name} verification code is {$verification->code}";
-            }, $meta);
+            VerificationCode::generateSmsVerificationFor($customer, 'storefront_create_customer', [
+                'messageCallback' => function ($verification) use ($about) {
+                    return "Your {$about->name} verification code is {$verification->code}";
+                },
+                'meta' => $meta,
+            ]);
         }
 
         return response()->json(['status' => 'ok']);
@@ -382,9 +388,11 @@ class CustomerController extends Controller
         $about = Storefront::about();
 
         // generate verification token
-        VerificationCode::generateSmsVerificationFor($user, 'storefront_login', function ($verification) use ($about) {
-            return "Your {$about->name} verification code is {$verification->code}";
-        });
+        VerificationCode::generateSmsVerificationFor($user, 'storefront_login', [
+            'messageCallback' => function ($verification) use ($about) {
+                return "Your {$about->name} verification code is {$verification->code}";
+            },
+        ]);
 
         return response()->json(['status' => 'OK']);
     }

package/server/src/Http/Controllers/v1/NetworkController.php

@@ -4,12 +4,12 @@ namespace Fleetbase\Storefront\Http\Controllers\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Models\Category;
 use Fleetbase\Storefront\Http\Resources\Store as StorefrontStore;
 use Fleetbase\Storefront\Http\Resources\StoreLocation as StorefrontStoreLocation;
 use Fleetbase\Storefront\Models\Store;
 use Fleetbase\Storefront\Models\StoreLocation;
-use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 
 class NetworkController extends Controller

package/server/src/Http/Controllers/v1/ProductController.php

@@ -71,7 +71,7 @@ class ProductController extends Controller
     /**
      * Deletes a Storefront Product resources.
      *
-     * @return \Fleetbase\Http\Resources\v1\DeletedResource
+     * @return DeletedResource
      */
     public function delete($id)
     {

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

@@ -17,6 +17,7 @@ use Fleetbase\Storefront\Models\Cart;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
 use Fleetbase\Storefront\Models\StoreLocation;
+use Fleetbase\Support\Utils as CoreUtils;
 use Illuminate\Support\Str;
 
 class ServiceQuoteController extends Controller
@@ -30,7 +31,7 @@ class ServiceQuoteController extends Controller
      */
     public function fromCart(GetServiceQuoteFromCart $request)
     {
-        $requestId        = ServiceQuote::generatePublicId('request');
+        $requestId        = CoreUtils::generatePublicId('request');
         $origin           = $this->getPlaceFromId($request->input('origin'));
         $destination      = $this->getPlaceFromId($request->input('destination'));
         $facilitator      = $request->input('facilitator');
@@ -302,7 +303,7 @@ class ServiceQuoteController extends Controller
 
             if ($integratedVendor) {
                 try {
-                    /** @var \Fleetbase\FleetOps\Models\ServiceQuote $serviceQuote */
+                    /** @var ServiceQuote $serviceQuote */
                     $serviceQuote = $integratedVendor->api()->setRequestId($requestId)->getQuoteFromPreliminaryPayload([...$origins, $destination], [], $serviceType, $scheduledAt, $isRouteOptimized);
                 } catch (\Exception $e) {
                     return response()->error($e->getMessage());

package/server/src/Http/Controllers/v1/StoreController.php

@@ -109,7 +109,7 @@ class StoreController extends Controller
 
         // if cod is enabled add cash as a gateway
         if ($about->hasOption('cod_enabled')) {
-            $gateways->push(Gateway::cash($sandbox));
+            $gateways->push(Gateway::cash(['sandbox'=>$sandbox]));
         }
 
         return GatewayResource::collection($gateways);

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

@@ -3,7 +3,7 @@
 namespace Fleetbase\Storefront\Http\Requests;
 
 use Fleetbase\Http\Requests\FleetbaseRequest;
-use Fleetbase\Rules\IsValidLocation;
+use Fleetbase\Storefront\Rules\IsValidLocation;
 use Illuminate\Support\Str;
 
 class GetServiceQuoteFromCart extends FleetbaseRequest

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

@@ -3,9 +3,8 @@
 namespace Fleetbase\Storefront\Http\Requests;
 
 use Fleetbase\Http\Requests\FleetbaseRequest;
-// use Fleetbase\Rules\Storefront\CartExists;
-use Fleetbase\Rules\Storefront\CustomerExists;
-use Fleetbase\Rules\Storefront\GatewayExists;
+use Fleetbase\Storefront\Rules\CustomerExists;
+use Fleetbase\Storefront\Rules\GatewayExists;
 
 class InitializeCheckoutRequest extends FleetbaseRequest
 {

package/server/src/Http/Resources/Category.php

@@ -30,7 +30,7 @@ class Category extends FleetbaseResource
             ),
             'tags'          => $this->tags ?? [],
             'translations'  => $this->translations ?? [],
-            'products'      => $this->when($request->has('with_products') || $request->inArray('with', 'products'), Product::collection($this->products)),
+            'products'      => $this->when($request->has('with_products') || $request->inArray('with', 'products'), $this->products ? Product::collection($this->products) : []),
             'subcategories' => $this->when(
                 $request->has('with_subcategories') || $request->inArray('with', 'subcategories'),
                 array_map(

package/server/src/Http/Resources/ReviewCustomer.php

@@ -25,37 +25,9 @@ class ReviewCustomer extends FleetbaseResource
             'email'         => $this->email,
             'phone'         => $this->phone,
             'photo_url'     => $this->photo_url,
-            'reviews_count' => $this->getReviewsCount(),
-            'uploads_count' => $this->getUploadsCount(),
             'slug'          => $this->slug,
             'created_at'    => $this->created_at,
             'updated_at'    => $this->updated_at,
         ];
     }
-
-    public function getReviewsCount()
-    {
-        if (session('storefront_network')) {
-            return $this->storeReviews()->whereHas('subject', function ($q) {
-                $q->whereHas('networks', function ($q) {
-                    $q->where('network_uuid', session('storefront_network'));
-                });
-            })->count();
-
-            // $productReviewsCount = $this->productReviews()->whereHas('subject', function ($q) {
-            //     $q->whereHas('store', function ($q) {
-            //         $q->whereHas('networks', function ($q) {
-            //             $q->where('network_uuid', session('storefront_network'));
-            //         });
-            //     });
-            // })->count();
-
-            // return $storeReviewsCount + $productReviewsCount;
-        }
-    }
-
-    public function getUploadsCount()
-    {
-        return $this->reviewUploads()->count();
-    }
 }

package/server/src/Imports/ProductsImport.php

@@ -9,7 +9,7 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 class ProductsImport implements ToCollection, WithHeadingRow
 {
     /**
-     * @return \Illuminate\Support\Collection
+     * @return Collection
      */
     public function collection(Collection $rows)
     {

package/server/src/Listeners/HandleOrderDriverAssigned.php

@@ -21,7 +21,7 @@ class HandleOrderDriverAssigned implements ShouldQueue
      */
     public function handle(OrderDriverAssigned $event)
     {
-        /** @var \Fleetbase\FleetOps\Models\Order $order */
+        /** @var Order $order */
         $order = $event->getModelRecord();
 
         // halt if unable to resolve order record from event

package/server/src/Models/Gateway.php

@@ -149,7 +149,7 @@ class Gateway extends StorefrontModel
     /**
      * Generates a new cash/cash on delivery gateway.
      */
-    public static function cash($attributes = ['sandbox' => 0]): Gateway
+    public static function cash($attributes = ['sandbox' => false]): Gateway
     {
         return new static([
             'public_id'    => 'gateway_cash',

package/server/src/Models/Network.php

@@ -21,7 +21,7 @@ use Spatie\Sluggable\SlugOptions;
 class Network extends StorefrontModel
 {
     use HasUuid;
-    use HasPublicId;
+    use HasPublicid;
     use HasApiModelBehavior;
     use HasOptionsAttributes;
     use HasSlug;
@@ -83,7 +83,7 @@ class Network extends StorefrontModel
     protected $hidden = ['logo', 'backdrop', 'files', 'media'];
 
     /**
-     * @var \Spatie\Sluggable\SlugOptions
+     * @var SlugOptions
      */
     public function getSlugOptions(): SlugOptions
     {

package/server/src/Models/Product.php

@@ -134,7 +134,7 @@ class Product extends StorefrontModel
     }
 
     /**
-     * @var \Spatie\Sluggable\SlugOptions
+     * @var SlugOptions
      */
     public function getSlugOptions(): SlugOptions
     {

package/server/src/Models/ProductAddon.php

@@ -76,7 +76,7 @@ class ProductAddon extends StorefrontModel
     protected $appends = [];
 
     /**
-     * @var \Spatie\Sluggable\SlugOptions
+     * @var SlugOptions
      */
     public function getSlugOptions(): SlugOptions
     {

package/server/src/Models/ProductStoreLocation.php

@@ -52,7 +52,7 @@ class ProductStoreLocation extends StorefrontModel
     protected $appends = [];
 
     /**
-     * @var \Spatie\Sluggable\SlugOptions
+     * @var SlugOptions
      */
     public function getSlugOptions(): SlugOptions
     {

package/server/src/Models/ProductVariant.php

@@ -86,7 +86,7 @@ class ProductVariant extends StorefrontModel
     protected $with = [];
 
     /**
-     * @var \Spatie\Sluggable\SlugOptions
+     * @var SlugOptions
      */
     public function getSlugOptions(): SlugOptions
     {

package/server/src/Models/Store.php

@@ -95,7 +95,7 @@ class Store extends StorefrontModel
     protected $filterParams = ['network', 'without_category', 'category', 'category_uuid'];
 
     /**
-     * @var \Spatie\Sluggable\SlugOptions
+     * @var SlugOptions
      */
     public function getSlugOptions(): SlugOptions
     {
@@ -332,7 +332,7 @@ class Store extends StorefrontModel
     /**
      * Retrieves the category of the store belonging to the specified network.
      *
-     * @param \Fleetbase\Storefront\Models\Network $network the network for which the category is to be retrieved
+     * @param Network $network the network for which the category is to be retrieved
      *
      * @return \Fleetbase\Models\Category|null the category of the store in the given network, or null if the store does not belong to the network
      */

package/server/src/Models/StoreLocation.php

@@ -7,14 +7,12 @@ use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicid;
 use Fleetbase\Traits\HasUuid;
-use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
 class StoreLocation extends StorefrontModel
 {
     use HasUuid;
     use HasPublicid;
     use HasApiModelBehavior;
-    use SpatialTrait;
 
     /**
      * The type of public Id to generate.

package/server/src/Notifications/StorefrontOrderCanceled.php

@@ -28,7 +28,7 @@ class StorefrontOrderCanceled extends Notification
     /**
      * The order instance this notification is for.
      *
-     * @var \Fleetbase\FleetOps\Models\Order
+     * @var Order
      */
     public $order;
 
@@ -63,7 +63,7 @@ class StorefrontOrderCanceled extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {

package/server/src/Notifications/StorefrontOrderCompleted.php

@@ -70,7 +70,7 @@ class StorefrontOrderCompleted extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {

package/server/src/Notifications/StorefrontOrderCreated.php

@@ -92,7 +92,7 @@ class StorefrontOrderCreated extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {

package/server/src/Notifications/StorefrontOrderDriverAssigned.php

@@ -69,7 +69,7 @@ class StorefrontOrderDriverAssigned extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {

package/server/src/Notifications/StorefrontOrderEnroute.php

@@ -68,7 +68,7 @@ class StorefrontOrderEnroute extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {

package/server/src/Notifications/StorefrontOrderNearby.php

@@ -70,7 +70,7 @@ class StorefrontOrderNearby extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {

package/server/src/Notifications/StorefrontOrderPreparing.php

@@ -69,7 +69,7 @@ class StorefrontOrderPreparing extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {

package/server/src/Notifications/StorefrontOrderReadyForPickup.php

@@ -69,7 +69,7 @@ class StorefrontOrderReadyForPickup extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {

package/server/src/Observers/NetworkObserver.php

@@ -10,7 +10,7 @@ class NetworkObserver
     /**
      * Handle the Network "updated" event.
      *
-     * @param \Fleetbase\Storefront\Models\Network $network the Network that is updating
+     * @param Network $network the Network that is updating
      */
     public function updating(Network $network): void
     {

package/server/src/Observers/ProductObserver.php

@@ -17,7 +17,7 @@ class ProductObserver
     /**
      * Handle the Product "created" event.
      *
-     * @param \Fleetbase\Storefront\Models\Product $product the Product that was created
+     * @param Product $product the Product that was created
      */
     public function created(Product $product): void
     {
@@ -41,7 +41,7 @@ class ProductObserver
     /**
      * Handle the Product "updated" event.
      *
-     * @param \Fleetbase\Storefront\Models\Product $product the Product that was created
+     * @param Product $product the Product that was created
      */
     public function updated(Product $product): void
     {

package/server/src/Providers/StorefrontServiceProvider.php

@@ -96,6 +96,5 @@ class StorefrontServiceProvider extends CoreServiceProvider
         $this->mergeConfigFrom(__DIR__ . '/../../config/database.connections.php', 'database.connections');
         $this->mergeConfigFrom(__DIR__ . '/../../config/storefront.php', 'storefront');
         $this->mergeConfigFrom(__DIR__ . '/../../config/api.php', 'storefront.api');
-        $this->mergeConfigFrom(__DIR__ . '/../../config/twilio-notification-channel.php', 'twilio-notification-channel');
     }
 }

package/server/src/Rules/CartExists.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Fleetbase\Storefront\Rules;
+
+use Fleetbase\Storefront\Models\Cart;
+use Illuminate\Contracts\Validation\Rule;
+
+class CartExists implements Rule
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param string $attribute
+     *
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return Cart::where(['public_id' => $attribute, 'unique_identifier' => $attribute])->exists();
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return 'Cart session does not exists.';
+    }
+}

package/server/src/Rules/CustomerExists.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Fleetbase\Storefront\Rules;
+
+use Fleetbase\FleetOps\Models\Contact;
+use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Support\Str;
+
+class CustomerExists implements Rule
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param string $attribute
+     *
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        $value = Str::replaceFirst('customer', 'contact', $value);
+
+        return Contact::where('public_id', $value)->exists();
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return 'No customer found.';
+    }
+}

package/server/src/Rules/GatewayExists.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Fleetbase\Storefront\Rules;
+
+use Fleetbase\Storefront\Models\Gateway;
+use Illuminate\Contracts\Validation\Rule;
+
+class GatewayExists implements Rule
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param string $attribute
+     *
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        if ($value === 'cash') {
+            return true;
+        }
+
+        return Gateway::where(['code' => $value])->exists();
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return 'No gateway by code provided exists.';
+    }
+}

package/server/src/Rules/IsValidLocation.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Fleetbase\Storefront\Rules;
+
+use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Storefront\Models\StoreLocation;
+use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Support\Str;
+
+class IsValidLocation implements Rule
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param string $attribute
+     *
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        // Validate Place id
+        if (Str::startsWith($value, 'place_')) {
+            return Place::where('public_id', $value)->exists();
+        }
+
+        // Validate StoreLocation id
+        if (Str::startsWith($value, 'store_location_')) {
+            return StoreLocation::where('public_id', $value)->exists();
+        }
+
+        // Validate object with coordinates
+        if (isset($value->coordinates)) {
+            return Utils::isCoordinates($value->coordinates);
+        }
+
+        // Validate coordinates
+        if (Utils::isCoordinates($value)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return 'Invalid :attribute.';
+    }
+}

package/server/src/Support/Storefront.php

@@ -10,6 +10,7 @@ use Fleetbase\Storefront\Models\Network;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
 use Fleetbase\Storefront\Notifications\StorefrontOrderCreated;
+use Fleetbase\Support\Utils;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Str;
@@ -92,7 +93,7 @@ class Storefront
         if ($token) {
             $accessToken = PersonalAccessToken::findToken($token);
 
-            if ($accessToken && Utils::isUuid($accessToken->name)) {
+            if ($accessToken && Str::isUuid($accessToken->name)) {
                 $customer = Contact::where('uuid', $accessToken->name)->first();
 
                 if ($customer) {

package/server/config/twilio-notification-channel.php

@@ -1,36 +0,0 @@
-<?php
-
-return [
-    'username' => env('TWILIO_USERNAME'), // optional when using auth token
-    'password' => env('TWILIO_PASSWORD'), // optional when using auth token
-    'auth_token' => env('TWILIO_TOKEN'), // optional when using username and password
-    'account_sid' => env('TWILIO_SID'),
-
-    'from' => env('TWILIO_FROM'), // optional
-    'alphanumeric_sender' => env('TWILIO_ALPHA_SENDER'),
-
-    /**
-     * See https://www.twilio.com/docs/sms/services.
-     */
-    'sms_service_sid' => env('TWILIO_SMS_SERVICE_SID'),
-
-    /**
-     * Specify a number where all calls/messages should be routed. This can be used in development/staging environments
-     * for testing.
-     */
-    'debug_to' => env('TWILIO_DEBUG_TO'),
-
-    /**
-     * If an exception is thrown with one of these error codes, it will be caught & suppressed.
-     * To replicate the 2.x behaviour, specify '*' in the array, which will cause all exceptions to be suppressed.
-     * Suppressed errors will not be logged or reported, but the `NotificationFailed` event will be emitted.
-     *
-     * @see https://www.twilio.com/docs/api/errors
-     */
-    'ignored_error_codes' => [
-        21608, // The 'to' phone number provided is not yet verified for this account.
-        21211, // Invalid 'To' Phone Number
-        21614, // 'To' number is not a valid mobile number
-        21408, // Permission to send an SMS has not been enabled for the region indicated by the 'To' number
-    ],
-];