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.

Merge commit from fork

Szymon Chorobski29282d1565ba
diff --git a/api/spec/controllers/spree/api/v2/storefront/checkout_controller_spec.rb b/api/spec/controllers/spree/api/v2/storefront/checkout_controller_spec.rb
new file mode 100644
index 0000000000..8cc43fd005
--- /dev/null
+++ b/api/spec/controllers/spree/api/v2/storefront/checkout_controller_spec.rb
@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe 'Spree::Api::V2::Storefront::CheckoutController', type: :request do
+ let(:user) { create(:user_with_addresses) }
+ let(:params) { { order: order_attributes } }
+ let(:store) { @default_store }
+
+ include_context 'API v2 tokens'
+
+ describe 'checkout#update' do
+ subject :patch_update do
+ patch '/api/v2/storefront/checkout', params: params, headers: headers_bearer
+ end
+
+ let(:order) { create(:order_with_line_items, user: user, state: 'address', store: store, bill_address_id: nil, ship_address_id: nil) }
+ let(:headers_bearer) { { 'X-Spree-Order-Token' => order.token } }
+
+ context 'with address attributes' do
+ context 'with new address attributes' do
+ let(:order_attributes) do
+ {
+ bill_address_attributes: {
+ firstname: 'John',
+ lastname: 'Doe',
+ address1: '51 Guild Street',
+ address2: '2nd floor',
+ city: 'London',
+ phone: '079 4721 9458',
+ zipcode: 'SE25 3FZ',
+ state_name: 'England',
+ country_id: create(:country).id
+ }
+ }
+ end
+
+ it 'updates address from new attributes' do
+ expect { patch_update }.to change { order.reload.bill_address&.firstname }.to('John')
+ end
+ end
+
+ context 'with existing address attributes' do
+ let(:order_attributes) do
+ {
+ bill_address_id: existing_address.id
+ }
+ end
+
+ context 'with logged in user' do
+ let(:existing_address) { create(:address, user: user) }
+
+ it 'updates address from existing address' do
+ expect { patch_update }.to change { order.reload.bill_address_id }.from(nil).to(existing_address.id)
+ end
+ end
+
+ context 'with guest user' do
+ let(:user) { nil }
+
+ context 'with address that belongs to existing user' do
+ let(:existing_address) { create(:address, user: create(:user)) }
+
+ it 'does not update guest user address' do
+ expect { patch_update }.not_to change { order.reload.bill_address_id }
+ end
+ end
+
+ context 'with address that belongs to guest user' do
+ let(:existing_address) { create(:address, user: nil) }
+
+ it 'does not update guest user address' do
+ expect { patch_update }.not_to change { order.reload.bill_address_id }
+ end
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/core/app/models/spree/order/address_book.rb b/core/app/models/spree/order/address_book.rb
index 7e113e4afe..d95107ece9 100644
--- a/core/app/models/spree/order/address_book.rb
+++ b/core/app/models/spree/order/address_book.rb
@@ -14,13 +14,17 @@ module Spree
end
def bill_address_id=(id)
+ return if bill_address_id == id
+
address = Spree::Address.find_by(id: id)
- if address && address.user_id == user_id
+ # rubocop:disable Style/ConditionalAssignment
+ if address && user_id.present? && address.user_id == user_id
self['bill_address_id'] = address.id
- bill_address.reload
else
self['bill_address_id'] = nil
end
+ # rubocop:enable Style/ConditionalAssignment
+ reset_bill_address
end
def bill_address_attributes=(attributes)
@@ -29,13 +33,17 @@ module Spree
end
def ship_address_id=(id)
+ return if ship_address_id == id
+
address = Spree::Address.find_by(id: id)
- if address && address.user_id == user_id
+ # rubocop:disable Style/ConditionalAssignment
+ if address && user_id.present? && address.user_id == user_id
self['ship_address_id'] = address.id
- ship_address.reload
else
self['ship_address_id'] = nil
end
+ # rubocop:enable Style/ConditionalAssignment
+ reset_ship_address
end
def ship_address_attributes=(attributes)
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index f08742b89e..46821e84af 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -1866,7 +1866,9 @@ describe Spree::Order, type: :model do
subject { order.bill_address_id = address.id }
let(:user) { create(:user) }
- let(:order) { create(:order, user: user) }
+ let(:order) { create(:order, user: user, bill_address: bill_address, ship_address: ship_address) }
+ let(:bill_address) { create(:address, user: user) }
+ let(:ship_address) { create(:address, user: user) }
let(:address) { create(:address, user: user) }
context 'when assigned address exist' do
@@ -1883,6 +1885,33 @@ describe Spree::Order, type: :model do
end
end
end
+
+ context 'when assigned address does not belong to user' do
+ let(:address) { create(:address, user: create(:user)) }
+
+ it 'sets order bill address to nil' do
+ expect { subject }.to change { order.bill_address_id }.to(nil)
+ end
+ end
+
+ context 'with guest user' do
+ let(:user) { nil }
+ let(:address) { create(:address, user: nil) }
+
+ context 'when assigning the same existing address' do
+ let(:address) { bill_address }
+
+ it 'does nothing' do
+ expect { subject }.not_to(change { order.bill_address_id })
+ end
+ end
+
+ context 'when assigning a different existing address' do
+ it 'sets order bill address to nil' do
+ expect { subject }.to change { order.bill_address_id }.to(nil)
+ end
+ end
+ end
end
describe '#bill_address_attributes=' do
@@ -1942,7 +1971,9 @@ describe Spree::Order, type: :model do
subject { order.ship_address_id = address.id }
let(:user) { create(:user) }
- let(:order) { create(:order, user: user) }
+ let(:order) { create(:order, user: user, bill_address: bill_address, ship_address: ship_address) }
+ let(:bill_address) { create(:address, user: user) }
+ let(:ship_address) { create(:address, user: user) }
let(:address) { create(:address, user: user) }
context 'when assigned address exist' do
@@ -1959,6 +1990,33 @@ describe Spree::Order, type: :model do
end
end
end
+
+ context 'when assigned address does not belong to user' do
+ let(:address) { create(:address, user: create(:user)) }
+
+ it 'sets order ship address to nil' do
+ expect { subject }.to change { order.ship_address_id }.to(nil)
+ end
+ end
+
+ context 'with guest user' do
+ let(:user) { nil }
+ let(:address) { create(:address, user: nil) }
+
+ context 'when assigning the same existing address' do
+ let(:address) { ship_address }
+
+ it 'does nothing' do
+ expect { subject }.not_to(change { order.ship_address_id })
+ end
+ end
+
+ context 'when assigning a different existing address' do
+ it 'sets order ship address to nil' do
+ expect { subject }.to change { order.ship_address_id }.to(nil)
+ end
+ end
+ end
end
describe '#ship_address_attributes=' do