@fleetbase/storefront-engine 0.3.3 → 0.3.5

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_carts_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_checkouts_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_gateways_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_network_stores_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_networks_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_notification_channels_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_payment_methods_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_addon_categories_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_addons_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_hours_table.php

@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_store_locations_table.php

@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_variant_options_table.php

@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_variants_table.php

@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_products_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_reviews_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_store_hours_table.php

@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_store_locations_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_stores_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_votes_table.php

@@ -1,13 +1,12 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Fleetbase\Support\Utils;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

package/server/seeders/OrderConfigSeeder.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Fleetbase\Storefront\Seeders;
+
+use Fleetbase\Models\Company;
+use Fleetbase\Storefront\Support\Storefront;
+use Illuminate\Database\Seeder;
+
+class OrderConfigSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $companies = Company::all();
+        foreach ($companies as $company) {
+            Storefront::createStorefrontConfig($company);
+        }
+    }
+}

package/server/src/Expansions/EntityExpansion.php

@@ -25,7 +25,7 @@ class EntityExpansion implements Expansion
      */
     public static function fromStorefrontProduct()
     {
-        return static function (Product $product) {
+        return static function (Product $product, $meta = []) {
             return new Entity([
                 'company_uuid' => session('company'),
                 'photo_uuid'   => $product->primary_image_uuid,
@@ -39,6 +39,7 @@ class EntityExpansion implements Expansion
                 'meta'         => [
                     'product_id' => $product->public_id,
                     'image_url'  => $product->primary_image_url,
+                    ...$meta,
                 ],
             ]);
         };

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

@@ -19,9 +19,6 @@ class CartController extends Controller
     {
         $cart = Cart::retrieve($uniqueId, true);
 
-        // reset currency
-        $cart->resetCurrency();
-
         return new StorefrontCart($cart);
     }
 
@@ -49,9 +46,6 @@ class CartController extends Controller
             return response()->error($e->getMessage());
         }
 
-        // reset currency
-        $cart->resetCurrency();
-
         return new StorefrontCart($cart);
     }
 
@@ -80,9 +74,6 @@ class CartController extends Controller
             return response()->error($e->getMessage());
         }
 
-        // reset currency
-        $cart->resetCurrency();
-
         return new StorefrontCart($cart);
     }
 
@@ -107,9 +98,6 @@ class CartController extends Controller
             return response()->error($e->getMessage());
         }
 
-        // reset currency
-        $cart->resetCurrency();
-
         return new StorefrontCart($cart);
     }
 

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

@@ -264,6 +264,40 @@ class CheckoutController extends Controller
         ]);
     }
 
