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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
ADD ability to handle phone on quick checkout and FIX duplicated cookies issue (#13203)
brozek9318855d2ed6
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rbindex 87ba338314..10d6a73e83 100644--- a/core/app/models/spree/address.rb+++ b/core/app/models/spree/address.rb@@ -179,7 +179,9 @@ module Spreeenddef require_phone?- Spree::Config[:address_requires_phone]+ # We want to collect phone number for quick checkout but not to validate it+ # as it's not available before payment by browser.+ !quick_checkout && Spree::Config[:address_requires_phone]enddef require_zipcode?diff --git a/core/app/services/spree/addresses/phone_validator.rb b/core/app/services/spree/addresses/phone_validator.rbindex ab8a1a7103..328e316264 100644--- a/core/app/services/spree/addresses/phone_validator.rb+++ b/core/app/services/spree/addresses/phone_validator.rb@@ -8,7 +8,7 @@ module Spreemodule Addressesclass PhoneValidator < ActiveModel::Validatordef validate(address)- return if !Spree::Config[:address_requires_phone] || address.phone.blank? || address.country.blank? || address.country_iso.blank?+ return if !address.require_phone? || address.phone.blank? || address.country.blank? || address.country_iso.blank?phone = Phonelib.parse(address.phone)unless phone.valid_for_country?(address.country_iso)diff --git a/core/spec/models/spree/address_spec.rb b/core/spec/models/spree/address_spec.rbindex 4a0f348044..ecfbcaa9ca 100644--- a/core/spec/models/spree/address_spec.rb+++ b/core/spec/models/spree/address_spec.rb@@ -707,4 +707,36 @@ describe Spree::Address, type: :model doaddress.valid?endend++ context 'require_phone?' do+ context 'when quick_checkout is true' do+ let(:address) { create(:address, quick_checkout: true) }++ it 'returns false' do+ expect(address.require_phone?).to be(false)+ end+ end++ context 'when quick_checkout is false' do+ let(:address) { build_stubbed(:address, quick_checkout: false) }++ context 'and Spree::Config[:address_requires_phone] is true' do+ before { Spree::Config[:address_requires_phone] = true }++ after { Spree::Config[:address_requires_phone] = false }++ it 'returns true' do+ expect(address.require_phone?).to be(true)+ end+ end++ context 'and Spree::Config[:address_requires_phone] is false' do+ before { Spree::Config[:address_requires_phone] = false }++ it 'returns false' do+ expect(address.require_phone?).to be(false)+ end+ end+ end+ endenddiff --git a/storefront/app/controllers/spree/line_items_controller.rb b/storefront/app/controllers/spree/line_items_controller.rbindex de234d69db..933c6a30ff 100644--- a/storefront/app/controllers/spree/line_items_controller.rb+++ b/storefront/app/controllers/spree/line_items_controller.rb@@ -15,7 +15,7 @@ module Spree@quantity = params[:quantity].to_i || 1options = params[:options] || {}- cookies.permanent.signed[:token] = @order.token if @order.persisted?+ cookies.permanent.signed[:token] = { value: @order.token, domain: current_store.url_or_custom_domain } if @order.persisted?result = cart_add_item_service.call(order: @order,variant: @variant,diff --git a/storefront/spec/features/cart_spec.rb b/storefront/spec/features/cart_spec.rbindex ba5e5fe5d3..ef0226eee0 100644--- a/storefront/spec/features/cart_spec.rb+++ b/storefront/spec/features/cart_spec.rb@@ -89,6 +89,11 @@ describe 'Cart', type: :feature docontext 'order by cookie' docontext 'order exists', js: true dobefore do+ # Mock store url to match Capybara url for cookie domain+ allow_any_instance_of(Spree::LineItemsController).to receive(:current_store)+ .and_return(store)+ host = Capybara.current_session.server.host+ allow(store).to receive(:url_or_custom_domain).and_return(host)add_to_cart(product)enddiff --git a/storefront/spec/features/product_details_page_spec.rb b/storefront/spec/features/product_details_page_spec.rbindex 1962b8f6f5..692d6f272e 100644--- a/storefront/spec/features/product_details_page_spec.rb+++ b/storefront/spec/features/product_details_page_spec.rb@@ -136,6 +136,11 @@ RSpec.describe 'Product detail page', type: :feature doit_behaves_like 'can be added to cart'it 'cannot add more than available quantity', js: true do+ # Mock store url to match Capybara url for cookie domain+ allow_any_instance_of(Spree::LineItemsController).to receive(:current_store)+ .and_return(store)+ host = Capybara.current_session.server.host+ allow(store).to receive(:url_or_custom_domain).and_return(host)# we need to populate cart firstwithin turbo_frame dofill_in 'quantity', with: 10