@fleetbase/storefront-engine 0.3.12 → 0.3.14

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

@@ -1,17 +1,14 @@
 <Layout::Section::Header @title={{concat this.category.name " Products"}} @titleClass="truncate" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-    {{!-- <Button @type="default" @text="Edit this category" @textClass="truncate" @icon="edit" @onClick={{fn this.editCategory this.category}} @disabled={{not this.category}} @wrapperClass="mr-2" />
-    <Button @type="danger" @text="Delete this category" @textClass="truncate" @icon="trash" @onClick={{this.deleteCategory}} @disabled={{not this.category}} /> --}}
-
     {{#if this.category}}
-        <DropdownButton @icon="gear" @text="Category" @type="default" @size="sm" @contentClass="dropdown-menu" as |dd|>
-            <div class="next-dd-menu">
+        <DropdownButton @icon="gear" @text="Category" @type="default" @size="sm" @contentClass="dropdown-menu" @renderInPlace={{true}} as |dd|>
+            <div class="next-dd-menu mt-1 mx-0" aria-labelledby="user-menu">
                 <div class="px-1">
-                    <a href="#" class="next-dd-item" {{on "click" (dropdown-fn dd this.editCategory this.category)}}>
+                    <a href="#" class="next-dd-item" disabled={{cannot "storefront update product-category"}} {{on "click" (dropdown-fn dd this.editCategory this.category)}}>
                         Edit this category...
                     </a>
                 </div>
                 <div class="px-1">
-                    <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.deleteCategory)}}>
+                    <a href="#" class="text-red-500 next-dd-item" disabled={{cannot "storefront delete product-category"}} {{on "click" (dropdown-fn dd this.deleteCategory)}}>
                         Delete this category...
                     </a>
                 </div>
@@ -32,11 +29,11 @@
                     <p class="text-sm truncate">{{product.description}}</p>
                     <p class="mb-2 text-sm text-green-400">{{format-currency product.price product.currency}}</p>
                     <div class="flex items-center justify-evenly space-x-4">
-                        <LinkTo @route="products.index.category.edit" @model={{product}} class="text-sm">
+                        <LinkTo @route="products.index.category.edit" @model={{product}} disabled={{cannot "storefront update product"}} class="text-sm">
                             <FaIcon @icon="pencil" class="mr-1" />
                             <span class="destroy-action">Edit</span>
                         </LinkTo>
-                        <a href="javascript:;" class="destroy-action text-sm" {{on "click" (fn this.deleteProduct product)}}>
+                        <a href="javascript:;" class="destroy-action text-sm" disabled={{cannot "storefront delete product"}} {{on "click" (fn this.deleteProduct product)}}>
                             <FaIcon @icon="trash" class="text-red-500 mr-1" />
                             <span class="destroy-action">Delete</span>
                         </a>

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

@@ -13,11 +13,11 @@
                         <p class="text-sm truncate">{{product.description}}</p>
                         <p class="mb-2 text-sm text-green-400">{{format-currency product.price product.currency}}</p>
                         <div class="flex items-center justify-evenly space-x-4">
-                            <LinkTo @route="products.index.index.edit" @model={{product}} class="text-sm">
+                            <LinkTo @route="products.index.index.edit" @model={{product}} disabled={{cannot "storefront update product"}} class="text-sm">
                                 <FaIcon @icon="pencil" class="mr-1" />
                                 <span class="destroy-action">Edit</span>
                             </LinkTo>
-                            <a href="javascript:;" class="destroy-action text-sm" {{on "click" (fn this.deleteProduct product)}}>
+                            <a href="javascript:;" class="destroy-action text-sm" disabled={{cannot "storefront delete product"}} {{on "click" (fn this.deleteProduct product)}}>
                                 <FaIcon @icon="trash" class="text-red-500 mr-1" />
                                 <span class="destroy-action">Delete</span>
                             </a>

package/addon/templates/products/index.hbs

@@ -1,17 +1,18 @@
 <Layout::Section::Header @title={{t "storefront.common.product"}}>
-    <Button @type="magic" @icon="tags" @text={{t "storefront.products.index.manage-addons"}} class="mr-2 flex-shrink-0" @onClick={{this.manageAddons}} />
+    <Button @type="magic" @icon="tags" @text={{t "storefront.products.index.manage-addons"}} class="mr-2 flex-shrink-0" @permission="storefront list product-addon" @onClick={{this.manageAddons}} />
     <Button
         @type="primary"
         @icon="plus"
         @iconPrefix="fas"
         @text={{t "storefront.common.new"}}
