spree_core 4.2.0.rc3 → 4.2.2

data/app/models/spree/line_item.rb

@@ -57,16 +57,13 @@ module Spree
     end
 
     def update_price
-      if Spree::Config.show_store_currency_selector == true
-        currency_price = Spree::Price.where(
-          currency: order.currency,
-          variant_id: variant_id
-        ).first
+      currency_price = variant.price_in(order.currency)
 
-        self.price = currency_price.price_including_vat_for(tax_zone: tax_zone)
-      else
-        self.price = variant.price_including_vat_for(tax_zone: tax_zone)
-      end
+      self.price = if currency_price.amount.present?
+                     currency_price.price_including_vat_for(tax_zone: tax_zone)
+                   else
+                     0
+                   end
     end
 
     def copy_tax_category

data/app/models/spree/price.rb

@@ -27,7 +27,7 @@ module Spree
     self.whitelisted_ransackable_attributes = ['amount', 'compare_at_amount']
 
     def money
-      Spree::Money.new(amount || 0, currency: currency)
+      Spree::Money.new(amount || 0, currency: currency.upcase)
     end
 
     def amount=(amount)

data/app/models/spree/product.rb

@@ -90,6 +90,10 @@ module Spree
     after_save :reset_nested_changes
     after_touch :touch_taxons
 
+    # reset cache on save inside trasaction and transaction commit
+    after_save :reset_memoized_data
+    after_commit :reset_memoized_data
+
     before_validation :normalize_slug, on: :update
     before_validation :validate_master
 
@@ -127,6 +131,13 @@ module Spree
 
     alias master_images images
 
+    def reload
+      %w(total_on_hand taxonomy_ids taxon_and_ancestors category category default_variant_id tax_category default_variant).each do |v|
+        instance_variable_set(:"@#{v}", nil)
+      end
+      super
+    end
+
     # Cant use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
     def purchasable?
       variants_including_master.any?(&:purchasable?)
@@ -160,7 +171,7 @@ module Spree
     #
     # @return [Spree::Variant]
     def default_variant
-      Rails.cache.fetch(default_variant_cache_key) do
+      @default_variant ||= Rails.cache.fetch(default_variant_cache_key) do
         if Spree::Config[:track_inventory_levels] && variants.in_stock_or_backorderable.any?
           variants.in_stock_or_backorderable.first
         else
@@ -172,11 +183,11 @@ module Spree
     # Returns default Variant ID for Product
     # @return [Integer]
     def default_variant_id
-      default_variant.id
+      @default_variant_id ||= default_variant.id
     end
 
     def tax_category
-      super || TaxCategory.find_by(is_default: true)
+      @tax_category ||= super || TaxCategory.find_by(is_default: true)
     end
 
     # Adding properties and option types on creation based on a chosen prototype
@@ -288,11 +299,11 @@ module Spree
     end
 
     def total_on_hand
-      if any_variants_not_track_inventory?
-        Float::INFINITY
-      else
-        stock_items.sum(:count_on_hand)
-      end
+      @total_on_hand ||= if any_variants_not_track_inventory?
+                           Float::INFINITY
+                         else
+                           stock_items.sum(:count_on_hand)
+                         end
     end
 
     # Master variant may be deleted (i.e. when the product is deleted)
@@ -303,14 +314,11 @@ module Spree
     end
 
     def brand
-      taxons.joins(:taxonomy).find_by(spree_taxonomies: { name: Spree.t(:taxonomy_brands_name) })
+      @brand ||= taxons.joins(:taxonomy).find_by(spree_taxonomies: { name: Spree.t(:taxonomy_brands_name) })
     end
 
     def category
-      taxons.joins(:taxonomy).
-        where(spree_taxonomies: { name: Spree.t(:taxonomy_categories_name) }).
-        order(depth: :desc).
-        first
+      @category ||= taxons.joins(:taxonomy).order(depth: :desc).find_by(spree_taxonomies: { name: Spree.t(:taxonomy_categories_name) })
     end
 
     private
@@ -440,12 +448,12 @@ module Spree
     end
 
     def taxon_and_ancestors
-      taxons.map(&:self_and_ancestors).flatten.uniq
+      @taxon_and_ancestors ||= taxons.map(&:self_and_ancestors).flatten.uniq
     end
 
     # Get the taxonomy ids of all taxons assigned to this product and their ancestors.
     def taxonomy_ids
-      taxon_and_ancestors.map(&:taxonomy_id).flatten.uniq
+      @taxonomy_ids ||= taxon_and_ancestors.map(&:taxonomy_id).flatten.uniq
     end
 
     # Iterate through this products taxons and taxonomies and touch their timestamps in a batch
@@ -471,5 +479,11 @@ module Spree
         errors.add(:discontinue_on, :invalid_date_range)
       end
     end
