spree_core 4.2.5 → 4.3.0.rc1

data/app/helpers/spree/locale_helper.rb

@@ -16,12 +16,16 @@ module Spree
 
     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]
+        [locale_full_name(locale), locale.to_s]
       else
         locale.to_s == 'en' ? ['English (US)', 'en'] : [locale, locale.to_s]
       end
     end
 
+    def locale_full_name(locale)
+      Spree.t('i18n.this_file_language', locale: locale)
+    end
+
     def should_render_locale_dropdown?
       return false if current_store.nil?
 

data/app/helpers/spree/products_helper.rb

@@ -44,9 +44,13 @@ module Spree
       variants_option_types_presenter(variants, product).options
     end
 
+    def product_wysiwyg_editor_enabled?
+      Spree::Config[:product_wysiwyg_editor_enabled]
+    end
+
     # converts line breaks in product description into <p> tags (for html display purposes)
     def product_description(product)
-      description = if Spree::Config[:show_raw_product_description]
+      description = if Spree::Config[:show_raw_product_description] || product_wysiwyg_editor_enabled?
                       product.description
                     else
                       product.description.to_s.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>')
@@ -63,7 +67,7 @@ module Spree
     end
 
     def cache_key_for_products(products = @products, additional_cache_key = nil)
-      max_updated_at = (products.maximum(:updated_at) || Date.today).to_s(:number)
+      max_updated_at = (products.except(:group, :order).maximum(:updated_at) || Date.today).to_s(:number)
       products_cache_keys = "spree/products/#{products.map(&:id).join('-')}-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{@taxon&.id}"
       (common_product_cache_keys + [products_cache_keys] + [additional_cache_key]).compact.join('/')
     end
@@ -131,7 +135,7 @@ module Spree
 
       return [] if product_ids.empty?
 
