spree_core 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29651cc98b21c283051b89c884815652b12416122f4846d2e632c82492bdbd6b
-  data.tar.gz: 0f4fb04697c3d4bbd9447cf94e0bf02f65575c56c1343fdd82b20021c3291f8d
+  metadata.gz: b9c76746a8aefcd58da169e77b4e30d436ce5c7b670dccbe5a949fa68f1bac08
+  data.tar.gz: f72936183c3f4c62db43b9b9fae337cd0ebf60c55f49fe7bdc051662d5490244
 SHA512:
-  metadata.gz: 6f5ece226aa444e98188ceae21fbcb6ccd808c84553c1bf595ced69319cbe4590e0e1f896c3bfa74b5b82a1109093051e9a54061f533e3f50dc45cf9bb528c11
-  data.tar.gz: 494df5497f58e806c211a15a6e55a625680f10951368a0afffee745e09e784ef1c7a24466f8dc4affb49a90ba5ea849430d72ed3dea02145b04eec0e09d3ba5c
+  metadata.gz: 454bcf0cafdf6205eddc4360e49a54a9d1c8afa0e4f352311a34988312628c2d6c7cd50b07944c9be4dccd98dadd1232052b60d97ff80f03ad3ed91cd670471f
+  data.tar.gz: f20f81616c612d250ba5080ccc2696fd55a758ece0b35002edb19b3b7ed353de720a95ecb9b2aaf0dbbea37f3e5b904afdf37521ff7ad9cf4490767985f70a29

data/app/finders/spree/addresses/find.rb

@@ -0,0 +1,17 @@
+module Spree
+  module Addresses
+    class Find
+      def initialize(scope:, params:)
+        @scope = scope
+      end
+
+      def execute
+        scope
+      end
+
+      private
+
+      attr_reader :scope
+    end
+  end
+end

data/app/finders/spree/products/find.rb

@@ -112,9 +112,11 @@ module Spree
       def by_options(products)
         return products unless options?
 
-        options.map do |key, value|
-          products.with_option_value(key, value)
-        end.inject(:&)
+        products.where(
+          id: options.map do |key, value|
+            products.with_option_value(key, value).ids
+          end.flatten.compact.uniq
+        )
       end
 
       def by_option_value_ids(products)

data/app/models/spree/app_dependencies.rb

@@ -11,7 +11,8 @@ module Spree
       :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
       :coupon_handler, :country_finder, :current_order_finder, :credit_card_finder,
       :completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,
-      :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service
+      :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
+      :account_create_address_service, :account_update_address_service, :address_finder
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -59,9 +60,14 @@ module Spree
       # coupons
       # TODO: we should split this service into 2 seperate - Add and Remove
       @coupon_handler = 'Spree::PromotionHandler::Coupon'
+
+      # account
+      @account_create_address_service = 'Spree::Account::Addresses::Create'
+      @account_update_address_service = 'Spree::Account::Addresses::Update'
     end
 
     def set_default_finders
+      @address_finder = 'Spree::Addresses::Find'
       @country_finder = 'Spree::Countries::Find'
       @current_order_finder = 'Spree::Orders::FindCurrent'
       @completed_order_finder = 'Spree::Orders::FindComplete'

data/app/models/spree/line_item.rb

@@ -59,7 +59,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

@@ -21,7 +21,8 @@ module Spree
     extend Spree::DisplayMoney
     money_methods :outstanding_balance, :item_total,           :adjustment_total,
                   :included_tax_total,  :additional_tax_total, :tax_total,
-                  :shipment_total,      :promo_total,          :total
+                  :shipment_total,      :promo_total,          :total,
+                  :cart_promo_total,    :pre_tax_item_amount,  :pre_tax_total
 
     alias display_ship_total display_shipment_total
     alias_attribute :ship_total, :shipment_total
@@ -173,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/product.rb

@@ -110,7 +110,7 @@ module Spree
 
     alias options product_option_types
 
-    self.whitelisted_ransackable_associations = %w[stores variants_including_master master variants]
+    self.whitelisted_ransackable_associations = %w[taxons stores variants_including_master master variants]
     self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on]
     self.whitelisted_ransackable_scopes = %w[not_discontinued]
 
@@ -321,7 +321,7 @@ module Spree
           price: master.price
         )
       end
-      throw(:abort) unless save
+      save
     end
 
     def ensure_master

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -23,7 +23,7 @@ module Spree
           order   = line_item.order
 
           # Prevent negative order totals
