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 quick checkout address feature

Łukasz Adamczykcf2bf905fbad
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb
index 551c937972..300744cfa5 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -34,7 +34,7 @@ module Spree
# those attributes depending of the logic of their applications
ADDRESS_FIELDS = %w(firstname lastname company address1 address2 city state zipcode country phone)
EXCLUDED_KEYS_FOR_COMPARISON = %w(id updated_at created_at deleted_at label user_id public_metadata private_metadata)
- FIELDS_TO_NORMALIZE = %w(firstname lastname phone company address1 address2 city zipcode)
+ FIELDS_TO_NORMALIZE = %w(firstname lastname phone alternative_phone company address1 address2 city zipcode)
scope :not_deleted, -> { where(deleted_at: nil) }
@@ -225,7 +225,7 @@ module Spree
def set_default_values
self.firstname ||= user.first_name
self.lastname ||= user.last_name
- self.phone ||= user.phone
+ self.phone ||= user.phone if user.respond_to?(:phone)
end
def clear_state
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 14aa56c143..9ae0693fde 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -280,6 +280,10 @@ module Spree
shipments.any?(&:backordered?)
end
+ def quick_checkout?
+ shipping_address.present? && shipping_address.quick_checkout?
+ end
+
# Returns the relevant zone (if any) to be used for taxation purposes.
# Uses default tax zone unless there is a specific match
def tax_zone
diff --git a/core/app/models/spree/order/address_book.rb b/core/app/models/spree/order/address_book.rb
index 0fb07e8c64..4d70b7de96 100644
--- a/core/app/models/spree/order/address_book.rb
+++ b/core/app/models/spree/order/address_book.rb
@@ -41,6 +41,7 @@ module Spree
def ship_address_attributes=(attributes)
self.ship_address = update_or_create_address(attributes)
user.ship_address = ship_address if should_assign_user_default_address?(ship_address)
+ self.ship_address = nil if quick_checkout_address?(attributes[:quick_checkout]) && !ship_address.persisted?
end
private
@@ -78,8 +79,12 @@ module Spree
scope.first
end
+ def quick_checkout_address?(quick_checkout_param)
+ quick_checkout_param.present? ? quick_checkout_param.to_b : false
+ end
+
def should_assign_user_default_address?(address)
- user.present? && address.present? && address.valid? && address.user == user
+ user.present? && address.present? && address.valid? && address.user == user && !address.quick_checkout?
end
end
end
diff --git a/core/spec/models/spree/address_spec.rb b/core/spec/models/spree/address_spec.rb
index 83917aeb01..2f944a6f71 100644
--- a/core/spec/models/spree/address_spec.rb
+++ b/core/spec/models/spree/address_spec.rb
@@ -3,6 +3,69 @@ require 'spec_helper'
describe Spree::Address, type: :model do
it_behaves_like 'metadata'
+ describe 'before_validation :remove_emoji_and_normalize' do
+ let(:address) do
+ create(:address,
+ firstname: 'Jan 👋',
+ lastname: 'Масник',
+ phone: '1234567😃89',
+ alternative_phone: '😊 234567890',
+ company: 'общество',
+ address1: 'Default Street 123🌴',
+ address2: '🎂Apartment 6',
+ city: 'Варшава',
+ zipcode: '35005 👋 '
+ )
+ end
+
+ it 'normalizes the address and removes emojis' do
+ expect(address.firstname).to eq('Jan')
+ expect(address.lastname).to eq('Masnik')
+ expect(address.phone).to eq('123456789')
+ expect(address.alternative_phone).to eq('234567890')
+ expect(address.company).to eq('obshchestvo')
+ expect(address.address1).to eq('Default Street 123')
+ expect(address.address2).to eq('Apartment 6')
+ expect(address.city).to eq('Varshava')
+ end
+ end
+
+ describe 'after_commit :async_geocode' do
+ let(:address) { build(:address) }
+
+
+ it 'geocodes the address in the background' do
+ expect { address.save! }.
+ to have_enqueued_job(Spree::Addresses::GeocodeAddressJob).
+ on_queue(Spree.queues.addresses).
+ exactly(:once)
+
+ job = Spree::Addresses::GeocodeAddressJob.queue_adapter.enqueued_jobs.last
+ expect(job['arguments']).to contain_exactly(address.id)
+ end
+
+ context "when geocoding data didn't change" do
+ before { address.save! }
+
+ it 'skips geocoding' do
+ expect { address.update!(company: 'New Test Company') }.to_not have_enqueued_job(Spree::Addresses::GeocodeAddressJob)
+ end
+ end
+ end
+
+ context 'default values' do
+ context 'with user' do
+ let(:user) { create(:user, first_name: 'John', last_name: 'Snow') }
+ let(:address) { Spree::Address.new(user: user) }
+
+ it 'sets user_id and first/last name from user' do
+ expect(address.user_id).to eq(user.id)
+ expect(address.firstname).to eq('John')
+ expect(address.lastname).to eq('Snow')
+ end
+ end
+ end
+
describe 'clone' do
it 'creates a copy of the address with the exception of the id, label, user_id, updated_at and created_at attributes' do
state = create(:state)
@@ -218,6 +281,13 @@ describe Spree::Address, type: :model do
end
context 'does not validate' do
+ it 'is for quick checkout' do
+ address.zipcode = 'abc'
+ address.quick_checkout = true
+ address.valid?
+ expect(address.errors['zipcode']).not_to include('is invalid')
+ end
+
it 'does not have a country' do
address.country = nil
address.valid?
@@ -277,6 +347,18 @@ describe Spree::Address, type: :model do
end
end
+ describe 'after create' do
+ context 'when user is assigned and it has default name' do
+ it 'should assign address name to the user' do
+ user = create(:user, first_name: nil, last_name: nil)
+ create(:address, user: user, firstname: 'John', lastname: 'Doe')
+
+ expect(user.reload.first_name).to eq 'John'
+ expect(user.reload.last_name).to eq 'Doe'
+ end
+ end
+ end
+
context '#full_name' do
context 'both first and last names are present' do
let(:address) { create(:address, firstname: 'Michael', lastname: 'Jackson') }
@@ -511,6 +593,7 @@ describe Spree::Address, type: :model do
describe '#assign_new_default_address_to_user' do
shared_examples 'default address' do
context 'when 2 addresses are available' do
+ let!(:address2_quick_checkout) { create(:address, user: user, quick_checkout: true) }
let!(:address3) { create(:address, user: user) }
it 'assigns last available address as default to bill and ship address' do