-      Spree::Product.
+      current_store.products.
         available.not_discontinued.distinct.
         where(id: product_ids).
         includes(

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

@@ -0,0 +1,42 @@
+module Spree
+  module DisplayLink
+    def link
+      case linked_resource_type
+      when 'Spree::Taxon'
+        return if linked_resource&.permalink.blank?
+
+        if spree_routes.method_defined?(:nested_taxons_path)
+          spree_routes.nested_taxons_path(linked_resource.permalink)
+        else
+          "/#{Spree::Config[:storefront_taxons_path]}/#{linked_resource.permalink}"
+        end
+      when 'Spree::Product'
+        return if linked_resource&.slug.blank?
+
+        if spree_routes.method_defined?(:products_path)
+          spree_routes.product_path(linked_resource)
+        else
+          "/#{Spree::Config[:storefront_products_path]}/#{linked_resource.slug}"
+        end
+      when 'Spree::CmsPage'
+        return if linked_resource&.slug.blank?
+
+        if spree_routes.method_defined?(:page_path)
+          spree_routes.page_path(linked_resource.slug)
+        else
+          "/#{Spree::Config[:storefront_pages_path]}/#{linked_resource.slug}"
+        end
+      when 'Home Page'
+        '/'
+      when 'URL'
+        destination
+      end
+    end
+
+    private
+
+    def spree_routes
+      Spree::Core::Engine.routes.url_helpers
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Spree
+  module FilterParam
+    extend ActiveSupport::Concern
+
+    included do
+      before_save :set_filter_param
+    end
+
+    protected
+
+    def set_filter_param
+      return if param_candidate.blank?
+
+      self.filter_param = param_candidate.parameterize
+    end
+
+    def param_candidate
+      name
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Spree
+  module MemoizedData
+    extend ActiveSupport::Concern
+
+    included do
+      # reset cache on save inside trasaction and transaction commit
+      after_save :reset_memoized_data
+      after_commit :reset_memoized_data
+
+      def reload(options = {})
+        reset_memoized_data
+        super(options)
+      end
+
+      private
+
+      def reset_memoized_data
+        self.class.const_get('MEMOIZED_METHODS').each do |v|
+          instance_variable_set(:"@#{v.gsub(/\?/, '')}", nil)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Spree
+  module MultiStoreResource
+    extend ActiveSupport::Concern
+
+    included do
+      scope :for_store, ->(store) { joins(:stores).where(Store.table_name => { id: store.id }) }
+
+      validate :must_have_one_store, unless: :disable_store_presence_validation?
+    end
+
+    protected
+
+    def must_have_one_store
+      return if stores.any?
+
+      errors.add(:stores, Spree.t(:must_have_one_store))
+    end
+
+    # this can be overriden on model basis
+    def disable_store_presence_validation?
+      Spree::Config[:disable_store_presence_validation]
+    end
+  end
+end

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

@@ -43,23 +43,23 @@ module Spree
       add_simple_scopes simple_scopes
 
       add_search_scope :ascend_by_master_price do
-        joins(master: :default_price).order("#{price_table_name}.amount ASC")
+        order("#{price_table_name}.amount ASC")
       end
 
       add_search_scope :descend_by_master_price do
-        joins(master: :default_price).order("#{price_table_name}.amount DESC")
+        order("#{price_table_name}.amount DESC")
       end
 
       add_search_scope :price_between do |low, high|
-        joins(master: :default_price).where(Price.table_name => { amount: low..high })
+        where(Price.table_name => { amount: low..high })
       end
 
       add_search_scope :master_price_lte do |price|
-        joins(master: :default_price).where("#{price_table_name}.amount <= ?", price)
+        where("#{price_table_name}.amount <= ?", price)
       end
 
       add_search_scope :master_price_gte do |price|
-        joins(master: :default_price).where("#{price_table_name}.amount >= ?", price)
+        where("#{price_table_name}.amount >= ?", price)
       end
 
       # This scope selects products in taxon AND all its descendants
@@ -94,6 +94,19 @@ module Spree
         taxons.first ? prepare_taxon_conditions(taxons) : where(nil)
       end
 
+      add_search_scope :ascend_by_taxons_min_position do |taxon_ids|
+        joins(:classifications).
+          where(Classification.table_name => { taxon_id: taxon_ids }).
+          select(
+            [
+              "#{Product.table_name}.*",
+              "MIN(#{Classification.table_name}.position) AS min_position"
+            ].join(', ')
+          ).
+          group(:id).
+          order(min_position: :asc)
+      end
+
       # a scope that finds all products having property specified by name, object or id
       add_search_scope :with_property do |property|
         joins(:properties).where(property_conditions(property))
@@ -107,6 +120,12 @@ module Spree
           where(property_conditions(property))
       end
 
+      add_search_scope :with_property_values do |property_filter_param, property_values|
+        joins(product_properties: :property).
+          where(Property.table_name => { filter_param: property_filter_param }).
+          where(ProductProperty.table_name => { filter_param: property_values.map(&:parameterize) })
+      end
+
       add_search_scope :with_option do |option|
         option_types = OptionType.table_name
         conditions = case option
@@ -198,18 +217,50 @@ module Spree
         end
       end
       search_scopes << :not_discontinued
+
+      def self.with_currency(currency)
+        joins(variants_including_master: :prices).
+          where(Price.table_name => { currency: currency.upcase }).
+          where.not(Price.table_name => { amount: nil }).
+          distinct
+      end
+      search_scopes << :with_currency
+
       # Can't use add_search_scope for this as it needs a default argument
-      def self.available(available_on = nil, _currency = nil)
+      def self.available(available_on = nil, currency = nil)
         available_on ||= Time.current
-        not_discontinued.joins(master: :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+
+        scope = not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+
+        unless Spree::Config.show_products_without_price
+          currency ||= Spree::Config[:currency]
+          scope = scope.with_currency(currency)
+        end
+
+        scope
       end
       search_scopes << :available
 
       def self.active(currency = nil)
-        available(nil, currency&.upcase)
+        available(nil, currency)
       end
       search_scopes << :active
 
+      def self.for_filters(currency, taxon: nil)
+        scope = active(currency)
+        scope = scope.in_taxon(taxon) if taxon.present?
+        scope
+      end
+      search_scopes << :for_filters
+
+      def self.for_user(user = nil)
+        if user.try(:has_spree_role?, 'admin')
+          with_deleted
+        else
+          not_deleted.not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", Time.current)
+        end
+      end
+
       add_search_scope :taxons_name_eq do |name|
         group('spree_products.id').joins(:taxons).where(Taxon.arel_table[:name].eq(name))
       end

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

@@ -0,0 +1,9 @@
+module Spree
+  module SingleStoreResource
+    extend ActiveSupport::Concern
+
+    included do
+      scope :for_store, ->(store) { where(store_id: store.id) }
+    end
+  end
+end

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

@@ -16,7 +16,12 @@ module Spree
       has_many :addresses, -> { where(deleted_at: nil).order('updated_at DESC') },
                            class_name: 'Spree::Address', foreign_key: :user_id
 
+      validate :address_not_associated_with_other_user, :address_not_deprecated_in_completed_order
+
       def persist_order_address(order)
+        # FIXME: we should check if the User's address is associated with country accepted by Store
+        # if not we should try to find an address with valid country in User's address book
+        # or we should call `build_bill_address`
         b_address = bill_address || build_bill_address
         b_address.attributes = order.bill_address.value_attributes
         b_address.save
@@ -30,6 +35,20 @@ module Spree
           update(ship_address_id: s_address.id)
         end
       end
+
+      private
+
+      def address_not_associated_with_other_user
+        errors.add(:bill_address_id, :belongs_to_other_user) if bill_address&.user_id && self != bill_address&.user
+        errors.add(:ship_address_id, :belongs_to_other_user) if ship_address&.user_id && self != ship_address&.user
+      end
+
+      def address_not_deprecated_in_completed_order
+        errors.add(:bill_address_id, :deprecated_in_completed_order) if
+          orders.complete.with_deleted_bill_address.where(bill_address: bill_address_id).any?
+        errors.add(:ship_address_id, :deprecated_in_completed_order) if
+          orders.complete.with_deleted_ship_address.where(ship_address: ship_address_id).any?
+      end
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Spree
       belongs_to :ship_address, class_name: 'Spree::Address', optional: true
       belongs_to :bill_address, class_name: 'Spree::Address', optional: true
 
-      self.whitelisted_ransackable_associations = %w[bill_address ship_address]
+      self.whitelisted_ransackable_associations = %w[bill_address ship_address addresses]
       self.whitelisted_ransackable_attributes = %w[id email]
 
       def self.with_email(query)
@@ -59,9 +59,10 @@ module Spree
         first
     end
 
-    def total_available_store_credit(currency = nil)
-      currency ||= Spree::Config[:currency]
-      store_credits.where(currency: currency).reload.to_a.sum(&:amount_remaining)
+    def total_available_store_credit(currency = nil, store = nil)
+      store ||= Store.default
+      currency ||= store.default_currency
+      store_credits.for_store(store).where(currency: currency).reload.to_a.sum(&:amount_remaining)
     end
 
     private

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.where(payment_method: Spree::PaymentMethod.active)
+        credit_cards.with_payment_profile.not_expired.where(payment_method: Spree::PaymentMethod.active).not_removed
       end
 
       def drop_payment_source(source)

data/app/models/spree/ability.rb

@@ -61,6 +61,8 @@ module Spree
 
     def apply_user_permissions(user)
       can :read, ::Spree::Country
+      can :read, ::Spree::Menu
+      can :read, ::Spree::CmsPage
       can :read, ::Spree::OptionType
       can :read, ::Spree::OptionValue
       can :create, ::Spree::Order
@@ -71,7 +73,7 @@ module Spree
         !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, :destroy], ::Spree::CreditCard, user_id: user.id
       can :read, ::Spree::Product
       can :read, ::Spree::ProductProperty
       can :read, ::Spree::Property

data/app/models/spree/address.rb

@@ -1,6 +1,6 @@
 module Spree
   class Address < Spree::Base
-    require 'twitter_cldr'
+    require 'validates_zipcode'
 
     if Rails::VERSION::STRING >= '6.1'
       serialize :preferences, Hash, default: {}
@@ -55,13 +55,21 @@ module Spree
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
 
-    self.whitelisted_ransackable_attributes = %w[firstname lastname company]
+    self.whitelisted_ransackable_attributes = ADDRESS_FIELDS
+    self.whitelisted_ransackable_associations = %w[country state user]
 
     def self.build_default
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        `Address#build_default` is deprecated and will be removed in Spree 5.0.
+        Please use standard rails `Address.new(country: current_store.default_country)`
+      DEPRECATION
       new(country: Spree::Country.default)
     end
 
     def self.default(user = nil, kind = 'bill')
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        `Address#default` is deprecated and will be removed in Spree 5.0.
+      DEPRECATION
       if user && user_address = user.public_send(:"#{kind}_address")
         user_address.clone
       else
@@ -157,6 +165,7 @@ module Spree
         super
       else
         update_column :deleted_at, Time.current
+        assign_new_default_address_to_user
       end
     end
 
@@ -214,11 +223,23 @@ module Spree
     end
 
     def postal_code_validate
-      return if country.blank? || country.iso.blank? || !require_zipcode?
-      return unless TwitterCldr::Shared::PostalCodes.territories.include?(country.iso.downcase.to_sym)
+      return if country.blank? || country_iso.blank? || !require_zipcode? || zipcode.blank?
+      return unless ::ValidatesZipcode::CldrRegexpCollection::ZIPCODES_REGEX.keys.include?(country_iso.upcase.to_sym)
 
-      postal_code = TwitterCldr::Shared::PostalCodes.for_territory(country.iso)
-      errors.add(:zipcode, :invalid) unless postal_code.valid?(zipcode.to_s.strip)
+      formatted_zip = ::ValidatesZipcode::Formatter.new(
+        zipcode: zipcode.to_s.strip,
+        country_alpha2: country_iso.upcase
+      ).format
+
+      errors.add(:zipcode, :invalid) unless ::ValidatesZipcode.valid?(formatted_zip, country_iso.upcase)
+    end
+
+    def assign_new_default_address_to_user
+      return unless user
+
+      user.bill_address = user.addresses.last if user.bill_address == self
+      user.ship_address = user.addresses.last if user.ship_address == self
+      user.save!
     end
   end
 end