@fleetbase/storefront-engine 0.2.7 → 0.2.9

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

@@ -18,6 +18,14 @@ export default class NetworksIndexNetworkStoresController extends Controller {
      */
     @service notifications;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     * @memberof NetworksIndexNetworkStoresController
+     */
+    @service intl;
+
     /**
      * Inject the `modals-manager` service
      *
@@ -128,7 +136,7 @@ export default class NetworksIndexNetworkStoresController extends Controller {
      */
     @tracked columns = [
         {
-            label: 'Store',
+            label: this.intl.t('storefront.networks.index.network.stores.store'),
             valuePath: 'name',
             width: '130px',
             resizable: true,
@@ -138,7 +146,7 @@ export default class NetworksIndexNetworkStoresController extends Controller {
             showOnlineIndicator: true,
         },
         {
-            label: 'ID',
+            label: this.intl.t('storefront.common.id'),
             valuePath: 'public_id',
             cellComponent: 'click-to-copy',
             width: '120px',
@@ -148,7 +156,7 @@ export default class NetworksIndexNetworkStoresController extends Controller {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Category',
+            label: this.intl.t('storefront.common.category'),
             valuePath: 'category.name',
             cellComponent: 'table/cell/base',
             width: '100px',
@@ -158,7 +166,7 @@ export default class NetworksIndexNetworkStoresController extends Controller {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Currency',
+            label: this.intl.t('storefront.common.currency'),
             valuePath: 'currency',
             cellComponent: 'table/cell/base',
             width: '100px',
@@ -168,7 +176,7 @@ export default class NetworksIndexNetworkStoresController extends Controller {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Created At',
+            label: this.intl.t('storefront.networks.index.network.stores.created-at'),
             valuePath: 'createdAtShort',
             sortParam: 'created_at',
             width: '100px',
@@ -189,22 +197,22 @@ export default class NetworksIndexNetworkStoresController extends Controller {
             width: '50px',
             actions: [
                 {
-                    label: 'View Store Details',
+                    label: this.intl.t('storefront.networks.index.network.stores.view-store-details'),
                     fn: this.viewStoreDetails,
                 },
                 {
-                    label: 'Edit Store',
+                    label: this.intl.t('storefront.networks.index.network.stores.edit-store'),
                     fn: this.editStore,
                 },
                 {
-                    label: 'Assign Category',
+                    label: this.intl.t('storefront.networks.index.network.stores.assign-category'),
                     fn: this.assignStoreToCategory,
                 },
                 {
                     separator: true,
                 },
                 {
-                    label: 'Remove Store from Network',
+                    label: this.intl.t('storefront.networks.index.network.stores.remove-store-from-network'),
                     fn: this.removeStore,
                 },
             ],
@@ -263,8 +271,8 @@ export default class NetworksIndexNetworkStoresController extends Controller {
      */
     @action deleteCategory(category) {
         this.modalsManager.confirm({
-            title: 'Delete network category?',
-            body: 'Deleting this category will move all stores inside to the top level, are you sure you want to delete this category?',
+            title: this.intl.t('storefront.networks.index.network.stores.delete-network-category'),
+            body: this.intl.t('storefront.networks.index.network.stores.deleting-category-move-all-stores-inside-on-top-level'),
             confirm: (modal) => {
                 modal.startLoading();
 
@@ -287,8 +295,8 @@ export default class NetworksIndexNetworkStoresController extends Controller {
      */
     @action assignStoreToCategory(store, options = {}) {
         this.modalsManager.show('modals/add-store-to-category', {
-            title: 'Add store to category',
-            acceptButtonText: 'Save Changes',
+            title: this.intl.t('storefront.networks.index.network.stores.add-store-to-category'),
+            acceptButtonText: this.intl.t('storefront.networks.index.network.stores.save-change'),
             acceptButtonIcon: 'save',
             selectedCategory: null,
             network: this.network,
@@ -366,10 +374,10 @@ export default class NetworksIndexNetworkStoresController extends Controller {
         const category = this.store.createRecord('category', categoryAttrs);
 
         return this.editCategory(category, {
-            title: 'Add new network category',
+            title: this.intl.t('storefront.networks.index.network.stores.add-new-network-category'),
             acceptButtonIcon: 'check',
-            acceptButtonText: 'Create new category',
-            successMessage: 'New category created.',
+            acceptButtonText: this.intl.t('storefront.networks.index.network.stores.create-new-category'),
+            successMessage: this.intl.t('storefront.networks.index.network.stores.new-category-created'),
             parentCategory,
             category,
             confirm: (modal) => {
@@ -378,7 +386,7 @@ export default class NetworksIndexNetworkStoresController extends Controller {
                 category
                     .save()
                     .then((category) => {
-                        this.notifications.success('New network category created.');
+                        this.notifications.success(this.intl.t('storefront.networks.index.network.stores.network-category-create'));
                         networkCategoriesPicker.categories.pushObject(category);
                         modal.done();
                     })
@@ -400,8 +408,8 @@ export default class NetworksIndexNetworkStoresController extends Controller {
      */
     @action editCategory(category, options = {}) {
         this.modalsManager.show('modals/create-network-category', {
-            title: `Edit category (${category.name})`,
-            acceptButtonText: 'Save Changes',
+            title: this.intl.t('storefront.networks.index.network.stores.edit-category', { categoryName: category.name }),
+            acceptButtonText: this.intl.t('storefront.networks.index.network.stores.save-change'),
             acceptButtonIcon: 'save',
             iconType: category.icon_file_uuid ? 'image' : 'svg',
             network: this.network,
@@ -467,7 +475,7 @@ export default class NetworksIndexNetworkStoresController extends Controller {
 
         return this.modalsManager.done().then(() => {
             this.modalsManager.show('modals/add-stores-to-network', {
-                title: 'Add stores to network',
+                title: this.intl.t('storefront.networks.index.network.stores.add-stores-to-network'),
                 acceptButtonIcon: 'check',
                 stores,
                 members,
@@ -485,7 +493,7 @@ export default class NetworksIndexNetworkStoresController extends Controller {
 
                     return network.addStores(stores, remove).then(() => {
                         return this.hostRouter.refresh().then(() => {
-                            this.notifications.success('Network stores updated.');
+                            this.notifications.success(this.intl.t('storefront.networks.index.network.stores.network-stores-update'));
                         });
                     });
                 },
@@ -502,8 +510,8 @@ export default class NetworksIndexNetworkStoresController extends Controller {
      */
     @action async removeStore(store) {
         this.modalsManager.confirm({
-            title: `Remove this store (${store.name}) from this network (${this.network.name})?`,
-            body: 'Are you sure you wish to remove this store from this network? It will no longer be findable by this network.',
+            title: this.intl.t('storefront.networks.index.network.stores.remove-this-store', { storeName: store.name, networkName: this.network.name }),
+            body: this.intl.t('storefront.networks.index.network.stores.longer-findable-by-this-network'),
             acceptButtonIcon: 'check',
             acceptButtonIconPrefix: 'fas',
             declineButtonIcon: 'times',
@@ -535,8 +543,8 @@ export default class NetworksIndexNetworkStoresController extends Controller {
      */
     @action viewStoreDetails(store, options = {}) {
         this.modalsManager.show('modals/store-details', {
-            title: `Viewing ${store.name} storefront`,
-            acceptButtonText: 'Done',
+            title: this.intl.t('storefront.networks.index.network.stores.viewing-storefront', { storeName: store.name }),
+            acceptButtonText: this.intl.t('storefront.networks.index.network.stores.done'),
             hideDeclineButton: true,
             store,
             ...options,
@@ -553,8 +561,8 @@ export default class NetworksIndexNetworkStoresController extends Controller {
      */
     @action editStore(store, options = {}) {
         this.modalsManager.show('modals/store-form', {
-            title: `Editing ${store.name} storefront`,
-            acceptButtonText: 'Save Changes',
+            title: this.intl.t('storefront.networks.index.network.stores.editing-storefront', { storeName: store.name }),
+            acceptButtonText: this.intl.t('storefront.networks.index.network.stores.save-change'),
             hideDeclineButton: true,
             store,
             confirm: (modal) => {
@@ -586,8 +594,8 @@ export default class NetworksIndexNetworkStoresController extends Controller {
         const shareableLink = createShareableLink(`join/network/${this.network.public_id}`);
 
         this.modalsManager.show('modals/share-network', {
-            title: 'Add stores to network',
-            acceptButtonText: 'Send Invitations',
+            title: this.intl.t('storefront.networks.index.network.stores.add-stores-to-network'),
+            acceptButtonText: this.intl.t('storefront.networks.index.network.stores.send-invitations'),
             acceptButtonIcon: 'paper-plane',
             acceptButtonDisabled: true,
             shareableLink,
@@ -626,12 +634,12 @@ export default class NetworksIndexNetworkStoresController extends Controller {
                 if (!isValid) {
                     modal.stopLoading();
 
-                    return this.notifications.error('Invalid emails provided!');
+                    return this.notifications.error(this.intl.t('storefront.networks.index.network.stores.invalid-emails-provided-error'));
                 }
 
                 return this.network.sendInvites(recipients).then(() => {
                     modal.stopLoading();
-                    this.notifications.success('Invitations sent to recipients!');
+                    this.notifications.success(this.intl.t('storefront.networks.index.network.stores.invitation-sent-recipients'));
                 });
             },
         });

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

@@ -4,13 +4,14 @@ import { action } from '@ember/object';
 
 export default class NetworksIndexNetworkController extends BaseController {
     @service modalsManager;
+    @service intl;
 
     @action transitionBack({ closeOverlay }) {
         if (this.model.hasDirtyAttributes) {
             // warn user about unsaved changes
             return this.modalsManager.confirm({
-                title: 'Network changes not saved!',
-                body: 'Going back will rollback all unsaved changes, are you sure you wish to continue?',
+                title: this.intl.t('storefront.controllers.networks.index.network.Network-changes-not-save'),
+                body: this.intl.t('storefront.controllers.networks.index.network.going-back-will-rollback-all-unsaved-changes'),
                 confirm: (modal) => {
                     modal.done();
                     return this.exit(closeOverlay);

package/addon/controllers/networks/index.js

@@ -22,6 +22,13 @@ export default class NetworksIndexController extends BaseController {
      */
     @service notifications;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `modals-manager` service
      *
@@ -167,13 +174,13 @@ export default class NetworksIndexController extends BaseController {
         }
 
         this.modalsManager.show('modals/create-network', {
-            title: 'Create a new network',
+            title: this.intl.t('storefront.networks.index.create-new-network'),
             network,
             confirm: (modal) => {
                 modal.startLoading();
 
                 return network.save().then(() => {
-                    this.notifications.success('Your new storefront network has been created!');
+                    this.notifications.success(this.intl.t('storefront.networks.index.success-message'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -192,7 +199,7 @@ export default class NetworksIndexController extends BaseController {
      */
     @action deleteNetwork(network) {
         return this.crud.delete(network, {
-            title: `Are you sure you wish to delete this network (${network.name})? All assigned stores, customers, orders will no longer be reachable.`,
+            title: this.intl.t('storefront.networks.index.delete-this-network-all-assigned-stores-customer-order', { networkName: network.name }),
             onSuccess: () => {
                 return this.hostRouter.refresh();
             },

package/addon/controllers/orders/index.js

@@ -13,6 +13,13 @@ export default class OrdersIndexController extends Controller {
      */
     @service notifications;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `modals-manager` service
      *
@@ -84,7 +91,7 @@ export default class OrdersIndexController extends Controller {
 
     @tracked columns = [
         {
-            label: 'ID',
+            label: this.intl.t('storefront.common.id'),
             valuePath: 'public_id',
             width: '150px',
             cellComponent: 'table/cell/link-to',
@@ -96,7 +103,7 @@ export default class OrdersIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Internal ID',
+            label: this.intl.t('storefront.orders.index.internal-id'),
             valuePath: 'internal_id',
             width: '125px',
             resizable: true,
@@ -105,7 +112,7 @@ export default class OrdersIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Customer',
+            label: this.intl.t('storefront.orders.index.customer'),
             valuePath: 'customer.name',
             cellComponent: 'table/cell/base',
             width: '125px',
@@ -114,12 +121,12 @@ export default class OrdersIndexController extends Controller {
             hidden: true,
             filterable: true,
             filterComponent: 'filter/model',
-            filterComponentPlaceholder: 'Select order customer',
+            filterComponentPlaceholder: this.intl.t('storefront.orders.index.select-order-customer'),
             filterParam: 'customer',
             model: 'customer',
         },
         {
-            label: 'Pickup',
+            label: this.intl.t('storefront.common.pickup'),
             valuePath: 'pickupName',
             cellComponent: 'table/cell/base',
             width: '160px',
@@ -127,12 +134,12 @@ export default class OrdersIndexController extends Controller {
             sortable: true,
             filterable: true,
             filterComponent: 'filter/model',
-            filterComponentPlaceholder: 'Select order pickup location',
+            filterComponentPlaceholder: this.intl.t('storefront.orders.index.select-order-pickup-location'),
             filterParam: 'pickup',
             model: 'place',
         },
         {
-            label: 'Dropoff',
+            label: this.intl.t('storefront.common.dropoff'),
             valuePath: 'dropoffName',
             cellComponent: 'table/cell/base',
             width: '160px',
@@ -140,12 +147,12 @@ export default class OrdersIndexController extends Controller {
             sortable: true,
             filterable: true,
             filterComponent: 'filter/model',
-            filterComponentPlaceholder: 'Select order dropoff location',
+            filterComponentPlaceholder: this.intl.t('storefront.orders.index.select-order-dropoff-location'),
             filterParam: 'dropoff',
             model: 'place',
         },
         {
-            label: 'Scheduled At',
+            label: this.intl.t('storefront.orders.index.scheduled-at'),
             valuePath: 'scheduledAt',
             sortParam: 'scheduled_at',
             filterParam: 'scheduled_at',
@@ -164,7 +171,7 @@ export default class OrdersIndexController extends Controller {
             width: '50px',
         },
         {
-            label: 'Transaction Total',
+            label: this.intl.t('storefront.orders.index.transaction-total'),
             cellComponent: 'table/cell/base',
             valuePath: 'transaction_amount',
             width: '50px',
@@ -173,7 +180,7 @@ export default class OrdersIndexController extends Controller {
             sortable: true,
         },
         {
-            label: 'Tracking Number',
+            label: this.intl.t('storefront.orders.index.tracking-number'),
             cellComponent: 'table/cell/base',
             valuePath: 'tracking_number.tracking_number',
             width: '170px',
@@ -183,7 +190,7 @@ export default class OrdersIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Driver Assigned',
+            label: this.intl.t('storefront.orders.index.driver-assigned'),
             cellComponent: 'table/cell/driver-name',
             valuePath: 'driver_assigned',
             modelPath: 'driver_assigned',
@@ -192,7 +199,7 @@ export default class OrdersIndexController extends Controller {
             sortable: true,
             filterable: true,
             filterComponent: 'filter/model',
-            filterComponentPlaceholder: 'Select driver for order',
+            filterComponentPlaceholder: this.intl.t('storefront.orders.index.select-driver-for-order'),
             filterParam: 'driver',
             model: 'driver',
             query: {
@@ -201,7 +208,7 @@ export default class OrdersIndexController extends Controller {
             },
         },
         {
-            label: 'Type',
+            label: this.intl.t('storefront.common.type'),
             cellComponent: 'cell/humanize',
             valuePath: 'type',
             width: '100px',
@@ -210,7 +217,7 @@ export default class OrdersIndexController extends Controller {
             sortable: true,
         },
         {
-            label: 'Status',
+            label: this.intl.t('storefront.common.status'),
             valuePath: 'status',
             cellComponent: 'table/cell/status',
             width: '120px',
@@ -221,7 +228,7 @@ export default class OrdersIndexController extends Controller {
             // filterOptions: this.statusOptions,
         },
         {
-            label: 'Created At',
+            label: this.intl.t('storefront.orders.index.created-at'),
             valuePath: 'createdAt',
             sortParam: 'created_at',
             filterParam: 'created_at',
@@ -232,7 +239,7 @@ export default class OrdersIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
-            label: 'Updated At',
+            label: this.intl.t('storefront.orders.index.updated-at'),
             valuePath: 'updatedAt',
             sortParam: 'updated_at',
             filterParam: 'updated_at',
@@ -244,7 +251,7 @@ export default class OrdersIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
-            label: 'Created By',
+            label: this.intl.t('storefront.orders.index.created-by'),
             valuePath: 'created_by_name',
             width: '125px',
             resizable: true,
@@ -256,14 +263,14 @@ export default class OrdersIndexController extends Controller {
             model: 'user',
         },
         {
-            label: 'Updated By',
+            label: this.intl.t('storefront.orders.index.updated-by'),
             valuePath: 'updated_by_name',
             width: '125px',
             resizable: true,
             hidden: true,
             filterable: true,
             filterComponent: 'filter/model',
-            filterComponentPlaceholder: 'Select user',
+            filterComponentPlaceholder: this.intl.t('storefront.orders.index.select-user'),
             filterParam: 'updated_by',
             model: 'user',
         },
@@ -279,12 +286,12 @@ export default class OrdersIndexController extends Controller {
             width: '12%',
             actions: [
                 {
-                    label: 'View Order',
+                    label: this.intl.t('storefront.orders.index.view-order'),
                     icon: 'eye',
                     fn: this.viewOrder,
                 },
                 {
-                    label: 'Cancel Order',
+                    label: this.intl.t('storefront.orders.index.cancel-order'),
                     icon: 'ban',
                     fn: this.cancelOrder,
                 },
@@ -292,7 +299,7 @@ export default class OrdersIndexController extends Controller {
                     separator: true,
                 },
                 {
-                    label: 'Delete Order',
+                    label: this.intl.t('storefront.orders.index.delete-order'),
                     icon: 'trash',
                     fn: this.deleteOrder,
                 },

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

@@ -2,9 +2,11 @@ import ProductsIndexCategoryNewController from './new';
 import { tracked } from '@glimmer/tracking';
 import { alias } from '@ember/object/computed';
 import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 
 export default class ProductsIndexCategoryEditController extends ProductsIndexCategoryNewController {
     @alias('model') product;
+    @service intl;
     @tracked overlayActionButtonTitle = 'Save Changes';
     @tracked overlayActionButtonIcon = 'save';
     @tracked overlayExitButtonTitle = 'Done';
@@ -21,7 +23,7 @@ export default class ProductsIndexCategoryEditController extends ProductsIndexCa
             .save()
             .then(() => {
                 this.isSaving = false;
-                this.notifications.success('Changes saved!');
+                this.notifications.success(this.intl.t('storefront.products.index.changes-saved'));
             })
             .catch((error) => {
                 this.isSaving = false;
@@ -37,8 +39,8 @@ export default class ProductsIndexCategoryEditController extends ProductsIndexCa
         if (this.product.hasDirtyAttributes) {
             // details have been added warn user it will lost
             return this.modalsManager.confirm({
-                title: 'Product is not saved!',
-                body: 'You will loose all unsaved changes, are you sure you wish to cancel?',
+                title: this.intl.t('storefront.products.index.edit.title'),
+                body: this.intl.t('storefront.products.index.edit.body'),
                 confirm: (modal) => {
                     modal.done();
                     return this.exit(closeOverlay);

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

@@ -13,6 +13,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
     @service modalsManager;
     @service currentUser;
     @service store;
+    @service intl;
     @service storefront;
     @service fetch;
     @service loader;
@@ -62,7 +63,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
             .then(() => {
                 this.loader.removeLoader(loader);
                 this.isSaving = false;
-                this.notifications.success('New product created successfully!');
+                this.notifications.success(this.intl.t('storefront.products.index.new.new-product-created-success'));
 
                 return this.transitionToRoute('products.index.category').then(() => {
                     return this.hostRouter.refresh();
@@ -94,14 +95,15 @@ export default class ProductsIndexCategoryNewController extends BaseController {
             return;
         }
 
+        // Queue and upload immediatley
         this.uploadQueue.pushObject(file);
         this.fetch.uploadFile.perform(
             file,
             {
                 path: `uploads/storefront/${this.activeStore.id}/products`,
                 subject_uuid: this.product.id,
-                subject_type: `storefront:product`,
-                type: `storefront_product`,
+                subject_type: 'storefront:product',
+                type: 'storefront_product',
             },
             (uploadedFile) => {
                 this.product.files.pushObject(uploadedFile);
@@ -115,6 +117,10 @@ export default class ProductsIndexCategoryNewController extends BaseController {
             },
             () => {
                 this.uploadQueue.removeObject(file);
+                // remove file from queue
+                if (file.queue && typeof file.queue.remove === 'function') {
+                    file.queue.remove(file);
+                }
             }
         );
     }
@@ -134,10 +140,10 @@ export default class ProductsIndexCategoryNewController extends BaseController {
 
     @action makePrimaryFile(file) {
         if (file.isNotImage) {
-            return this.notifications.warning('You can only select an image file to be primary!');
+            return this.notifications.warning(this.intl.t('storefront.products.index.category.new.warning-only-select-an-image-file-to-be-primary'));
         }
 
-        this.notifications.success(`${file.original_filename} was made the primary image.`);
+        this.notifications.success(this.intl.t('storefront.products.index.category.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;
@@ -147,8 +153,8 @@ export default class ProductsIndexCategoryNewController extends BaseController {
         if (this.product.hasDirtyAttributes) {
             // details have been added warn user it will lost
             return this.modalsManager.confirm({
-                title: 'Product is not saved!',
-                body: 'Going back will cancel this product creation, if you continue all input fields will be cleared!',
+                title: this.intl.t('storefront.products.index.new.title'),
+                body: this.intl.t('storefront.products.index.new.body'),
                 confirm: (modal) => {
                     modal.done();
                     return this.exit(closeOverlay);
@@ -175,7 +181,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
 
         return this.modalsManager.done().then(() => {
             this.modalsManager.show('modals/select-addon-category', {
-                title: 'Select addon categories',
+                title: this.intl.t('storefront.products.index.new.select-addon-categories'),
                 addonCategories,
                 product,
                 updateProductAddonCategories: (categories) => {
@@ -200,7 +206,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
         const productVariant = this.store.createRecord('product-variant');
 
         return this.modalsManager.show('modals/create-new-variant', {
-            title: 'Add new product variant',
+            title: this.intl.t('storefront.products.index.new.add-new-product-variant'),
             productVariant,
             confirm: (modal) => {
                 modal.startLoading();
@@ -213,7 +219,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
 
     @action editProductVariant(productVariant) {
         return this.modalsManager.show('modals/create-new-variant', {
-            title: 'Edit product variant',
+            title: this.intl.t('storefront.products.index.new.edit-product-variant'),
             productVariant,
         });
     }
@@ -272,7 +278,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
             meta_array = [];
         }
 
-        const label = `Untitled Field`;
+        const label = this.intl.t('storefront.products.index.new.untitled-field');
 
         meta_array.pushObject({
             key: underscore(label),