-        class="mr-2 flex-shrink-0"
         @onClick={{this.createNewProduct}}
         @disabled={{not this.category}}
         @helpText={{unless this.category "Select a category to create a product within"}}
+        @permission="storefront create product"
+        class="mr-2 flex-shrink-0"
     />
-    <Button @icon="file-import" @text={{t "storefront.common.import"}} class="mr-2" @wrapperClass="hidden lg:flex flex-shrink-0" @onClick={{this.importProducts}} />
-    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @wrapperClass="hidden lg:flex flex-shrink-0" @text={{t "storefront.common.export"}} />
+    <Button @icon="file-import" @text={{t "storefront.common.import"}} class="mr-2" @wrapperClass="hidden lg:flex flex-shrink-0" @permission="storefront import product" @onClick={{this.importProducts}} />
+    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @wrapperClass="hidden lg:flex flex-shrink-0" @permission="storefront export product" @text={{t "storefront.common.export"}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body class="section-content flex flex-col lg:flex-row">
@@ -28,7 +29,12 @@
         @customTopItemClass="border-t border-gray-200 dark:border-gray-700"
         as |category|
     >
-        <a href="javascript:;" class="aside-item-link cursor-pointer flex w-full md:px-6 md:py-5" {{on "click" (fn this.switchCategory category)}}>
+        <a
+            href="javascript:;"
+            class="aside-item-link cursor-pointer flex w-full md:px-6 md:py-5"
+            disabled={{cannot "storefront list product"}}
+            {{on "click" (fn this.switchCategory category)}}
+        >
             <div class="flex items-center justify-between">
                 <div>
                     <h4>{{category.name}}</h4>

package/addon/templates/settings/index.hbs

@@ -327,6 +327,7 @@
                     @size="lg"
                     @isLoading={{this.isLoading}}
                     @onClick={{this.saveSettings}}
+                    @permission="storefront update settings"
                 />
             </div>
         </div>

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.12",
+    "version": "0.3.14",
     "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.12",
+    "version": "0.3.14",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
@@ -43,13 +43,14 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.2.12",
-        "@fleetbase/ember-ui": "^0.2.18",
+        "@fleetbase/ember-core": "^0.2.17",
+        "@fleetbase/ember-ui": "^0.2.24",
         "@fleetbase/fleetops-data": "^0.1.17",
         "@babel/core": "^7.23.2",
-        "@fortawesome/ember-fontawesome": "^0.4.1",
-        "@fortawesome/fontawesome-svg-core": "^6.4.0",
-        "@fortawesome/free-solid-svg-icons": "^6.4.0",
+        "@fortawesome/ember-fontawesome": "^2.0.0",
+        "@fortawesome/fontawesome-svg-core": "6.4.0",
+        "@fortawesome/free-solid-svg-icons": "6.4.0",
+        "@fortawesome/free-brands-svg-icons": "6.4.0",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0",
         "ember-intl": "6.3.2",
@@ -69,7 +70,7 @@
         "broccoli-funnel": "^3.0.8",
         "broccoli-merge-trees": "^4.2.0",
         "concurrently": "^8.2.2",
-        "ember-auto-import": "^2.6.3",
+        "ember-auto-import": "^2.7.4",
         "ember-classic-decorator": "^3.0.0",
         "ember-cli": "~5.4.1",
         "ember-cli-clean-css": "^3.0.0",

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

@@ -17,7 +17,7 @@ class Storefront
     /**
      * Guards these permissions should apply to.
      */
-    public array $guards = ['web', 'api'];
+    public array $guards = ['sanctum'];
 
     /**
      * The permission schema resources.
@@ -25,11 +25,15 @@ class Storefront
     public array $resources = [
         [
             'name'    => 'order',
-            'actions' => ['accept', 'mark-as-ready', 'mark-as-completed', 'reject'],
+            'actions' => ['accept', 'mark-as-ready', 'mark-as-completed', 'reject', 'export', 'import'],
+        ],
+        [
+            'name'    => 'customer',
+            'actions' => ['export'],
         ],
         [
             'name'    => 'product',
-            'actions' => ['import'],
+            'actions' => ['import', 'export'],
         ],
         [
             'name'    => 'product-addon',
@@ -55,6 +59,10 @@ class Storefront
             'name'    => 'product-variant-option',
             'actions' => [],
         ],
+        [
+            'name'    => 'product-category',
+            'actions' => [],
+        ],
         [
             'name'    => 'gateway',
             'actions' => [],
@@ -71,6 +79,10 @@ class Storefront
             'name'    => 'network-store',
             'actions' => [],
         ],
+        [
+            'name'    => 'network-category',
+            'actions' => [],
+        ],
         [
             'name'    => 'store',
             'actions' => [],
@@ -83,5 +95,87 @@ class Storefront
             'name'    => 'store-hour',
             'actions' => [],
         ],
+        [
+            'name'           => 'settings',
+            'action'         => ['import'],
+            'remove_actions' => ['delete', 'export', 'list', 'create'],
+        ],
+    ];
+
+    /**
+     * Policies provided by this schema.
+     */
+    public array $policies = [
+        [
+            'name'        => 'InventoryManager',
+            'description' => 'Policy for managing products and categories.',
+            'permissions' => [
+                'see extension',
+                '* product',
+                '* product-addon',
+                '* product-addon-category',
+                '* product-variant',
+                '* product-variant-option',
+                '* product-hour',
+                '* product-store-location',
+                '* product-category',
+            ],
+        ],
+        [
+            'name'        => 'OrderManager',
+            'description' => 'Policy for managing order.',
+            'permissions' => [
+                'see extension',
+                '* order',
+            ],
+        ],
+        [
+            'name'        => 'CustomerService',
+            'description' => 'Policy for providing support to customers.',
+            'permissions' => [
+                'see extension',
+                '* customer',
+                '* order',
+            ],
+        ],
+        [
+            'name'        => 'MarketplaceManager',
+            'description' => 'Policy for managing networks.',
+            'permissions' => [
+                'see extension',
+                '* product',
+                '* order',
+                '* network',
+                '* network-store',
+                '* network-category',
+            ],
+        ],
+    ];
+
+    /**
+     * Roles provided by this schema.
+     */
+    public array $roles = [
+        [
+            'name'        => 'Storefront Administrator',
+            'description' => 'Role for managing all of storefront resources.',
+            'policies'    => [
+                'StorefrontFullAccess',
+            ],
+        ],
+        [
+            'name'        => 'Customer Service',
+            'description' => 'Role for providing support to customers.',
+            'policies'    => [
+                'CustomerService',
+            ],
+        ],
+        [
+            'name'        => 'Inventory Manager',
+            'description' => 'Role for managing all products.',
+            'policies'    => [
+                'InventoryManager',
+            ],
+        ],
     ];
 }

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

