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.

Fixed tests

Damian Legawiec90e63365ca41
diff --git a/backend/engines/api/spec/controllers/spree/api/v3/store/markets/countries_controller_spec.rb b/backend/engines/api/spec/controllers/spree/api/v3/store/markets/countries_controller_spec.rb
index 6c31bc0fb8..37f84047e0 100644
--- a/backend/engines/api/spec/controllers/spree/api/v3/store/markets/countries_controller_spec.rb
+++ b/backend/engines/api/spec/controllers/spree/api/v3/store/markets/countries_controller_spec.rb
@@ -6,11 +6,9 @@ RSpec.describe Spree::Api::V3::Store::Markets::CountriesController, type: :contr
include_context 'API v3 Store'
let(:country) { create(:country) }
- let(:zone) { create(:zone, kind: :country) }
- let!(:market) { create(:market, store: store, zone: zone) }
+ let!(:market) { create(:market, store: store, countries: [country]) }
before do
- zone.zone_members.create!(zoneable: country)
request.headers['x-spree-api-key'] = api_key.token
end
diff --git a/backend/engines/api/spec/controllers/spree/api/v3/store/markets_controller_spec.rb b/backend/engines/api/spec/controllers/spree/api/v3/store/markets_controller_spec.rb
index 1e65a528e9..3a2ccc0f23 100644
--- a/backend/engines/api/spec/controllers/spree/api/v3/store/markets_controller_spec.rb
+++ b/backend/engines/api/spec/controllers/spree/api/v3/store/markets_controller_spec.rb
@@ -5,8 +5,8 @@ RSpec.describe Spree::Api::V3::Store::MarketsController, type: :controller do
include_context 'API v3 Store'
- let(:zone) { create(:zone_with_country) }
- let!(:market) { create(:market, :default, store: store, zone: zone, name: 'North America', currency: 'USD') }
+ let(:country) { create(:country) }
+ let!(:market) { create(:market, :default, store: store, countries: [country], name: 'North America', currency: 'USD') }
before do
request.headers['x-spree-api-key'] = api_key.token
@@ -62,8 +62,6 @@ RSpec.describe Spree::Api::V3::Store::MarketsController, type: :controller do
end
describe 'GET #resolve' do
- let(:country) { zone.country_list.first }
-
it 'resolves country to market' do
get :resolve, params: { country: country.iso }
diff --git a/backend/engines/core/config/locales/en.yml b/backend/engines/core/config/locales/en.yml
index 8f4bc9b7b8..1255c25dd5 100644
--- a/backend/engines/core/config/locales/en.yml
+++ b/backend/engines/core/config/locales/en.yml
@@ -1357,11 +1357,11 @@ en:
manual_adjustments: Manual Adjustments
manual_intervention_required: Manual intervention required
mark_as_default: Mark as default
- master: Master
- master_price: Master Price
market: Market
market_ids: Markets
markets: Markets
+ master: Master
+ master_price: Master Price
master_sku: Master SKU
match_choices:
all: All
@@ -1766,6 +1766,9 @@ en:
customer_group_rule:
description: Apply pricing to specific customer groups
name: Customer Group
+ market_rule:
+ description: Apply pricing based on the market
+ name: Market
user_rule:
description: Apply pricing to specific customers
name: User
@@ -1775,9 +1778,6 @@ en:
zone_rule:
description: Apply pricing based on geographic zone
name: Zone
- market_rule:
- description: Apply pricing based on the market
- name: Market
price_rules:
customer_group_rule:
description: Apply pricing to specific customer groups