@fleetbase/storefront-engine 0.3.0 → 0.3.1

package/addon/controllers/networks/index/network/index.js

@@ -89,7 +89,7 @@ export default class NetworksIndexNetworkIndexController extends Controller {
         this.model
             .save()
             .then(() => {
-                this.notifications.success(this.intl.t('storefront.controllers.networks.index.change-network-saved'));
+                this.notifications.success(this.intl.t('storefront.networks.index.network.index.change-network-saved'));
             })
             .catch((error) => {
                 this.notifications.serverError(error);

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

@@ -140,10 +140,10 @@ export default class ProductsIndexCategoryNewController extends BaseController {
 
     @action makePrimaryFile(file) {
         if (file.isNotImage) {
-            return this.notifications.warning(this.intl.t('storefront.products.index.category.new.warning-only-select-an-image-file-to-be-primary'));
+            return this.notifications.warning(this.intl.t('storefront.products.index.new.warning-only-select-an-image-file-to-be-primary'));
         }
 
-        this.notifications.success(this.intl.t('storefront.products.index.category.new.made-the-primary-success-image', { fileName: file.original_filename }));
+        this.notifications.success(this.intl.t('storefront.products.index.new.made-the-primary-success-image', { fileName: file.original_filename }));
         this.product.primary_image_uuid = file.id;
         this.product.primary_image_url = file.url;
         this.product.primary_image = file;

package/addon/templates/networks/index/network/index.hbs

@@ -183,7 +183,10 @@
                             }}</span>
                     </Toggle>
                     {{#if @model.options.require_pod}}
-                        <InputGroup @wrapperClass="mb-0 mt-2" @name={{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.proof-of-delivery-method"}}>
+                        <InputGroup
+                            @wrapperClass="mb-0 mt-2"
+                            @name={{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.proof-of-delivery-method-label"}}
+                        >
                             <Select
                                 @options={{this.podMethods}}
                                 @optionValue="value"

package/addon/templates/settings/gateways.hbs

@@ -15,7 +15,7 @@
                 </div>
             </div>
 
-            {{#each this.gateways as |gateway|}}
+            {{#each this.model as |gateway|}}
                 <ContentPanel @title={{gateway.name}} @open={{true}} @pad={{true}}>
                     <InputGroup @name={{t "storefront.settings.gateways.gateway-name"}} @value={{gateway.name}} @helpText={{t "storefront.settings.gateways.helpText"}} />
                     <InputGroup @name={{t "storefront.settings.gateways.gateway-code"}} @value={{gateway.code}} @disabled={{true}} @helpText={{t "storefront.settings.gateways.gateway-code-help-text"}} />

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,8 +22,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.3",
-        "fleetbase/fleetops-api": "^0.4.9",
+        "fleetbase/core-api": "^1.4.7",
+        "fleetbase/fleetops-api": "^0.4.13",
         "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.0",
+    "version": "0.3.1",
     "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.3.0",
+    "version": "0.3.1",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
@@ -44,8 +44,8 @@
     },
     "dependencies": {
         "@fleetbase/ember-core": "^0.2.4",
-        "@fleetbase/ember-ui": "^0.2.10",
-        "@fleetbase/fleetops-data": "^0.1.8",
+        "@fleetbase/ember-ui": "^0.2.11",
+        "@fleetbase/fleetops-data": "^0.1.9",
         "@babel/core": "^7.23.2",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",

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/Controllers/v1/StoreController.php

@@ -109,7 +109,7 @@ class StoreController extends Controller
 
         // if cod is enabled add cash as a gateway
         if ($about->hasOption('cod_enabled')) {
-            $gateways->push(Gateway::cash($sandbox));
+            $gateways->push(Gateway::cash(['sandbox'=>$sandbox]));
         }
 
         return GatewayResource::collection($gateways);

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

@@ -30,7 +30,7 @@ class Category extends FleetbaseResource
             ),
             'tags'          => $this->tags ?? [],
             'translations'  => $this->translations ?? [],
-            'products'      => $this->when($request->has('with_products') || $request->inArray('with', 'products'), Product::collection($this->products)),
+            'products'      => $this->when($request->has('with_products') || $request->inArray('with', 'products'), $this->products ? Product::collection($this->products) : []),
             'subcategories' => $this->when(
                 $request->has('with_subcategories') || $request->inArray('with', 'subcategories'),
                 array_map(

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', []);
@@ -120,7 +120,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)) {
@@ -157,7 +157,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/Http/Resources/ReviewCustomer.php

@@ -25,37 +25,9 @@ class ReviewCustomer extends FleetbaseResource
             'email'         => $this->email,
             'phone'         => $this->phone,
             'photo_url'     => $this->photo_url,
-            'reviews_count' => $this->getReviewsCount(),
-            'uploads_count' => $this->getUploadsCount(),
             'slug'          => $this->slug,
             'created_at'    => $this->created_at,
             'updated_at'    => $this->updated_at,
         ];
     }
-
-    public function getReviewsCount()
-    {
-        if (session('storefront_network')) {
-            return $this->storeReviews()->whereHas('subject', function ($q) {
-                $q->whereHas('networks', function ($q) {
-                    $q->where('network_uuid', session('storefront_network'));
-                });
-            })->count();
-
-            // $productReviewsCount = $this->productReviews()->whereHas('subject', function ($q) {
-            //     $q->whereHas('store', function ($q) {
-            //         $q->whereHas('networks', function ($q) {
-            //             $q->where('network_uuid', session('storefront_network'));
-            //         });
-            //     });
-            // })->count();
-
-            // return $storeReviewsCount + $productReviewsCount;
-        }
-    }
-
-    public function getUploadsCount()
-    {
-        return $this->reviewUploads()->count();
-    }
 }

package/server/src/Models/Cart.php

@@ -587,7 +587,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/Providers/StorefrontServiceProvider.php

@@ -96,6 +96,5 @@ class StorefrontServiceProvider extends CoreServiceProvider
         $this->mergeConfigFrom(__DIR__ . '/../../config/database.connections.php', 'database.connections');
         $this->mergeConfigFrom(__DIR__ . '/../../config/storefront.php', 'storefront');
         $this->mergeConfigFrom(__DIR__ . '/../../config/api.php', 'storefront.api');
-        $this->mergeConfigFrom(__DIR__ . '/../../config/twilio-notification-channel.php', 'twilio-notification-channel');
     }
 }

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;

package/server/config/twilio-notification-channel.php

@@ -1,36 +0,0 @@
-<?php
-
-return [
-    'username' => env('TWILIO_USERNAME'), // optional when using auth token
-    'password' => env('TWILIO_PASSWORD'), // optional when using auth token
-    'auth_token' => env('TWILIO_TOKEN'), // optional when using username and password
-    'account_sid' => env('TWILIO_SID'),
-
-    'from' => env('TWILIO_FROM'), // optional
-    'alphanumeric_sender' => env('TWILIO_ALPHA_SENDER'),
-
-    /**
-     * See https://www.twilio.com/docs/sms/services.
-     */
-    'sms_service_sid' => env('TWILIO_SMS_SERVICE_SID'),
-
-    /**
-     * Specify a number where all calls/messages should be routed. This can be used in development/staging environments
-     * for testing.
-     */
-    'debug_to' => env('TWILIO_DEBUG_TO'),
-
-    /**
-     * If an exception is thrown with one of these error codes, it will be caught & suppressed.
-     * To replicate the 2.x behaviour, specify '*' in the array, which will cause all exceptions to be suppressed.
-     * Suppressed errors will not be logged or reported, but the `NotificationFailed` event will be emitted.
-     *
-     * @see https://www.twilio.com/docs/api/errors
-     */
-    'ignored_error_codes' => [
-        21608, // The 'to' phone number provided is not yet verified for this account.
-        21211, // Invalid 'To' Phone Number
-        21614, // 'To' number is not a valid mobile number
-        21408, // Permission to send an SMS has not been enabled for the region indicated by the 'To' number
-    ],
-];