@fleetbase/storefront-engine 0.2.5 → 0.2.6

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

@@ -17,6 +17,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
     @service fetch;
     @service loader;
     @service crud;
+    @service hostRouter;
     @alias('storefront.activeStore') activeStore;
     @tracked product = this.store.createRecord('product', { store_uuid: this.activeStore.id, currency: this.activeStore.currency, tags: [], meta_array: [] });
     @tracked uploadQueue = [];
@@ -58,15 +59,13 @@ export default class ProductsIndexCategoryNewController extends BaseController {
         this.product
             .serializeMeta()
             .save()
-            .then((product) => {
+            .then(() => {
                 this.loader.removeLoader(loader);
                 this.isSaving = false;
                 this.notifications.success('New product created successfully!');
 
                 return this.transitionToRoute('products.index.category').then(() => {
-                    console.log(this.productsIndexCategoryController);
-                    console.log(this.productsIndexCategoryController.products);
-                    this.productsIndexCategoryController?.products?.pushObject(product);
+                    return this.hostRouter.refresh();
                 });
             })
             .catch((error) => {
@@ -81,8 +80,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
             this.product.tags = [];
         }
 
-        this.product.tags?.pushObject(tag);
-        console.log('this.product.tags', this.product.tags);
+        this.product.tags.pushObject(tag);
     }
 
     @action removeTag(index) {
@@ -191,7 +189,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
                         });
                     });
 
-                    product.addon_categories = productAddonCategories;
+                    product.addon_categories.pushObjects(productAddonCategories);
                 },
             });
         });
@@ -265,8 +263,6 @@ export default class ProductsIndexCategoryNewController extends BaseController {
         } else {
             productAddonCategory.excluded_addons.pushObject(id);
         }
