spree_core 4.2.0.rc2 → 4.2.1

data/app/models/spree/store_credit.rb

@@ -68,7 +68,7 @@ module Spree
     end
 
     def validate_authorization(amount, order_currency)
-      if amount_remaining.to_d < amount.to_d
+      if BigDecimal(amount_remaining, 3) < BigDecimal(amount, 3)
         errors.add(:base, Spree.t('store_credit_payment_method.insufficient_funds'))
       elsif currency != order_currency
         errors.add(:base, Spree.t('store_credit_payment_method.currency_mismatch'))

data/app/models/spree/variant.rb

@@ -3,7 +3,7 @@ module Spree
     acts_as_paranoid
     acts_as_list scope: :product
 
-    belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :variants
+    belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product', inverse_of: :variants
     belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
     delegate :name, :name=, :description, :slug, :available_on, :shipping_category_id,
@@ -123,15 +123,15 @@ module Spree
     end
 
     def tax_category
-      if self[:tax_category_id].nil?
-        product.tax_category
-      else
-        Spree::TaxCategory.find(self[:tax_category_id])
-      end
+      @tax_category ||= if self[:tax_category_id].nil?
+                          product.tax_category
+                        else
+                          Spree::TaxCategory.find(self[:tax_category_id])
+                        end
     end
 
     def options_text
-      Spree::Variants::OptionsPresenter.new(self).to_sentence
+      @options_text ||= Spree::Variants::OptionsPresenter.new(self).to_sentence
     end
 
     # Default to master name
@@ -150,13 +150,6 @@ module Spree
       !!deleted_at
     end
 
-    # Product may be created with deleted_at already set,
-    # which would make AR's default finder return nil.
-    # This is a stopgap for that little problem.
-    def product
-      Spree::Product.unscoped { super }
-    end
-
     def options=(options = {})
       options.each do |option|
         set_option_value(option[:name], option[:value])
@@ -199,7 +192,7 @@ module Spree
     end
 
     def price_in(currency)
-      prices.detect { |price| price.currency == currency } || prices.build(currency: currency)
+      prices.detect { |price| price.currency == currency&.upcase } || prices.build(currency: currency&.upcase)
     end
 
     def amount_in(currency)
@@ -233,7 +226,7 @@ module Spree
     end
 
     def compare_at_price
-      price_in(cost_currency).try(:compare_at_amount)
+      @compare_at_price ||= price_in(cost_currency).try(:compare_at_amount)
     end
 
     def name_and_sku

data/app/models/spree/zone.rb

@@ -101,8 +101,6 @@ module Spree
           zone_member.zoneable_id == address.country_id
         when 'Spree::State'
           zone_member.zoneable_id == address.state_id
-        else
-          false
         end
       end
     end
@@ -114,8 +112,6 @@ module Spree
                        zoneables
                      when 'state' then
                        zoneables.collect(&:country)
-                     else
-                       []
                      end.flatten.compact.uniq
     end
 
@@ -171,6 +167,19 @@ module Spree
       true
     end
 
+    def state_list
+      case kind
+      when 'country'
+        zoneables.map(&:states)
+      when 'state'
+        zoneables
+      end.flatten.compact.uniq
+    end
+
+    def state_list_for(country)
+      state_list.select { |state| state.country == country }
+    end
+
     private
 
     def remove_defunct_members

data/app/paginators/spree/shared/paginate.rb

@@ -4,7 +4,14 @@ module Spree
       def initialize(collection, params)
         @collection = collection
         @page       = params[:page]
-        @per_page   = params[:per_page]
+
+        per_page_limit = Spree::Api::Config[:api_v2_per_page_limit]
+
+        @per_page = if params[:per_page].to_i.between?(1, per_page_limit)
+                      params[:per_page]
+                    else
+                      Kaminari.config.default_per_page
+                    end
       end
 
       def call

data/app/presenters/spree/variant_presenter.rb

@@ -2,6 +2,7 @@ module Spree
   class VariantPresenter
     include Rails.application.routes.url_helpers
     include Spree::BaseHelper
+    include Spree::ProductsHelper
 
     attr_reader :current_currency, :current_price_options, :current_store
 
@@ -19,7 +20,7 @@ module Spree
           display_price: display_price(variant),
           price: variant.price_in(current_currency),
           display_compare_at_price: display_compare_at_price(variant),
-          should_display_compare_at_price: should_display_compare_at_price(variant),
+          should_display_compare_at_price: should_display_compare_at_price?(variant),
           is_product_available_in_currency: @is_product_available_in_currency,
           backorderable: backorderable?(variant),
           in_stock: in_stock?(variant),