-          amounts << order.amount - order.adjustments.sum(:amount).abs if order.adjustments.any?
+          amounts << order.amount - order.adjustments.eligible.sum(:amount).abs if order.adjustments.eligible.any?
 
           amounts.min * -1
         end

data/app/models/spree/variant.rb

@@ -234,7 +234,11 @@ module Spree
     end
 
     def in_stock?
-      Rails.cache.fetch(in_stock_cache_key) do
+      # Issue 10280
+      # Check if model responds to cache version and fall back to updated_at for older rails versions
+      # This makes sure a version is supplied when recyclable cache keys are disabled.
+      version = respond_to?(:cache_version) ? cache_version : updated_at.to_i
+      Rails.cache.fetch(in_stock_cache_key, version: version) do
         total_on_hand > 0
       end
     end

data/app/models/spree/zone.rb

@@ -69,8 +69,8 @@ module Spree
     end
 
     def kind
-      if kind?
-        super
+      if self[:kind].present?
+        self[:kind]
       else
         not_nil_scope = members.where.not(zoneable_type: nil)
         zone_type = not_nil_scope.order('created_at ASC').pluck(:zoneable_type).last

data/app/services/spree/account/addresses/base.rb

@@ -0,0 +1,39 @@
+module Spree
+  module Account
+    module Addresses
+      class Base
+        prepend Spree::ServiceModule::Base
+
+        private
+
+        attr_accessor :country
+
+        def fill_country_and_state_ids(params)
+          replace_country_iso_with_id(params)
+          fill_state_id(params)
+        end
+
+        def replace_country_iso_with_id(params)
+          iso = params[:country_iso]
+          return params unless iso.present?
+
+          country = Spree::Country.by_iso(iso)
+          params[:country_id] = country&.id
+          params.delete(:country_iso)
+          params
+        end
+
+        def fill_state_id(params)
+          state_name = params[:state_name]
+          return params unless state_name.present?
+
+          country ||= Spree::Country.find(params[:country_id]) if params[:country_id].present?
+          return params unless country
+
+          params[:state_id] = country.states.find_by(name: state_name)&.id
+          params
+        end
+      end
+    end
+  end
+end

data/app/services/spree/account/addresses/create.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Account
+    module Addresses
+      class Create < ::Spree::Account::Addresses::Base
+        def call(user:, address_params:)
+          fill_country_and_state_ids(address_params)
+
+          address = user.addresses.new(address_params)
+          if address.save
+            success(address)
+          else
+            failure(address)
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/spree/account/addresses/update.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Account
+    module Addresses
+      class Update < ::Spree::Account::Addresses::Base
+        def call(address:, address_params:)
+          address_params[:country_id] ||= address.country_id
+          fill_country_and_state_ids(address_params)
+
+          if address.update(address_params)
+            success(address)
+          else
+            failure(address)
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/spree/checkout/get_shipping_rates.rb

@@ -7,9 +7,7 @@ module Spree
         run :reload_order
         run :ensure_shipping_address
         run :ensure_line_items_present
-        run :move_order_to_delivery_state
-        run :generate_shipping_rates
-        run :return_shipments
+        run :generate_or_return_shipping_rates
       end
 
       private
@@ -31,6 +29,11 @@ module Spree
         success(order: order)
       end
 
+      def generate_or_return_shipping_rates(order:)
+        generate_shipping_rates(order: order) if order.shipments.empty?
+        return_shipments(order: order)
+      end
+
       def generate_shipping_rates(order:)
         ApplicationRecord.transaction do
           order.create_proposed_shipments
@@ -42,13 +45,7 @@ module Spree
       end
 
       def return_shipments(order:)
-        success(order.shipments.includes([shipping_rates: :shipping_method]))
-      end
-
-      def move_order_to_delivery_state(order:)
-        Spree::Dependencies.checkout_next_service.constantize.call(order: order) until order.state == 'delivery'
-
-        success(order: order)
+        success(order.reload.shipments.includes([shipping_rates: :shipping_method]))
       end
     end
   end

data/app/services/spree/checkout/update.rb

@@ -4,8 +4,12 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call(order:, params:, permitted_attributes:, request_env:)
-        params = replace_country_iso_with_id(params, 'ship') if address_with_country_iso_present?(params, 'ship')
-        params = replace_country_iso_with_id(params, 'bill') if address_with_country_iso_present?(params, 'bill')
+        ship_changed = address_with_country_iso_present?(params, 'ship')
+        bill_changed = address_with_country_iso_present?(params, 'bill')
+        params = replace_country_iso_with_id(params, 'ship') if ship_changed
+        params = replace_country_iso_with_id(params, 'bill') if bill_changed
+        order.state = 'address' if (ship_changed || bill_changed) && order.has_checkout_step?('address')
+        order.state = 'delivery' if selected_shipping_rate_present?(params) && order.has_checkout_step?('delivery')
         return success(order) if order.update_from_params(params, permitted_attributes, request_env)
 
         failure(order)
