@fleetbase/storefront-engine 0.3.29 → 0.3.31

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.29",
+    "version": "0.3.31",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.29",
+    "version": "0.3.31",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.3.29",
+    "version": "0.3.31",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",

package/server/config/database.connections.php

@@ -7,7 +7,8 @@ $database = env('DB_DATABASE', 'fleetbase');
 $username = env('DB_USERNAME', 'fleetbase');
 $password = env('DB_PASSWORD', '');
 
-if ($databaseUrl = getenv('DATABASE_URL')) {
+$databaseUrl = getenv('DATABASE_URL');
+if (!empty($databaseUrl)) {
     $url = Utils::parseUrl($databaseUrl);
 
     $host = $url['host'];

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

@@ -5,17 +5,325 @@ namespace Fleetbase\Storefront\Http\Controllers\v1;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Models\Category;
+use Fleetbase\Storefront\Http\Requests\CreateProductRequest;
+use Fleetbase\Storefront\Http\Requests\UpdateProductRequest;
 use Fleetbase\Storefront\Http\Resources\Product as StorefrontProduct;
+use Fleetbase\Storefront\Models\AddonCategory;
 use Fleetbase\Storefront\Models\Product;
+use Fleetbase\Storefront\Models\ProductAddon;
+use Fleetbase\Storefront\Models\ProductAddonCategory;
+use Fleetbase\Storefront\Models\ProductVariant;
+use Fleetbase\Storefront\Models\ProductVariantOption;
+use Fleetbase\Storefront\Models\Store;
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
 
 class ProductController extends Controller
 {
+    /**
+     * Create a new Storefront product.
+     *
+     * @return void
+     */
+    public function create(CreateProductRequest $request)
+    {
+        // Collect product details input
+        $input = $request->only([
+            'name',
+            'description',
+            'tags',
+            'meta',
+            'sku',
+            'price',
+            'currency',
+            'sale_price',
+            'addons',
+            'variants',
+            'is_service',
+            'is_bookable',
+            'is_available',
+            'is_on_sale',
+            'is_recommended',
+            'can_pickup',
+            'youtube_urls',
+            'status',
+        ]);
+
+        // Set product store
+        $input['store_uuid'] = session('storefront_store');
+
+        // Set product relations
+        $input['company_uuid']    = session('company');
+        $input['created_by_uuid'] = session('user');
+
+        // Prepare arrayable data
+        $input['tags']         = Utils::arrayFrom(data_get($input, 'tags', []));
+        $input['youtube_urls'] = Utils::arrayFrom(data_get($input, 'youtube_urls', []));
+
+        // Prepare money
+        $input['price']      = Utils::numbersOnly(data_get($input, 'price', 0));
+        $input['sale_price'] = Utils::numbersOnly(data_get($input, 'sale_price', 0));
+
+        // Set currency
+        $input['currency'] = data_get($input, 'currency', session('storefront_currency', 'USD'));
+
+        // Resolve category
+        if ($request->filled('category')) {
+            $categoryInput = $request->input('category');
+
+            if (Utils::isPublicId($categoryInput)) {
+                $category = Category::where([
+                    'company_uuid' => session('company'),
+                    'owner_uuid'   => session('storefront_store'),
+                    'public_id'    => $categoryInput,
+                    'for'          => 'storefront_product',
+                ])->first();
+            }
+
+            // Create new product if data is array
+            if (is_array($categoryInput) && isset($categoryInput['name'])) {
+                $category = Category::create([
+                    'company_uuid' => session('company'),
+                    'owner_uuid'   => session('storefront_store'),
+                    'owner_type'   => Utils::getMutationType('storefront:store'),
+                    'name'         => data_get($categoryInput, 'name'),
+                    'description'  => data_get($categoryInput, 'description'),
+                    'tags'         => Utils::arrayFrom(data_get($categoryInput, 'tags', [])),
+                    'for'          => 'storefront_product',
+                ]);
+            }
+
+            // Set the cateogry for the product
+            if ($category instanceof Category) {
+                $input['category_uuid'] = $category->uuid;
+            }
+        }
+
+        // Create product
+        $product = Product::create($input);
+
+        // Resolve addon categories
+        if ($request->filled('addon_categories') && $request->isArray('addon_categories')) {
+            $request->collect('addon_categories')->each(function ($addonCategoryInput) use ($product) {
+                // Resolve existing addon category from ID
+                if (Utils::isPublicId($addonCategoryInput)) {
+                    $addonCategory = AddonCategory::where('public_id', $addonCategoryInput)->first();
+                }
+
+                // Create new addon cateogry with addons
+                if (is_array($addonCategoryInput)) {
+                    $addonCategory = AddonCategory::create([
+                        'company_uuid' => session('company'),
+                        'name'         => data_get($addonCategoryInput, 'name'),
+                        'description'  => data_get($addonCategoryInput, 'description'),
+                        'tags'         => Utils::arrayFrom(data_get($addonCategoryInput, 'tags', [])),
+                    ]);
+
+                    if (isset($addonCategoryInput['addons']) && is_array($addonCategoryInput['addons'])) {
+                        collect($addonCategoryInput['addons'])->each(function ($addonInput) use ($addonCategory) {
+                            if (is_string($addonInput)) {
+                                return ProductAddon::create([
+                                    'category_uuid'   => $addonCategory->uuid,
+                                    'created_by_uuid' => session('user'),
+                                    'name'            => $addonInput,
+                                ]);
+                            }
+
+                            if (is_array($addonInput)) {
+                                return ProductAddon::create([
+                                    'category_uuid'   => $addonCategory->uuid,
+                                    'created_by_uuid' => session('user'),
+                                    'name'            => data_get($addonInput, 'name'),
+                                    'price'           => Utils::numbersOnly(data_get($addonInput, 'price', 0)),
+                                    'sale_price'      => Utils::numbersOnly(data_get($addonInput, 'sale_price', 0)),
+                                    'is_on_sale'      => Utils::castBoolean(data_get($addonInput, 'is_on_sale', false)),
+                                ]);
+                            }
+                        });
+                    }
+                }
+
+                // Create product addon category
+                if ($addonCategory instanceof AddonCategory) {
+                    ProductAddonCategory::create([
+                        'product_uuid'    => $product->uuid,
+                        'category_uuid'   => $addonCategory->uuid,
+                        'excluded_addons' => Utils::arrayFrom(data_get($addonCategoryInput, 'excluded_addons', [])),
+                        'max_selectable'  => data_get($addonCategoryInput, 'max_selectable'),
+                        'is_required'     => Utils::castBoolean(data_get($addonCategoryInput, 'is_required')),
+                    ]);
+                }
+            });
+        }
+
+        // Resolve variants
+        if ($request->filled('variants') && $request->isArray('variants')) {
+            $request->collect('variants')->each(function ($variantInput) use ($product) {
+                // Create new variants for product
+                if (is_array($variantInput)) {
+                    $productVariant = ProductVariant::create([
+                        'product_uuid'   => $product->uuid,
+                        'name'           => data_get($variantInput, 'name'),
+                        'description'    => data_get($variantInput, 'description'),
+                        'meta'           => data_get($variantInput, 'meta', []),
+                        'is_required'    => Utils::castBoolean(data_get($variantInput, 'is_required')),
+                        'is_multiselect' => Utils::castBoolean(data_get($variantInput, 'is_multiselect')),
+                        'min'            => data_get($variantInput, 'min', 0),
+                        'max'            => data_get($variantInput, 'max', 1),
+                    ]);
+
+                    if (isset($variantInput['options']) && is_array($variantInput['options'])) {
+                        collect($variantInput['options'])->each(function ($variantOptionInput) use ($productVariant) {
+                            if (is_string($variantOptionInput)) {
+                                ProductVariantOption::create([
+                                    'product_variant_uuid' => $productVariant->uuid,
+                                    'name'                 => $variantOptionInput,
+                                ]);
+                            }
+
+                            if (is_array($variantOptionInput)) {
+                                ProductVariantOption::create([
+                                    'product_variant_uuid' => $productVariant->uuid,
+                                    'name'                 => data_get($variantOptionInput, 'name'),
+                                    'description'          => data_get($variantOptionInput, 'description'),
+                                    'additional_cost'      => Utils::numbersOnly(data_get($variantOptionInput, 'additional_cost', 0)),
+                                ]);
+                            }
+                        });
+                    }
+                }
+            });
+        }
+
+        return new StorefrontProduct($product);
+    }
+
+    /**
+     * Updates a Storefront Product.
+     *
+     * @param string $id
+     *
+     * @return \Fleetbase\Storefront\Http\Resources\StorefrontProduct
+     */
+    public function update($id, UpdateProductRequest $request)
+    {
+        // Try to resolve the product by public_id or uuid (custom method)
+        try {
+            $product = Product::findRecordOrFail($id);
+        } catch (ModelNotFoundException $exception) {
+            return response()->json([
+                'error' => 'Product not found.',
+            ], 404);
+        }
+
+        // Validate input
+        $input = $request->validated();
+
+        // Sanitize/transform
+        $input['tags']         = Utils::arrayFrom(data_get($input, 'tags', []));
+        $input['youtube_urls'] = Utils::arrayFrom(data_get($input, 'youtube_urls', []));
+        $input['price']        = Utils::numbersOnly(data_get($input, 'price', 0));
+        $input['sale_price']   = Utils::numbersOnly(data_get($input, 'sale_price', 0));
+
+        // Resolve or create category
+        if (isset($input['category'])) {
+            $categoryInput = $input['category'];
+            $category      = null;
+
+            if (Utils::isPublicId($categoryInput)) {
+                $category = Category::where([
+                    'company_uuid' => session('company'),
+                    'owner_uuid'   => session('storefront_store'),
+                    'public_id'    => $categoryInput,
+                    'for'          => 'storefront_product',
+                ])->first();
+            }
+
+            if (is_array($categoryInput) && isset($categoryInput['name'])) {
+                $category = Category::create([
+                    'company_uuid' => session('company'),
+                    'owner_uuid'   => session('storefront_store'),
+                    'owner_type'   => Utils::getMutationType('storefront:store'),
+                    'name'         => data_get($categoryInput, 'name'),
+                    'description'  => data_get($categoryInput, 'description'),
+                    'tags'         => Utils::arrayFrom(data_get($categoryInput, 'tags', [])),
+                    'for'          => 'storefront_product',
+                ]);
+            }
+
+            if ($category instanceof Category) {
+                $input['category_uuid'] = $category->uuid;
+            }
+        }
+
+        // Update the product
+        $product->update($input);
+
+        // Update sync addon categories
+        if ($request->filled('addon_categories') && $request->isArray('addon_categories')) {
+            $addonCategories = $request->collect('addon_categories')->map(function ($addonCategory) {
+                // Resolve category public_id to UUID
+                if (isset($addonCategory['category'])) {
+                    $category = AddonCategory::where('public_id', $addonCategory['category'])->first();
+                    if ($category) {
+                        $addonCategory['category_uuid'] = $category->uuid;
+                    }
+                }
+
+                // Resolve ProductAddonCategory public_id if present (e.g. for updates)
+                if (isset($addonCategory['id']) && Utils::isPublicId($addonCategory['id'])) {
+                    $pac = ProductAddonCategory::where('public_id', $addonCategory['id'])->first();
+                    if ($pac) {
+                        $addonCategory['uuid'] = $pac->uuid;
+                    }
+                }
+
+                return $addonCategory;
+            })->toArray();
+
+            $product->setAddonCategories($addonCategories);
+        }
+
+        // update sync product variants and options
+        if ($request->filled('variants') && $request->isArray('variants')) {
+            $variants = $request->collect('variants')->map(function ($variant) {
+                // Resolve variant public_id to UUID
+                if (isset($variant['id']) && Utils::isPublicId($variant['id'])) {
+                    $variantModel = ProductVariant::where('public_id', $variant['id'])->first();
+                    if ($variantModel) {
+                        $variant['uuid'] = $variantModel->uuid;
+                    }
+                }
+
+                // Resolve variant option IDs if using public_id
+                if (isset($variant['options']) && is_array($variant['options'])) {
+                    $variant['options'] = collect($variant['options'])->map(function ($option) {
+                        if (isset($option['id']) && Utils::isPublicId($option['id'])) {
+                            $optionModel = ProductVariantOption::where('public_id', $option['id'])->first();
+                            if ($optionModel) {
+                                $option['uuid'] = $optionModel->uuid;
+                            }
+                        }
+
+                        return $option;
+                    })->toArray();
+                }
+
+                return $variant;
+            })->toArray();
+
+            $product->setProductVariants($variants);
+        }
+
+        // Return resource
+        return new StorefrontProduct($product);
+    }
+
     /**
      * Query for Storefront Product resources.
      *
-     * @return \Fleetbase\Http\Resources\DriverCollection
+     * @return \Fleetbase\Http\Resources\ProductCollection
      */
     public function query(Request $request)
     {

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

@@ -0,0 +1,46 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Requests;
+
+use Fleetbase\Http\Requests\FleetbaseRequest;
+use Illuminate\Validation\Rule;
+
+class CreateProductRequest extends FleetbaseRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return session('storefront_key') || request()->session()->has('api_credential');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+        return [
+            'name'             => 'required|string|max:255',
+            'description'      => 'nullable|string',
+            'tags'             => 'nullable|array',
+            'meta'             => 'nullable|array',
+            'sku'              => 'nullable|string|max:100',
+            'price'            => [Rule::requiredIf(fn () => $this->isMethod('POST')), 'numeric', 'min:0'],
+            'sale_price'       => 'nullable|numeric|min:0',
+            'currency'         => 'nullable|string|size:3',
+            'addons'           => 'nullable|array',
+            'variants'         => 'nullable|array',
+            'is_service'       => 'nullable|boolean',
+            'is_bookable'      => 'nullable|boolean',
+            'is_available'     => 'nullable|boolean',
+            'is_on_sale'       => 'nullable|boolean',
+            'is_recommended'   => 'nullable|boolean',
+            'can_pickup'       => 'nullable|boolean',
+            'youtube_urls'     => 'nullable|array',
+            'status'           => 'nullable|string|in:draft,active,archived',
+            'category'         => 'nullable',
+            'addon_categories' => 'nullable|array',
+        ];
+    }
+}

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

@@ -0,0 +1,7 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Requests;
+
+class UpdateProductRequest extends CreateProductRequest
+{
+}

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

@@ -4,6 +4,7 @@ namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
+use Fleetbase\Support\Utils;
 
 class CatalogCategory extends FleetbaseResource
 {
@@ -26,8 +27,8 @@ class CatalogCategory extends FleetbaseResource
             'owner_uuid'                         => $this->when(Http::isInternalRequest(), $this->owner_uuid),
             'name'                               => $this->name,
             'description'                        => $this->description,
-            'tags'                               => $this->tags ?? [],
-            'meta'                               => $this->meta ?? [],
+            'tags'                               => data_get($this, 'tags', []),
+            'meta'                               => data_get($this, 'meta', Utils::createObject()),
             'products'                           => CatalogProduct::collection($this->products ?? []),
             'for'                                => $this->for,
             'order'                              => $this->order,

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

@@ -4,6 +4,7 @@ namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
+use Fleetbase\Support\Utils;
 
 class Category extends FleetbaseResource
 {
@@ -28,7 +29,7 @@ class Category extends FleetbaseResource
                     return $parentCategory->public_id;
                 }
             ),
-            'tags'          => $this->tags ?? [],
+            'tags'          => Utils::arrayFrom($this->tags),
             'translations'  => $this->translations ?? [],
             'products'      => $this->when($request->has('with_products') || $request->inArray('with', 'products'), $this->products ? Product::collection($this->products) : []),
             'subcategories' => $this->when(
@@ -40,6 +41,7 @@ class Category extends FleetbaseResource
                     $this->subCategories->toArray()
                 )
             ),
+            'meta'       => data_get($this, 'meta', Utils::createObject()),
             'order'      => $this->order,
             'slug'       => $this->slug,
             'created_at' => $this->created_at,

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

@@ -5,6 +5,7 @@ namespace Fleetbase\Storefront\Http\Resources;
 use Fleetbase\FleetOps\Http\Resources\v1\Place;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
+use Fleetbase\Support\Utils;
 use Illuminate\Support\Str;
 
 class Customer extends FleetbaseResource
@@ -33,7 +34,7 @@ class Customer extends FleetbaseResource
             'address'              => data_get($this, 'place.address'),
             'addresses'            => $this->whenLoaded('places', Place::collection($this->places)),
             'token'                => $this->when($this->token, $this->token),
-            'meta'                 => $this->meta ?? [],
+            'meta'                 => data_get($this, 'meta', Utils::createObject()),
             'slug'                 => $this->slug,
             'created_at'           => $this->created_at,
             'updated_at'           => $this->updated_at,

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

@@ -4,6 +4,7 @@ namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
+use Fleetbase\Support\Utils;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
@@ -42,6 +43,7 @@ class Product extends FleetbaseResource
             'is_available'       => $this->is_available,
             'tags'               => $this->tags ?? [],
             'status'             => $this->status,
+            'meta'               => data_get($this, 'meta', Utils::createObject()),
             'slug'               => $this->slug,
             'translations'       => $this->translations ?? [],
             'addon_categories'   => $this->mapAddonCategories($this->addonCategories),

package/server/src/Support/PushNotification.php

@@ -6,6 +6,7 @@ use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\Storefront\Models\Network;
 use Fleetbase\Storefront\Models\NotificationChannel;
 use Fleetbase\Storefront\Models\Store;
+use Fleetbase\Support\Utils;
 use Illuminate\Container\Container;
 use Kreait\Laravel\Firebase\FirebaseProjectManager;
 use NotificationChannels\Apn\ApnMessage;
@@ -117,7 +118,9 @@ class PushNotification
         $notificationChannel = static::getNotificationChannel('apn', $storefront, $order);
         $config              = (array) $notificationChannel->config;
 
-        return new PushOkClient(PuskOkToken::create($config));
+        $isProductionEnv = Utils::castBoolean(data_get($config, 'production', app()->isProduction()));
+
+        return new PushOkClient(PuskOkToken::create($config), $isProductionEnv);
     }
 
     public static function getStorefrontFromOrder(Order $order): Network|Store|null

package/server/src/routes.php

@@ -73,6 +73,8 @@ Route::prefix(config('storefront.api.routing.prefix', 'storefront'))->namespace(
                 $router->group(['prefix' => 'products'], function () use ($router) {
                     $router->get('/', 'ProductController@query');
                     $router->get('{id}', 'ProductController@find');
+                    $router->post('/', 'ProductController@create');
+                    $router->put('{id}', 'ProductController@update');
                 });
 
                 // storefront/v1/food-trucks