-
-        console.log(productAddonCategory);
     }
 
     @action addMetaField() {

package/addon/models/product-addon-category.js

@@ -1,5 +1,6 @@
 import Model, { attr, belongsTo } from '@ember-data/model';
 import { format, formatDistanceToNow } from 'date-fns';
+import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 
 export default class ProductAddonCategoryModel extends Model {
     /** @ids */
@@ -19,7 +20,15 @@ export default class ProductAddonCategoryModel extends Model {
 
     /** @methods */
     toJSON() {
-        return this.serialize();
+        return {
+            uuid: this.id,
+            category_uuid: this.category_uuid,
+            product_uuid: this.product_uuid,
+            name: this.name,
+            excluded_addons: getWithDefault(this, 'excluded_addons', []),
+            updated_at: this.updated_at,
+            created_at: this.created_at,
+        };
     }
 
     /** @computed */

package/addon/models/product-variant.js

@@ -4,8 +4,6 @@ import { format, formatDistanceToNow } from 'date-fns';
 export default class ProductVariantModel extends Model {
     /** @ids */
     @attr('string') product_uuid;
-    @attr('string') created_by_uuid;
-    @attr('string') company_uuid;
 
     /** @relationships */
     @hasMany('product-variant-option') options;

package/addon/models/product.js

@@ -20,7 +20,7 @@ export default class ProductModel extends Model {
     @belongsTo('file') primary_image;
     @hasMany('file') files;
     @hasMany('product-variant', { async: false }) variants;
-    @hasMany('product-addon-category') addon_categories;
+    @hasMany('product-addon-category', { async: false }) addon_categories;
     @hasMany('product-hour') hours;
 
     /** @attributes */
@@ -56,7 +56,40 @@ export default class ProductModel extends Model {
 
     /** @methods */
     toJSON() {
-        return this.serialize();
+        return {
+            uuid: this.id,
+            created_by_uuid: this.created_by_uuid,
+            company_uuid: this.company_uuid,
+            store_uuid: this.store_uuid,
+            category_uuid: this.category_uuid,
+            primary_image_uuid: this.primary_image_uuid,
+            public_id: this.public_id,
+            name: this.name,
+            category: this.category,
+            primary_image: this.primary_image,
+            files: this.files,
+            variants: this.variants,
+            addon_categories: this.addon_categories,
+            hours: this.hours,
+            description: this.description,
+            primary_image_url: this.primary_image_url,
+            sku: this.sku,
+            currency: this.currency,
+            price: this.price,
+            sale_price: this.sale_price,
+            tags: this.tags,
+            youtube_urls: this.youtube_urls,
+            translations: this.translations,
+            is_on_sale: this.is_on_sale,
+            is_recommended: this.is_recommended,
+            is_service: this.is_service,
+            is_available: this.is_available,
+            is_bookable: this.is_bookable,
+            status: this.status,
+            slug: this.slug,
+            created_at: this.created_at,
+            updated_at: this.updated_at,
+        };
     }
 
     /** @computed */

package/addon/serializers/product.js

@@ -1,5 +1,6 @@
 import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
 import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
+import { isArray } from '@ember/array';
 
 export default class ProductSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
     /**
@@ -17,4 +18,19 @@ export default class ProductSerializer extends ApplicationSerializer.extend(Embe
             category: { embedded: 'always' },
         };
     }
+
+    serializeHasMany(snapshot, json, relationship) {
+        let key = relationship.key;
+
+        if (key === 'addon_categories') {
+            const addonCategories = snapshot.record.get('addon_categories');
+
+            if (isArray(addonCategories)) {
+                json.addon_categories = addonCategories;
+            }
+            return;
+        }
+
+        return super.serializeHasMany(...arguments);
+    }
 }

package/addon/templates/products/index/category/new.hbs

@@ -117,7 +117,7 @@
         </ContentPanel>
 
         <ContentPanel @title="Add-Ons" @open={{this.product.addon_categories.length}} @pad={{false}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
-            <div class="px-4 py-3">
+            <div class="px-4">
                 <div class="flex items-center justify-end mb-3">
                     <Button @text="Select Addon Categories" @icon="plus" @iconPrefix="fas" @onClick={{this.selectAddonCategory}} />
                 </div>
@@ -139,7 +139,7 @@
                                 {{#each addonCategory.category.addons as |addon|}}
                                     <div class="grid grid-cols-10 gap-1 px-3 py-2 rounded-md border border-gray-200 dark:border-gray-900 dark:text-gray-100 dark:bg-gray-800 bg-gray-200">
                                         <div class="flex items-center">
-                                            <Checkbox @value={{not-in-array addon.id addonCategory.excluded_addons}} @onToggle={{fn this.excludeAddon index addon}} />
+                                            <Checkbox @value={{not (in-array addon.id addonCategory.excluded_addons)}} @onToggle={{fn this.excludeAddon index addon}} />
                                         </div>
                                         <div class="col-span-3 flex items-center">
                                             {{addon.name}}

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.2.4",
+    "version": "0.2.6",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,8 +22,8 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "fleetbase/core-api": "^1.3.2",
-        "fleetbase/fleetops-api": "^0.3.5",
+        "fleetbase/core-api": "^1.3.6",
+        "fleetbase/fleetops-api": "^0.3.8",
         "geocoder-php/google-maps-places-provider": "^1.4",
         "laravel-notification-channels/apn": "^3.8",
         "laravel-notification-channels/fcm": "^2.7",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.2.4",
+    "version": "0.2.6",
     "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.5",
+  "version": "0.2.6",
   "description": "Headless Commerce & Marketplace Extension for Fleetbase",
   "fleetbase": {
     "route": "storefront",

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

@@ -6,90 +6,82 @@ class Storefront
 {
     /**
      * The permission schema Name.
-     *
-     * @var string
      */
     public string $name = 'storefront';
 
     /**
      * The permission schema Polict Name.
-     *
-     * @var string
      */
     public string $policyName = 'Storefront';
 
     /**
      * Guards these permissions should apply to.
-     *
-     * @var array
      */
     public array $guards = ['web', 'api'];
 
     /**
      * The permission schema resources.
-     *
-     * @var array
      */
     public array $resources = [
         [
-            'name' => 'order',
-            'actions' => ['accept', 'mark-as-ready', 'mark-as-completed', 'reject']
+            'name'    => 'order',
+            'actions' => ['accept', 'mark-as-ready', 'mark-as-completed', 'reject'],
         ],
         [
-            'name' => 'product',
-            'actions' => ['import']
+            'name'    => 'product',
+            'actions' => ['import'],
         ],
         [
-            'name' => 'product-addon',
-            'actions' => []
+            'name'    => 'product-addon',
+            'actions' => [],
         ],
         [
-            'name' => 'product-addon-category',
-            'actions' => []
+            'name'    => 'product-addon-category',
+            'actions' => [],
         ],
         [
-            'name' => 'product-hour',
-            'actions' => []
+            'name'    => 'product-hour',
+            'actions' => [],
         ],
         [
-            'name' => 'product-store-location',
-            'actions' => []
+            'name'    => 'product-store-location',
+            'actions' => [],
         ],
         [
-            'name' => 'product-variant',
-            'actions' => []
+            'name'    => 'product-variant',
+            'actions' => [],
         ],
         [
-            'name' => 'product-variant-option',
-            'actions' => []
+            'name'    => 'product-variant-option',
+            'actions' => [],
         ],
         [
-            'name' => 'gateway',
-            'actions' => []
+            'name'    => 'gateway',
+            'actions' => [],
         ],
         [
-            'name' => 'notification-channel',
-            'actions' => []
+            'name'    => 'notification-channel',
+            'actions' => [],
         ],
         [
-            'name' => 'network',
-            'actions' => []
+            'name'    => 'network',
+            'actions' => [],
         ],
         [
-            'name' => 'network-store',
-            'actions' => []
+            'name'    => 'network-store',
+            'actions' => [],
         ],
         [
-            'name' => 'store',
-            'actions' => []
+            'name'    => 'store',
+            'actions' => [],
         ],
         [
-            'name' => 'store-location',
-            'actions' => []
+            'name'    => 'store-location',
+            'actions' => [],
         ],
         [
-            'name' => 'store-hour',
-            'actions' => []
-        ]
+            'name'    => 'store-hour',
+            'actions' => [],
+        ],
     ];
 }

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

@@ -33,17 +33,17 @@ class NotifyStorefrontOrderNearby extends Command
         // Get storefront orders that are enroute
         $orders = $this->getActiveStorefrontOrders();
 
-        // Notify and update 
+        // Notify and update
         $this->alert('Found (' . $orders->count() . ') Storefront Orders which are Enroute.');
 
         // Iterate each order
         $orders->each(
             function ($order) {
-                $origin = $order->payload->getPickupOrFirstWaypoint();
+                $origin      = $order->payload->getPickupOrFirstWaypoint();
                 $destination = $order->payload->getDropoffOrLastWaypoint();
-                $matrix = Utils::getDrivingDistanceAndTime($origin, $destination);
-                $distance = $matrix->distance;
-                $time = $matrix->time;
+                $matrix      = Utils::getDrivingDistanceAndTime($origin, $destination);
+                $distance    = $matrix->distance;
+                $time        = $matrix->time;
 
                 if (!$distance || !$time) {
                     return;
@@ -63,21 +63,19 @@ class NotifyStorefrontOrderNearby extends Command
 
     /**
      * Fetches active storefront orders based on certain criteria.
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function getActiveStorefrontOrders(): \Illuminate\Database\Eloquent\Collection
     {
         return Order::where(
             [
-                'status' => 'driver_enroute',
-                'type' => 'storefront',
-                'dispatched' => true
+                'status'     => 'driver_enroute',
+                'type'       => 'storefront',
+                'dispatched' => true,
             ]
         )->with(
             [
                 'payload',
-                'customer'
+                'customer',
             ]
         )
             ->withoutGlobalScopes()

package/server/src/Expansions/ContactFilterExpansion.php

@@ -24,7 +24,7 @@ class ContactFilterExpansion implements Expansion
     public function storefront()
     {
         return function (?string $storefront) {
-            /** @var \Fleetbase\FleetOps\Http\Filter\ContactFilter $this */
+            /* @var \Fleetbase\FleetOps\Http\Filter\ContactFilter $this */
             $this->builder->whereHas(
                 'customerOrders',
                 function ($query) use ($storefront) {

package/server/src/Expansions/EntityExpansion.php

@@ -17,7 +17,7 @@ class EntityExpansion implements Expansion
     }
 
     /**
-     * Create a new Entity from a Storefront Product
+     * Create a new Entity from a Storefront Product.
      *
      * @return \Fleetbase\FleetOps\Models\Entity
      */
@@ -26,18 +26,18 @@ class EntityExpansion implements Expansion
         return static function (\Fleetbase\Storefront\Models\Product $product) {
             return new static([
                 'company_uuid' => session('company'),
-                'photo_uuid' => $product->primary_image_uuid,
-                'internal_id' => $product->public_id,
-                'name' => $product->name,
-                'description' => $product->description,
-                'currency' => $product->currency,
-                'sku' => $product->sku,
-                'price' => $product->price,
-                'sale_price' => $product->sale_price,
-                'meta' => [
+                'photo_uuid'   => $product->primary_image_uuid,
+                'internal_id'  => $product->public_id,
+                'name'         => $product->name,
+                'description'  => $product->description,
+                'currency'     => $product->currency,
+                'sku'          => $product->sku,
+                'price'        => $product->price,
+                'sale_price'   => $product->sale_price,
+                'meta'         => [
                     'product_id' => $product->public_id,
-                    'image_url' => $product->primary_image_url,
-                ]
+                    'image_url'  => $product->primary_image_url,
+                ],
             ]);
         };
     }

package/server/src/Expansions/OrderFilterExpansion.php

@@ -24,7 +24,7 @@ class OrderFilterExpansion implements Expansion
     public function storefront()
     {
         return function (?string $storefront) {
-            /** @var \Fleetbase\FleetOps\Http\Filter\OrderFilter $this */
+            /* @var \Fleetbase\FleetOps\Http\Filter\OrderFilter $this */
             $this->builder->where('meta->storefront_id', $storefront);
         };
     }

package/server/src/Expansions/VendorFilterExpansion.php

@@ -24,7 +24,7 @@ class VendorFilterExpansion implements Expansion
     public function storefront()
     {
         return function (?string $storefront) {
-            /** @var \Fleetbase\FleetOps\Http\Filter\VendorFilter $this */
+            /* @var \Fleetbase\FleetOps\Http\Filter\VendorFilter $this */
             $this->builder->whereHas(
                 'customerOrders',
                 function ($query) use ($storefront) {

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

@@ -2,9 +2,9 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
-use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Storefront\Models\Store;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
@@ -19,7 +19,6 @@ class ActionController extends Controller
     /**
      * Get the number of storefronts created.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function getStoreCount(Request $request)
@@ -32,21 +31,20 @@ class ActionController extends Controller
     /**
      * Get key metrics for storefront.
      *
-     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     public function getMetrics(Request $request)
     {
         $store = $request->input('store');
         $start = $request->has('start') ? Carbon::fromString($request->input('start'))->toDateTimeString() : Carbon::now()->startOfMonth()->toDateTimeString();
-        $end = $request->has('end') ? Carbon::fromString($request->input('end'))->toDateTimeString() : Carbon::now()->toDateTimeString();
+        $end   = $request->has('end') ? Carbon::fromString($request->input('end'))->toDateTimeString() : Carbon::now()->toDateTimeString();
 
         // default metrics
         $metrics = [
-            'orders_count' => 0,
+            'orders_count'    => 0,
             'customers_count' => 0,
-            'stores_count' => 0,
-            'earnings_sum' => 0
+            'stores_count'    => 0,
+            'earnings_sum'    => 0,
         ];
 
         // get the current active store
@@ -60,7 +58,7 @@ class ActionController extends Controller
             return response()->json($metrics);
         }
 
-        /**
+        /*
          * Query metrics between given time period
          */
 
@@ -70,7 +68,7 @@ class ActionController extends Controller
         // - orders count
         $metrics['orders_count'] = Order::where([
             'company_uuid' => session('company'),
-            'type' => 'storefront'
+            'type'         => 'storefront',
         ])
             ->where('meta->storefront_id', $store->public_id)
             ->whereNotIn('status', ['canceled'])
@@ -79,7 +77,7 @@ class ActionController extends Controller
         // - customers count -- change to where has orders where meta->storefront_id === store
         $metrics['customers_count'] = Contact::where([
             'company_uuid' => session('company'),
-            'type' => 'customer'
+            'type'         => 'customer',
         ])->whereHas('customerOrders', function ($q) use ($start, $end, $store) {
             $q->whereBetween('created_at', [$start, $end]);
             $q->where('meta->storefront_id', $store->public_id);
@@ -93,7 +91,7 @@ class ActionController extends Controller
         // $metrics['earnings_sum'] = Transaction::where(['company_uuid' => session('company'), 'type' => 'storefront', 'meta->storefront_id' => $store->public_id])->whereBetween('created_at', [$start, $end])->sum('amount');
         $metrics['earnings_sum'] = Order::where([
             'company_uuid' => session('company'),
-            'type' => 'storefront'
+            'type'         => 'storefront',
         ])
             ->whereBetween('created_at', [$start, $end])
             ->where('meta->storefront_id', $store->public_id)

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class AddonCategoryController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class CustomerController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class GatewayController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -2,16 +2,16 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
-use Fleetbase\Storefront\Support\Metrics;
 use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Storefront\Support\Metrics;
 use Illuminate\Http\Request;
 
 class MetricsController extends Controller
 {
     public function all(Request $request)
     {
-        $start = $request->date('start');
-        $end = $request->date('end');
+        $start    = $request->date('start');
+        $end      = $request->date('end');
         $discover = $request->array('discover', []);
 
         try {
@@ -25,10 +25,10 @@ class MetricsController extends Controller
 
     public function dashboard(Request $request)
     {
-        $start = $request->date('start');
-        $end = $request->date('end');
+        $start    = $request->date('start');
+        $end      = $request->date('end');
         $discover = $request->array('discover', []);
-        $metrics = [];
+        $metrics  = [];
 
         try {
             $metrics = Metrics::forCompany($request->user()->company, $start, $end)->with($discover)->get();
@@ -42,28 +42,28 @@ class MetricsController extends Controller
         // dashboard config
         $dashboardConfig = [
             [
-                'size' => 12,
-                'title' => 'Storefront Metrics',
-                'classList' => [],
-                'component' => null,
+                'size'        => 12,
+                'title'       => 'Storefront Metrics',
+                'classList'   => [],
+                'component'   => null,
                 'queryParams' => [
                     'start' => ['component' => 'date-picker'],
-                    'end' => ['component' => 'date-picker'],
+                    'end'   => ['component' => 'date-picker'],
                 ],
                 'widgets' => collect($metrics)
                     ->map(function ($value, $key) use ($metricsFormats) {
                         return [
                             'component' => 'count',
-                            'options' => [
+                            'options'   => [
                                 'format' => $metricsFormats[$key] ?? null,
-                                'title' => str_replace('_', ' ', \Illuminate\Support\Str::title($key)),
-                                'value' => $value
-                            ]
+                                'title'  => str_replace('_', ' ', \Illuminate\Support\Str::title($key)),
+                                'value'  => $value,
+                            ],
                         ];
                     })
                     ->values()
-                    ->toArray()
-            ]
+                    ->toArray(),
+            ],
         ];
 
         return response()->json(array_values($dashboardConfig));