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.

Add `Order#use_shipping` (#12281)

Damian Legawiecfeea2925a8c7
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 51dbdf50ae..fb7d096554 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -146,7 +146,8 @@ module Spree
before_validation :ensure_currency_presence
before_validation :clone_billing_address, if: :use_billing?
- attr_accessor :use_billing
+ before_validation :clone_shipping_address, if: :use_shipping?
+ attr_accessor :use_billing, :use_shipping
before_create :link_by_email
before_update :ensure_updated_shipments, :homogenize_line_item_currencies, if: :currency_changed?
@@ -760,6 +761,10 @@ module Spree
use_billing.in?([true, 'true', '1'])
end
+ def use_shipping?
+ use_shipping.in?([true, 'true', '1'])
+ end
+
def ensure_currency_presence
self.currency ||= store.default_currency
end
diff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rb
index 08c4f7ea69..3a77caf14c 100644
--- a/core/lib/spree/permitted_attributes.rb
+++ b/core/lib/spree/permitted_attributes.rb
@@ -48,7 +48,7 @@ module Spree
]
@@checkout_attributes = [
- :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing,
+ :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :use_shipping,
:user_id, :bill_address_id, :ship_address_id
]
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index b52b6984ea..ff4df0ed9b 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -15,7 +15,7 @@ describe Spree::Order, type: :model do
it_behaves_like 'metadata'
- describe '.scopes' do
+ describe 'Scopes' do
let!(:user) { create(:user) }
let!(:completed_order) { create(:order, user: user, completed_at: Time.current) }
let!(:incompleted_order) { create(:order, user: user, completed_at: nil) }
@@ -36,6 +36,25 @@ describe Spree::Order, type: :model do
end
end
+ describe 'Callbacks' do
+ let(:order) { build(:order, user: user, store: store, ship_address: ship_address) }
+ let(:ship_address) { create(:address, user: user) }
+
+ describe '#clone_shipping_address' do
+ it 'clones the shipping address when use_shipping is true' do
+ order.use_shipping = true
+ order.save!
+ expect(order.ship_address).to eq(order.bill_address)
+ end
+
+ it 'does not clone the shipping address when use_shipping is false' do
+ order.use_shipping = false
+ order.save!
+ expect(order.ship_address).not_to eq(order.bill_address)
+ end
+ end
+ end
+
describe '#update_with_updater!' do
let(:updater) { Spree::OrderUpdater.new(order) }