+    /**
+     * Process a cart item and create/save an entity.
+     *
+     * @param mixed $cartItem the cart item to process
+     * @param mixed $payload  the payload
+     * @param mixed $customer the customer
+     *
+     * @return void
+     */
+    private function processCartItem($cartItem, $payload, $customer)
+    {
+        $product = Product::where('public_id', $cartItem->product_id)->first();
+
+        // Generate metas array
+        $metas = [
+            'variants'     => $cartItem->variants ?? [],
+            'addons'       => $cartItem->addons ?? [],
+            'subtotal'     => $cartItem->subtotal,
+            'quantity'     => $cartItem->quantity,
+            'scheduled_at' => $cartItem->scheduled_at ?? null,
+        ];
+
+        // Create and fill entity
+        $entity = Entity::fromStorefrontProduct($product, $metas)->fill([
+            'company_uuid'  => session('company'),
+            'payload_uuid'  => $payload->uuid,
+            'customer_uuid' => $customer->uuid,
+            'customer_type' => Utils::getMutationType('fleet-ops:contact'),
+        ]);
+
+        // Save entity
+        $entity->save();
+    }
+
     public function captureOrder(CaptureOrderRequest $request)
     {
         $token              = $request->input('token');
@@ -458,10 +492,7 @@ class CheckoutController extends Controller
 
         // create entities
         foreach ($cart->items as $cartItem) {
-            $product = Product::where('public_id', $cartItem->product_id)->first();
-            $entity  = Entity::fromStorefrontProduct($product);
-
-            $entity->save();
+            $this->processCartItem($cartItem, $payload, $customer);
         }
 
         // create order meta
@@ -515,8 +546,6 @@ class CheckoutController extends Controller
         // create order
         $order = Order::create($orderInput);
 
-        info('Order created', $order->toArray());
-
         // notify order creation
         Storefront::alertNewOrder($order);
 
@@ -692,22 +721,7 @@ class CheckoutController extends Controller
 
             // create entities
             foreach ($cartItems as $cartItem) {
-                $product = Product::where('public_id', $cartItem->product_id)->first();
-
-                $entity = Entity::fromStorefrontProduct($product)->fill([
-                    'company_uuid'  => $store->company_uuid,
-                    'payload_uuid'  => $payload->uuid,
-                    'customer_uuid' => $customer->uuid,
-                    'customer_type' => Utils::getMutationType('fleet-ops:contact'),
-                ])->setMetas([
-                    'variants'     => $cartItem->variants,
-                    'addons'       => $cartItem->addons,
-                    'subtotal'     => $cartItem->subtotal,
-                    'quantity'     => $cartItem->quantity,
-                    'scheduled_at' => $cartItem->scheduled_at ?? null,
-                ]);
-
-                $entity->save();
+                $this->processCartItem($cartItem, $payload, $customer);
             }
 
             // get order subtotal
@@ -797,22 +811,7 @@ class CheckoutController extends Controller
 
         // create entities
         foreach ($cart->items as $cartItem) {
-            $product = Product::where('public_id', $cartItem->product_id)->first();
-
-            $entity = Entity::fromStorefrontProduct($product)->fill([
-                'company_uuid'  => session('company'),
-                'payload_uuid'  => $payload->uuid,
-                'customer_uuid' => $customer->uuid,
-                'customer_type' => Utils::getMutationType('fleet-ops:contact'),
-            ])->setMetas([
-                'variants'     => $cartItem->variants,
-                'addons'       => $cartItem->addons,
-                'subtotal'     => $cartItem->subtotal,
-                'quantity'     => $cartItem->quantity,
-                'scheduled_at' => $cartItem->scheduled_at ?? null,
-            ]);
-
-            $entity->save();
+            $this->processCartItem($cartItem, $payload, $customer);
         }
 
         // prepare master order meta

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

@@ -5,11 +5,11 @@ namespace Fleetbase\Storefront\Http\Controllers\v1;
 use Fleetbase\FleetOps\Http\Resources\v1\ServiceQuote as ServiceQuoteResource;
 use Fleetbase\FleetOps\Models\Entity;
 use Fleetbase\FleetOps\Models\IntegratedVendor;
+use Fleetbase\FleetOps\Models\OrderConfig;
 use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Models\ServiceQuote;
 use Fleetbase\FleetOps\Models\ServiceQuoteItem;
 use Fleetbase\FleetOps\Models\ServiceRate;
-use Fleetbase\FleetOps\Support\Flow;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Storefront\Http\Requests\GetServiceQuoteFromCart;
@@ -100,12 +100,11 @@ class ServiceQuoteController extends Controller
         $serviceQuotes = collect();
 
         // get order configurations for ecommerce / task
-        $orderConfigs = Flow::queryOrderConfigurations(function (&$query) use ($config) {
-            $query->where('key', $config);
-        });
+        $orderConfig    = OrderConfig::resolveFromIdentifier($config);
+        $orderConfigKey = data_get($orderConfig, 'key', 'storefront');
 
         // get service rates for config type
-        $serviceRates = ServiceRate::whereIn('service_type', $orderConfigs->pluck('key'))->get();
+        $serviceRates = ServiceRate::where('service_type', $orderConfigKey)->get();
 
         // if no service rates send an empty quote
         if ($serviceRates->isEmpty()) {
@@ -289,12 +288,11 @@ class ServiceQuoteController extends Controller
         $serviceQuotes = collect();
 
         // get order configurations for ecommerce / task
-        $orderConfigs = Flow::queryOrderConfigurations(function (&$query) use ($config) {
-            $query->where('key', $config);
-        });
+        $orderConfig    = OrderConfig::resolveFromIdentifier($config);
+        $orderConfigKey = data_get($orderConfig, 'key', 'storefront');
 
         // get service rates for config type
-        $serviceRates = ServiceRate::whereIn('service_type', $orderConfigs->pluck('key'))->get();
+        $serviceRates = ServiceRate::where('service_type', $orderConfigKey)->get();
 
         // if no service rates send an empty quote
         if ($serviceRates->isEmpty()) {

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

@@ -37,6 +37,7 @@ class Network extends FleetbaseResource
             'tags'            => $this->tags ?? [],
             'currency'        => $this->currency ?? 'USD',
             'options'         => $this->options ?? [],
+            'alertable'       => $this->alertable,
             'logo_url'        => $this->logo_url,
             'backdrop_url'    => $this->backdrop_url,
             'rating'          => $this->rating,

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

@@ -41,6 +41,7 @@ class Store extends FleetbaseResource
             'backdrop_url'    => $this->backdrop_url,
             'rating'          => $this->rating,
             'online'          => $this->online,
+            'alertable'       => $this->alertable,
             'is_network'      => false,
             'is_store'        => true,
             'category'        => $this->when($request->filled('network') && ($request->has('with_category') || $request->inArray('with', 'category')), new Category($this->getNetworkCategoryUsingId($request->input('network')))),

package/server/src/Models/Cart.php

@@ -334,6 +334,8 @@ class Cart extends StorefrontModel
             'addons'            => $addons,
         ];
 
+        $this->updateCurrency($product->currency, false);
+
         foreach ($properties as $prop => $value) {
             $cartItem->{$prop} = $value;
         }
@@ -598,16 +600,6 @@ class Cart extends StorefrontModel
         return $this;
     }
 
-    /**
-     * Reset the cart currency code to the current session.
-     *
-     * @return \Fleetbase\Models\Storefront\Cart
-     */
-    public function resetCurrency()
-    {
-        return $this->updateCurrency(null, true);
-    }
-
     /**
      * Creates a new cart.
      *
@@ -679,6 +671,6 @@ class Cart extends StorefrontModel
      */
     public static function findProduct(string $id): ?Product
     {
-        return Product::select(['uuid', 'store_uuid', 'public_id', 'name', 'description', 'price', 'sale_price', 'is_on_sale'])->where(['public_id' => $id])->with([])->first();
+        return Product::select(['uuid', 'store_uuid', 'public_id', 'name', 'description', 'price', 'currency', 'sale_price', 'is_on_sale'])->where(['public_id' => $id])->with([])->first();
     }
 }

