spree_core 4.1.12 → 4.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33d0ee9db08dacfb3d34d1040ad4cea3d34ae19282d54726f98f64ea5624d098
-  data.tar.gz: e23248e5fe3a71e58c81a1496165a6d60f4ff86fff82c7dc1d55c5d062dd2bb6
+  metadata.gz: 775010b644f68e5f0f68cfd1a41688880373b1194b535c13d949e3a98724b65c
+  data.tar.gz: ad88929eee197b0737f67cf5b5501760c0cdfb397204640b4a5c2d7fddfd0f3d
 SHA512:
-  metadata.gz: 17d12f688f122afd17a59e36d963c57c1dd0a3c36dc40199d25ec716016cb4c045f8f9f894213b561f5b6b0599d95b53dfcf1a15aea7b02073d6e052c1d92fa6
-  data.tar.gz: 969d4e6e871792b735501655fc19a775df64a6bbc4bec014ecc0ecea0b64bcb7820f0a8cd7a6fd1f63afb32f4b86fe0c147fe43f9c87b6b2cc4c018a983c72d4
+  metadata.gz: 43b44e18f7060d1b655b5a407f051354eebd9c19a5fb18cfa2cef29843d801326ad662980da842d367db32027e534967d24de2b34dd7a1f28b7930bfd8c18710
+  data.tar.gz: e2c479a8e0119c7a9ba64f6b7b3768a14e82f3a255148708234e2bb81e0073423dbbb28bb4ac85848b8935d4e47e4030656e0f2672244242ad834dd247b5f897

data/app/models/spree/order/address_book.rb

@@ -55,31 +55,18 @@ module Spree
       def update_or_create_address(attributes = {})
         return if attributes.blank?
 
-        attributes = attributes.select { |_k, v| v.present? }
+        attributes.transform_values! { |v| v == '' ? nil : v }
 
-        if user
-          address = user.addresses.build(attributes.except(:id)).check
-          return address if address.id
-        end
-
-        if attributes[:id]
-          address = Spree::Address.find(attributes[:id])
-          attributes.delete(:id)
+        default_address_scope = user ? user.addresses : ::Spree::Address
+        default_address = default_address_scope.find_by(id: attributes[:id])
 
-          if address&.editable?
-            address.update(attributes)
-            return address
-          else
-            attributes.delete(:id)
-          end
-        end
+        if default_address&.editable?
+          default_address.update(attributes)
 
-        unless attributes[:id]
-          address = Spree::Address.new(attributes)
-          address.save
+          return default_address
         end
 
-        address
+        ::Spree::Address.find_or_create_by(attributes.except(:id, :updated_at, :created_at))
       end
     end
   end

data/app/models/spree/promotion_handler/coupon.rb

@@ -25,7 +25,6 @@ module Spree
 
       def remove(coupon_code)
         promotion = order.promotions.with_coupon_code(coupon_code)
-
         if promotion.present?
           # Order promotion has to be destroyed before line item removing
           order.order_promotions.find_by!(promotion_id: promotion.id).destroy
@@ -76,7 +75,7 @@ module Spree
           line_item = order.find_line_item_by_variant(item.variant)
           next if line_item.blank?
 
-          Spree::Dependencies.cart_remove_item_service(order: order, item: item.variant, quantity: item.quantity)
+          Spree::Dependencies.cart_remove_item_service.constantize.call(order: order, item: item.variant, quantity: item.quantity)
         end
       end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.12'
+    '4.1.13'
   end
 end

data/spree_core.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'twitter_cldr', '>= 4.3', '< 7.0'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
-  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.11.0'
+  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.12.0'
   s.add_dependency 'image_processing', '~> 1.2'
 
   s.add_development_dependency 'email_spec', '~> 2.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 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: activemerchant
@@ -351,7 +351,7 @@ dependencies:
         version: 4.9.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -361,7 +361,7 @@ dependencies:
         version: 4.9.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.12.0
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -1089,9 +1089,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: