@fleetbase/storefront-engine 0.3.24 → 0.3.26

package/server/migrations/2025_01_30_042853_create_catalogs_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Fleetbase\Support\Utils;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $databaseName = Utils::getFleetbaseDatabaseName();
+
+        Schema::connection(config('storefront.connection.db'))->create('catalogs', function (Blueprint $table) use ($databaseName) {
+            $table->bigIncrements('id');
+            $table->uuid('uuid')->unique()->default(Str::uuid()->toString());
+            $table->string('public_id')->unique()->nullable();
+            $table->foreignUuid('store_uuid')->nullable()->references('uuid')->on('stores')->onUpdate('CASCADE')->onDelete('SET NULL');
+            $table->foreignUuid('company_uuid')->nullable()->references('uuid')->on(new Expression($databaseName . '.companies'))->onUpdate('CASCADE')->onDelete('SET NULL');
+            $table->foreignUuid('created_by_uuid')->nullable()->references('uuid')->on(new Expression($databaseName . '.users'))->onUpdate('CASCADE')->onDelete('SET NULL');
+            $table->string('name');
+            $table->text('description')->nullable();
+            $table->string('status')->default('draft');
+            $table->json('meta')->nullable();
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::connection(config('storefront.connection.db'))->dropIfExists('catalogs');
+    }
+};

package/server/migrations/2025_01_30_044728_create_catalog_category_products_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Fleetbase\Support\Utils;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $databaseName = Utils::getFleetbaseDatabaseName();
+
+        Schema::connection(config('storefront.connection.db'))->create('catalog_category_products', function (Blueprint $table) use ($databaseName) {
+            $table->bigIncrements('id');
+            $table->uuid('uuid')->unique()->default(Str::uuid()->toString());
+            $table->foreignUuid('catalog_category_uuid')->nullable()->references('uuid')->on(new Expression($databaseName . '.categories'))->onUpdate('CASCADE')->onDelete('CASCADE');
+            $table->foreignUuid('product_uuid')->nullable()->references('uuid')->on('products')->onUpdate('CASCADE')->onDelete('CASCADE');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::connection(config('storefront.connection.db'))->dropIfExists('catalog_category_products');
+    }
+};

package/server/migrations/2025_01_30_050611_create_food_trucks_table.php

@@ -0,0 +1,72 @@
+<?php
+
+use Fleetbase\Support\Utils;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // If your main Fleetbase DB name is needed for references:
+        $databaseName = Utils::getFleetbaseDatabaseName();
+
+        Schema::connection(config('storefront.connection.db'))->create('food_trucks', function (Blueprint $table) use ($databaseName) {
+            $table->bigIncrements('id');
+            $table->uuid('uuid')->unique()->default(Str::uuid()->toString());
+            $table->string('public_id')->unique()->nullable();
+            $table->foreignUuid('vehicle_uuid')
+                ->nullable()
+                ->references('uuid')
+                ->on(new Expression($databaseName . '.vehicles'))
+                ->onUpdate('CASCADE')
+                ->onDelete('SET NULL');
+            $table->foreignUuid('service_area_uuid')
+                ->nullable()
+                ->references('uuid')
+                ->on(new Expression($databaseName . '.service_areas'))
+                ->onUpdate('CASCADE')
+                ->onDelete('SET NULL');
+            $table->foreignUuid('zone_uuid')
+                ->nullable()
+                ->references('uuid')
+                ->on(new Expression($databaseName . '.zones'))
+                ->onUpdate('CASCADE')
+                ->onDelete('SET NULL');
+            $table->foreignUuid('store_uuid')
+                ->nullable()
+                ->references('uuid')
+                ->on('stores')
+                ->onUpdate('CASCADE')
+                ->onDelete('SET NULL');
+            $table->foreignUuid('company_uuid')
+                ->nullable()
+                ->references('uuid')
+                ->on(new Expression($databaseName . '.companies'))
+                ->onUpdate('CASCADE')
+                ->onDelete('SET NULL');
+            $table->foreignUuid('created_by_uuid')
+                ->nullable()
+                ->references('uuid')
+                ->on(new Expression($databaseName . '.users'))
+                ->onUpdate('CASCADE')
+                ->onDelete('SET NULL');
+            $table->string('status')->default('inactive');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::connection(config('storefront.connection.db'))->dropIfExists('food_trucks');
+    }
+};

package/server/migrations/2025_01_30_052157_create_catalog_subjects_table.php

@@ -0,0 +1,54 @@
+<?php
+
+use Fleetbase\Support\Utils;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $databaseName = Utils::getFleetbaseDatabaseName();
+
+        Schema::connection(config('storefront.connection.db'))->create('catalog_subjects', function (Blueprint $table) use ($databaseName) {
+            $table->bigIncrements('id');
+            $table->uuid('uuid')->unique()->default(Str::uuid()->toString());
+            $table->foreignUuid('catalog_uuid')
+                ->references('uuid')
+                ->on('catalogs')
+                ->onUpdate('CASCADE')
+                ->onDelete('CASCADE');
+            $table->string('subject_type');
+            $table->uuid('subject_uuid');
+            $table->foreignUuid('company_uuid')
+                ->nullable()
+                ->references('uuid')
+                ->on(new Expression($databaseName . '.companies'))
+                ->onUpdate('CASCADE')
+                ->onDelete('SET NULL');
+
+            $table->foreignUuid('created_by_uuid')
+                ->nullable()
+                ->references('uuid')
+                ->on(new Expression($databaseName . '.users'))
+                ->onUpdate('CASCADE')
+                ->onDelete('SET NULL');
+            $table->timestamps();
+            $table->softDeletes();
+            $table->index(['subject_type', 'subject_uuid'], 'catalog_subject_idx');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::connection(config('storefront.connection.db'))->dropIfExists('catalog_subjects');
+    }
+};

package/server/migrations/2025_01_30_052402_create_catalog_hours_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Fleetbase\Support\Utils;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $databaseName = Utils::getFleetbaseDatabaseName();
+
+        Schema::connection(config('storefront.connection.db'))->create('catalog_hours', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->uuid('uuid')->unique()->default(Str::uuid()->toString());
+            $table->foreignUuid('catalog_uuid')
+                ->references('uuid')->on('catalogs')
+                ->onUpdate('CASCADE')
+                ->onDelete('CASCADE');
+            $table->string('day_of_week');
+            $table->time('start')->nullable();
+            $table->time('end')->nullable();
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::connection(config('storefront.connection.db'))->dropIfExists('catalog_hours');
+    }
+};

package/server/src/Auth/Schemas/Storefront.php

@@ -95,6 +95,22 @@ class Storefront
             'name'    => 'store-hour',
             'actions' => [],
         ],
+        [
+            'name'    => 'catalog',
+            'actions' => [],
+        ],
+        [
+            'name'    => 'catalog-category',
+            'actions' => [],
+        ],
+        [
+            'name'    => 'catalog-hour',
+            'actions' => [],
+        ],
+        [
+            'name'    => 'food-truck',
+            'actions' => [],
+        ],
         [
             'name'           => 'settings',
             'action'         => ['import'],

package/server/src/Console/Commands/PurgeExpiredCarts.php

@@ -28,10 +28,20 @@ class PurgeExpiredCarts extends Command
      */
     public function handle()
     {
-        // Alternatively, using the DB facade for direct deletion
-        $dbDeletedCount = DB::table('carts')->where('expires_at', '<', now())->delete();
+        $dbConnection = DB::connection(config('storefront.connection.db'));
 
-        // Log and output the results
+        // Disable foreign key checks for the correct connection
+        $dbConnection->statement('SET FOREIGN_KEY_CHECKS=0;');
+
+        // Delete expired carts
+        $dbDeletedCount = $dbConnection->table('carts')
+            ->where('expires_at', '<', now())
+            ->delete();
+
+        // Re-enable foreign key checks
+        $dbConnection->statement('SET FOREIGN_KEY_CHECKS=1;');
+
+        // Log output
         $this->info("Successfully deleted {$dbDeletedCount} expired carts.");
 
         return Command::SUCCESS;

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

@@ -0,0 +1,13 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Controllers;
+
+class CatalogCategoryController extends StorefrontController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'catalog_category';
+}

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

@@ -0,0 +1,13 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Controllers;
+
+class CatalogController extends StorefrontController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'catalog';
+}

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

@@ -0,0 +1,13 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Controllers;
+
+class CatalogHourController extends StorefrontController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'catalog_category';
+}

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