@@ -15,7 +15,7 @@ class CartController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function retrieve(string $uniqueId = null, Request $request)
+    public function retrieve(?string $uniqueId = null, Request $request)
     {
         $cart = Cart::retrieve($uniqueId, true);
 

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

@@ -462,7 +462,7 @@ class CustomerController extends Controller
     /**
      * Patches phone number with international code.
      */
-    public static function phone(string $phone = null): string
+    public static function phone(?string $phone = null): string
     {
         if ($phone === null) {
             $phone = request()->input('phone');

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

@@ -55,7 +55,7 @@ class Product extends FleetbaseResource
         ];
     }
 
-    public function mapHours(\Illuminate\Database\Eloquent\Collection $hours = null): array
+    public function mapHours(?\Illuminate\Database\Eloquent\Collection $hours = null): array
     {
         if (empty($hours)) {
             return [];
@@ -79,7 +79,7 @@ class Product extends FleetbaseResource
         );
     }
 
-    public function mapFiles(\Illuminate\Database\Eloquent\Collection $files = null, $contentType = 'image')
+    public function mapFiles(?\Illuminate\Database\Eloquent\Collection $files = null, $contentType = 'image')
     {
         return collect($files)->map(function ($file) use ($contentType) {
             if (!Str::contains($file->content_type, $contentType)) {
@@ -90,7 +90,7 @@ class Product extends FleetbaseResource
         })->filter()->values();
     }
 
-    public function mapAddonCategories(\Illuminate\Database\Eloquent\Collection $addonCategories = null)
+    public function mapAddonCategories(?\Illuminate\Database\Eloquent\Collection $addonCategories = null)
     {
         return collect($addonCategories)->map(function ($addonCategory) {
             $addons = data_get($addonCategory, 'category.addons', []);
@@ -122,7 +122,7 @@ class Product extends FleetbaseResource
         });
     }
 
-    public function mapProductAddons(\Illuminate\Database\Eloquent\Collection $addons = null, $excluded = [])
+    public function mapProductAddons(?\Illuminate\Database\Eloquent\Collection $addons = null, $excluded = [])
     {
         return collect($addons)->map(function ($addon) use ($excluded) {
             if (is_array($excluded) && in_array($addon->uuid, $excluded)) {
@@ -159,7 +159,7 @@ class Product extends FleetbaseResource
         })->filter()->values();
     }
 
-    public function mapVariants(\Illuminate\Database\Eloquent\Collection $variants = null)
+    public function mapVariants(?\Illuminate\Database\Eloquent\Collection $variants = null)
     {
         return collect($variants)->map(function ($variant) {
             $productVariantArr = [

package/server/src/Models/Cart.php

@@ -589,7 +589,7 @@ class Cart extends StorefrontModel
      *
      * @return \Fleetbase\Models\Storefront\Cart
      */
-    public function updateCurrency(string $currencyCode = null, $save = false)
+    public function updateCurrency(?string $currencyCode = null, $save = false)
     {
         $this->attributes['currency'] = $currencyCode ?? session('storefront_currency');
 

package/server/src/Models/Network.php

@@ -220,7 +220,7 @@ class Network extends StorefrontModel
     /**
      * Adds a new store to the network.
      */
-    public function addStore(Store $store, Category $category = null): NetworkStore
+    public function addStore(Store $store, ?Category $category = null): NetworkStore
     {
         return NetworkStore::updateOrCreate(
             [
@@ -241,7 +241,7 @@ class Network extends StorefrontModel
      * @param File|string|null $icon
      * @param string           $iconColor
      */
-    public function createCategory(string $name, string $description = '', ?array $meta = [], ?array $translations = [], Category $parent = null, $icon = null, $iconColor = '#000000'): Category
+    public function createCategory(string $name, string $description = '', ?array $meta = [], ?array $translations = [], ?Category $parent = null, $icon = null, $iconColor = '#000000'): Category
     {
         $iconFile = null;
         $iconName = null;
@@ -276,7 +276,7 @@ class Network extends StorefrontModel
      * @param File|string|null $icon
      * @param string           $iconColor
      */
-    public function createCategoryStrict(string $name, string $description = '', ?array $meta = [], ?array $translations = [], Category $parent = null, $icon = null, $iconColor = '#000000'): Category
+    public function createCategoryStrict(string $name, string $description = '', ?array $meta = [], ?array $translations = [], ?Category $parent = null, $icon = null, $iconColor = '#000000'): Category
     {
         $existingCategory = Category::where(['company_uuid' => $this->company_uuid, 'owner_uuid' => $this->uuid, 'name' => $name])->first();
 

package/server/src/Models/Store.php

@@ -360,7 +360,7 @@ class Store extends StorefrontModel
      * @param File|string|null $icon
      * @param string           $iconColor
      */
-    public function createCategory(string $name, string $description = '', ?array $meta = [], ?array $translations = [], Category $parent = null, $icon = null, $iconColor = '#000000'): Category
+    public function createCategory(string $name, string $description = '', ?array $meta = [], ?array $translations = [], ?Category $parent = null, $icon = null, $iconColor = '#000000'): Category
     {
         $iconFile = null;
         $iconName = null;
@@ -397,7 +397,7 @@ class Store extends StorefrontModel
      * @param File|string|null $icon
      * @param string           $iconColor
      */
-    public function createCategoryStrict(string $name, string $description = '', ?array $meta = [], ?array $translations = [], Category $parent = null, $icon = null, $iconColor = '#000000'): Category
+    public function createCategoryStrict(string $name, string $description = '', ?array $meta = [], ?array $translations = [], ?Category $parent = null, $icon = null, $iconColor = '#000000'): Category
     {
         $existingCategory = Category::where(['company_uuid' => $this->company_uuid, 'owner_uuid' => $this->uuid, 'name' => $name])->first();
 
@@ -411,7 +411,7 @@ class Store extends StorefrontModel
     /**
      * Creates a new product in the store.
      */
-    public function createProduct(string $name, string $description, array $tags = [], Category $category = null, File $image = null, User $createdBy = null, string $sku = '', int $price = 0, string $status = 'available', array $options = []): Product
+    public function createProduct(string $name, string $description, array $tags = [], ?Category $category = null, ?File $image = null, ?User $createdBy = null, string $sku = '', int $price = 0, string $status = 'available', array $options = []): Product
     {
         return Product::create(
             [
@@ -438,7 +438,7 @@ class Store extends StorefrontModel
         );
     }
 
-    public function createLocation($location, string $name = null, ?User $createdBy): ?StoreLocation
+    public function createLocation($location, ?string $name = null, ?User $createdBy): ?StoreLocation
     {
         $place = Place::createFromMixed($location);
 

package/server/src/Support/Metrics.php

@@ -23,7 +23,7 @@ class Metrics
     protected Company $company;
     protected array $metrics = [];
 
-    public static function new(Company $company, \DateTime $start = null, \DateTime $end = null): Metrics
+    public static function new(Company $company, ?\DateTime $start = null, ?\DateTime $end = null): Metrics
     {
         $start = $start === null ? Carbon::create(1900)->toDateTime() : $start;
         $end   = $end === null ? Carbon::tomorrow()->toDateTime() : $end;
@@ -31,7 +31,7 @@ class Metrics
         return (new static())->setCompany($company)->between($start, $end);
     }
 
-    public static function forCompany(Company $company, \DateTime $start = null, \DateTime $end = null): Metrics
+    public static function forCompany(Company $company, ?\DateTime $start = null, ?\DateTime $end = null): Metrics
     {
         return static::new($company, $start, $end);
     }
@@ -104,7 +104,7 @@ class Metrics
         return $this;
     }
 
-    public function totalProducts(callable $callback = null): Metrics
+    public function totalProducts(?callable $callback = null): Metrics
     {
         $query = Product::where('company_uuid', $this->company->uuid);
 
@@ -117,7 +117,7 @@ class Metrics
         return $this->set('total_products', $data);
     }
 
-    public function totalStores(callable $callback = null): Metrics
+    public function totalStores(?callable $callback = null): Metrics
     {
         $query = Store::where('company_uuid', $this->company->uuid);
 
@@ -130,7 +130,7 @@ class Metrics
         return $this->set('total_stores', $data);
     }
 
-    public function totalNetworks(callable $callback = null): Metrics
+    public function totalNetworks(?callable $callback = null): Metrics
     {
         $query = Network::where('company_uuid', $this->company->uuid);
 
@@ -143,7 +143,7 @@ class Metrics
         return $this->set('total_networks', $data);
     }
 
-    public function ordersInProgress(callable $callback = null): Metrics
+    public function ordersInProgress(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -159,7 +159,7 @@ class Metrics
         return $this->set('orders_in_progress', $data);
     }
 
-    public function ordersCompleted(callable $callback = null): Metrics
+    public function ordersCompleted(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -175,7 +175,7 @@ class Metrics
         return $this->set('orders_completed', $data);
     }
 
-    public function ordersCanceled(callable $callback = null): Metrics
+    public function ordersCanceled(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])

package/server/src/Support/QPay.php

@@ -12,7 +12,7 @@ class QPay
     private array $requestOptions = [];
     private Client $client;
 
-    public function __construct(string $username = null, string $password = null, string $callbackUrl = null)
+    public function __construct(?string $username = null, ?string $password = null, ?string $callbackUrl = null)
     {
         $this->callbackUrl    = $callbackUrl;
         $this->requestOptions = [
@@ -60,7 +60,7 @@ class QPay
         return $this;
     }
 
-    public static function instance(string $username = null, string $password = null, string $callbackUrl = null): QPay
+    public static function instance(?string $username = null, ?string $password = null, ?string $callbackUrl = null): QPay
     {
         return new static($username, $password, $callbackUrl);
     }
@@ -120,7 +120,7 @@ class QPay
         return $this;
     }
 
-    public function setAuthToken(string $accessToken = null): QPay
+    public function setAuthToken(?string $accessToken = null): QPay
     {
         if ($accessToken) {
             $this->useBearerToken($accessToken);
@@ -136,7 +136,7 @@ class QPay
         return $this;
     }
 
-    public function createSimpleInvoice(int $amount, ?string $invoiceCode = '', ?string $invoiceDescription = '', ?string $invoiceReceiverCode = '', ?string $senderInvoiceNo = '', string $callbackUrl = null)
+    public function createSimpleInvoice(int $amount, ?string $invoiceCode = '', ?string $invoiceDescription = '', ?string $invoiceReceiverCode = '', ?string $senderInvoiceNo = '', ?string $callbackUrl = null)
     {
         if (!$callbackUrl && $this->hasCallbackUrl()) {
             $callbackUrl = $this->callbackUrl;