spree_frontend 4.1.10 → 4.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 468861e8e9b5c9c2e97eccecd6214b66997de7c7db90be2ab74a19ecd1570686
-  data.tar.gz: c606b21f6b0a1fe5a9e4bb8e7a3d9b625b09c86b7f363bb491394e8c372d38bc
+  metadata.gz: 87e63119b1cd0065992e082871f0234a8d76c8e566c6a50e87e402a63f21cabd
+  data.tar.gz: 9e3e84b645bbfcd999281ab15aadffe5c7452af7f36dac2e6901dd248f6433bd
 SHA512:
-  metadata.gz: 814d074252ce0ab20f706115f7755e6168b1041cde16a50626909b51b818023920315564c6a10b702d98ce51282c1fe3cf80f0d1cf15969d566b75502878038d
-  data.tar.gz: 3f9b057303f1d5803fbcc08d1a9b4a0ad028a8239e6f24515e299f801d32ee195c4a3d6548d480d2432e53e7c451b71c77b7eb149ac236adf0a6b5b2d2f60277
+  metadata.gz: 93a25e74457255d837853916739c81508853644c68be18018913915de7c77302ebcefd4ae2943bbcd3e2e1c789c9dd1245dbd04b6a31083a809e23346036a59e
+  data.tar.gz: 538c23ff241c9717a0c809c5a4b7c94d6d11ccaa86d159ffaedd1bd9aa766cef10cd69e76c07f3ebcb6de8567170d8e749fc8be480296e00ef5a21741f595abc

data/app/controllers/concerns/spree/checkout/address_book.rb

@@ -32,21 +32,23 @@ module Spree
       end
 
       def normalize_addresses
-        return unless params[:state] == 'address' && @order.bill_address_id && @order.ship_address_id
+        return unless params[:state] == 'address' && @order.bill_address_id
 
-        # ensure that there is no validation errors and addresses were saved
-        return unless @order.bill_address && @order.ship_address
+        if @order.checkout_steps.include?('delivery')
+          return unless @order.ship_address_id
+        end
 
         bill_address = @order.bill_address
         ship_address = @order.ship_address
+
+        if params[:save_user_address].present? && try_spree_current_user.present?
+          [bill_address, ship_address].each { |address| address&.update_attribute(:user_id, try_spree_current_user&.id) }
+        end
+
         if @order.bill_address_id != @order.ship_address_id && bill_address == ship_address
           @order.update_column(:bill_address_id, ship_address.id)
           bill_address.destroy
-        elsif params[:save_user_address]
-          bill_address.update_attribute(:user_id, try_spree_current_user&.id)
         end
-
-        ship_address.update_attribute(:user_id, try_spree_current_user&.id) if params[:save_user_address]
       end
     end
   end

data/app/controllers/spree/addresses_controller.rb

@@ -37,6 +37,7 @@ module Spree
       else
         new_address = @address.clone
         new_address.attributes = address_params
+        new_address.user_id = @address.user_id
         @address.update_attribute(:deleted_at, Time.current)
         if new_address.save
           flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)

data/config/initializers/canonical_rails.rb

@@ -10,5 +10,5 @@ CanonicalRails.setup do |config|
   # Parameter spamming can cause index dilution by creating seemingly different URLs with identical or near-identical content.
   # Unless whitelisted, these parameters will be omitted
 
-  config.whitelisted_parameters = [:keywords, :page, :search, :taxon]
+  config.allowed_parameters = [:keywords, :page, :search, :taxon]
 end

data/spree_frontend.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'bootstrap',       '~> 4.3.1'
   s.add_dependency 'glyphicons',      '~> 1.0.2'
-  s.add_dependency 'canonical-rails', '~> 0.2.5'
+  s.add_dependency 'canonical-rails', '~> 0.2.10'
   s.add_dependency 'inline_svg',      '~> 1.5'
   s.add_dependency 'jquery-rails',    '~> 4.3'
   s.add_dependency 'turbolinks',      '~> 5.2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.1.10
+  version: 4.1.14
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.10
+        version: 4.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.10
+        version: 4.1.14
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.10
+        version: 4.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.10
+        version: 4.1.14
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.10
 - !ruby/object:Gem::Dependency
   name: inline_svg
   requirement: !ruby/object:Gem::Requirement
@@ -501,10 +501,10 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.10
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.14
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.1.10
-post_install_message: 
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.14
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -520,8 +520,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.
 test_files: []