spree_core 4.1.10 → 4.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6076d4a3647fbf0b2a1a72578b5cd9336181f4b50c40bda5f7dcffab9806e4a
-  data.tar.gz: 663b00f1b45448020c4274925264c31ef11363fc6bd4561db5eff1f8897c4b5f
+  metadata.gz: 3c8287bde543c898068e2948a047426bcbb5e889e72d6959b8d3708be3deef05
+  data.tar.gz: 855883bee8a429ad1517498b487a6f7e7447e9dfadf02b27a408d0020f3f026b
 SHA512:
-  metadata.gz: 235b59d743b4d580fe4b9e2a16d082a39285bccbee99f9fea6615c65e0e760a9134a0267ed9def3d9bac5fa76974416127dbdaeeac52865b8578b6926a5d2c65
-  data.tar.gz: 2bdc502c7b9134df69893818a1e230bd546ff895f8d0733e4ff380dbb2a8c4be9eccfe0acc356c8e618ad2d75d75f74228955af8961231617e00e0ec19e6ec27
+  metadata.gz: ad62daa6a479e57108a618a9896ea281281f489a729af95c5b3ad36052880b0d1eb3005dae876b85d20a3c9d8816f13933d3a0fddd7ced20660e0e946726af9d
+  data.tar.gz: b8403ad63e76b14e42ffd5904c00a3b3b483f3315480790244e6ee3a5566e3289acac67784b3486e3ddf89c1297fa926c083fec53af8c1d16f22cd84bec661f0

data/app/models/spree/line_item.rb

@@ -66,7 +66,8 @@ module Spree
 
     extend DisplayMoney
     money_methods :amount, :subtotal, :discounted_amount, :final_amount, :total, :price,
-                  :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total
+                  :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total,
+                  :pre_tax_amount
 
     alias single_money display_price
     alias single_display_amount display_price

data/app/models/spree/order.rb

@@ -22,7 +22,7 @@ module Spree
     money_methods :outstanding_balance, :item_total,           :adjustment_total,
                   :included_tax_total,  :additional_tax_total, :tax_total,
                   :shipment_total,      :promo_total,          :total,
-                  :cart_promo_total
+                  :cart_promo_total,    :pre_tax_item_amount,  :pre_tax_total
 
     alias display_ship_total display_shipment_total
     alias_attribute :ship_total, :shipment_total
@@ -174,7 +174,12 @@ module Spree
 
     # Sum of all line item amounts pre-tax
     def pre_tax_item_amount
-      line_items.to_a.sum(&:pre_tax_amount)
+      line_items.sum(:pre_tax_amount)
+    end
+
+    # Sum of all line item and shipment pre-tax
+    def pre_tax_total
+      pre_tax_item_amount + shipments.sum(:pre_tax_amount)
     end
 
     def shipping_discount

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/db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb

@@ -1,4 +1,4 @@
-class AddDeafultValueForStoreDefaultCurrency < ActiveRecord::Migration[6.0]
+class AddDeafultValueForStoreDefaultCurrency < ActiveRecord::Migration[5.2]
   def change
     Spree::Store.where(default_currency: nil).update_all(default_currency: Spree::Config[:currency])
   end

data/db/migrate/20200102141311_add_social_to_spree_stores.rb

@@ -1,4 +1,4 @@
-class AddSocialToSpreeStores < ActiveRecord::Migration[6.0]
+class AddSocialToSpreeStores < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_stores, :facebook, :string
     add_column :spree_stores, :twitter, :string

data/db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb

@@ -1,4 +1,4 @@
-class AddHideFromNavToTaxons < ActiveRecord::Migration[6.0]
+class AddHideFromNavToTaxons < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_taxons, :hide_from_nav, :boolean, default: false, index: true
   end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -32,7 +32,6 @@ module Spree
       opts[:skip_bundle] = true
       opts[:skip_gemfile] = true
       opts[:skip_git] = true
-      opts[:skip_keeps] = true
       opts[:skip_listen] = true
       opts[:skip_rc] = true
       opts[:skip_spring] = true

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.10'
+    '4.1.14'
   end
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -63,6 +63,13 @@ rescue Selenium::WebDriver::Error::TimeOutError
   default_options[:error].nil? ? false : raise(default_options[:error])
 end
 
+# Usage examples:
+# fill_in_with_force 'CVC', with: 123
+def fill_in_with_force(locator, with:)
+  field_id = find_field(locator)[:id]
+  page.execute_script "document.getElementById('#{field_id}').value = '#{with}';"
+end
+
 Capybara.configure do |config|
   config.match = :smart
   config.ignore_hidden_elements = true

data/spree_core.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4.2'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '~> 6.0.0'
+  s.add_dependency 'rails', '>= 5.2', '< 6.1'
   s.add_dependency 'ransack', '~> 2.3.0'
   s.add_dependency 'responders'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
@@ -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.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: activemerchant
@@ -214,16 +214,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -351,7 +357,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 +367,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,10 +1095,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
@@ -1107,8 +1113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.
 test_files: []