From 1887c0dd08572c787a768f897f52fbfbd2302156 Mon Sep 17 00:00:00 2001 From: Munkh-erdene Damdinbazar Date: Mon, 8 Jan 2024 18:09:17 +0800 Subject: [PATCH 01/19] add translation and some of component --- addon/components/modals/add-store-hours.hbs | 4 +- addon/components/modals/assign-driver.hbs | 6 +- .../components/modals/create-first-store.hbs | 12 +- addon/components/modals/create-gateway.hbs | 14 +- .../modals/create-network-category.hbs | 10 +- addon/components/modals/create-network.hbs | 14 +- .../components/modals/create-new-variant.hbs | 8 +- .../modals/create-notification-channel.hbs | 14 +- .../modals/create-product-category.hbs | 12 +- addon/components/modals/create-store.hbs | 6 +- addon/components/modals/import-products.hbs | 23 ++- addon/components/modals/incoming-order.hbs | 36 ++--- addon/components/modals/manage-addons.hbs | 14 +- addon/components/network-category-picker.hbs | 10 +- addon/components/schedule-manager.hbs | 2 +- addon/components/store-selector.hbs | 4 +- translations/en-us.yaml | 138 +++++++++++++++++- 17 files changed, 231 insertions(+), 96 deletions(-) diff --git a/addon/components/modals/add-store-hours.hbs b/addon/components/modals/add-store-hours.hbs index e0035b3..90fd666 100644 --- a/addon/components/modals/add-store-hours.hbs +++ b/addon/components/modals/add-store-hours.hbs @@ -1,8 +1,8 @@
- - + +
\ No newline at end of file diff --git a/addon/components/modals/assign-driver.hbs b/addon/components/modals/assign-driver.hbs index caaf274..32116d4 100644 --- a/addon/components/modals/assign-driver.hbs +++ b/addon/components/modals/assign-driver.hbs @@ -10,11 +10,11 @@

- Select a driver to assign to this order. + {{t "storefront.component.modals.assign-driver.message-driver"}}

- - + {{model.name}} diff --git a/addon/components/modals/create-first-store.hbs b/addon/components/modals/create-first-store.hbs index 03f4da5..8b391b5 100644 --- a/addon/components/modals/create-first-store.hbs +++ b/addon/components/modals/create-first-store.hbs @@ -3,17 +3,17 @@
-

Welcome to Storefront!

+

{{t "storefront.component.modals.create-first-store.title"}}

- Storefront allows you to quickly setup a headless and dynamic on-demand shop powered by Fleetbase. - Submit the form below to create your first store. + {{t "storefront.component.modals.create-first-store.message"}} + {{t "storefront.component.modals.create-first-store.submit-message"}}

