spree_core 4.2.0.rc5 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d0f9d56b3e68e0ff69cfa46d00d61872b775e2e92ddf76a3eccd85899ca863b
-  data.tar.gz: 80879be83858cb06f69c5e78f975b9cbf1846941d62282290c8403bd8b509363
+  metadata.gz: a59c1e362e580d2884f8c82e1c15d2cdf057e21b1efc66e1ede10ef4e41883a8
+  data.tar.gz: cfe5bc95ed8d23c91c0c19dace8fe3d96b015cbcd97af1c38524b73c94797cac
 SHA512:
-  metadata.gz: 82e15e51f5847c472eac8cd4e24e549dc28705b328f082860009c638277f203adbfe42ff898105862e3385b4ed5935e102200cd247ee998b09b4b2f3912b77d3
-  data.tar.gz: c843177415698e0d50d2d9d81b2803f84713db0dfe7d9098c41a7de69cb9c1c15158d97b93a2ecc97dc62752078797adbd03436bad2a8674c87eef07ecb97e35
+  metadata.gz: 420dbd7fdd44e2a4fa1d68d4d9e78a2fc42062757fc9470e57277bb7599fc3883b9e01a8052e5d0c34fb784361a5bc2b1b0b8e0e7bd7342860412e09e5799e70
+  data.tar.gz: 6b45c3c66e49701c0830b59e51ecb1776563abf078fc0728080479799dbbda443b4191c5f3af934cb663cdda6e824564b5891ec805950e87f949f0011b34430c

data/app/assets/javascripts/spree.js

@@ -17,9 +17,25 @@ Spree.adminPath = function () {
 
 Spree.pathFor = function (path) {
   var locationOrigin = (window.location.protocol + '//' + window.location.hostname) + (window.location.port ? ':' + window.location.port : '')
+
   return this.url('' + locationOrigin + (this.mountedAt()) + path, this.url_params).toString()
 }
 
+Spree.localizedPathFor = function(path) {
+  if (typeof (SPREE_LOCALE) !== 'undefined') {
+    if (path.match(/api\/v/)) {
+      if (path.match(/\?/)) {
+        path = path + '&locale=' + SPREE_LOCALE
+      } else {
+        path = path + '?locale=' + SPREE_LOCALE
+      }
+    } else {
+      path = SPREE_LOCALE + '/' + path
+    }
+  }
+  return Spree.pathFor(path)
+}
+
 Spree.adminPathFor = function (path) {
   return this.pathFor('' + (this.adminPath()) + path)
 }

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

@@ -7,7 +7,7 @@ module Spree
         @ids              = String(params.dig(:filter, :ids)).split(',')
         @skus             = String(params.dig(:filter, :skus)).split(',')
         @price            = String(params.dig(:filter, :price)).split(',').map(&:to_f)
-        @currency         = params[:currency] || current_currency
+        @currency         = current_currency
         @taxons           = taxon_ids(params.dig(:filter, :taxons))
         @concat_taxons    = taxon_ids(params.dig(:filter, :concat_taxons))
         @name             = params.dig(:filter, :name)
@@ -103,7 +103,7 @@ module Spree
           where(
             spree_prices: {
               amount: price.min..price.max,
-              currency: currency
+              currency: currency&.upcase
             }
           )
       end
@@ -111,7 +111,7 @@ module Spree
       def by_currency(products)
         return products unless currency?
 
-        products.joins(master: :prices).where(spree_prices: { currency: currency })
+        products.joins(master: :prices).where(spree_prices: { currency: currency.upcase })
       end
 
       def by_taxons(products)

data/app/helpers/spree/base_helper.rb

@@ -134,7 +134,8 @@ module Spree
       [I18n.l(date.to_date, format: :long)].join(' ')
     end
 
-    def seo_url(taxon, options = nil)
+    def seo_url(taxon, options = {})
+      options.merge(locale: locale_param)
       spree.nested_taxons_path(taxon.permalink, options)
     end
 

data/app/helpers/spree/currency_helper.rb

@@ -0,0 +1,24 @@
+module Spree
+  module CurrencyHelper
+    def currency_options(selected_value = nil)
+      selected_value ||= Spree::Config[:currency]
+      currencies = ::Money::Currency.table.map do |_code, details|
+        iso = details[:iso_code]
+        [iso, "#{details[:name]} (#{iso})"]
+      end
+      options_from_collection_for_select(currencies, :first, :last, selected_value)
+    end
+
+    def supported_currency_options
+      return if current_store.nil?
+
+      current_store.supported_currencies_list.map(&:iso_code)
+    end
+
+    def should_render_currency_dropdown?
+      return false if current_store.nil?
+
+      current_store.supported_currencies_list.size > 1
+    end
+  end
+end

data/app/helpers/spree/locale_helper.rb

@@ -8,12 +8,24 @@ module Spree
       available_locales.map { |locale| locale_presentation(locale) }
     end
 
+    def supported_locales_options
+      return if current_store.nil?
+
+      current_store.supported_locales_list.map { |locale| locale_presentation(locale) }
+    end
+
     def locale_presentation(locale)
-      if defined?(SpreeI18n)
-        [Spree.t('i18n.this_file_language', locale: locale), locale]
+      if I18n.exists?('spree.i18n.this_file_language', locale: locale)
+        [Spree.t('i18n.this_file_language', locale: locale), locale.to_s]
       else
-        locale.to_s == 'en' ? ['English (US)', :en] : [locale, locale]
+        locale.to_s == 'en' ? ['English (US)', 'en'] : [locale, locale.to_s]
       end
     end
+
+    def should_render_locale_dropdown?
+      return false if current_store.nil?
+
+      current_store.supported_locales_list.size > 1
+    end
   end
 end

data/app/models/concerns/spree/product_scopes.rb

@@ -206,7 +206,7 @@ module Spree
       search_scopes << :available
 
       def self.active(currency = nil)
-        available(nil, currency)
+        available(nil, currency&.upcase)
       end
       search_scopes << :active
 

data/app/models/spree/app_configuration.rb

@@ -69,7 +69,7 @@ module Spree
     preference :credit_to_new_allocation, :boolean, default: false
 
     # Multi store configurations
-    preference :show_store_selector, :boolean, default: true
+    preference :show_store_selector, :boolean, default: false
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class

data/app/models/spree/app_dependencies.rb

@@ -13,7 +13,7 @@ module Spree
       :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,
       :account_create_address_service, :account_update_address_service, :address_finder,
-      :collection_sorter
+      :collection_sorter, :error_handler
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -66,6 +66,8 @@ module Spree
       # account
       @account_create_address_service = 'Spree::Account::Addresses::Create'
       @account_update_address_service = 'Spree::Account::Addresses::Update'
+
+      @error_handler = 'Spree::ErrorReporter'
     end
 
     def set_default_finders

data/app/models/spree/credit_card.rb

@@ -127,6 +127,10 @@ module Spree
       "XXXX-XXXX-XXXX-#{last_digits}"
     end
 
+    def display_brand
+      brand.present? ? brand.upcase : Spree.t(:no_cc_type)
+    end
+
     def actions
       %w{capture void credit}
     end

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?)
@@ -468,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/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}%") }
@@ -50,14 +51,14 @@ module Spree
     end
 
     def supported_currencies_list
-      @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 ||= [default_locale].compact.uniq
+      @supported_locales_list ||= (read_attribute(:supported_locales).to_s.split(',') << default_locale).compact.uniq.sort
     end
 
     def unique_name
@@ -96,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)

data/app/models/spree/variant.rb

@@ -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)

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/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/views/spree/shared/_base_mailer_stylesheets.html.erb

@@ -287,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;
@@ -400,6 +410,9 @@
     .email-footer {
       width: 100% !important;
     }
+    .content-cell {
+      padding: 40px 15px !important;
+    }
   }
 
   @media (prefers-color-scheme: dark) {

data/app/views/spree/shared/_purchased_items_table.html.erb

@@ -8,10 +8,13 @@
           <td></td>
           <td>
             <p class="f-fallback purchase_total purchase_total--label">
-              <%= Spree.t(:promotion) %> <%= label %>:
+              <%= Spree.t(:promotion) %>:
+            </p>
+            <p class="f-fallback purchase_total--name purchase_total--label">
+              <%= label %>
             </p>
           </td>
-          <td>
+          <td class="purchase_total-col">
             <p class="f-fallback purchase_total">
               <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
             </p>
@@ -25,10 +28,13 @@
       <td></td>
       <td>
         <p class="f-fallback purchase_total purchase_total--label">
-          <%= Spree.t(:shipping) %> <%= name %>:
+          <%= Spree.t(:shipping) %>:
+        </p>
+        <p class="f-fallback purchase_total--name purchase_total--label">
+          <%= name %>
         </p>
       </td>
-      <td>
+      <td class="purchase_total-col">
         <p class="f-fallback purchase_total">
           <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
         </p>
@@ -41,10 +47,13 @@
         <td></td>
         <td>
           <p class="f-fallback purchase_total purchase_total--label">
-            <%= Spree.t(:tax) %> <%= label %>:
+            <%= Spree.t(:tax) %>:
+          </p>
+          <p class="f-fallback purchase_total--name purchase_total--label">
+            <%= label %>
           </p>
         </td>
-        <td>
+        <td class="purchase_total-col">
           <p class="f-fallback purchase_total">
             <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
           </p>