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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Added `Order#currency_must_be_supported_by_store` validation
Damian Legawiececc56b0b57b5
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 3fd08cd40f..881f3c48b7 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -184,6 +184,7 @@ module Spreevalidates :shipment_total, MONEY_VALIDATIONvalidates :promo_total, NEGATIVE_MONEY_VALIDATIONvalidates :total, MONEY_VALIDATION+ validate :currency_must_be_supported_by_storedelegate :update_totals, :persist_totals, to: :updaterdelegate :merge!, to: :merger@@ -1010,6 +1011,15 @@ module Spreeself.currency ||= store&.default_currencyend+ def currency_must_be_supported_by_store+ return if currency.blank? || store.blank?++ supported_codes = store.supported_currencies_list.map(&:iso_code)+ unless supported_codes.include?(currency)+ errors.add(:currency, Spree.t(:currency_not_supported_by_store))+ end+ end+def collect_payment_methodsSpree::Deprecation.warn('`Order#collect_payment_methods` is deprecated and will be removed in Spree 5.5. Use `collect_frontend_payment_methods` instead.')diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 06fb0bca5f..ebfc727e1a 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -950,6 +950,7 @@ en:credits: Creditscurrencies: Currenciescurrency: Currency+ currency_not_supported_by_store: is not supported by this storecurrency_settings: Currency Settingscurrent: Currentcurrent_password: Current passworddiff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 46821e84af..3f616e1b9d 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -92,6 +92,33 @@ describe Spree::Order, type: :model doendend+ describe 'Validations' do+ describe '#currency_must_be_supported_by_store' do+ let(:order) { build(:order, store: store, currency: currency) }++ before do+ allow(store).to receive(:supported_currencies).and_return(['EUR', 'USD'])+ end++ context 'when currency is supported by the store' do+ let(:currency) { 'EUR' }++ it 'is valid' do+ expect(order).to be_valid+ end+ end++ context 'when currency is not supported by the store' do+ let(:currency) { 'JPY' }++ it 'is invalid' do+ expect(order).not_to be_valid+ expect(order.errors[:currency]).to include(Spree.t(:currency_not_supported_by_store))+ end+ end+ end+ end+describe '#full_name' dosubject { order.full_name }@@ -224,7 +251,7 @@ describe Spree::Order, type: :model doendend- context 'events', events: true do+ context 'events', :events dolet(:order) { create(:completed_order_with_totals, store: store) }it 'publishes order.canceled event' do@@ -240,7 +267,7 @@ describe Spree::Order, type: :model dobefore { order.cancel! }- it 'publishes order.resumed event', events: true do+ it 'publishes order.resumed event', :events doexpect(order).to receive(:publish_event).with('order.resumed').at_least(:once)allow(order).to receive(:publish_event).with(anything)order.resume!@@ -290,7 +317,7 @@ describe Spree::Order, type: :model doendend- context 'events', events: true do+ context 'events', :events dolet(:order) { create(:completed_order_with_totals) }it 'publishes order.canceled event' do@@ -401,7 +428,7 @@ describe Spree::Order, type: :model doendend- context 'events', events: true do+ context 'events', :events dolet(:order) { create(:order_with_line_items, store: store) }before { order.update_column(:state, 'complete') }@@ -415,10 +442,10 @@ describe Spree::Order, type: :model doit 'enqueues RefreshMetricsJob for each product in the order' doproduct_count = order.line_items.map { |li| li.variant.product_id }.uniq.count- expect {+ expect doorder.finalize!perform_enqueued_jobs(only: Spree::Events::SubscriberJob)- }.to have_enqueued_job(Spree::Products::RefreshMetricsJob).exactly(product_count).times+ end.to have_enqueued_job(Spree::Products::RefreshMetricsJob).exactly(product_count).timesendendend@@ -571,11 +598,11 @@ describe Spree::Order, type: :model doenddescribe '#currency' do- context 'when object currency is ABC' do- before { order.currency = 'ABC' }+ context 'when object currency is EUR' do+ before { order.currency = 'EUR' }it 'returns the currency from the object' do- expect(order.currency).to eq('ABC')+ expect(order.currency).to eq('EUR')endendend@@ -696,7 +723,7 @@ describe Spree::Order, type: :model doendend- context 'events', events: true do+ context 'events', :events doit 'publishes order.updated event' doorder = create(:order_with_totals, state: 'delivery')expect(order).to receive(:publish_event).with('order.updated').at_least(:once)@@ -973,7 +1000,7 @@ describe Spree::Order, type: :model doit_behaves_like '#associate_user!', trueend- context 'events', events: true do+ context 'events', :events dolet(:order) { create(:order, order_attributes) }it 'publishes order.updated event' do@@ -1026,7 +1053,7 @@ describe Spree::Order, type: :model doorder.approved_by(admin_user)end- context 'events', events: true do+ context 'events', :events doit 'publishes order.approved event' doexpect(order).to receive(:publish_event).with('order.approved').at_least(:once)order.approved_by(admin_user)@@ -1042,7 +1069,7 @@ describe Spree::Order, type: :model doexpect(order.reload.considered_risky).to be trueend- context 'events', events: true do+ context 'events', :events doit 'publishes order.updated event' doexpect(order).to receive(:publish_event).with('order.updated')order.considered_risky!@@ -1062,7 +1089,7 @@ describe Spree::Order, type: :model doexpect(order.reload.considered_risky).to be falseend- context 'events', events: true do+ context 'events', :events doit 'publishes order.approved event' doexpect(order).to receive(:publish_event).with('order.approved')order.approve!@@ -1097,7 +1124,7 @@ describe Spree::Order, type: :model doexpect(order.reload.state).to eq('address')end- context 'events', events: true do+ context 'events', :events doit 'publishes order.updated event' doexpect(order).to receive(:publish_event).with('order.updated').at_least(:once)order.ensure_updated_shipmentsdiff --git a/core/spec/services/spree/cart/create_spec.rb b/core/spec/services/spree/cart/create_spec.rbindex 5db50a8992..bc7e2bd48e 100644--- a/core/spec/services/spree/cart/create_spec.rb+++ b/core/spec/services/spree/cart/create_spec.rb@@ -23,23 +23,6 @@ module Spreeendend- context 'create an order with store in params' do- let(:store_2) { create :store }- let(:order_params) { { store: store_2, currency: 'XVII' } }- let(:execute) { subject.call user: user, store: store_2, currency: currency, order_params: order_params }- let(:value) { execute.value }-- it do- expect { execute }.to change(Order, :count)- expect(execute).to be_success- expect(value).to eq expected- expect(expected.user).to eq user- expect(expected.store).to eq store_2- expect(expected.currency).to eq 'XVII'- expect(expected.number).to be_present- end- end-context 'create an order with store currency' dolet(:order_params) { { store: store, currency: nil } }let(:execute) { subject.call user: user, store: store, currency: currency, order_params: order_params }