spree_core 4.2.0.rc3 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e1c991fe1a4f4ffcb163ad34f7db0d399c802a14b09cabae9b6db567db1adbc
-  data.tar.gz: 6d27129f5c12ec9b48941c3001a341d8306e219fdb702b153944645bc1044b72
+  metadata.gz: 612f2690babce476b244e52eaf770e6993cabeef0ba9d7fa76a921cc1281a826
+  data.tar.gz: 1e71e1322e8d7af3b9595f33108c5b82ddb1ba0824570d6e9bb50e47160cc71e
 SHA512:
-  metadata.gz: 4627be5137cf9b13ac72562df61b91a6ad0a95eb0119e9b9cf0c9a32b562874799ff35a0187ae8eadec622c88c0c5ee56f10cb21df79512b6524394b2f668fb1
-  data.tar.gz: ecaf570ab3245130d1ea2b521e0201937617e2aa0d308051d56ec17e2757549ce202fc243bb0c9b7609e379dfb7179005773656a8c7cc69632341c9751a26967
+  metadata.gz: 3d8788642e21a9ae5f5e5ea2684cafb00e80a3ed300851c4b4bdb83e8bf83a927dfd6798ea99e8da04f94809e9163ada634e89452568b3307b0bffc3e567827c
+  data.tar.gz: db77fb1c959dbe53a50cc103977a1b3c83f3d45d846ce353b1ed739ebd89c8e9b0234b470ddc23a0b14b94137ee996c60165cf36350b997ea2eeb42d34ec7caf

data/app/assets/javascripts/spree.js

@@ -17,9 +17,28 @@ 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 + '/' + path
+    }
+    return fullUrl.origin + (this.mountedAt()) + 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,7 +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

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/orders/find_current.rb

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

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

@@ -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,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/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/concerns/spree/user_payment_source.rb

@@ -9,7 +9,7 @@ module Spree
       end
 
       def payment_sources
-        credit_cards.with_payment_profile.not_expired
+        credit_cards.with_payment_profile.not_expired.where(payment_method: Spree::PaymentMethod.active)
       end
 
       def drop_payment_source(source)

data/app/models/spree/ability.rb

@@ -23,55 +23,70 @@ module Spree
     end
 
     def initialize(user)
-      # add cancancan aliasing
-      alias_action :delete, to: :destroy
-      alias_action :create, :update, :destroy, to: :modify
+      alias_cancan_delete_action
 
       user ||= Spree.user_class.new
 
       if user.respond_to?(:has_spree_role?) && user.has_spree_role?('admin')
-        can :manage, :all
+        apply_admin_permissions(user)
       else
-        can :read, Country
-        can :read, OptionType
-        can :read, OptionValue
-        can :create, Order
-        can :show, Order do |order, token|
-          order.user == user || order.token && token == order.token
-        end
-        can :update, Order do |order, token|
-          !order.completed? && (order.user == user || order.token && token == order.token)
-        end
-        can :manage, Address, user_id: user.id
-        can :read, CreditCard, user_id: user.id
-        can :read, Product
-        can :read, ProductProperty
-        can :read, Property
-        can :create, Spree.user_class
-        can [:show, :update, :destroy], Spree.user_class, id: user.id
-        can :read, State
-        can :read, Store
-        can :read, Taxon
-        can :read, Taxonomy
-        can :read, Variant
-        can :read, Zone
+        apply_user_permissions(user)
       end
 
       # Include any abilities registered by extensions, etc.
+      # this is legacy behaviour and should be removed in Spree 5.0
       Ability.abilities.merge(abilities_to_register).each do |clazz|
         merge clazz.new(user)
       end
 
-      # Protect admin role
-      cannot [:update, :destroy], Role, name: ['admin']
+      protect_admin_role
     end
 
-    private
+    protected
 
     # you can override this method to register your abilities
     # this method has to return array of classes
     def abilities_to_register
       []
     end
+
+    def alias_cancan_delete_action
+      alias_action :delete, to: :destroy
+      alias_action :create, :update, :destroy, to: :modify
+    end
+
+    def apply_admin_permissions(user)
+      can :manage, :all
+    end
+
+    def apply_user_permissions(user)
+      can :read, ::Spree::Country
+      can :read, ::Spree::OptionType
+      can :read, ::Spree::OptionValue
+      can :create, ::Spree::Order
+      can :show, ::Spree::Order do |order, token|
+        order.user == user || order.token && token == order.token
+      end
+      can :update, ::Spree::Order do |order, token|
+        !order.completed? && (order.user == user || order.token && token == order.token)
+      end
+      can :manage, ::Spree::Address, user_id: user.id
+      can :read, ::Spree::CreditCard, user_id: user.id
+      can :read, ::Spree::Product
+      can :read, ::Spree::ProductProperty
+      can :read, ::Spree::Property
+      can :create, ::Spree.user_class
+      can [:show, :update, :destroy], ::Spree.user_class, id: user.id
+      can :read, ::Spree::State
+      can :read, ::Spree::Store
+      can :read, ::Spree::Taxon
+      can :read, ::Spree::Taxonomy
+      can :read, ::Spree::Variant
+      can :read, ::Spree::Zone
+    end
+
+    def protect_admin_role
+      cannot [:update, :destroy], ::Spree::Role, name: ['admin']
+    end
   end
 end

data/app/models/spree/app_configuration.rb

@@ -68,8 +68,8 @@ module Spree
     preference :non_expiring_credit_types, :array, default: []
     preference :credit_to_new_allocation, :boolean, default: false
 
-    # Multi currency configurations
-    preference :show_store_currency_selector, :boolean, default: false
+    # Multi store configurations
+    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/image.rb

@@ -15,13 +15,13 @@ module Spree
         width, height = size.chop.split('x')
 
         {
-          url: polymorphic_path(attachment.variant(combine_options: {
-                                                     gravity: 'center',
-                                                     resize: size,
-                                                     extent: size,
-                                                     background: 'snow2',
-                                                     quality: 80
-                                                   }), only_path: true),
+          url: polymorphic_path(attachment.variant(
+                                  gravity: 'center',
+                                  resize: size,
+                                  extent: size,
+                                  background: 'snow2',
+                                  quality: 80
+                                ), only_path: true),
           width: width,
           height: height
         }
@@ -35,13 +35,13 @@ module Spree
       width, height = size.chop.split('x')
 
       {
-        url: polymorphic_path(attachment.variant(combine_options: {
-                                                   gravity: 'center',
-                                                   resize: size,
-                                                   extent: size,
-                                                   background: 'snow2',
-                                                   quality: 80
-                                                 }), only_path: true),
+        url: polymorphic_path(attachment.variant(
+                                gravity: 'center',
+                                resize: size,
+                                extent: size,
+                                background: 'snow2',
+                                quality: 80
+                              ), only_path: true),
         size: size,
         width: width,
         height: height