@@ -75,9 +76,5 @@ module Spree
         purchasable: variant.purchasable?
       }
     end
-
-    def should_display_compare_at_price(variant)
-      variant.compare_at_price.present? && variant.compare_at_price > variant.price
-    end
   end
 end

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

@@ -1,7 +1,12 @@
 module Spree
   module Account
     module Addresses
-      class Create < ::Spree::Account::Addresses::Base
+      class Create
+        prepend Spree::ServiceModule::Base
+        include Spree::Account::Addresses::Helper
+
+        attr_accessor :country
+
         def call(user:, address_params:)
           fill_country_and_state_ids(address_params)
 

data/app/services/spree/account/addresses/{base.rb → helper.rb}

@@ -1,9 +1,7 @@
 module Spree
   module Account
     module Addresses
-      class Base
-        prepend Spree::ServiceModule::Base
-
+      module Helper
         private
 
         attr_accessor :country

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

@@ -1,7 +1,12 @@
 module Spree
   module Account
     module Addresses
-      class Update < ::Spree::Account::Addresses::Base
+      class Update
+        prepend Spree::ServiceModule::Base
+        include Spree::Account::Addresses::Helper
+
+        attr_accessor :country
+
         def call(address:, address_params:)
           address_params[:country_id] ||= address.country_id
           fill_country_and_state_ids(address_params)

data/app/services/spree/build_localized_redirect_url.rb

@@ -0,0 +1,101 @@
+require 'uri'
+
+module Spree
+  class BuildLocalizedRedirectUrl
+    prepend Spree::ServiceModule::Base
+
+    LOCALE_REGEX = /^\/[A-Za-z]{2}\/|^\/[A-Za-z]{2}-[A-Za-z]{2}\/|^\/[A-Za-z]{2}$|^\/[A-Za-z]{2}-[A-Za-z]{2}$/.freeze
+
+    SUPPORTED_PATHS_REGEX = /\/(products|t\/|cart|checkout|addresses|content)/.freeze
+
+    # rubocop:disable Lint/UnusedMethodArgument
+    def call(url:, locale:, default_locale: nil)
+      run :initialize_url_object
+      run :generate_new_path
+      run :append_locale_param
+      run :build_url
+    end
+    # rubocop:enable Lint/UnusedMethodArgument
+
+    protected
+
+    def initialize_url_object(url:, locale:, default_locale:)
+      success(
+        url: URI(url),
+        locale: locale,
+        default_locale_supplied: default_locale_supplied?(locale, default_locale)
+      )
+    end
+
+    def generate_new_path(url:, locale:, default_locale_supplied:)
+      unless supported_path?(url.path)
+        return success(
+          url: url,
+          locale: locale,
+          path: cleanup_path(url.path),
+          default_locale_supplied: default_locale_supplied,
+          locale_added_to_path: false
+        )
+      end
+
+      new_path = if default_locale_supplied
+                   maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, '/') : url.path
+                 else
+                   maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, "/#{locale}/") : "/#{locale}#{url.path}"
+                 end
+
+      success(
+        url: url,
+        locale: locale,
+        path: cleanup_path(new_path),
+        default_locale_supplied: default_locale_supplied,
+        locale_added_to_path: true
+      )
+    end
+
+    def append_locale_param(url:, locale:, path:, default_locale_supplied:, locale_added_to_path:)
+      return success(url: url, path: path, query: url.query) if locale_added_to_path
+
+      query_params = Rack::Utils.parse_nested_query(url.query)
+
+      if default_locale_supplied
+        query_params.delete('locale')
+      else
+        query_params.merge!('locale' => locale)
+      end
+
+      query_string = query_params.any? ? query_params.to_query : nil
+
+      success(url: url, path: path, query: query_string)
+    end
+
+    def build_url(url:, path:, query:)
+      localized_url = builder_class(url).build(host: url.host, port: url.port, path: path, query: query).to_s
+      success(localized_url)
+    end
+
+    private
+
+    def supported_path?(path)
+      return true if path.blank? || path == '/' || maches_locale_regex?(path)
+
+      path.match(SUPPORTED_PATHS_REGEX)
+    end
+
+    def maches_locale_regex?(path)
+      path.match(LOCALE_REGEX)[0].gsub('/', '') if path.match(LOCALE_REGEX)
+    end
+
+    def default_locale_supplied?(locale, default_locale)
+      default_locale.present? && default_locale.to_s == locale.to_s
+    end
+
+    def cleanup_path(path)
+      path.chomp('/').gsub('//', '/')
+    end
+
+    def builder_class(url)
+      url.scheme == 'http' ? URI::HTTP : URI::HTTPS
+    end
+  end
+end

data/app/services/spree/cart/estimate_shipping_rates.rb

@@ -24,7 +24,7 @@ module Spree
         if country_iso.present?
           ::Spree::Country.by_iso(country_iso)&.id
         else
-          ::Spree::Country.default.id
+          Spree::Config[:default_country_id]
         end
       end
 

data/app/services/spree/compare_line_items.rb

@@ -1,9 +1,11 @@
 # This class should be refactored
 module Spree
   class CompareLineItems
-    prepend Spree::ServiceModule:: Base
+    prepend Spree::ServiceModule::Base
+
+    def call(order:, line_item:, options: {}, comparison_hooks: nil)
+      comparison_hooks ||= Rails.application.config.spree.line_item_comparison_hooks
 
-    def call(order:, line_item:, options: {}, comparison_hooks: Rails.application.config.spree.line_item_comparison_hooks)
       legacy_part = comparison_hooks.all? do |hook|
         order.send(hook, line_item, options)
       end

data/app/sorters/spree/base_sorter.rb

@@ -0,0 +1,35 @@
+module Spree
+  class BaseSorter
+    def initialize(scope, params = {}, allowed_sort_attributes = [])
+      @scope = scope
+      @sort = params[:sort]
+      @allowed_sort_attributes = allowed_sort_attributes
+    end
+
+    def call
+      by_param_attribute(scope)
+    end
+
+    protected
+
+    attr_reader :scope, :collection, :sort, :allowed_sort_attributes
+
+    def by_param_attribute(scope)
+      return scope if sort_field.blank? || !allowed_sort_attributes.include?(sort_field.to_sym)
+
+      scope.order("#{sort_field}": order_direction)
+    end
+
+    def desc_order
+      @desc_order ||= String(sort)[0] == '-'
+    end
+
+    def sort_field
+      @sort_field ||= desc_order ? sort[1..-1] : sort
+    end
+
+    def order_direction
+      desc_order ? :desc : :asc
+    end
+  end
+end

data/app/sorters/spree/orders/sort.rb

@@ -1,42 +1,6 @@
 module Spree
   module Orders
-    class Sort
-      attr_reader :scope, :sort
-
-      def initialize(scope, params)
-        @scope = scope
-        @sort = params[:sort]
-      end
-
-      def call
-        orders = completed_at(scope)
-
-        orders
-      end
-
-      private
-
-      def desc_order
-        @desc_order ||= String(sort)[0] == '-'
-      end
-
-      def sort_field
-        @sort_field ||= desc_order ? sort[1..-1] : sort
-      end
-
-      def order_direction
-        desc_order ? :asc : :desc
-      end
-
-      def completed_at?
-        sort_field.eql?('completed_at')
-      end
-
-      def completed_at(orders)
-        return orders unless completed_at?
-
-        orders.order(completed_at: order_direction)
-      end
+    class Sort < ::Spree::BaseSorter
     end
   end
 end

data/app/sorters/spree/products/sort.rb

@@ -1,53 +1,30 @@
 module Spree
   module Products
-    class Sort
-      def initialize(scope, params, current_currency)
-        @scope    = scope
-        @sort     = params[:sort]
+    class Sort < ::Spree::BaseSorter
+      def initialize(scope, current_currency, params = {}, allowed_sort_attributes = [])
+        super(scope, params, allowed_sort_attributes)
         @currency = params[:currency] || current_currency
       end
 
       def call
-        products = updated_at(scope)
-        products = price(products)
+        products = by_param_attribute(scope)
+        products = by_price(products)
 
         products.distinct
       end
 
       private
 
-      attr_reader :sort, :scope, :currency
-
-      def desc_order
-        @desc_order ||= String(sort)[0] == '-'
-      end
-
-      def sort_field
-        @sort_field ||= desc_order ? sort[1..-1] : sort
-      end
-
-      def updated_at?
-        sort_field == 'updated_at'
-      end
+      attr_reader :sort, :scope, :currency, :allowed_sort_attributes
 
       def price?
         sort_field == 'price'
       end
 
-      def order_direction
-        desc_order ? :desc : :asc
-      end
-
-      def updated_at(products)
-        return products unless updated_at?
-
-        products.order(updated_at: order_direction)
-      end
-
-      def price(products)
-        return products unless price?
+      def by_price(scope)
+        return scope unless price?
 
-        products.joins(master: :prices).
+        scope.joins(master: :prices).
           select("#{Spree::Product.table_name}.*, #{Spree::Price.table_name}.amount").
           distinct.
           where(spree_prices: { currency: currency }).