+
+    def reset_memoized_data
+      %w(total_on_hand taxonomy_ids taxon_and_ancestors category default_variant_id tax_category default_variant).each do |v|
+        instance_variable_set(:"@#{v}", nil)
+      end
+    end
   end
 end

data/app/models/spree/promotion/rules/option_value.rb

@@ -31,7 +31,7 @@ module Spree
         end
 
         def actionable?(line_item)
-          product_id = line_item.product.id
+          product_id = line_item.product_id
           option_values_ids = line_item.variant.option_value_ids
           eligible_product_ids = preferred_eligible_values.keys
           eligible_value_ids = preferred_eligible_values[product_id]

data/app/models/spree/store.rb

@@ -24,6 +24,7 @@ module Spree
     validates :mailer_logo, content_type: ['image/png', 'image/jpg', 'image/jpeg']
 
     before_save :ensure_default_exists_and_is_unique
+    before_save :ensure_supported_currencies, :ensure_supported_locales
     before_destroy :validate_not_default
 
     scope :by_url, ->(url) { where('url like ?', "%#{url}%") }
@@ -43,28 +44,39 @@ module Spree
       end
     end
 
+    def self.available_locales
+      Rails.cache.fetch('stores_available_locales') do
+        Spree::Store.all.map(&:supported_locales_list).flatten.uniq
+      end
+    end
+
     def supported_currencies_list
-      (read_attribute(:supported_currencies).to_s.split(',') << default_currency).map(&:to_s).map do |code|
+      @supported_currencies_list ||= (read_attribute(:supported_currencies).to_s.split(',') << default_currency).sort.map(&:to_s).map do |code|
         ::Money::Currency.find(code.strip)
       end.uniq.compact
     end
 
+    def supported_locales_list
+      # TODO: add support of multiple supported languages to a single Store
+      @supported_locales_list ||= (read_attribute(:supported_locales).to_s.split(',') << default_locale).compact.uniq.sort
+    end
+
     def unique_name
-      "#{name} (#{code})"
+      @unique_name ||= "#{name} (#{code})"
     end
 
     def formatted_url
       return if url.blank?
 
-      if url.match(/http:\/\/|https:\/\//)
-        url
-      else
-        "https://#{url}"
-      end
+      @formatted_url ||= if url.match(/http:\/\/|https:\/\//)
+                           url
+                         else
+                           Rails.env.development? ? "http://#{url}" : "https://#{url}"
+                         end
     end
 
     def countries_available_for_checkout
-      checkout_zone_or_default.try(:country_list) || Spree::Country.all
+      @countries_available_for_checkout ||= checkout_zone_or_default.try(:country_list) || Spree::Country.all
     end
 
     def states_available_for_checkout(country)
@@ -72,7 +84,7 @@ module Spree
     end
 
     def checkout_zone_or_default
-      checkout_zone || Spree::Zone.default_checkout_zone
+      @checkout_zone_or_default ||= checkout_zone || Spree::Zone.default_checkout_zone
     end
 
     private
@@ -85,6 +97,22 @@ module Spree
       end
     end
 
+    def ensure_supported_locales
+      return unless attributes.keys.include?('supported_locales')
+      return if supported_locales.present?
+      return if default_locale.blank?
+
+      self.supported_locales = default_locale
+    end
+
+    def ensure_supported_currencies
+      return unless attributes.keys.include?('supported_currencies')
+      return if supported_currencies.present?
+      return if default_currency.blank?
+
+      self.supported_currencies = default_currency
+    end
+
     def validate_not_default
       if default
         errors.add(:base, :cannot_destroy_default_store)
@@ -94,6 +122,7 @@ module Spree
 
     def clear_cache
       Rails.cache.delete('default_store')
+      Rails.cache.delete('stores_available_locales')
     end
   end
 end

data/app/models/spree/variant.rb

@@ -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
@@ -192,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)
@@ -226,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/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/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/views/spree/shared/_base_mailer_stylesheets.html.erb

@@ -249,11 +249,9 @@
     color: #51545E;
     font-size: 15px;
     line-height: 18px;
-    width: 62%;
   }
 
   .purchase_image {
-    width: 18%;
     padding: 5px;
   }
 
@@ -289,10 +287,20 @@
     color: #333333;
   }
 
+  .purchase_total--name {
+    margin: 0;
+    text-align: right;
+    color: #333333;
+  }
+
   .purchase_total--label {
     padding: 0 15px 0 0;
   }
 
+  .purchase_total-col {
+    vertical-align: bottom;
+  }
+
   body {
     background-color: #F2F4F6;
     color: #51545E;
@@ -402,6 +410,9 @@
     .email-footer {
       width: 100% !important;
     }
+    .content-cell {
+      padding: 40px 15px !important;
+    }
   }
 
   @media (prefers-color-scheme: dark) {