@@ -20,6 +24,13 @@ module Spree
         true
       end
 
+      def selected_shipping_rate_present?(params)
+        shipments_attributes = params.dig(:order, :shipments_attributes)
+        return false unless shipments_attributes
+
+        shipments_attributes.any? { |s| s.dig(:selected_shipping_rate_id) }
+      end
+
       def replace_country_iso_with_id(params, address_kind = 'ship')
         country_id = Spree::Country.by_iso(params[:order]["#{address_kind}_address_attributes"].fetch(:country_iso))&.id
 

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -26,5 +26,6 @@ Spree.dependencies do |dependencies|
   # dependencies.cart_add_item_service = 'MyNewAwesomeService'
 end
 
+# Spree::Api::Dependencies.storefront_cart_serializer = 'MyRailsApp::CartSerializer'
 
 Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>

data/lib/spree/core.rb

@@ -93,6 +93,7 @@ require 'spree/money'
 require 'spree/permitted_attributes'
 require 'spree/service_module'
 require 'spree/dependencies_helper'
+require 'spree/database_type_utilities'
 
 require 'spree/core/importer'
 require 'spree/core/query_filters'

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.0.5'
+    '4.0.6'
   end
 end

data/lib/spree/database_type_utilities.rb

@@ -0,0 +1,12 @@
+module Spree
+  module  DatabaseTypeUtilities
+    def self.maximum_value_for(data_type)
+      case data_type
+      when :integer
+        ActiveModel::Type::Integer.new.instance_eval { range.max }
+      else
+        raise ArgumentError.new('Currently only :integer argument is acceptable')
+      end
+    end
+  end
+end

data/spree_core.gemspec

@@ -6,17 +6,23 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_core'
   s.version     = Spree.version
+  s.author      = 'Sean Schofield'
+  s.email       = 'sean@spreecommerce.com'
   s.summary     = 'The bare bones necessary for Spree.'
   s.description = 'The bare bones necessary for Spree.'
+  s.homepage    = 'http://spreecommerce.org'
+  s.license     = 'BSD-3-Clause'
+
+  s.metadata = {
+    "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
+    "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
+    "documentation_uri" => "https://guides.spreecommerce.org/",
+    "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
+  }
 
   s.required_ruby_version     = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
-  s.author      = 'Sean Schofield'
-  s.email       = 'sean@spreecommerce.com'
-  s.homepage    = 'http://spreecommerce.org'
-  s.license     = 'BSD-3-Clause'
-
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.require_path = 'lib'
 
@@ -28,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'ffaker', '~> 2.9'
   s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.4.0'
   s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
-  s.add_dependency 'kaminari', '>= 1.0.1', '< 1.2.0'
+  s.add_dependency 'kaminari', '~> 1.2.1'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -144,22 +144,16 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -400,6 +394,7 @@ files:
 - app/assets/images/noimage/small.png
 - app/assets/javascripts/spree.js
 - app/controllers/spree/base_controller.rb
+- app/finders/spree/addresses/find.rb
 - app/finders/spree/countries/find.rb
 - app/finders/spree/credit_cards/find.rb
 - app/finders/spree/line_items/find_by_variant.rb
@@ -606,6 +601,9 @@ files:
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
 - app/paginators/spree/shared/paginate.rb
+- app/services/spree/account/addresses/base.rb
+- app/services/spree/account/addresses/create.rb
+- app/services/spree/account/addresses/update.rb
 - app/services/spree/cart/add_item.rb
 - app/services/spree/cart/create.rb
 - app/services/spree/cart/estimate_shipping_rates.rb
@@ -971,6 +969,7 @@ files:
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_generator.rb
 - lib/spree/core/version.rb
+- lib/spree/database_type_utilities.rb
 - lib/spree/dependencies_helper.rb
 - lib/spree/i18n.rb
 - lib/spree/i18n/base.rb
@@ -1062,7 +1061,11 @@ files:
 homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/spree/spree/issues
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.0.6
+  documentation_uri: https://guides.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.0.6
 post_install_message:
 rdoc_options: []
 require_paths: