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.

Do not require shipping address for digital delivery (#12894)

Damian Kaczmarczyk92678ca335c5
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 8f3107cd35..0a3ff511a2 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -860,6 +860,10 @@ module Spree
line_items
end
+ def requires_ship_address?
+ !digital?
+ end
+
private
def link_by_email
diff --git a/core/app/models/spree/shipment.rb b/core/app/models/spree/shipment.rb
index d810580a03..a0166e91be 100644
--- a/core/app/models/spree/shipment.rb
+++ b/core/app/models/spree/shipment.rb
@@ -433,6 +433,8 @@ module Spree
end
def can_get_rates?
+ return true unless order.requires_ship_address?
+
order.ship_address&.valid?
end
diff --git a/core/app/models/spree/shipping_method.rb b/core/app/models/spree/shipping_method.rb
index a10891ae6c..7e75ec55ff 100644
--- a/core/app/models/spree/shipping_method.rb
+++ b/core/app/models/spree/shipping_method.rb
@@ -48,6 +48,7 @@ module Spree
end
def include?(address)
+ return true unless requires_zone_check?
return false unless address
zones.includes(:zone_members).any? do |zone|
@@ -55,6 +56,10 @@ module Spree
end
end
+ def requires_zone_check?
+ !calculator.is_a?(Spree::Calculator::Shipping::DigitalDelivery)
+ end
+
def build_tracking_url(tracking)
return if tracking.blank?
diff --git a/core/spec/models/spree/shipment_spec.rb b/core/spec/models/spree/shipment_spec.rb
index 80e1ffe621..bb6b9780cb 100644
--- a/core/spec/models/spree/shipment_spec.rb
+++ b/core/spec/models/spree/shipment_spec.rb
@@ -325,6 +325,37 @@ describe Spree::Shipment, type: :model do
end
end
+ describe '#can_get_rates?' do
+ let(:digital_shipping_method) { create(:digital_shipping_method) }
+ let(:digital_product) { create(:product, shipping_category: digital_shipping_method.shipping_categories.first) }
+ let(:digital_line_item) { create(:line_item, variant: create(:variant, product: digital_product)) }
+
+ it 'returns true if order is digital and it does not have a ship address' do
+ order.ship_address = nil
+ order.line_items = [digital_line_item]
+ expect(order.digital?).to eq(true)
+ expect(shipment.send(:can_get_rates?)).to be_truthy
+ end
+
+ it 'returns false if order is not digital and it does not have a ship address' do
+ order.ship_address = nil
+ expect(order.digital?).to eq(false)
+ expect(shipment.send(:can_get_rates?)).to be_falsey
+ end
+
+ it 'returns false when order\'s ship address is not valid' do
+ order.ship_address = build(:address, address1: nil)
+ expect(order.digital?).to eq(false)
+ expect(shipment.send(:can_get_rates?)).to be_falsey
+ end
+
+ it 'returns true when order\'s ship address is valid' do
+ order.ship_address = build(:address)
+ expect(order.digital?).to eq(false)
+ expect(shipment.send(:can_get_rates?)).to be_truthy
+ end
+ end
+
context 'shipping_rates' do
let(:shipment) { create(:shipment) }
let(:shipping_method1) { create(:shipping_method) }
diff --git a/core/spec/models/spree/shipping_method_spec.rb b/core/spec/models/spree/shipping_method_spec.rb
index 232eecf7cd..a8d074f4a3 100644
--- a/core/spec/models/spree/shipping_method_spec.rb
+++ b/core/spec/models/spree/shipping_method_spec.rb
@@ -35,6 +35,17 @@ describe Spree::ShippingMethod, type: :model do
end
end
+ describe '#requires_zone_check?' do
+ it 'returns true if the shipping method is not digital' do
+ expect(shipping_method.requires_zone_check?).to be_truthy
+ end
+
+ it 'returns false if the shipping method is digital' do
+ shipping_method = create(:digital_shipping_method)
+ expect(shipping_method.requires_zone_check?).to be_falsey
+ end
+ end
+
context 'calculators' do
it "rejects calculators that don't inherit from Spree::ShippingCalculator" do
allow(Spree::ShippingMethod).to receive_message_chain(:spree_calculators, :shipping_methods).and_return([