@@ -0,0 +1,13 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Controllers;
+
+class FoodTruckController extends StorefrontController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'food_truck';
+}

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

@@ -0,0 +1,38 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Controllers\v1;
+
+use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Storefront\Models\Catalog;
+use Illuminate\Http\Request;
+
+class CatalogController extends Controller
+{
+    /**
+     * Query for Food Truck resources.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function query(Request $request)
+    {
+        $limit   = $request->input('limit', false);
+        $offset  = $request->input('offset', false);
+        $results = [];
+
+        if (session('storefront_store')) {
+            $results = Catalog::queryWithRequest($request, function (&$query) use ($limit, $offset) {
+                $query->where('subject_uuid', session('storefront_store'));
+
+                if ($limit) {
+                    $query->limit($limit);
+                }
+
+                if ($offset) {
+                    $query->offset($offset);
+                }
+            });
+        }
+
+        return $results;
+    }
+}

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

@@ -14,7 +14,7 @@ use Illuminate\Support\Facades\DB;
 class CategoryController extends Controller
 {
     /**
-     * Query for Storefront Product resources.
+     * Query for Storefront Category resources.
      *
      * @return \Illuminate\Http\Response
      */

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

@@ -598,6 +598,7 @@ class CheckoutController extends Controller
     {
         $token              = $request->input('token');
         $transactionDetails = $request->input('transactionDetails', []); // optional details to be supplied about transaction
+        $notes              = $request->input('notes');
 
         // validate transaction details
         if (!is_array($transactionDetails)) {
@@ -828,6 +829,7 @@ class CheckoutController extends Controller
             'type'             => 'storefront',
             'status'           => 'created',
             'meta'             => $orderMeta,
+            'notes'            => $notes,
         ];
 
         // if it's integrated vendor order apply to meta
@@ -879,6 +881,7 @@ class CheckoutController extends Controller
     {
         $token              = $request->input('token');
         $transactionDetails = $request->input('transactionDetails', []); // optional details to be supplied about transaction
+        $notes              = $request->input('notes');
 
         // validate transaction details
         if (!is_array($transactionDetails)) {
@@ -1055,6 +1058,7 @@ class CheckoutController extends Controller
                 'adhoc'            => $about->isOption('auto_dispatch'),
                 'type'             => 'storefront',
                 'status'           => 'created',
+                'notes'            => $notes,
             ];
 
             // if it's integrated vendor order apply to meta

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

@@ -270,7 +270,11 @@ class CustomerController extends Controller
         }
 
         // update the contact
-        $contact->update($input);
+        try {
+            $contact->update($input);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage());
+        }
 
         // response the contact resource
         return new Customer($contact);

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

@@ -0,0 +1,39 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Controllers\v1;
+
+use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Storefront\Http\Resources\FoodTruck as FoodTruckResource;
+use Fleetbase\Storefront\Models\FoodTruck;
+use Illuminate\Http\Request;
+
+class FoodTruckController extends Controller
+{
+    /**
+     * Query for Food Truck resources.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function query(Request $request)
+    {
+        $limit   = $request->input('limit', false);
+        $offset  = $request->input('offset', false);
+        $results = [];
+
+        if (session('storefront_store')) {
+            $results = FoodTruck::queryWithRequest($request, function (&$query) use ($limit, $offset) {
+                $query->where('store_uuid', session('storefront_store'));
+
+                if ($limit) {
+                    $query->limit($limit);
+                }
+
+                if ($offset) {
+                    $query->offset($offset);
+                }
+            });
+        }
+
+        return FoodTruckResource::collection($results);
+    }
+}

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

@@ -2,8 +2,8 @@
 
 namespace Fleetbase\Storefront\Http\Controllers\v1;
 
+use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\Http\Controllers\Controller;
-use Fleetbase\Http\Resources\v1\DeletedResource;
 use Fleetbase\Models\Category;
 use Fleetbase\Storefront\Http\Resources\Product as StorefrontProduct;
 use Fleetbase\Storefront\Models\Product;

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

@@ -33,8 +33,8 @@ class ReviewController extends Controller
         }
 
         if (session('storefront_store')) {
-            $results = Review::queryWithRequest($request, function (&$query) use ($store, $limit, $offset) {
-                $query->where('subject_uuid', $store->uuid);
+            $results = Review::queryWithRequest($request, function (&$query) use ($limit, $offset) {
+                $query->where('subject_uuid', session('storefront_store'));
 
                 if ($limit) {
                     $query->limit($limit);
@@ -176,8 +176,10 @@ class ReviewController extends Controller
      */
     public function create(CreateReviewRequest $request)
     {
-        $customer = Storefront::getCustomerFromToken();
-        $about    = Storefront::about();
+        $customer    = Storefront::getCustomerFromToken();
+        $about       = Storefront::about();
+        $disk        = $request->input('disk', config('filesystems.default'));
+        $bucket      = $request->input('bucket', config('filesystems.disks.' . $disk . '.bucket', config('filesystems.disks.s3.bucket')));
 
         if (!$customer) {
             return response()->error('Not authorized to create reviews');
@@ -209,7 +211,7 @@ class ReviewController extends Controller
                 $bucketPath = 'hyperstore/' . $about->public_id . '/review-photos/' . $review->uuid . '/' . File::randomFileName($extension);
 
                 // upload file to path
-                $upload = Storage::disk('s3')->put($bucketPath, base64_decode($data), 'public');
+                $upload = Storage::disk($disk)->put($bucketPath, base64_decode($data), 'public');
 
                 // create the file
                 $file = File::create([
@@ -222,7 +224,7 @@ class ReviewController extends Controller
                     'extension'         => $extension,
                     'content_type'      => $mimeType,
                     'path'              => $bucketPath,
-                    'bucket'            => config('filesystems.disks.s3.bucket'),
+                    'bucket'            => $bucket,
                     'type'              => 'storefront_review_upload',
                     'size'              => Utils::getBase64ImageSize($data),
                 ]);

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

@@ -3,6 +3,7 @@
 namespace Fleetbase\Storefront\Http\Controllers\v1;
 
 use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Models\Category;
 use Fleetbase\Storefront\Http\Resources\Gateway as GatewayResource;
 use Fleetbase\Storefront\Http\Resources\Network as NetworkResource;
 use Fleetbase\Storefront\Http\Resources\Product as ProductResource;
@@ -188,6 +189,15 @@ class StoreController extends Controller
                 ->whereStatus('published')
                 ->get();
 
+            // Search categories as well
+            $categories = Category::where(['company_uuid' => session('company'), 'for' => 'storefront_product'])->search($searchQuery)->get();
+            if ($categories) {
+                foreach ($categories as $category) {
+                    $categoryProducts = Product::where('category_uuid', $category->uuid)->get();
+                    $results          = $results->merge($categoryProducts)->unique('uuid');
+                }
+            }
+
             return ProductResource::collection($results);
         }
 

package/server/src/Http/Filter/FoodTruckFilter.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Filter;
+
+use Fleetbase\FleetOps\Http\Filter\OrderFilter as FleetOpsOrderFilter;
+use Fleetbase\FleetOps\Models\ServiceArea;
+
+class FoodTruckFilter extends FleetOpsOrderFilter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function storefront($storefront)
+    {
+        $this->builder->whereHas(
+            'store',
+            function ($query) use ($storefront) {
+                $query->where('public_id', $storefront);
+            }
+        );
+    }
+
+    public function serviceArea(string $serviceAreaId)
+    {
+        $matchingServiceAreaIds = ServiceArea::on(config('fleetbase.connection.db'))
+            ->where(function ($query) use ($serviceAreaId) {
+                $query->where('public_id', $serviceAreaId)
+                    ->orWhere('uuid', $serviceAreaId);
+            })
+            ->pluck('uuid')
+            ->toArray();
+
+        $this->builder->whereIn('service_area_uuid', $matchingServiceAreaIds);
+    }
+}

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

@@ -0,0 +1,34 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Resources;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class Catalog extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id'                                 => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                               => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'                          => $this->when(Http::isInternalRequest(), $this->public_id),
+            'company_uuid'                       => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'created_by_uuid'                    => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'store_uuid'                         => $this->when(Http::isInternalRequest(), $this->store_uuid),
+            'name'                               => $this->name,
+            'description'                        => $this->description,
+            'categories'                         => CatalogCategory::collection($this->categories ?? []),
+            'status'                             => $this->status,
+            'created_at'                         => $this->created_at,
+            'updated_at'                         => $this->updated_at,
+        ];
+    }
+}