@fleetbase/storefront-engine 0.4.4 → 0.4.6

package/addon/components/widget/storefront-key-metrics.hbs

@@ -1,7 +1,7 @@
 <div class="storefront-key-metrics" ...attributes>
     <div class="flex flex-col">
         <div class="flex flex-row items-center justify-between px-4 py-2 border dark:border-gray-700 border-gray-200 dark:bg-gray-800 bg-gray-50 rounded-lg shadow-sm">
-            <span class="text-base font-bold text-black dark:text-gray-100">{{t "storefront.component.widget.key-metrics.title"}}</span>
+            <span class="text-base tracking-wide uppercase font-bold text-gray-700 dark:text-gray-400">{{t "storefront.component.widget.key-metrics.title"}}</span>
         </div>
 
         <div class="mt-4">

package/addon/components/widget/storefront-metrics.hbs

@@ -1,7 +1,7 @@
 <div class="storefront-metrics-widget" ...attributes>
     <div class="flex items-center justify-between">
-        <div class="flex items-center">
-            <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-gray-100 mr-2">
+        <div class="flex items-center pl-1.5">
+            <h3 class="text-base font-semibold tracking-wide uppercase text-gray-700 dark:text-gray-400">
                 Metrics
             </h3>
             {{#if this.loadMetrics.isRunning}}

package/addon/controllers/settings.js

@@ -0,0 +1,36 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+
+export default class SettingsController extends Controller {
+    @service intl;
+
+    get tabs() {
+        return [
+            {
+                route: 'settings.index',
+                label: this.intl.t('storefront.common.general'),
+                icon: 'cog',
+            },
+            {
+                route: 'settings.locations',
+                label: this.intl.t('storefront.common.location'),
+                icon: 'map-marker-alt',
+            },
+            {
+                route: 'settings.gateways',
+                label: this.intl.t('storefront.common.gateways'),
+                icon: 'cash-register',
+            },
+            {
+                route: 'settings.api',
+                label: this.intl.t('storefront.common.api'),
+                icon: 'code',
+            },
+            {
+                route: 'settings.notifications',
+                label: this.intl.t('storefront.common.notification'),
+                icon: 'bell-concierge',
+            },
+        ];
+    }
+}

package/addon/services/storefront.js

@@ -94,11 +94,14 @@ export default class StorefrontService extends Service.extend(Evented) {
         this.playAlert();
         this.trigger('order.incoming', order, store);
 
+        const alreadyAccepted = !['created', 'pending'].includes(order.status);
+
         this.modalsManager.show('modals/incoming-order', {
             title: this.intl.t('storefront.service.storefront.new-incoming-order'),
-            acceptButtonText: this.intl.t('storefront.service.storefront.accept-order'),
+            acceptButtonText: alreadyAccepted ? this.intl.t('common.ok') : this.intl.t('storefront.service.storefront.accept-order'),
             acceptButtonIcon: 'check',
             acceptButtonIconPrefix: 'fas',
+            hideDeclineButton: alreadyAccepted,
             declineButtonText: this.intl.t('storefront.service.storefront.decline-order'),
             declineButtonScheme: 'danger',
             closeButton: false,
@@ -109,6 +112,8 @@ export default class StorefrontService extends Service.extend(Evented) {
             confirm: async (modal) => {
                 modal.startLoading();
 
+                if (alreadyAccepted) return modal.done();
+
                 try {
                     await this.fetch.post('orders/accept', { order: order.id }, { namespace: 'storefront/int/v1' });
                     this.trigger('order.accepted', order);

package/addon/templates/settings/gateways.hbs

@@ -16,7 +16,7 @@
             </div>
 
             {{#each @model as |gateway|}}
-                <ContentPanel @title={{gateway.name}} @open={{true}} @pad={{true}}>
+                <ContentPanel @title={{gateway.name}} @open={{true}} @pad={{false}} @wrapperClass="bordered-classic">
                     <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"}}
@@ -38,10 +38,10 @@
                         {{#each-in gateway.config as |key value|}}
                             {{#if (is-bool-value value)}}
                                 <div class="input-group">
-                                    <Checkbox @value={{value}} @label={{humanize key}} @disabled={{true}} />
+                                    <Checkbox @value={{value}} @label={{smart-humanize key}} @disabled={{true}} />
                                 </div>
                             {{else}}
-                                <InputGroup @name={{humanize key}}>
+                                <InputGroup @name={{smart-humanize key}}>
                                     <Input
                                         @type={{if (can "storefront update gateway") "text" "password"}}
                                         class="form-input w-full"