package/server/src/Models/Product.php

@@ -322,9 +322,6 @@ class Product extends StorefrontModel
                 'max_selectable'  => data_get($addonCategory, 'max_selectable'),
                 'is_required'     => data_get($addonCategory, 'is_required'),
             ]);
-
-            // insert to hasmany relation
-            $this->addonCategories->push($productAddonCategory);
         }
 
         return $this;
@@ -357,8 +354,8 @@ class Product extends StorefrontModel
                     'meta'           => data_get($variant, 'meta', []),
                     'is_multiselect' => data_get($variant, 'is_multiselect'),
                     'is_required'    => data_get($variant, 'is_required'),
-                    'min'            => data_get($variant, 'min'),
-                    'max'            => data_get($variant, 'max'),
+                    'min'            => data_get($variant, 'min') ?? 0,
+                    'max'            => data_get($variant, 'max') ?? 100,
                 ]);
 
                 // Update product variant options if applicable

package/server/src/Observers/CompanyObserver.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Fleetbase\Storefront\Observers;
+
+use Fleetbase\Models\Company;
+use Fleetbase\Storefront\Support\Storefront;
+
+class CompanyObserver
+{
+    /**
+     * Handle the Company "created" event.
+     *
+     * @return void
+     */
+    public function created(Company $company)
+    {
+        // Add the default storefront order config
+        Storefront::createStorefrontConfig($company);
+    }
+}

package/server/src/Observers/NetworkObserver.php

@@ -27,7 +27,7 @@ class NetworkObserver
                 return [
                     $key => collect($alertables)->map(
                         function ($user) {
-                            return data_get($user, 'public_id');
+                            return $user;
                         }
                     )
                         ->values()

package/server/src/Providers/StorefrontServiceProvider.php

@@ -26,6 +26,7 @@ class StorefrontServiceProvider extends CoreServiceProvider
     public $observers = [
         \Fleetbase\Storefront\Models\Product::class => \Fleetbase\Storefront\Observers\ProductObserver::class,
         \Fleetbase\Storefront\Models\Network::class => \Fleetbase\Storefront\Observers\NetworkObserver::class,
+        \Fleetbase\Models\Company::class            => \Fleetbase\Storefront\Observers\CompanyObserver::class,
     ];
 
     /**