- - - + + +
diff --git a/addon/components/modals/create-gateway.hbs b/addon/components/modals/create-gateway.hbs index 845f7ad..3228d44 100644 --- a/addon/components/modals/create-gateway.hbs +++ b/addon/components/modals/create-gateway.hbs @@ -1,20 +1,20 @@
- + +
-
@@ -29,16 +29,16 @@
- +
- +
- Remove + {{t "storefront.common.remove"}}
{{/each}} diff --git a/addon/components/network-category-picker.hbs b/addon/components/network-category-picker.hbs index 699a326..2605bca 100644 --- a/addon/components/network-category-picker.hbs +++ b/addon/components/network-category-picker.hbs @@ -4,13 +4,13 @@ {{#if this.isLoading}}
- Loading... + {{t "storefront.common.loading"}}
{{else}} {{#if this.selectedCategory}} - Back + {{t "storefront.common.back"}} {{/if}} {{#each this.categories as |category|}} @@ -20,9 +20,9 @@ {{else}}
{{#if this.selectedCategory}} - No subcategories for {{this.selectedCategory.name}} + {{t "storefront.network-category-picker.no-subcategory"}} {{this.selectedCategory.name}} {{else}} - No categories for this network + {{t "storefront.network-category-picker.no-categories"}} {{/if}}
{{/each}} @@ -32,7 +32,7 @@
- Create a new category + {{t "storefront.network-category-picker.create-category"}}
diff --git a/addon/components/schedule-manager.hbs b/addon/components/schedule-manager.hbs index 8a41d10..339162a 100644 --- a/addon/components/schedule-manager.hbs +++ b/addon/components/schedule-manager.hbs @@ -4,7 +4,7 @@

{{day}}

-
diff --git a/addon/components/store-selector.hbs b/addon/components/store-selector.hbs index 6fe48c4..f792bb7 100644 --- a/addon/components/store-selector.hbs +++ b/addon/components/store-selector.hbs @@ -7,14 +7,14 @@ {{or store.name "-"}} {{else}} - + {{/each}}
- Create a new storefront + {{t "storefront.component.store-selector.create-storefront"}}
diff --git a/translations/en-us.yaml b/translations/en-us.yaml index b30bacc..41eaf4a 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -1,2 +1,138 @@ storefront: - extension-name: Storefront \ No newline at end of file + extension-name: Storefront + common: + back: Back + cash: Cash + config: Config + customer: Customer + delivery: Delivery + invalid: Invalid + loading: Loading... + photos: photos + pickup: Pickup + remove: Remove + store: Store + total: Total + upload-new: Upload new + uploading: Uploading... + + component: + modals: + add-store-hours: + start-time: Start time + operation-start: When availability/operation start + end-time: End time + operation-end: When availability/operation hours end + assign-driver: + message-driver: Select a driver to assign to this order. + name-driver: Select Driver + placeholder-driver: Select Driver to Assign + create-first-store: + title: Welcome to Storefront! + message: Storefront allows you to quickly setup a headless and dynamic on-demand shop powered by Fleetbase. + submit-message: Submit the form below to create your first store. + storefront-name: Storefront name + enter-name: Enter the name of your store + description: Storefront description + brief-description: Give your store a simple brief description on the types of things sold + currency: Storefront currency + select-currency: Select the default currency for your storefront + create-getaway: + getaway: Gateway type + getaway-text: Select gateway type + getaway-name: Getaway name + name-text: Give your payment gateway a name, this will only be relevent internally + getaway-code: Getaway code + code-text: Identifier code used to identify gateway to the SDK + callback-url: Callback URL + callback-text: Callback URL if applicable + return-url: Return URL + return-text: Return URL if applicable + sandbox-getaway: This is a sandbox gateway + create-network-category: + parent-category: Parent category + select-parent: Select a parent category if any + category-name: Category name + name-text: Enter a name for category + description: Category description + description-text: Give your network category a brief description + category-icon: Category icon type + create-network: + title: Start a Network + messagle-line1: Storefront allows you to quickly create marketplaces, enabling multiple storefronts to sell under an umbrella. + messagle-line2: When you create the network you defined your rules and you're able to expand your network through invitiations. + messagle-line3: Get started by creating a network below. + name: Network name + name-text: Enter the name of your store + description: Network description + description-text: Give your store a simple brief description on the types of things sold + currency: Network currency + currency-text: Select the default currency for your storefront + create-new-variant: + name: Variant name + name-text: Give your product variant a name + description: Variant description + description-text: Short description of the variant + cheackbox-1: Allow user to select multiple variant options at once + cheackbox-2: This product variant selection is required + create-notification-channel: + title: Channel + title-text: Select notification channel + name: Channel name + name-text: Give your notification channel a name, this will only be relevent internally + key: Channel Key + key-text: This is your notification channel key, use this to specify which apps should utilize this notification channel via sdk configs. + create-product-category: + name: Category name + name-text: Enter a name for category + description: Category description + description-text: Give your product category a brief description + icon: Category icon + uploading-new: Upload new category icon + create-store: + name: Storefront name + name-text: Enter the name of your store + description: Storefront description + description-text: Give your store a simple brief description on the types of things sold + currency: Storefront currency + currency-text: Select the default currency for your storefront + import-products: + uploading-message: Processing import... + drop-upload: Drop to upload + ready-upload: ready for upload. + upload-spreadsheets: Upload Spreadsheets + drag-drop: Drag and drop spreadsheet files onto this dropzone + select-spreadsheets: or select spreadsheets to upload. + upload-queue: Upload Queue + optionally-select-category: Optionally select a category to import products into + select-category: Select Category + incoming-order: + assigned: Driver Assigned + not-assigned: No driver assigned + no-phone: No phone + change-driver: Change Driver + assign-driver: Assign Driver + pickup-order: Customer must pickup order from + address: Customer address + tracking: Tracking + summary: Order Summary + subtotal: Subtotal + fee: Delivery fee + tip: Tip + delivery-tip: Delivery Tip + manage-addons: + title: New Category + delete: Delete Category + new: New Addon + name: Addon Name + description: Addon Description + + network-category-picker: + no-subcategory: No subcategories for + no-categories: No categories for this network + create-category: Create a new category + schedule-manager: + add-hours: Add Hours + store-selector: + no-stores: No stores to select + create-storefront: Create a new storefront \ No newline at end of file From 6de5f5549ac635dd8c37cbd3d2527d95371fcdf2 Mon Sep 17 00:00:00 2001 From: Bayarbold8 Date: Tue, 9 Jan 2024 17:54:22 +0800 Subject: [PATCH 02/19] storefront translation --- .../components/modals/order-ready-assign-driver.hbs | 8 +++----- addon/components/modals/share-network.hbs | 12 ++++++------ translations/en-us.yaml | 11 +++++++++++ 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/addon/components/modals/order-ready-assign-driver.hbs b/addon/components/modals/order-ready-assign-driver.hbs index f1d863a..89c1f9f 100644 --- a/addon/components/modals/order-ready-assign-driver.hbs +++ b/addon/components/modals/order-ready-assign-driver.hbs @@ -12,18 +12,16 @@

- You are about to set this order as ready and dispatch, use the dropdown below to select a driver - to dispatch to.

Or optionally you can opt to dispatch order as adhoc which will ping the - order to all nearby drivers to be accepted. + {{t "storefront.component.modals.order-ready-assign-driver.driver-dispatch" htmlSafe=true}}

{{#unless @options.adhoc}} - + {{model.name}} diff --git a/addon/components/modals/share-network.hbs b/addon/components/modals/share-network.hbs index 6470187..4d2f0f3 100644 --- a/addon/components/modals/share-network.hbs +++ b/addon/components/modals/share-network.hbs @@ -3,9 +3,9 @@
-

Invite members to your network

+

{{t "storefront.components.modals.share-network.invite-member"}}

- Grab a shareable invitiation link or send individual invites via email below. + {{t "storefront.components.modals.share-network.email-below"}}

@@ -13,19 +13,19 @@

Share with people and organizations

- Enter the emails of people or organizations you want to send an invite to your network. + {{t "storefront.components.modals.share-network.invite-network"}}

- + {{tag}}
-

Get link

+

{{t "storefront.components.modals.share-network.get-link"}}

- +
{{#if @options.network.options.shareable_link_enabled}} diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 41eaf4a..896c331 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -126,6 +126,17 @@ storefront: new: New Addon name: Addon Name description: Addon Description + order-ready-assign-driver: + driver-dispatch: You are about to set this order as ready and dispatch, use the dropdown below to select a driver to dispatch to.

Or optionally you can opt to dispatch order as adhoc which will ping the order to all nearby drivers to be accepted. + name: Select Driver + placeholder: Select Driver to Assign + share-network: + invite-member: Invite members to your network + email-below: Grab a shareable invitiation link or send individual invites via email below. + invite-network: Enter the emails of people or organizations you want to send an invite to your network. + placeholder: Add emails + get-link: Get link + helpText: Anyone with this link is able to join your network network-category-picker: no-subcategory: No subcategories for From ac6e448f552cddfcefd3bbd6c12d9d80db2cd6d4 Mon Sep 17 00:00:00 2001 From: Bayarbold8 Date: Wed, 10 Jan 2024 17:56:11 +0800 Subject: [PATCH 03/19] storefront translation file and components --- addon/components/modals/incoming-order.hbs | 4 +- addon/components/modals/share-network.hbs | 2 +- addon/components/modals/store-details.hbs | 8 +- addon/components/modals/store-form.hbs | 10 +- .../components/modals/store-location-form.hbs | 28 ++-- addon/components/widget/customers.hbs | 12 +- addon/components/widget/orders.hbs | 42 +++--- .../components/widget/storefront-metrics.hbs | 10 +- addon/templates/customers/index.hbs | 4 +- .../networks/index/network/index.hbs | 98 +++++++------- translations/en-us.yaml | 121 +++++++++++++++++- 11 files changed, 227 insertions(+), 112 deletions(-) diff --git a/addon/components/modals/incoming-order.hbs b/addon/components/modals/incoming-order.hbs index 1e3ec94..882b687 100644 --- a/addon/components/modals/incoming-order.hbs +++ b/addon/components/modals/incoming-order.hbs @@ -32,7 +32,7 @@ {{@options.order.driver_assigned.name}}
{{n-a @options.order.driver_assigned.displayName}}
-
{{n-a @options.order.driver_assigned.phone {{t "storefront.component.modals.incoming-order.no-phone"}} }}
+
{{n-a @options.order.driver_assigned.phone (t "storefront.component.modals.incoming-order.no-phone")}}
{{else}} @@ -40,7 +40,7 @@ {{/if}} {{#if @options.assignDriver}}
-
{{/if}}
diff --git a/addon/components/modals/share-network.hbs b/addon/components/modals/share-network.hbs index 4d2f0f3..a4f5766 100644 --- a/addon/components/modals/share-network.hbs +++ b/addon/components/modals/share-network.hbs @@ -22,7 +22,7 @@
-
+

{{t "storefront.components.modals.share-network.get-link"}}

diff --git a/addon/components/modals/store-details.hbs b/addon/components/modals/store-details.hbs index 5785f79..c2ccbda 100644 --- a/addon/components/modals/store-details.hbs +++ b/addon/components/modals/store-details.hbs @@ -2,19 +2,19 @@
-
Name
+
{{t "storefront.common.name"}}
{{n-a @options.store.name}}
-
Description
+
{{t "storefront.common.description"}}
{{n-a @options.store.description}}
-
Tags
+
{{t "storefront.common.tag"}}
{{n-a @options.store.tagsList}}
-
Currency
+
{{t "storefront.common.currency"}}
{{n-a @options.store.currency}}
diff --git a/addon/components/modals/store-form.hbs b/addon/components/modals/store-form.hbs index c2d9d80..543a1c2 100644 --- a/addon/components/modals/store-form.hbs +++ b/addon/components/modals/store-form.hbs @@ -1,20 +1,20 @@
- - + + - + {{tag}} - +
- Online + {{t "storefront.common.online"}}
diff --git a/addon/components/modals/store-location-form.hbs b/addon/components/modals/store-location-form.hbs index 5c7f027..5243b4a 100644 --- a/addon/components/modals/store-location-form.hbs +++ b/addon/components/modals/store-location-form.hbs @@ -1,30 +1,30 @@
- - - + + + {{result.address}} - - - - - - - - + + + + + + + + - +
- + - +
\ No newline at end of file diff --git a/addon/components/widget/customers.hbs b/addon/components/widget/customers.hbs index b0e03fe..c3d79fc 100644 --- a/addon/components/widget/customers.hbs +++ b/addon/components/widget/customers.hbs @@ -8,10 +8,10 @@ - - - - + + + + @@ -35,8 +35,8 @@
{{customer.name}}
-
Phone:{{n-a customer.phone}}
-
Email: {{n-a customer.email}}
+
{{t "storefront.components.widget.customers.phone"}}{{n-a customer.phone}}
+
{{t "storefront.components.widget.customers.email"}} {{n-a customer.email}}
{{/each}} diff --git a/addon/components/widget/orders.hbs b/addon/components/widget/orders.hbs index 91afeff..3e5ed0b 100644 --- a/addon/components/widget/orders.hbs +++ b/addon/components/widget/orders.hbs @@ -8,12 +8,12 @@
IDPhoneEmailOrders{{t "storefront.common.id"}}{{t "storefront.common.phone"}}{{t "storefront.common.email"}}{{t "storefront.common.order"}}
- - - - - - + + + + + + @@ -30,13 +30,13 @@ @@ -59,48 +59,48 @@
-
- +
-
Customer: {{n-a order.customer_name}}
-
Driver: {{n-a order.driver_name}}
+
{{t "storefront.components.widget.orders.customer."}} {{n-a order.customer_name}}
+
{{t "storefront.components.widget.orders.driver"}} {{n-a order.driver_name}}
- Subtotal + {{t "storefront.components.widget.orders.subtotal"}} {{format-currency order.meta.subtotal order.meta.currency}}
{{#unless order.meta.is_pickup}}
- Delivery fee + {{t "storefront.components.widget.orders.delivery"}} {{format-currency order.meta.delivery_fee order.meta.currency}}
{{/unless}} {{#if order.meta.tip}}
- Tip + {{t "storefront.common.tip"}} {{get-tip-amount order.meta.tip order.meta.subtotal order.meta.currency}}
{{/if}} {{#if order.meta.delivery_tip}}
- Delivery Tip + {{t "storefront.components.widget.order.delivery-tip"}} {{get-tip-amount order.meta.delivery_tip order.meta.subtotal order.meta.currency}}
{{/if}}
- Total + {{t "storefront.common.tip"}} {{format-currency order.meta.total order.meta.currency}}
diff --git a/addon/components/widget/storefront-metrics.hbs b/addon/components/widget/storefront-metrics.hbs index 3f54da3..29a90f5 100644 --- a/addon/components/widget/storefront-metrics.hbs +++ b/addon/components/widget/storefront-metrics.hbs @@ -2,7 +2,7 @@

- Last 30 days + {{t "storefront.components.widger.storefront-metrics.last-day"}}

{{#if this.isLoading}}
@@ -17,7 +17,7 @@
- Orders + {{t "storefront.common.order"}}
{{this.metrics.orders_count}} @@ -26,7 +26,7 @@
- Customers + {{t "storefront.common.customer"}}
{{this.metrics.customers_count}} @@ -35,7 +35,7 @@
- Stores + {{t "storefront.common.order"}}
{{this.metrics.stores_count}} @@ -44,7 +44,7 @@
- Earnings + {{t "storefront.common.earning"}}
{{format-currency this.metrics.earnings_sum this.metrics.currency}} diff --git a/addon/templates/customers/index.hbs b/addon/templates/customers/index.hbs index 9dbaf86..4de81ee 100644 --- a/addon/templates/customers/index.hbs +++ b/addon/templates/customers/index.hbs @@ -1,7 +1,7 @@ - + -
diff --git a/addon/templates/settings/locations.hbs b/addon/templates/settings/locations.hbs index 7c65789..c0f24fa 100644 --- a/addon/templates/settings/locations.hbs +++ b/addon/templates/settings/locations.hbs @@ -4,14 +4,14 @@

- Location Settings + {{t "storefront.locations.index.location-setting"}}

- Manage your stores operating locations and hours. + {{t "storefront.locations.index.manage-store"}}

-
@@ -19,11 +19,11 @@
-

Manage store hours

+

{{t "storefront.locations.index.store-hour"}}

-
diff --git a/addon/templates/settings/notifications.hbs b/addon/templates/settings/notifications.hbs index 943c4c7..e8db482 100644 --- a/addon/templates/settings/notifications.hbs +++ b/addon/templates/settings/notifications.hbs @@ -4,16 +4,14 @@

- Notification Settings + {{t "storefront.notification.index.notification-setting"}}

- Configure notification channels for your storefront, each notification channel additionally can - have - it's own rules and options. + {{t "storefront.notification.index.notification-storefront"}}

-
@@ -24,8 +22,8 @@ {{notificationChannel.name}}
-
{{/each}} diff --git a/translations/en-us.yaml b/translations/en-us.yaml index a546112..4eff42b 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -7,6 +7,7 @@ storefront: back: Back backdrop: backdrop building: Building + bulk-action: Bulk Action cash: Cash city: City config: Config @@ -23,6 +24,7 @@ storefront: email: Email export: Export id: ID + import: Import invalid: Invalid loading: Loading... logo: logo @@ -33,11 +35,13 @@ storefront: phone: Phone photos: photos pickup: Pickup + product: Products remove: Remove state: State status: Status store: Store street-1: Street 1 + storefront: Storefront tag: Tags tip: Tip total: Total @@ -45,6 +49,14 @@ storefront: uploading: Uploading... view: View website: Website + edit: Edit + delete: Delete + network: Networks + file: files + general: General + location: Location + notification: Notification + gateways: Gateways component: modals: add-store-hours: @@ -206,6 +218,10 @@ storefront: index: networks: index: + network-option: Network Options + manage-network: Manage Network + send-invite: Send Invites + delete-network: Delete Network network: index: title: General Network Settings @@ -259,4 +275,108 @@ storefront: payment-gateways: Add or manage your payment gateway settings here. text-gateways: Create new gateway name-gateways: Gateway name - helpText-internally: Give your payment gateway a name, this will only be relevent internally \ No newline at end of file + helpText-internally: Give your payment gateway a name, this will only be relevent internally + name-code: Gateway code + helpText-sdk: Identifier code used to identify gateway to the SDK + name-url: Callback URL + helpText-callback: Callback URL if applicable + name-return: Return URL + helpText-return: Return URL if applicable + text-delete: Delete payment gateway + title-channel: Notification Channels + notification-setting: Notification Settings + storefront-channel: Configure notification channels for your storefront, each notification channel additionally can have it's own rules and options. + text-new-channel: New channel + stores: + title: Stores + text: Add Stores + text-store: Invite Stores + title-network: Manage Network + setting: Settings + store: Stores + customer: Customers + orders: + index: + delete-order: Delete Orders + products: + index: + text: Manage Addons + title: Product Categories + settings: + api: + api-setting: API Settings + access-key: Access key for Storefront API & Integrations. + name: Store Key + helpText: This is your store key, use this to enable apps and integrations for your storefront. + gateways: + gateway-setting: Gateway Settings + payment: Add or manage your payment gateway settings here. + text: Create new gateway + name: Gateway name + name-code: Gateway code + name-callback: Callback URL + name-return: Return URL + helpText: Give your payment gateway a name, this will only be relevent internally + helpText-sdk: Identifier code used to identify gateway to the SDK + helpText-callback: Callback URL if applicable + helpText-return: Return URL if applicable + text-delete: Delete payment gateway + index: + general-setting: General Settings + storefront: Provide the general settings for your storefront. + placeholder: Storefront Name + helpText: The name of your store. + placeholder-storefront: Storefront Description + helpText-description: Give your store a brief description to let users know what you sell. + placeholder-tag: Add tags + title: Contact & Social + helpText-website: Your business website URL. + placeholder-facebook: Facebook ID + helpText-facebook: Your business Facebook page ID. + placeholder-instagram: Instagram Username + helpText-instagram: Your business Instagram username. + placeholder-twitter: Twitter Username + helpText-twitter: Your business Twitter username. + title-logo: Logo & Backdrop + helpText-logo: Logo for your store. + upload-logo: Upload new logo + helpText-store: Optional banner or background image for your store. + upload-backdrop: Upload new backdrop + title-image: Images & Videos + drop-upload: Drop to upload + ready-upload: ready for upload. + upload-image: Upload Images & Videos + dropzone: Drag and drop image and video files onto this dropzone + upload-queue: Upload Queue + event: Configure who should be alerted for certain events. + name-alert: New order alert + placeholder-alert: Select users to alert for new order + enable-tax: Enable tax + name-tax: Tax Percentage + placeholder-tax: Tax Percentage + helpText-tax: The sales tax percentage to apply to orders. + auto-accept: Auto accept incoming orders + auto-dispatch: Auto dispatch orders + delivery: Require proof of delivery + name-method: Proof of Delivery Method + enable-method: Enable cash on delivery + order-pickup: Enable order pickup + enable-tip: Enable tips + enable-delivery: Enable delivery tips + name-select: Select integrated vendors to use + placeholder-select: Select integrated vendors to use + text-save: Save Changes + locations: + location-setting: Location Settings + manage-store: Manage your stores operating locations and hours + text-location: Create new location + store-hour: Manage store hours + notification: + notification-setting: Notification Settings + notification-storefront: Configure notification channels for your storefront, each notification channel additionally can have it's own rules and options. + text: New channel + application: + launch-app: Launch App + home: + title: Storefront Dashboard + settings: From b565ee6ec24cb0baeac4e106806f47e219846c9f Mon Sep 17 00:00:00 2001 From: Bayarbold8 Date: Fri, 12 Jan 2024 17:06:15 +0800 Subject: [PATCH 06/19] storefront js file all finsh --- addon/components/file-record.js | 4 +- addon/components/schedule-manager.js | 6 +- addon/components/widget/customers.js | 2 +- addon/components/widget/orders.js | 18 +-- addon/controllers/customers/index.js | 6 +- addon/controllers/networks/index.js | 2 +- addon/controllers/networks/index/network.js | 4 +- .../networks/index/network/index.js | 14 +-- .../networks/index/network/stores.js | 26 ++--- addon/controllers/products/index.js | 9 +- addon/controllers/products/index/category.js | 10 +- .../products/index/category/edit.js | 4 +- addon/controllers/products/index/index.js | 2 +- addon/controllers/settings/gateways.js | 8 +- addon/controllers/settings/locations.js | 16 +-- translations/en-us.yaml | 107 ++++++++++++++++-- 16 files changed, 166 insertions(+), 72 deletions(-) diff --git a/addon/components/file-record.js b/addon/components/file-record.js index 31d733c..1933fcc 100644 --- a/addon/components/file-record.js +++ b/addon/components/file-record.js @@ -27,8 +27,8 @@ export default class FileRecordComponent extends Component { @action deleteFile(file) { return this.modalsManager.confirm({ - title: 'Are you sure you wish to delete this file?', - body: 'Once you delete this file you will be unable to recover it.', + title: this.intl.t('storefront.components.file-record.title'), + body: this.intl.t('storefront.components.file-record.body'), confirm: (modal) => { file.destroyRecord(); diff --git a/addon/components/schedule-manager.js b/addon/components/schedule-manager.js index eef5656..847802f 100644 --- a/addon/components/schedule-manager.js +++ b/addon/components/schedule-manager.js @@ -43,7 +43,7 @@ export default class ScheduleManagerComponent extends Component { }); this.modalsManager.show('modals/add-store-hours', { - title: `Add new hours for ${day}`, + title: this.intl.t('storefront.components.schedule-manager-title',{Day: day}), acceptButtonText: 'Add hours', acceptButtonIcon: 'save', hours, @@ -60,8 +60,8 @@ export default class ScheduleManagerComponent extends Component { @action removeHours(hours) { this.modalsManager.confirm({ - title: 'Are you sure you wish to remove these hours?', - body: 'By removing these operation/availability hours, your store or product may become inactive or unavailable according to the updated schedule...', + title: this.intl.t('storefront.components.schedule-manager.title-hour'), + body: this.intl.t('storefront.components.schedule-manager.body'), acceptButtonIcon: 'trash', confirm: (modal) => { modal.startLoading(); diff --git a/addon/components/widget/customers.js b/addon/components/widget/customers.js index 93df489..4774a32 100644 --- a/addon/components/widget/customers.js +++ b/addon/components/widget/customers.js @@ -9,7 +9,7 @@ export default class WidgetCustomersComponent extends Component { @service storefront; @tracked isLoading = true; @tracked customers = []; - @tracked title = 'Recent Customers'; + @tracked title = this.intl.t('storefront.components.widget.customers.title'); constructor(owner, { title }) { super(...arguments); diff --git a/addon/components/widget/orders.js b/addon/components/widget/orders.js index b2488a8..b049fb4 100644 --- a/addon/components/widget/orders.js +++ b/addon/components/widget/orders.js @@ -139,7 +139,7 @@ export default class WidgetOrdersComponent extends Component { await order.loadCustomer(); this.modalsManager.show('modals/incoming-order', { - title: 'Accept Order', + title: this.intl.t('storefront.components.widget.orders.accept-order'), acceptButtonText: 'Accept Order', acceptButtonScheme: 'success', acceptButtonIcon: 'check', @@ -162,8 +162,8 @@ export default class WidgetOrdersComponent extends Component { // for pickup orders if (order.meta?.is_pickup === true) { this.modalsManager.confirm({ - title: 'Mark order ready for pickup?', - body: 'Marking the order as ready will notify the customer their order is ready for pickup!', + title: this.intl.t('storefront.components.widget.orders.title-pickup'), + body: this.intl.t('storefront.components.widget.orders.body'), acceptButtonText: 'Ready for Pickup!', acceptButtonIcon: 'check', acceptButtonScheme: 'success', @@ -183,7 +183,7 @@ export default class WidgetOrdersComponent extends Component { if (!order.adhoc) { // prompt to assign driver then dispatch return this.modalsManager.show('modals/order-ready-assign-driver', { - title: 'Assign driver and dispatch orders', + title: this.intl.t('storefront.components.widget.orders.title-order'), acceptButtonText: 'Assign & Dispatch!', acceptButtonScheme: 'success', acceptButtonIcon: 'check', @@ -206,8 +206,8 @@ export default class WidgetOrdersComponent extends Component { } this.modalsManager.confirm({ - title: 'Are you want to mark order as ready?', - body: 'Marking the order as ready will dispatch the order to nearby drivers, only mark the order as ready when it can be picked up.', + title: this.intl.t('storefront.components.widget.orders.title-ready'), + body: this.intl.t('storefront.components.widget.orders.-body-pickup'), acceptButtonText: 'Dispatch!', acceptButtonIcon: 'check', acceptButtonScheme: 'success', @@ -226,8 +226,8 @@ export default class WidgetOrdersComponent extends Component { @action markAsCompleted(order) { this.modalsManager.confirm({ - title: 'Are you sure you want to mark order as completed?', - body: 'Marking the order as completed is a confirmation that the customer has picked up the order and the order is completed.', + title: this.intl.t('storefront.components.widget.orders.title-complete'), + body: this.intl.t('storefront.components.widget.orders.body-complete'), acceptButtonText: 'Order Completed!', acceptButtonIcon: 'check', acceptButtonScheme: 'success', @@ -248,7 +248,7 @@ export default class WidgetOrdersComponent extends Component { await order.loadDriver(); this.modalsManager.show('modals/assign-driver', { - title: 'Assign driver', + title: this.intl.t('storefront.components.widget.orders.assign-drive'), acceptButtonText: 'Assign Driver', acceptButtonScheme: 'success', acceptButtonIcon: 'check', diff --git a/addon/controllers/customers/index.js b/addon/controllers/customers/index.js index d33e48a..537bfa8 100644 --- a/addon/controllers/customers/index.js +++ b/addon/controllers/customers/index.js @@ -225,11 +225,11 @@ export default class CustomersIndexController extends Controller { width: '10%', actions: [ { - label: this.intl.t('storefront.controllers.customers.view-customer') + label: this.intl.t('storefront.customers.index.view-customer') // fn: this.viewVendor, }, { - label: this.intl.t('storefront.controllers.customers.edit-customer') + label: this.intl.t('storefront.customers.index.edit-customer') // fn: this.editVendor, }, @@ -237,7 +237,7 @@ export default class CustomersIndexController extends Controller { separator: true, }, { - label: this.intl.t('storefront.controllers.customers.delete-customer') + label: this.intl.t('storefront.customers.index.delete-customer') // fn: this.deleteVendor, }, ], diff --git a/addon/controllers/networks/index.js b/addon/controllers/networks/index.js index 99c3bee..153bcf3 100644 --- a/addon/controllers/networks/index.js +++ b/addon/controllers/networks/index.js @@ -173,7 +173,7 @@ export default class NetworksIndexController extends BaseController { modal.startLoading(); return network.save().then(() => { - this.notifications.success('Your new storefront network has been created!'); + this.notifications.success(this.intl.t('storefront.controllers.networks.index.success-message')); return this.hostRouter.refresh(); }); }, diff --git a/addon/controllers/networks/index/network.js b/addon/controllers/networks/index/network.js index c4dd5ce..de23a23 100644 --- a/addon/controllers/networks/index/network.js +++ b/addon/controllers/networks/index/network.js @@ -9,8 +9,8 @@ export default class NetworksIndexNetworkController extends BaseController { 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.title'), + body: this.intl.t('storefront.controllers.networks.index.network.body'), confirm: (modal) => { modal.done(); return this.exit(closeOverlay); diff --git a/addon/controllers/networks/index/network/index.js b/addon/controllers/networks/index/network/index.js index ecc5876..de5758c 100644 --- a/addon/controllers/networks/index/network/index.js +++ b/addon/controllers/networks/index/network/index.js @@ -82,7 +82,7 @@ export default class NetworksIndexNetworkIndexController extends Controller { this.model .save() .then(() => { - this.notifications.success('Changes to network saved.'); + this.notifications.success(this.intl.t('storefront.controllers.networks.index.success-message')); }) .catch((error) => { this.notifications.serverError(error); @@ -134,13 +134,13 @@ export default class NetworksIndexNetworkIndexController extends Controller { }); this.editGateway(gateway, { - title: `Create a new payment gateway`, + title: this.intl.t('storefront.controllers.networks.index.title'), acceptButtonText: 'Save Gateway', confirm: (modal) => { modal.startLoading(); return gateway.save().then((gateway) => { - this.notifications.success(`New gateway added to network`); + this.notifications.success(this.intl.t('storefront.controllers.networks.index.success-network')); this.gateways.pushObject(gateway); }); }, @@ -169,7 +169,7 @@ export default class NetworksIndexNetworkIndexController extends Controller { modal.startLoading(); return gateway.save().then(() => { - this.notifications.success(`Payment gateway changes saved!`); + this.notifications.success(this.intl.t('storefront.controllers.networks.index.success-payment')); }); }; } @@ -200,13 +200,13 @@ export default class NetworksIndexNetworkIndexController extends Controller { }); this.editChannel(channel, { - title: `Create a new notification channel`, + title: this.intl.t('storefront.controllers.networks.index.title-channel'), acceptButtonText: 'Create Notification Channel', confirm: (modal) => { modal.startLoading(); return channel.save().then((channel) => { - this.notifications.success(`New notification channel added to network!`); + this.notifications.success(this.intl.t('storefront.controllers.networks.index.success-channel')); this.channels.pushObject(channel); }); }, @@ -235,7 +235,7 @@ export default class NetworksIndexNetworkIndexController extends Controller { modal.startLoading(); return channel.save().then(() => { - this.notifications.success(`Notification channel changes saved!`); + this.notifications.success(this.intl.t('storefront.controllers.networks.index.success-save')); }); }; } diff --git a/addon/controllers/networks/index/network/stores.js b/addon/controllers/networks/index/network/stores.js index cf0d625..47d99a3 100644 --- a/addon/controllers/networks/index/network/stores.js +++ b/addon/controllers/networks/index/network/stores.js @@ -263,8 +263,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.controllers.networks.index.network.stores.title'), + body: this.intl.t('storefront.controllers.networks.index.network.stores.body'), confirm: (modal) => { modal.startLoading(); @@ -287,7 +287,7 @@ export default class NetworksIndexNetworkStoresController extends Controller { */ @action assignStoreToCategory(store, options = {}) { this.modalsManager.show('modals/add-store-to-category', { - title: 'Add store to category', + title: this.intl.t('storefront.controllers.networks.index.network.stores.title-category'), acceptButtonText: 'Save Changes', acceptButtonIcon: 'save', selectedCategory: null, @@ -366,7 +366,7 @@ 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.controllers.networks.index.network.stores.title-network'), acceptButtonIcon: 'check', acceptButtonText: 'Create new category', successMessage: 'New category created.', @@ -378,7 +378,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.controllers.networks.index.network.stores.success-message')); networkCategoriesPicker.categories.pushObject(category); modal.done(); }) @@ -400,7 +400,7 @@ export default class NetworksIndexNetworkStoresController extends Controller { */ @action editCategory(category, options = {}) { this.modalsManager.show('modals/create-network-category', { - title: `Edit category (${category.name})`, + title: this.intl.t('storefront.controllers.networks.index.network.stores.category-name', {categoryName: category.name}), acceptButtonText: 'Save Changes', acceptButtonIcon: 'save', iconType: category.icon_file_uuid ? 'image' : 'svg', @@ -467,7 +467,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.controllers.networks.index.network.stores.title-store'), acceptButtonIcon: 'check', stores, members, @@ -502,8 +502,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.controllers.networks.index.network.stores.title-remove', {storeName: store.name, networkName: this.network.name}), + body: this.intl.t('storefront.controllers.networks.index.network.stores.body-network'), acceptButtonIcon: 'check', acceptButtonIconPrefix: 'fas', declineButtonIcon: 'times', @@ -535,7 +535,7 @@ export default class NetworksIndexNetworkStoresController extends Controller { */ @action viewStoreDetails(store, options = {}) { this.modalsManager.show('modals/store-details', { - title: `Viewing ${store.name} storefront`, + title: this.intl.t('storefront.controllers.networks.index.network.stores.title-storefront.', {storeName: store.name}), acceptButtonText: 'Done', hideDeclineButton: true, store, @@ -553,7 +553,7 @@ export default class NetworksIndexNetworkStoresController extends Controller { */ @action editStore(store, options = {}) { this.modalsManager.show('modals/store-form', { - title: `Editing ${store.name} storefront`, + title: this.intl.t('storefront.controllers.networks.index.network.stores.store-name.', {storeName: store.name}), acceptButtonText: 'Save Changes', hideDeclineButton: true, store, @@ -586,7 +586,7 @@ 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', + title: this.intl.t('storefront.controllers.networks.index.network.stores.add-store'), acceptButtonText: 'Send Invitations', acceptButtonIcon: 'paper-plane', acceptButtonDisabled: true, @@ -631,7 +631,7 @@ export default class NetworksIndexNetworkStoresController extends Controller { return this.network.sendInvites(recipients).then(() => { modal.stopLoading(); - this.notifications.success('Invitations sent to recipients!'); + this.notifications.success(this.intl.t('storefront.controllers.networks.index.network.stores.invitation')); }); }, }); diff --git a/addon/controllers/products/index.js b/addon/controllers/products/index.js index 8d9c85a..30de0c9 100644 --- a/addon/controllers/products/index.js +++ b/addon/controllers/products/index.js @@ -34,7 +34,7 @@ export default class ProductsIndexController extends BaseController { @action manageAddons() { this.modalsManager.show('modals/manage-addons', { - title: 'Manage Addons', + title: this.intl.t('storefront.controllers.products.index.title'), modalClass: 'modal-lg', acceptButtonText: 'Done', store: this.activeStore, @@ -60,7 +60,7 @@ export default class ProductsIndexController extends BaseController { }); this.modalsManager.show('modals/create-product-category', { - title: 'Create a new product category', + title: this.intl.t('storefront.controllers.products.index.title-create'), acceptButtonIcon: 'check', acceptButtonIconPrefix: 'fas', declineButtonIcon: 'times', @@ -88,7 +88,7 @@ export default class ProductsIndexController extends BaseController { modal.startLoading(); return category.save().then(() => { - this.notifications.success('New product category created.'); + this.notifications.success(this.intl.t('storefront.controllers.products.index.product-category')); return this.hostRouter.refresh(); }); }, @@ -107,7 +107,7 @@ export default class ProductsIndexController extends BaseController { }; this.modalsManager.show('modals/import-products', { - title: 'Import products via spreadsheets', + title: this.intl.t('storefront.controllers.products.index.import'), acceptButtonText: 'Start Upload', acceptButtonScheme: 'magic', acceptButtonIcon: 'upload', @@ -185,6 +185,7 @@ export default class ProductsIndexController extends BaseController { modal.done().then(() => { if (results?.length) { this.notifications.success(`Successfully imported ${results.length} products...`); + this.notifications.success(this.intl.t('storefront.controllers.products.index.success', {resultsLength: results.length})); return this.hostRouter.refresh(); } }); diff --git a/addon/controllers/products/index/category.js b/addon/controllers/products/index/category.js index 72e3432..ded01aa 100644 --- a/addon/controllers/products/index/category.js +++ b/addon/controllers/products/index/category.js @@ -99,8 +99,8 @@ export default class ProductsIndexCategoryController extends BaseController { } this.modalsManager.confirm({ - title: this.intl.t('storefront.product.index.category'), - body: 'Warning! Deleting this category will also remove all products listed under this category.', + title: this.intl.t('storefront.controllers.product.index.category'), + body: this.intl.t('storefront.controllers.product.index.body'), confirm: (modal) => { modal.startLoading(); @@ -113,7 +113,7 @@ export default class ProductsIndexCategoryController extends BaseController { @action editCategory(category) { this.modalsManager.show('modals/create-product-category', { - title: this.intl.t('storefront.product.index.edit-category',{ categoryName: category.name }), + title: this.intl.t('storefront.controllers.product.index.edit-category',{ categoryName: category.name }), acceptButtonText: 'Save Changes', acceptButtonIcon: 'save', declineButtonIcon: 'times', @@ -149,8 +149,8 @@ export default class ProductsIndexCategoryController extends BaseController { @action deleteProduct(product) { this.modalsManager.confirm({ - title: this.intl.t('storefront.product.index.category.delete-product'), - body: 'Warning! Once this product is deleted it will no longer be accessible.', + title: this.intl.t('storefront.controllers.product.index.category.delete-product'), + body: this.intl.t('storefront.controllers.product.index.category.body-warning'), confirm: (modal) => { modal.startLoading(); diff --git a/addon/controllers/products/index/category/edit.js b/addon/controllers/products/index/category/edit.js index 147034f..8b05112 100644 --- a/addon/controllers/products/index/category/edit.js +++ b/addon/controllers/products/index/category/edit.js @@ -37,8 +37,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.controllers.products.index.category.edit.title'), + body: this.intl.t('storefront.controllers.products.index.category.edit.body'), confirm: (modal) => { modal.done(); return this.exit(closeOverlay); diff --git a/addon/controllers/products/index/index.js b/addon/controllers/products/index/index.js index d88af16..6603fcd 100644 --- a/addon/controllers/products/index/index.js +++ b/addon/controllers/products/index/index.js @@ -122,7 +122,7 @@ export default class ProductsIndexIndexController extends BaseController { @action deleteProduct(product) { this.modalsManager.confirm({ title: this.intl.t('storefront.products.index.product'), - body: 'Warning! Once this product is deleted it will no longer be accessible.', + body: this.intl.t('storefront.products.index.body'), confirm: (modal) => { modal.startLoading(); diff --git a/addon/controllers/settings/gateways.js b/addon/controllers/settings/gateways.js index 26f4f22..de4a551 100644 --- a/addon/controllers/settings/gateways.js +++ b/addon/controllers/settings/gateways.js @@ -20,7 +20,7 @@ export default class SettingsGatewaysController extends Controller { }); this.editGateway(gateway, { - title: `Create a new payment gateway`, + title: this.intl.t('storefront.controllers.settings.gateways.title'), acceptButtonText: 'Save Gateway', decline: (modal) => { gateway.destroyRecord(); @@ -42,7 +42,7 @@ export default class SettingsGatewaysController extends Controller { const schemaOptions = Object.keys(schemas); this.modalsManager.show('modals/create-gateway', { - title: `Edit payment gateway`, + title: this.intl.t('storefront.controllers.settings.gateways.title-edit'), acceptButtonText: 'Save Changes', schema: null, schemas, @@ -95,8 +95,8 @@ export default class SettingsGatewaysController extends Controller { @action deleteGateway(gateway) { this.modalsManager.confirm({ - title: 'Are you sure you wish to remove this gateway?', - body: 'All applications and websites utilizing this gateway in configuration could be disrupted if gateway is not replaced beforehand', + title: this.intl.t('storefront.controllers.settings.gateways.title-remove'), + body: this.intl.t('storefront.controllers.settings.gateways.body'), confirm: (modal) => { modal.startLoading(); diff --git a/addon/controllers/settings/locations.js b/addon/controllers/settings/locations.js index 31068b4..8293c41 100644 --- a/addon/controllers/settings/locations.js +++ b/addon/controllers/settings/locations.js @@ -64,7 +64,7 @@ export default class SettingsLocationsController extends Controller { }); return this.editStoreLocation(storeLocation, { - title: 'New store location', + title: this.intl.t('storefront.controllers.settings.locations.title'), acceptButtonText: 'Add new Location', acceptButtonIcon: 'save', }); @@ -82,7 +82,7 @@ export default class SettingsLocationsController extends Controller { } this.modalsManager.show('modals/store-location-form', { - title: 'Edit store location', + title: this.intl.t('storefront.controllers.settings.locations.title-edit'), acceptButtonText: 'Save Changes', acceptButtonIcon: 'save', place, @@ -134,8 +134,8 @@ export default class SettingsLocationsController extends Controller { @action removeStoreLocation(storeLocation) { this.modalsManager.confirm({ - title: 'Are you sure you wish to remove this store location?', - body: 'All products that are solely assosciated with this location will no longer be accessible.', + title: this.intl.t('storefront.controllers.settings.locations.title-location'), + body: this.intl.t('storefront.controllers.settings.locations.body'), confirm: (modal) => { modal.startLoading(); @@ -156,7 +156,7 @@ export default class SettingsLocationsController extends Controller { }); this.modalsManager.show('modals/add-store-hours', { - title: `Add new store hours for ${day}`, + title: this.intl.t('storefront.controllers.settings.locations.title-hour', {Day: day}), acceptButtonText: 'Add hours', acceptButtonIcon: 'save', storeHours, @@ -165,7 +165,7 @@ export default class SettingsLocationsController extends Controller { return storeHours.save().then((storeHours) => { storeLocation.hours.pushObject(storeHours); - this.notifications.success(`New store hours added for ${day}`); + this.notifications.success(this.intl.t('storefront.controllers.settings.location.success',{Day: day})); }); }, }); @@ -173,8 +173,8 @@ export default class SettingsLocationsController extends Controller { @action removeHours(storeHours) { this.modalsManager.confirm({ - title: 'Are you sure you wish to remove these hours?', - body: 'By removing these operation hours, your store may become inactive according to the updated schedule for this location..', + title: this.intl.t('storefront.controllers.settings.locations.title-remove'), + body: this.intl.t('storefront.controllers.settings.locations.body-location'), confirm: (modal) => { modal.startLoading(); diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 4eff42b..52e1b0c 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -192,6 +192,7 @@ storefront: customers: phone: "Phone:" email: "Email:" + title: Recent Customers orders: text: Accept Order! text-ready: Mark as Ready! @@ -203,6 +204,19 @@ storefront: driver: "Driver:" subtotal: Subtotal delivery: Delivery fee + accept-order: Accept Order + title-pickup: Mark order ready for pickup? + body: Marking the order as ready will notify the customer their order is ready for pickup! + title-order: Assign driver and dispatch orders + title-ready: Are you want to mark order as ready? + body-pickup: Marking the order as ready will dispatch the order to nearby drivers, only mark the order as ready when it can be picked up. + title-complete : Are you sure you want to mark order as completed? + body-complete: Marking the order as completed is a confirmation that the customer has picked up the order and the order is completed. + assign-drive: Assign driver + file-record: + title: Are you sure you wish to delete this file? + body: Once you delete this file you will be unable to recover it. + storefront-metrics: last-day: Last 30 days network-category-picker: @@ -211,17 +225,95 @@ storefront: create-category: Create a new category schedule-manager: add-hours: Add Hours + title: Add new hours for {day} + title-hour: Are you sure you wish to remove these hours? + body: By removing these operation/availability hours, your store or product may become inactive or unavailable according to the updated schedule... store-selector: no-stores: No stores to select create-storefront: Create a new - customers: + controllers: + customers: + index: + view-customer: View Customer Details + edit-customer: Edit Customer + success-message: Your new storefront network has been created! + delete-customer: Delete Customer + networks: + index: + network: + success-message: Changes to network saved. + title: Create a new payment gateway + success-network: New gateway added to network + success-payment: Payment gateway changes saved! + title-channel: Create a new notification channel + success-channel: New notification channel added to network! + success-save: Notification channel changes saved! + stores: + 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-category: Add store to category + title-network: Add new network category + success-message: New network category created. + category-name: Edit category ({categoryName}) + title-store: Add stores to network + title-remove: Remove this store ({store.name}) from this network ({this.network.name})? + body-network: Are you sure you wish to remove this store from this network? It will no longer be findable by this network. + title-storefront: Viewing {store.name} storefront + store-name: Editing {store.name} storefront + add-store: Add stores to network + invitation: Invitations sent to recipients! + title: Network changes not saved! + body: Going back will rollback all unsaved changes, are you sure you wish to continue? + + network-option: Network Options + manage-network: Manage Network + send-invite: Send Invites + delete-network: Delete Network + + title: Create a new network + success-message: Yout new storefront network has been created! + title-network: Are you sure you wish to delete this network ({networkName})? All assigned stores, customers, orders will no longer be reachable. + orders: + index: + view-order: View Order + cancel-order: Cancel Order + delete-order: Delete Order + products: index: - networks: - index: - network-option: Network Options - manage-network: Manage Network - send-invite: Send Invites - delete-network: Delete Network + category: + edit: + title: Product is not saved! + body: You will loose all unsaved changes, are you sure you wish to cancel? + index: + category: + category: category + body: Warning! Deleting this category will also remove all products listed under this category. + edit-category: Edit category + delete-product: Are you sure you wish to delete this product? + body-warning: Warning! Once this product is deleted it will no longer be accessible. + product: Are you sure you wish to delete this product? + body: Warning! Once this product is deleted it will no longer be accessible. + index: + title: Manage Addons + title-create: Create a new product category + product-category: New product category created. + import: Import products via spreadsheets + success: Successfully imported {results.length} products... + settings: + gateways: + title: Create a new payment gateway + title-edit: Edit payment gateway + title-remove: Are you sure you wish to remove this gateway? + body: All applications and websites utilizing this gateway in configuration could be disrupted if gateway is not replaced beforehand + locations: + title: New store location + title-edit: Edit store location + title-location: Are you sure you wish to remove this store location? + body: All products that are solely assosciated with this location will no longer be accessible. + title-hour: Add new store hours for {day} + success: New store hours added for {day} + title-remove: Are you sure you wish to remove these hours? + body-location: By removing these operation hours, your store may become inactive according to the updated schedule for this location.. network: index: title: General Network Settings @@ -380,3 +472,4 @@ storefront: home: title: Storefront Dashboard settings: + con From a6310c3a6c8d8d73cb20e0b7d21bdc6ea4eab1c0 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Mon, 15 Jan 2024 16:02:48 +0800 Subject: [PATCH 07/19] fixing of translation key naming conventions for networks and widget components --- addon/components/widget/customers.hbs | 2 +- addon/components/widget/customers.js | 3 +- addon/components/widget/orders.hbs | 32 +- addon/components/widget/orders.js | 33 +- .../components/widget/storefront-metrics.hbs | 8 +- addon/controllers/products/index.js | 4 +- addon/templates/application.hbs | 16 +- addon/templates/networks/index/network.hbs | 10 +- .../networks/index/network/index.hbs | 114 ++-- .../networks/index/network/stores.hbs | 4 +- addon/templates/orders/index.hbs | 2 +- translations/en-us.yaml | 623 +++++++++++------- 12 files changed, 487 insertions(+), 364 deletions(-) diff --git a/addon/components/widget/customers.hbs b/addon/components/widget/customers.hbs index c3d79fc..8a13fcc 100644 --- a/addon/components/widget/customers.hbs +++ b/addon/components/widget/customers.hbs @@ -11,7 +11,7 @@
- + diff --git a/addon/components/widget/customers.js b/addon/components/widget/customers.js index 4774a32..e8c2ba9 100644 --- a/addon/components/widget/customers.js +++ b/addon/components/widget/customers.js @@ -7,9 +7,10 @@ import setComponentArg from '@fleetbase/ember-core/utils/set-component-arg'; export default class WidgetCustomersComponent extends Component { @service store; @service storefront; + @service intl; @tracked isLoading = true; @tracked customers = []; - @tracked title = this.intl.t('storefront.components.widget.customers.title'); + @tracked title = this.intl.t('storefront.component.widget.customers.widget-title'); constructor(owner, { title }) { super(...arguments); diff --git a/addon/components/widget/orders.hbs b/addon/components/widget/orders.hbs index 3e5ed0b..a0b8dd1 100644 --- a/addon/components/widget/orders.hbs +++ b/addon/components/widget/orders.hbs @@ -8,7 +8,7 @@
IDAmountCustomerDriverCreatedStatus{{t "storefront.components.widget.orders.id"}}{{t "storefront.common.amount"}}{{t "storefront.common.customer"}}{{t "storefront.common.driver"}}{{t "storefront.common.created"}}{{t "storefront.common.status"}}
{{#if order.isFresh}} -
{{t "storefront.common.id"}} {{t "storefront.common.phone"}} {{t "storefront.common.email"}}{{t "storefront.common.order"}}{{t "storefront.common.orders"}}
- + @@ -30,13 +30,13 @@ @@ -60,47 +60,47 @@
- +
-
{{t "storefront.components.widget.orders.customer."}} {{n-a order.customer_name}}
-
{{t "storefront.components.widget.orders.driver"}} {{n-a order.driver_name}}
+
{{t "storefront.component.widget.orders.customer"}}: {{n-a order.customer_name}}
+
{{t "storefront.component.widget.orders.driver"}}: {{n-a order.driver_name}}
- {{t "storefront.components.widget.orders.subtotal"}} + {{t "storefront.component.widget.orders.subtotal"}} {{format-currency order.meta.subtotal order.meta.currency}}
{{#unless order.meta.is_pickup}}
- {{t "storefront.components.widget.orders.delivery"}} + {{t "storefront.component.widget.orders.delivery-fee"}} {{format-currency order.meta.delivery_fee order.meta.currency}}
{{/unless}} {{#if order.meta.tip}}
- {{t "storefront.common.tip"}} + {{t "storefront.component.widget.order.tip"}} {{get-tip-amount order.meta.tip order.meta.subtotal order.meta.currency}}
{{/if}} {{#if order.meta.delivery_tip}}
- {{t "storefront.components.widget.order.delivery-tip"}} + {{t "storefront.component.widget.order.delivery-tip"}} {{get-tip-amount order.meta.delivery_tip order.meta.subtotal order.meta.currency}}
{{/if}}
- {{t "storefront.common.tip"}} + {{t "storefront.component.widget.order.tip"}} {{format-currency order.meta.total order.meta.currency}}
diff --git a/addon/components/widget/orders.js b/addon/components/widget/orders.js index b049fb4..15bdd55 100644 --- a/addon/components/widget/orders.js +++ b/addon/components/widget/orders.js @@ -8,13 +8,14 @@ export default class WidgetOrdersComponent extends Component { @service store; @service storefront; @service fetch; + @service intl; @service appCache; @service modalsManager; @tracked isLoading = true; @tracked orders = []; @computed('args.title') get title() { - return this.args.title ?? 'Recent Orders'; + return this.args.title ?? this.intl.t('storefront.component.widget.orders.widget-title'); } constructor() { @@ -139,8 +140,8 @@ export default class WidgetOrdersComponent extends Component { await order.loadCustomer(); this.modalsManager.show('modals/incoming-order', { - title: this.intl.t('storefront.components.widget.orders.accept-order'), - acceptButtonText: 'Accept Order', + title: this.intl.t('storefront.component.widget.orders.accept-order'), + acceptButtonText: this.intl.t('storefront.component.widget.orders.accept-order'), acceptButtonScheme: 'success', acceptButtonIcon: 'check', order, @@ -162,9 +163,9 @@ export default class WidgetOrdersComponent extends Component { // for pickup orders if (order.meta?.is_pickup === true) { this.modalsManager.confirm({ - title: this.intl.t('storefront.components.widget.orders.title-pickup'), - body: this.intl.t('storefront.components.widget.orders.body'), - acceptButtonText: 'Ready for Pickup!', + title: this.intl.t('storefront.component.widget.orders.mark-as-ready-modal-pickup-title'), + body: this.intl.t('storefront.component.widget.orders.mark-as-ready-modal-pickup-body'), + acceptButtonText: this.intl.t('storefront.component.widget.orders.mark-as-ready-modal-pickup-accept-button-text'), acceptButtonIcon: 'check', acceptButtonScheme: 'success', confirm: (modal) => { @@ -183,8 +184,8 @@ export default class WidgetOrdersComponent extends Component { if (!order.adhoc) { // prompt to assign driver then dispatch return this.modalsManager.show('modals/order-ready-assign-driver', { - title: this.intl.t('storefront.components.widget.orders.title-order'), - acceptButtonText: 'Assign & Dispatch!', + title: this.intl.t('storefront.component.widget.orders.mark-as-ready-modal-not-adhoc-title'), + acceptButtonText: this.intl.t('storefront.component.widget.orders.mark-as-ready-modal-not-adhoc-accept-button-text'), acceptButtonScheme: 'success', acceptButtonIcon: 'check', adhoc: false, @@ -206,9 +207,9 @@ export default class WidgetOrdersComponent extends Component { } this.modalsManager.confirm({ - title: this.intl.t('storefront.components.widget.orders.title-ready'), - body: this.intl.t('storefront.components.widget.orders.-body-pickup'), - acceptButtonText: 'Dispatch!', + title: this.intl.t('storefront.component.widget.orders.mark-as-ready-modal-title'), + body: this.intl.t('storefront.component.widget.orders.mark-as-ready-modal-body'), + acceptButtonText: this.intl.t('storefront.component.widget.orders.mark-as-ready-modal-accept-button-text'), acceptButtonIcon: 'check', acceptButtonScheme: 'success', confirm: (modal) => { @@ -226,9 +227,9 @@ export default class WidgetOrdersComponent extends Component { @action markAsCompleted(order) { this.modalsManager.confirm({ - title: this.intl.t('storefront.components.widget.orders.title-complete'), - body: this.intl.t('storefront.components.widget.orders.body-complete'), - acceptButtonText: 'Order Completed!', + title: this.intl.t('storefront.component.widget.orders.mark-as-completed-modal-title'), + body: this.intl.t('storefront.component.widget.orders.mark-as-completed-modal-body'), + acceptButtonText: this.intl.t('storefront.component.widget.orders.mark-as-completed-accept-button-text'), acceptButtonIcon: 'check', acceptButtonScheme: 'success', confirm: (modal) => { @@ -248,8 +249,8 @@ export default class WidgetOrdersComponent extends Component { await order.loadDriver(); this.modalsManager.show('modals/assign-driver', { - title: this.intl.t('storefront.components.widget.orders.assign-drive'), - acceptButtonText: 'Assign Driver', + title: this.intl.t('storefront.component.widget.orders.assign-driver-modal-title'), + acceptButtonText: this.intl.t('storefront.component.widget.orders.assign-driver-accept-button-text'), acceptButtonScheme: 'success', acceptButtonIcon: 'check', driver: order.driver_assigned, diff --git a/addon/components/widget/storefront-metrics.hbs b/addon/components/widget/storefront-metrics.hbs index 29a90f5..839e4a5 100644 --- a/addon/components/widget/storefront-metrics.hbs +++ b/addon/components/widget/storefront-metrics.hbs @@ -2,7 +2,7 @@

- {{t "storefront.components.widger.storefront-metrics.last-day"}} + {{t "storefront.component.widget.storefront-metrics.last-day"}}

{{#if this.isLoading}}
@@ -17,7 +17,7 @@
- {{t "storefront.common.order"}} + {{t "storefront.common.orders"}}
{{this.metrics.orders_count}} @@ -26,7 +26,7 @@
- {{t "storefront.common.customer"}} + {{t "storefront.common.customers"}}
{{this.metrics.customers_count}} @@ -35,7 +35,7 @@
- {{t "storefront.common.order"}} + {{t "storefront.common.orders"}}
{{this.metrics.stores_count}} diff --git a/addon/controllers/products/index.js b/addon/controllers/products/index.js index 30de0c9..7ce137e 100644 --- a/addon/controllers/products/index.js +++ b/addon/controllers/products/index.js @@ -13,6 +13,7 @@ export default class ProductsIndexController extends BaseController { @service fetch; @service hostRouter; @service storefront; + @service intl; /** * the current storefront store session. @@ -184,8 +185,7 @@ export default class ProductsIndexController extends BaseController { modal.done().then(() => { if (results?.length) { - this.notifications.success(`Successfully imported ${results.length} products...`); - this.notifications.success(this.intl.t('storefront.controllers.products.index.success', {resultsLength: results.length})); + this.notifications.success(this.intl.t('storefront.products.index.import-products-success-message', { resultsLength: results.length })); return this.hostRouter.refresh(); } }); diff --git a/addon/templates/application.hbs b/addon/templates/application.hbs index d6850ed..0ded445 100644 --- a/addon/templates/application.hbs +++ b/addon/templates/application.hbs @@ -1,14 +1,14 @@ - - {{t "storefront.common.dashboard"}} - {{t "storefront.common.product"}} - {{t "storefront.common.customer"}} - {{t "storefront.common.order"}} - {{t "storefront.common.network"}} - {{t "storefront.common.setting"}} + + {{t "storefront.sidebar.dashboard"}} + {{t "storefront.sidebar.products"}} + {{t "storefront.sidebar.customers"}} + {{t "storefront.sidebar.orders"}} + {{t "storefront.sidebar.networks"}} + {{t "storefront.sidebar.settings"}} - {{t "storefront.application.launch-app"}} + {{t "storefront.sidebar.launch-app"}} diff --git a/addon/templates/networks/index/network.hbs b/addon/templates/networks/index/network.hbs index f59a577..18da0d8 100644 --- a/addon/templates/networks/index/network.hbs +++ b/addon/templates/networks/index/network.hbs @@ -1,5 +1,5 @@ - +
@@ -13,19 +13,19 @@
diff --git a/addon/templates/networks/index/network/index.hbs b/addon/templates/networks/index/network/index.hbs index dddf11f..0586b46 100644 --- a/addon/templates/networks/index/network/index.hbs +++ b/addon/templates/networks/index/network/index.hbs @@ -1,37 +1,37 @@
- +

- {{t "storefront.network.index.general-network"}} + {{t "storefront.networks.index.network.index.general-network-settings-title"}}

- {{t "storefront.network.index.general-settings"}} + {{t "storefront.networks.index.network.index.general-network-settings-subtitle"}}

- - - + + + - - + + - - - - - + + + + + - - + +
{{concat - + {{#if queue.files.length}} @@ -41,7 +41,7 @@ {{else}} - {{t "storefront.networks.index.network.index.upload-logo"}} + {{t "storefront.networks.index.network.index.general-network-settings-form.logo-backdrop-panel.upload-logo-button-text"}} {{/if}} @@ -49,10 +49,10 @@
- +
{{concat - + {{#if queue.files.length}} @@ -62,7 +62,7 @@ {{else}} - {{t "storefront.networks.index.network.index.upload-backdrop"}} + {{t "storefront.networks.index.network.index.general-network-settings-form.logo-backdrop-panel.upload-backdrop-button-text"}} {{/if}} @@ -71,11 +71,11 @@ - +
-

{{t "storefront.networks.index.network.index.certain-event"}}

- - +

{{t "storefront.networks.index.network.index.general-network-settings-form.alert-panel.panel-description"}}

+ + {{model.name}} @@ -85,119 +85,119 @@
- {{t "storefront.common.online"}} + {{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.online"}}
- {{t "storefront.networks.index.network.index.enable-tax"}} + {{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.enable-tax"}} {{#if @model.options.tax_enabled}} - + {{/if}}
- {{t "storefront.networks.index.network.index.auto-accept"}} + {{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.auto-accept-incoming-orders"}}
- {{t "storefront.networks.index.network.index.auto-dispatch"}} + {{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.auto-dispatch-orders"}}
- {{t "storefront.networks.index.network.index.require-delivery"}} + {{t "storefront.networks.index.network.index.general-network-settings-form.config-switches.require-proof-of-delivery"}} {{#if @model.options.require_pod}} - + +
diff --git a/addon/components/modals/manage-addons.js b/addon/components/modals/manage-addons.js index 72b65ba..9b26e61 100644 --- a/addon/components/modals/manage-addons.js +++ b/addon/components/modals/manage-addons.js @@ -5,6 +5,7 @@ import { action } from '@ember/object'; export default class ModalsManageAddonsComponent extends Component { @service store; + @service intl; @service currentUser; @service modalsManager; @tracked categories = []; @@ -39,7 +40,7 @@ export default class ModalsManageAddonsComponent extends Component { @action deleteCategory(index) { const category = this.categories.objectAt(index); - const result = confirm('Are you sure you wish to delete this addon category? All addons assosciated will be lost!'); + const result = confirm(this.intl.t('storefront.component.modals.manage-addons.delete-this-addon-category-assosiated-will-lost')); if (result) { this.categories.removeAt(index); @@ -54,7 +55,7 @@ export default class ModalsManageAddonsComponent extends Component { @action createCategory(store) { const category = this.store.createRecord('addon-category', { - name: 'Untitled Addon Category', + name: this.intl.t('storefront.component.modals.manage-addons-untitled-addon-category'), for: 'storefront_product_addon', owner_type: 'storefront:store', owner_uuid: store.id, diff --git a/addon/components/modals/order-ready-assign-driver.hbs b/addon/components/modals/order-ready-assign-driver.hbs index 89c1f9f..6e1aeb8 100644 --- a/addon/components/modals/order-ready-assign-driver.hbs +++ b/addon/components/modals/order-ready-assign-driver.hbs @@ -16,12 +16,12 @@

- +
{{#unless @options.adhoc}} - + {{model.name}} diff --git a/addon/components/modals/share-network.hbs b/addon/components/modals/share-network.hbs index a4f5766..1cd77b8 100644 --- a/addon/components/modals/share-network.hbs +++ b/addon/components/modals/share-network.hbs @@ -3,9 +3,9 @@
-

{{t "storefront.components.modals.share-network.invite-member"}}

+

{{t "storefront.component.modals.share-network.invite-member"}}

- {{t "storefront.components.modals.share-network.email-below"}} + {{t "storefront.component.modals.share-network.email-below"}}

@@ -13,19 +13,19 @@

Share with people and organizations

- {{t "storefront.components.modals.share-network.invite-network"}} + {{t "storefront.component.modals.share-network.invite-network"}}

- + {{tag}}
-

{{t "storefront.components.modals.share-network.get-link"}}

+

{{t "storefront.component.modals.share-network.get-link"}}

- +
{{#if @options.network.options.shareable_link_enabled}} diff --git a/addon/components/modals/store-form.hbs b/addon/components/modals/store-form.hbs index 543a1c2..1818443 100644 --- a/addon/components/modals/store-form.hbs +++ b/addon/components/modals/store-form.hbs @@ -1,9 +1,9 @@
- - + + - + {{tag}} diff --git a/addon/components/modals/store-location-form.hbs b/addon/components/modals/store-location-form.hbs index 5243b4a..621a8fb 100644 --- a/addon/components/modals/store-location-form.hbs +++ b/addon/components/modals/store-location-form.hbs @@ -7,15 +7,15 @@ {{result.address}} - + - - + + - + diff --git a/addon/components/schedule-manager.js b/addon/components/schedule-manager.js index 847802f..9dbb56d 100644 --- a/addon/components/schedule-manager.js +++ b/addon/components/schedule-manager.js @@ -6,6 +6,7 @@ export default class ScheduleManagerComponent extends Component { @service notifications; @service modalsManager; @service store; + @service intl; @computed('args.subject.hours.@each.id', 'hours.length') get schedule() { const schedule = {}; @@ -43,8 +44,8 @@ export default class ScheduleManagerComponent extends Component { }); this.modalsManager.show('modals/add-store-hours', { - title: this.intl.t('storefront.components.schedule-manager-title',{Day: day}), - acceptButtonText: 'Add hours', + title: this.intl.t('storefront.component.schedule-manager.add-new-hours-for-day',{Day: day}), + acceptButtonText: this.intl.t('storefront.component.schedule-manager-add-hours'), acceptButtonIcon: 'save', hours, confirm: (modal) => { @@ -52,7 +53,7 @@ export default class ScheduleManagerComponent extends Component { return hours.save().then((hours) => { subject.hours.pushObject(hours); - this.notifications.success(`New hours added for ${day}`); + this.notifications.success(this.intl.t('storefront.component.schedule-manager.new-hours-added-for-day',{day})); }); }, }); @@ -60,8 +61,8 @@ export default class ScheduleManagerComponent extends Component { @action removeHours(hours) { this.modalsManager.confirm({ - title: this.intl.t('storefront.components.schedule-manager.title-hour'), - body: this.intl.t('storefront.components.schedule-manager.body'), + title: this.intl.t('storefront.component.schedule-manager.you-wish-to-remove-these-hour'), + body: this.intl.t('storefront.component.schedule-manager.by-removing-these-operation'), acceptButtonIcon: 'trash', confirm: (modal) => { modal.startLoading(); diff --git a/addon/components/widget/customers.hbs b/addon/components/widget/customers.hbs index 8a13fcc..622f2c3 100644 --- a/addon/components/widget/customers.hbs +++ b/addon/components/widget/customers.hbs @@ -35,8 +35,8 @@
{{customer.name}}
-
{{t "storefront.components.widget.customers.phone"}}{{n-a customer.phone}}
-
{{t "storefront.components.widget.customers.email"}} {{n-a customer.email}}
+
{{t "storefront.component.widget.customers.phone"}}{{n-a customer.phone}}
+
{{t "storefront.component.widget.customers.email"}} {{n-a customer.email}}
{{/each}} diff --git a/translations/en-us.yaml b/translations/en-us.yaml index a8d1293..a5cd0b2 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -175,27 +175,31 @@ storefront: manage-addons: title: New Category delete: Delete Category - new: New Addon - name: Addon Name + new-addon: New Addon + addon-name: Addon Name description: Addon Description + delete-this-addon-category-assosiated-will-lost: Are you sure you wish to delete this addon category? All addons assosciated will be lost! + untitled-addon-category: Untitled Addon Category order-ready-assign-driver: driver-dispatch: You are about to set this order as ready and dispatch, use the dropdown below to select a driver to dispatch to.

Or optionally you can opt to dispatch order as adhoc which will ping the order to all nearby drivers to be accepted. - name: Select Driver - placeholder: Select Driver to Assign + adhoc-dispatch-nearby-drivers: Adhoc dispatch to nearby drivers + select-driver: Select Driver + select-driver-to-assign: Select Driver to Assign share-network: invite-member: Invite members to your network email-below: Grab a shareable invitiation link or send individual invites via email below. invite-network: Enter the emails of people or organizations you want to send an invite to your network. - placeholder: Add emails + add-email: Add emails get-link: Get link - helpText: Anyone with this link is able to join your network + enable-shareable-link: Enable shareable link + anyone-with-this-link-able-to-join-your-network: Anyone with this link is able to join your network store-form: - placeholder: Storefront Name - helpText: The name of your store. - placeholder-description: Storefront Description - helpText-sell: Give your store a brief description to let users know what you sell. - placeholder-tags: Add tags - store-location: + storefront-name: Storefront Name + the-name-of-your-store: The name of your store. + storefront-description-placeholder: Storefront Description + give-your-store-brief-description: Give your store a brief description to let users know what you sell. + add-tags-placeholder: Add tags + store-location-form: name: Street 2 name-code: Security Access Code name-postal: Postal Code @@ -451,6 +455,9 @@ storefront: warning-no-file-upload: No files in queue to upload! products-success-message: Successfully imported {resultsLength} products... settings: + + + api: gateways: create-new-payment-gateway: Create a new payment gateway save-gateway: Save Gateway From fdb6122865a43f49cf5df28c044f71a21f701748 Mon Sep 17 00:00:00 2001 From: Bayarbold8 Date: Wed, 17 Jan 2024 15:30:42 +0800 Subject: [PATCH 12/19] updated translations file --- translations/en-us.yaml | 230 ++-------------------------------------- 1 file changed, 9 insertions(+), 221 deletions(-) diff --git a/translations/en-us.yaml b/translations/en-us.yaml index a5cd0b2..9782121 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -200,9 +200,9 @@ storefront: give-your-store-brief-description: Give your store a brief description to let users know what you sell. add-tags-placeholder: Add tags store-location-form: - name: Street 2 - name-code: Security Access Code - name-postal: Postal Code + street-2: Street 2 + security-access-code: Security Access Code + postal-code: Postal Code widget: customers: widget-title: Recent Customers @@ -239,17 +239,18 @@ storefront: storefront-metrics: last-day: Last 30 days file-record: - title: Are you sure you wish to delete this file? - body: Once you delete this file you will be unable to recover it. + delete-this-file: Are you sure you wish to delete this file? + delete-this-file-you-will-unable-recover: Once you delete this file you will be unable to recover it. network-category-picker: no-subcategory: No subcategories for no-categories: No categories for this network create-category: Create a new category schedule-manager: add-hours: Add Hours - title: Add new hours for {day} - title-hour: Are you sure you wish to remove these hours? - body: By removing these operation/availability hours, your store or product may become inactive or unavailable according to the updated schedule... + add-new-hours-for-day: Add new hours for {day} + new-hours-added-for-day: New hours added for {day} + you-wish-to-remove-these-hour: Are you sure you wish to remove these hours? + by-removing-these-operation: By removing these operation/availability hours, your store or product may become inactive or unavailable according to the updated schedule... store-selector: no-stores: No stores to select create-storefront: Create a new @@ -455,8 +456,6 @@ storefront: warning-no-file-upload: No files in queue to upload! products-success-message: Successfully imported {resultsLength} products... settings: - - api: gateways: create-new-payment-gateway: Create a new payment gateway @@ -503,214 +502,3 @@ storefront: storefront-create-success: Your new storefront has been created! application: launch-app: Launch App - - # description-help-text: Give your store a brief description to let users know what your network is about. - # website: Store - # title-contact: Contact & Social - # helpText-email: Your business email. - # helpText-url: Your business website URL. - # facebook: Facebook - # placeholder-facebook: Facebook ID - # helpText-facebook: Your business Facebook page ID. - # instagram: Instagram - # placeholder-instagram: Instagram Username - # helpText-instagram: Your business Instagram username. - # twitter: Twitter - # placeholder-twitter: Twitter Username - # helpText-twitter: Your business Twitter username. - # success-message: Changes to network saved. - # title: Create a new payment gateway - # success-network: New gateway added to network - # success-payment: Payment gateway changes saved! - # title-channel: Create a new notification channel - # success-channel: New notification channel added to network! - # success-save: Notification channel changes saved! - # stores: - # 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-category: Add store to category - - # success-message: New network category created. - # category-name: Edit category ({categoryName}) - # title-store: Add stores to network - # title-remove: Remove this store ({store.name}) from this network ({this.network.name})? - # body-network: Are you sure you wish to remove this store from this network? It will no longer be findable by this network. - # title-storefront: Viewing {store.name} storefront - # store-name: Editing {store.name} storefront - # add-store: Add stores to network - # invitation: Invitations sent to recipients! - # title: Network changes not saved! - # body: Going back will rollback all unsaved changes, are you sure you wish to continue? - - - - # title: Create a new network - # success-message: Yout new storefront network has been created! - # title-network: Are you sure you wish to delete this network ({networkName})? All assigned stores, customers, orders will no longer be reachable. - - # orders: - # index: - # view-order: View Order - # cancel-order: Cancel Order - # delete-order: Delete Order - - - - # settings: - # - - # network: - # index: - # title: General Network Settings - # general-network: General Network Settings - # general-settings: Provide the general settings for your network or marketplace. - # placeholder: Storefront Name - # helpText: The name of your network or marketplace. - # placeholder-description: Storefront Description - # helpText-about: Give your store a brief description to let users know what your network is about. - # title-contact: Contact & Social - # helpText-email: Your business email. - # helpText-url: Your business website URL. - # facebook: Facebook - # placeholder-facebook: Facebook ID - # helpText-facebook: Your business Facebook page ID. - # instagram: Instagram - # placeholder-instagram: Instagram Username - # helpText-instagram: Your business Instagram username. - # twitter: Twitter - # placeholder-twitter: Twitter Username - # helpText-twitter: Your business Twitter username. - # title-logo: Logo & Backdrop - # helpText-logo: Logo for your store. - # upload-logo: Upload new logo - # name-backdrop: Backdrop - # upload-backdrop: Upload new backdrop - # certain-event: Configure who should be alerted for certain events. - # new-order: New order alert - # placeholder-order: Select users to alert for new order - # enable-tax: Enable tax - # name-tax: Tax Percentage - # placeholder-tax: Tax Percentage - # helpText-tax: The sales tax percentage to apply to orders. - # auto-accept: Auto accept incoming orders - # auto-dispatch: Auto dispatch orders - # require-delivery: Require proof of delivery - # name-method: Proof of Delivery Method - # cash-delivery: Enable cash on delivery - # enable-order: Enable order pickup - # enable-tip: Enable tips - # enable-delivery: Enable delivery tips - # enable-cart: Enable multi-cart checkout - # enable-review: Enable user reviews - # save-changes: Save Changes - # api-settings: API Settings - # access-key: Access key for Storefront API & Integrations. - # name-network: Network Key - # helpText-network : This is your network key, use this to enable apps and integrations for your network. - # title-gateways: Payment Gateways - # gateways-settings: Gateway Settings - # payment-gateways: Add or manage your payment gateway settings here. - # text-gateways: Create new gateway - # name-gateways: Gateway name - # helpText-internally: Give your payment gateway a name, this will only be relevent internally - # name-code: Gateway code - # helpText-sdk: Identifier code used to identify gateway to the SDK - # name-url: Callback URL - # helpText-callback: Callback URL if applicable - # name-return: Return URL - # helpText-return: Return URL if applicable - # text-delete: Delete payment gateway - # title-channel: Notification Channels - # notification-setting: Notification Settings - # storefront-channel: Configure notification channels for your storefront, each notification channel additionally can have it's own rules and options. - # text-new-channel: New channel - # stores: - # title: Stores - # text: Add Stores - # text-store: Invite Stores - # title-network: Manage Network - # setting: Settings - # store: Stores - # customer: Customers - # orders: - # index: - # delete-order: Delete Orders - # products: - # index: - # text: Manage Addons - # title: Product Categories - # settings: - # api: - # api-setting: API Settings - # access-key: Access key for Storefront API & Integrations. - # name: Store Key - # helpText: This is your store key, use this to enable apps and integrations for your storefront. - # gateways: - # gateway-setting: Gateway Settings - # payment: Add or manage your payment gateway settings here. - # text: Create new gateway - # name: Gateway name - # name-code: Gateway code - # name-callback: Callback URL - # name-return: Return URL - # helpText: Give your payment gateway a name, this will only be relevent internally - # helpText-sdk: Identifier code used to identify gateway to the SDK - # helpText-callback: Callback URL if applicable - # helpText-return: Return URL if applicable - # text-delete: Delete payment gateway - # index: - # general-setting: General Settings - # storefront: Provide the general settings for your storefront. - # placeholder: Storefront Name - # helpText: The name of your store. - # placeholder-storefront: Storefront Description - # helpText-description: Give your store a brief description to let users know what you sell. - # placeholder-tag: Add tags - # title: Contact & Social - # helpText-website: Your business website URL. - # placeholder-facebook: Facebook ID - # helpText-facebook: Your business Facebook page ID. - # placeholder-instagram: Instagram Username - # helpText-instagram: Your business Instagram username. - # placeholder-twitter: Twitter Username - # helpText-twitter: Your business Twitter username. - # title-logo: Logo & Backdrop - # helpText-logo: Logo for your store. - # upload-logo: Upload new logo - # helpText-store: Optional banner or background image for your store. - # upload-backdrop: Upload new backdrop - # title-image: Images & Videos - # drop-upload: Drop to upload - # ready-upload: ready for upload. - # upload-image: Upload Images & Videos - # dropzone: Drag and drop image and video files onto this dropzone - # upload-queue: Upload Queue - # event: Configure who should be alerted for certain events. - # name-alert: New order alert - # placeholder-alert: Select users to alert for new order - # enable-tax: Enable tax - # name-tax: Tax Percentage - # placeholder-tax: Tax Percentage - # helpText-tax: The sales tax percentage to apply to orders. - # auto-accept: Auto accept incoming orders - # auto-dispatch: Auto dispatch orders - # delivery: Require proof of delivery - # name-method: Proof of Delivery Method - # enable-method: Enable cash on delivery - # order-pickup: Enable order pickup - # enable-tip: Enable tips - # enable-delivery: Enable delivery tips - # name-select: Select integrated vendors to use - # placeholder-select: Select integrated vendors to use - # text-save: Save Changes - # locations: - # location-setting: Location Settings - # manage-store: Manage your stores operating locations and hours - # text-location: Create new location - # store-hour: Manage store hours - # notification: - # notification-setting: Notification Settings - # notification-storefront: Configure notification channels for your storefront, each notification channel additionally can have it's own rules and options. - # text: New channel - # application: - # launch-app: Launch App From 16d9bc15d8e3c37a19918204b5bedf0d7bc47e2a Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Wed, 17 Jan 2024 15:48:52 +0800 Subject: [PATCH 13/19] fixed up translations build --- addon/components/file-record.hbs | 11 +- addon/components/modals/add-store-hours.hbs | 14 +- addon/components/modals/assign-driver.hbs | 19 +- .../components/modals/create-first-store.hbs | 18 +- addon/components/modals/create-gateway.hbs | 18 +- .../modals/create-network-category.hbs | 24 +- addon/components/modals/create-network.hbs | 12 +- .../components/modals/create-new-variant.hbs | 24 +- .../modals/create-notification-channel.hbs | 35 +-- .../modals/create-product-category.hbs | 21 +- addon/components/modals/create-store.hbs | 12 +- addon/components/modals/import-products.hbs | 32 ++- addon/components/modals/incoming-order.hbs | 14 +- addon/components/modals/manage-addons.hbs | 57 ++++- .../modals/order-ready-assign-driver.hbs | 31 ++- .../modals/select-addon-category.hbs | 9 +- addon/components/modals/share-network.hbs | 21 +- addon/components/modals/store-form.hbs | 25 ++- .../components/modals/store-location-form.hbs | 14 +- addon/components/network-category-picker.hbs | 13 +- addon/components/schedule-manager.hbs | 9 +- addon/components/schedule-manager.js | 4 +- addon/components/store-selector.hbs | 13 +- addon/components/widget/customers.hbs | 11 +- addon/components/widget/orders.hbs | 45 +++- addon/controllers/customers/index.js | 13 +- .../networks/index/network/stores.js | 8 +- addon/controllers/orders/index.js | 2 +- addon/controllers/products/index/category.js | 4 +- .../products/index/category/edit.js | 2 +- .../products/index/category/new.js | 6 +- addon/controllers/settings/gateways.js | 2 +- addon/controllers/settings/locations.js | 6 +- addon/templates/customers/index.hbs | 23 +- addon/templates/customers/index/edit.hbs | 1 - addon/templates/networks/index.hbs | 7 +- .../networks/index/network/customers.hbs | 1 - .../networks/index/network/index.hbs | 208 +++++++++++++++--- .../networks/index/network/orders.hbs | 1 - .../networks/index/network/stores.hbs | 19 +- addon/templates/orders/index.hbs | 23 +- addon/templates/orders/index/edit.hbs | 1 - addon/templates/orders/index/new.hbs | 1 - addon/templates/orders/index/view.hbs | 1 - addon/templates/products/index.hbs | 27 ++- .../templates/products/index/category/new.hbs | 77 ++++++- addon/templates/settings/index.hbs | 133 +++++++++-- addon/templates/settings/locations.hbs | 9 +- translations/en-us.yaml | 28 +-- 49 files changed, 901 insertions(+), 208 deletions(-) diff --git a/addon/components/file-record.hbs b/addon/components/file-record.hbs index 1c8fd90..4252f27 100644 --- a/addon/components/file-record.hbs +++ b/addon/components/file-record.hbs @@ -1,6 +1,9 @@
-
+
{{#if this.isVideo}} {{/if}} @@ -15,7 +18,11 @@ {{/if}}
- +
diff --git a/addon/components/modals/add-store-hours.hbs b/addon/components/modals/add-store-hours.hbs index 90fd666..77d16f0 100644 --- a/addon/components/modals/add-store-hours.hbs +++ b/addon/components/modals/add-store-hours.hbs @@ -1,8 +1,18 @@
- - + +
\ No newline at end of file diff --git a/addon/components/modals/assign-driver.hbs b/addon/components/modals/assign-driver.hbs index 32116d4..54b4857 100644 --- a/addon/components/modals/assign-driver.hbs +++ b/addon/components/modals/assign-driver.hbs @@ -3,7 +3,12 @@
- +
@@ -14,8 +19,16 @@

- + {{model.name}} diff --git a/addon/components/modals/create-first-store.hbs b/addon/components/modals/create-first-store.hbs index 8b391b5..35cfbd8 100644 --- a/addon/components/modals/create-first-store.hbs +++ b/addon/components/modals/create-first-store.hbs @@ -11,9 +11,21 @@
- - - + + +
diff --git a/addon/components/modals/create-gateway.hbs b/addon/components/modals/create-gateway.hbs index 3228d44..a5a3350 100644 --- a/addon/components/modals/create-gateway.hbs +++ b/addon/components/modals/create-gateway.hbs @@ -7,12 +7,24 @@
{{#if @options.schema}} - + - - + +
diff --git a/addon/components/modals/create-network-category.hbs b/addon/components/modals/create-network-category.hbs index 9b95d4e..0a48999 100644 --- a/addon/components/modals/create-network-category.hbs +++ b/addon/components/modals/create-network-category.hbs @@ -1,12 +1,30 @@
- + {{model.name}} - - + + {{!--
diff --git a/addon/components/modals/create-network.hbs b/addon/components/modals/create-network.hbs index cc290a1..e4efe5b 100644 --- a/addon/components/modals/create-network.hbs +++ b/addon/components/modals/create-network.hbs @@ -12,8 +12,16 @@
- - + +
diff --git a/addon/components/modals/create-new-variant.hbs b/addon/components/modals/create-new-variant.hbs index fb10728..75d4c64 100644 --- a/addon/components/modals/create-new-variant.hbs +++ b/addon/components/modals/create-new-variant.hbs @@ -1,12 +1,28 @@
- - + +
- +
- +
diff --git a/addon/components/modals/create-notification-channel.hbs b/addon/components/modals/create-notification-channel.hbs index e0c20e9..be48cf7 100644 --- a/addon/components/modals/create-notification-channel.hbs +++ b/addon/components/modals/create-notification-channel.hbs @@ -3,20 +3,28 @@ {{#unless @options.channel.id}}
-
{{/unless}} {{#if @options.schema}} - + {{#if @options.channel.id}} - - + + {{/if}}
@@ -24,18 +32,15 @@ {{#each-in @options.schema as |key value|}} {{#if (is-bool-value value)}}
- +
- {{else if (or (eq key 'private_key_content') (eq key 'firebase_credentials_json'))}} + {{else if (or (eq key "private_key_content") (eq key "firebase_credentials_json"))}} -
{{t "storefront.components.widget.orders.id"}}{{t "storefront.component.widget.orders.id-column"}} {{t "storefront.common.amount"}} {{t "storefront.common.customer"}} {{t "storefront.common.driver"}} {{#if order.isFresh}} -