spree_frontend 4.1.12 → 4.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 927d3464e4cd36a3828602f101f911b0fea3968b5be7e0d30f0c15ca1ebf5d58
-  data.tar.gz: c6421c452a2aae0b0bd355aaf5f9aec8d31f2a3bc21f6a5ae653437a64dc0c99
+  metadata.gz: 78c25c5b833141110ec9f1d61389ce18ffd64d7c84016eb2634f0059542f1d9f
+  data.tar.gz: b930dc7a6d9bb4f38b42be4be538615329f27fe1585c9ceee06b2d14d9f42bcf
 SHA512:
-  metadata.gz: 8ceb40b8da84332689b48a32a1d5030285e3e12d052882732abd1fef105ee95345c100e0999d2c6dfb7c4d93e28125ba236990faf7f759a991a19b449888935e
-  data.tar.gz: 184036e1a7e5669bbe3e0012c1413b311ea39dffad4b4f795dd8381bc7e596958006594da5c0a17b9338bea8bf4343ce5ae5c26dd6c74cea966439bfb52239f6
+  metadata.gz: 777636195b350fa750af9f8b26d493d7c159f5cdae60da792471d7fca49638c3cc8e2007373b218bdf7bebc14b846cf18fe0b5f411dea9a685a3bea942dcc733
+  data.tar.gz: 3b10879e8acbe55a3064ff7104c4385952e42d02c4fb76694e88743dde0ce3ddc924ffd2dd8db8c2c5443c58e7bcc5dca524d48461c2c3d3ee8422bffd64dd4c

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.12
+  version: 4.1.13
 platform: ruby
 authors:
 - Sean Schofield
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-12-15 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.12
+        version: 4.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.1.13
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.1.13
 - !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,9 +501,9 @@ 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.12
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.13
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.1.12
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.13
 post_install_message:
 rdoc_options: []
 require_paths: