spree_core 4.2.0.rc2 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c4aedf602c42650159969df6a8bc7f450fd1c68f6d93d2a40ff8635f691b5be
-  data.tar.gz: 41c8433179fb96ecb5ea01dd0b7f35cf600652531f8bdebdb837e24977cf795f
+  metadata.gz: 5f9630450c68b8797b744c4f046769f568ebf50366a956fcbad41ede886c8419
+  data.tar.gz: 76d0ef19926855683298402e5ff729982be202b4c03fd021e4440ec7dc6d5185
 SHA512:
-  metadata.gz: 5f3c60e7a972db6b1a2747b06485210904a431959eda4bdf5e9b0948207b5352bbff1b9fca5c414ac68b03d872301fb8aaffdbb1aef8b61777c51c5fa927b0c1
-  data.tar.gz: 15fa837cab8e2f12a409ff45432206e01f3d54211545b52c3ae26c0291baa2ee40cd8f49edaccdb9d6914411b8bacff269abc91993968741b959d555b8bdab30
+  metadata.gz: 604ae3a3334b1a70869577cbafa21eafb5c4953f280e6c9ef6b76b51e5b50b7dbe010b66681076019f55745e40448906e0668c9ee0dc4d8912759ae4fd7289b7
+  data.tar.gz: 6fb2f4a1d3b55e5974326ff473fa554757a8d5464c41cb2963af4ffef11e8f26250000c020075fa6dc70127a8267d908687490c9f62919d11ec6b18f56a512ed

data/app/assets/javascripts/spree.js

@@ -17,9 +17,29 @@ 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' && typeof (SPREE_CURRENCY) !== 'undefined') {
+    var fullUrl = new URL(Spree.pathFor(path))
+    var params = fullUrl.searchParams
+    var pathName = fullUrl.pathname
+
+    params.set('currency', SPREE_CURRENCY)
+
+    if (pathName.match(/api\/v/)) {
+      params.set('locale', SPREE_LOCALE)
+    } else {
+      pathName = SPREE_LOCALE + '/' + pathName
+    }
+
+    path = pathName + '?' + params.toString()
+  }
+  return Spree.pathFor(path)
+}
+
 Spree.adminPathFor = function (path) {
   return this.pathFor('' + (this.adminPath()) + path)
 }

data/app/controllers/spree/base_controller.rb

@@ -7,9 +7,8 @@ class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Search
   include Spree::Core::ControllerHelpers::Store
   include Spree::Core::ControllerHelpers::StrongParameters
-  include Spree::Core::ControllerHelpers::CurrencyHelpers
+  include Spree::Core::ControllerHelpers::Locale
+  include Spree::Core::ControllerHelpers::Currency
 
   respond_to :html
 end
-
-require 'spree/i18n/initializer'

data/app/controllers/spree/errors_controller.rb

@@ -0,0 +1,11 @@
+module Spree
+  class ErrorsController < BaseController
+    def forbidden
+      render status: 403
+    end
+
+    def unauthorized
+      render status: 401
+    end
+  end
+end

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

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

data/app/finders/spree/base_finder.rb

@@ -0,0 +1,14 @@
+module Spree
+  class BaseFinder
+    def initialize(scope:, params:)
+      @scope = scope
+      @params = params
+    end
+
+    attr_reader :scope, :params
+
+    def execute
+      scope
+    end
+  end
+end

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

@@ -1,13 +1,21 @@
 module Spree
   module Countries
-    class Find
-      def initialize(scope, params)
+    class Find < ::Spree::BaseFinder
+      def initialize(scope:, params:)
         @scope = scope
 
         @shippable = String(params[:filter][:shippable]) unless params[:filter].nil?
       end
 
       def call
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Spree::Countries::Find.new.call is deprecated and will be removed in Spree 5.0.
+          Please use Spree::Countries::Find.new.execute instead
+        DEPRECATION
+        execute
+      end
+
+      def execute
         countries = by_shippability(scope)
 
         countries
@@ -15,7 +23,7 @@ module Spree
 
       private
 
-      attr_reader :shippable, :scope
+      attr_reader :shippable
 
       def shippable?
         shippable.present?

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

@@ -1,7 +1,7 @@
 module Spree
   module CreditCards
-    class Find
-      def execute(scope:, params:)
+    class Find < ::Spree::BaseFinder
+      def execute
         return scope.default.take if params[:id].eql?('default')
         return scope.where(payment_method_id: params[:filter]['payment_method_id']) if params[:filter].present?
 

data/app/finders/spree/orders/find_current.rb

@@ -9,13 +9,13 @@ module Spree
         return order unless order.nil?
         return if user.nil?
 
-        incomplete_orders.order(created_at: :desc).find_by(store: store, user: user)
+        incomplete_orders.order(created_at: :desc).find_by(store: store, user: user, currency: params[:currency])
       end
 
       private
 
       def incomplete_orders
-        Spree::Order.incomplete.includes(scope_includes)
+        Spree::Order.incomplete.not_canceled.includes(scope_includes)
       end
 
       def scope_includes

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)
@@ -22,6 +22,7 @@ module Spree
         products = by_ids(scope)
         products = by_skus(products)
         products = by_price(products)
+        products = by_currency(products)
         products = by_taxons(products)
         products = by_concat_taxons(products)
         products = by_name(products)
@@ -51,6 +52,10 @@ module Spree
         price.present?
       end
 
+      def currency?
+        currency.present?
+      end
+
       def taxons?
         taxons.present?
       end
@@ -94,15 +99,21 @@ module Spree
       def by_price(products)
         return products unless price?
 
-        products.joins(master: :default_price).
+        products.joins(master: :prices).
           where(
             spree_prices: {
               amount: price.min..price.max,
-              currency: currency
+              currency: currency&.upcase
             }
           )
       end
 
+      def by_currency(products)
+        return products unless currency?
+
+        products.joins(master: :prices).where(spree_prices: { currency: currency.upcase })
+      end
+
       def by_taxons(products)
         return products unless taxons?
 

data/app/helpers/spree/base_helper.rb

@@ -1,13 +1,7 @@
 module Spree
   module BaseHelper
     def available_countries
-      checkout_zone = current_store.checkout_zone || Spree::Zone.default_checkout_zone
-
-      countries = if checkout_zone && checkout_zone.kind == 'country'
-                    checkout_zone.country_list
-                  else
-                    Spree::Country.all
-                  end
+      countries = current_store.countries_available_for_checkout
 
       countries.collect do |country|
         country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
@@ -140,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,34 @@
+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).map { |currency| currency_presentation(currency) }
+    end
+
+    def should_render_currency_dropdown?
+      return false if current_store.nil?
+
+      current_store.supported_currencies_list.size > 1
+    end
+
+    def currency_symbol(currency)
+      ::Money::Currency.find(currency).symbol
+    end
+
+    def currency_presentation(currency)
+      label = [currency_symbol(currency), currency].compact.join(' ')
+
+      [label, currency]
+    end
+  end
+end

data/app/helpers/spree/locale_helper.rb

@@ -0,0 +1,31 @@
+module Spree
+  module LocaleHelper
+    def all_locales_options
+      supported_locales_for_all_stores.map { |locale| locale_presentation(locale) }
+    end
+
+    def available_locales_options
+      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 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.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/helpers/spree/products_helper.rb

@@ -35,6 +35,11 @@ module Spree
       variants_option_types_presenter(variants, product).default_variant || product.default_variant
     end
 
+    def should_display_compare_at_price?(default_variant)
+      default_variant_price = default_variant.price_in(current_currency)
+      default_variant_price.compare_at_amount.present? && (default_variant_price.compare_at_amount > default_variant_price.amount)
+    end
+
     def used_variants_options(variants, product)
       variants_option_types_presenter(variants, product).options
     end
@@ -115,19 +120,39 @@ module Spree
       ).call.to_json
     end
 
+    def product_relation_types
+      @product_relation_types ||= @product.respond_to?(:relation_types) ? @product.relation_types : []
+    end
+
+    def product_relations_by_type(relation_type)
+      return [] if product_relation_types.none? || !@product.respond_to?(:relations)
+
+      product_ids = @product.relations.where(relation_type: relation_type).pluck(:related_to_id).uniq
+
+      return [] if product_ids.empty?
+
+      Spree::Product.
+        available.not_discontinued.distinct.
+        where(id: product_ids).
+        includes(
+          :tax_category,
+          master: [
+            :prices,
+            { images: { attachment_attachment: :blob } },
+          ]
+        ).
+        limit(Spree::Config[:products_per_page])
+    end
+
     def related_products
-      return [] unless @product.respond_to?(:has_related_products?) && @product.has_related_products?(:related_products)
-
-      @related_products ||= @product.
-                            related_products.
-                            includes(
-                              :tax_category,
-                              master: [
-                                :prices,
-                                images: { attachment_attachment: :blob },
-                              ]
-                            ).
-                            limit(Spree::Config[:products_per_page])
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        ProductsHelper#related_products is deprecated and will be removed in Spree 5.0.
+        Please use ProductsHelper#relations from now on.
+      DEPRECATION
+
+      return [] unless @product.respond_to?(:has_related_products?)
+
+      @related_products ||= relations_by_type('related_products')
     end
 
     def product_available_in_currency?

data/app/mailers/spree/base_mailer.rb

@@ -1,6 +1,6 @@
 module Spree
   class BaseMailer < ActionMailer::Base
-    add_template_helper(MailHelper)
+    helper Spree::MailHelper
 
     def current_store
       @current_store ||= Spree::Store.current
@@ -23,7 +23,7 @@ module Spree
     helper_method :frontend_available?
 
     def mail(headers = {}, &block)
-      ensure_default_action_mailer_url_host
+      ensure_default_action_mailer_url_host(headers[:store_url])
       set_email_locale
       super if Spree::Config[:send_core_emails]
     end
@@ -33,9 +33,9 @@ module Spree
     # this ensures that ActionMailer::Base.default_url_options[:host] is always set
     # this is only a fail-safe solution if developer didn't set this in environment files
     # http://guides.rubyonrails.org/action_mailer_basics.html#generating-urls-in-action-mailer-views
-    def ensure_default_action_mailer_url_host
+    def ensure_default_action_mailer_url_host(store_url = nil)
       ActionMailer::Base.default_url_options ||= {}
-      ActionMailer::Base.default_url_options[:host] ||= current_store.url
+      ActionMailer::Base.default_url_options[:host] ||= store_url || current_store.url
     end
 
     def set_email_locale

data/app/mailers/spree/order_mailer.rb

@@ -5,14 +5,14 @@ module Spree
       current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
 
     def store_owner_notification_email(order)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       current_store = @order.store
       subject = Spree.t('order_mailer.store_owner_notification_email.subject', store_name: current_store.name)
-      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject)
+      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject, store_url: current_store.url)
     end
 
     def cancel_email(order, resend = false)
@@ -20,7 +20,7 @@ module Spree
       current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
   end
 end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -6,7 +6,7 @@ module Spree
       current_store = @reimbursement.store || Spree::Store.current
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: current_store.mail_from_address, subject: subject)
+      mail(to: @order.email, from: current_store.mail_from_address, subject: subject, store_url: current_store.url)
     end
   end
 end

data/app/mailers/spree/shipment_mailer.rb

@@ -6,7 +6,7 @@ module Spree
       current_store = @shipment.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
   end
 end