Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Admin promotions - translations and spec fixes

Damian Legawiec01c1bf4c1872
diff --git a/admin/app/views/spree/admin/promotions/form/_kind.html.erb b/admin/app/views/spree/admin/promotions/form/_kind.html.erb
index dc57c285df..4779ef1d9f 100644
--- a/admin/app/views/spree/admin/promotions/form/_kind.html.erb
+++ b/admin/app/views/spree/admin/promotions/form/_kind.html.erb
@@ -49,7 +49,7 @@
<div class="mt-4 custom-control custom-radio">
<%= f.radio_button :kind, :automatic, data: { toggle: :collapse, target: '#coupon-code' }, class: 'custom-control-input' %>
- <%= f.label :kind_automatic, Spree.t(:automatic), class: 'custom-control-label' %>
+ <%= f.label :kind_automatic, Spree.t(:automatic_promotion), class: 'custom-control-label' %>
<p class="form-text text-muted mt-2 mb-0">
This promotion will be automatically applied to all eligible orders.
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index 3dad4ece9c..1b54260f3f 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -41,6 +41,9 @@ en:
remove_tags: Remove tags
copy_payment_link: Copy Payment Link
copy_to_clipboard: Copy to clipboard
+ coupon_codes:
+ used: Used
+ unused: Unused
created_at: Created At
dashboard:
getting_started:
diff --git a/api/spec/integration/api/v2/platform/promotion_actions_spec.rb b/api/spec/integration/api/v2/platform/promotion_actions_spec.rb
index c6fa34df3f..e874d29932 100644
--- a/api/spec/integration/api/v2/platform/promotion_actions_spec.rb
+++ b/api/spec/integration/api/v2/platform/promotion_actions_spec.rb
@@ -12,9 +12,9 @@ describe 'Promotion Actions API', swagger: true do
let(:promotion) { create(:promotion) }
- let(:id) { create(:promotion_action, promotion: promotion).id }
- let(:records_list) { create_list(:promotion_action, 2, promotion: promotion) }
- let(:valid_create_param_value) { build(:promotion_action, promotion: promotion).attributes }
+ let(:id) { create(:promotion_action_create_adjustment, promotion: promotion).id }
+ let(:records_list) { create_list(:promotion_action_create_adjustment, 2, promotion: promotion) }
+ let(:valid_create_param_value) { build(:promotion_action_create_adjustment, promotion: promotion).attributes }
let(:valid_update_param_value) do
{
type: 'Spree::Promotion::Actions::CreateAdjustment'
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 2267271b96..66427aabf8 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -632,6 +632,7 @@ en:
authorization_failure: Authorization Failure
authorized: Authorized
auto_capture: Auto Capture
+ automatic_promotion: Automatic
automatic_taxon_names:
new_arrivals: New arrivals
on_sale: On sale
@@ -977,6 +978,7 @@ en:
expedited_exchanges_warning: Any specified exchanges will ship to the customer immediately upon saving. The customer will be charged the full amount of the item if they do not return the original item within %{days_window} days.
expiration: Expiration
expiration_date: Expiration Date
+ expired: Expired
explore_taxon: Explore taxon
export: Export
export_mailer:
@@ -1571,12 +1573,12 @@ en:
promotion_not_cloned: 'Promotion has not been cloned. Reason: %{error}'
promotion_rule: Promotion Rule
promotion_rule_types:
- currency:
- description: Limit to orders in a specific currency
- name: Currency
country:
description: Limit to orders with shipping address in a specific country
name: Country
+ currency:
+ description: Limit to orders in a specific currency
+ name: Currency
first_order:
description: Must be the customer's first order
name: First order
@@ -1587,7 +1589,7 @@ en:
description: Only One Use Per User
name: One Use Per User
option_value:
- description: Order includes specified product(s) with matching option value(s)
+ description: Order includes products with matching option value(s)
name: Option Value(s)
product:
description: Order includes specified product(s)