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: raise an error when trying to add a variant without price in s… (#12103)

Damian Legawiec241da461eb5a
diff --git a/api/spec/requests/spree/api/v2/storefront/cart_spec.rb b/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
index f65c418c92..af555f1218 100644
--- a/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
@@ -6,7 +6,7 @@ describe 'API V2 Storefront Cart Spec', type: :request do
let(:user) { create(:user) }
let(:order) { create(:order, user: user, store: store, currency: currency) }
let(:product) { create(:product, stores: [store]) }
- let(:variant) { create(:variant, product: product) }
+ let(:variant) { create(:variant, product: product, prices: [create(:price, currency: store.default_currency)]) }
include_context 'API v2 tokens'
@@ -259,6 +259,21 @@ describe 'API V2 Storefront Cart Spec', type: :request do
end
end
+ shared_examples 'doesnt add item with no price with cart currency' do
+ let(:variant) { create(:variant, product: product) }
+ let(:price) { create(:price, currency: 'MKD') }
+
+ before do
+ variant.default_price = price
+ variant.save
+ execute
+ end
+
+ it 'returns an error' do
+ expect(json_response[:error]).to eq("#{variant.name} is not available in #{order.currency}")
+ end
+ end
+
context 'as a signed in user' do
include_context 'order with a physical line item'
@@ -267,6 +282,7 @@ describe 'API V2 Storefront Cart Spec', type: :request do
it_behaves_like 'doesnt add item with quantity unnavailble'
it_behaves_like 'doesnt add item from different store'
it_behaves_like 'doesnt add non-existing item'
+ it_behaves_like 'doesnt add item with no price with cart currency'
it_behaves_like 'doesnt add item if metadata is not a hash'
end
@@ -281,6 +297,7 @@ describe 'API V2 Storefront Cart Spec', type: :request do
it_behaves_like 'doesnt add item with quantity unnavailble'
it_behaves_like 'doesnt add item from different store'
it_behaves_like 'doesnt add non-existing item'
+ it_behaves_like 'doesnt add item with no price with cart currency'
it_behaves_like 'doesnt add item if metadata is not a hash'
end
diff --git a/core/app/services/spree/cart/add_item.rb b/core/app/services/spree/cart/add_item.rb
index 9036afb1d4..bedb7220d8 100644
--- a/core/app/services/spree/cart/add_item.rb
+++ b/core/app/services/spree/cart/add_item.rb
@@ -16,6 +16,8 @@ module Spree
options ||= {}
quantity ||= 1
+ return failure(variant, "#{variant.name} is not available in #{order.currency}") if variant.amount_in(order.currency).nil?
+
line_item = Spree::Dependencies.line_item_by_variant_finder.constantize.new.execute(order: order, variant: variant, options: options)
line_item_created = line_item.nil?
diff --git a/core/spec/services/spree/cart/add_item_spec.rb b/core/spec/services/spree/cart/add_item_spec.rb
index 776243ba37..cfdb7a79cd 100644
--- a/core/spec/services/spree/cart/add_item_spec.rb
+++ b/core/spec/services/spree/cart/add_item_spec.rb
@@ -231,5 +231,18 @@ module Spree
end
end
end
+
+ context 'when variant has price in the cart currency, but with amount set to nil' do
+ let(:call_service) { subject.call(order: order, variant: variant, quantity: 1) }
+
+ before do
+ variant.prices.first.update(amount: nil)
+ end
+
+ it 'does not add the item and raises error' do
+ expect(call_service).to be_failure
+ expect(call_service.error).not_to be_nil
+ end
+ end
end
end