spree_core 4.2.0.rc2 → 4.2.1

data/app/models/spree/order.rb

@@ -157,6 +157,7 @@ module Spree
     scope :completed_between, ->(start_date, end_date) { where(completed_at: start_date..end_date) }
     scope :complete, -> { where.not(completed_at: nil) }
     scope :incomplete, -> { where(completed_at: nil) }
+    scope :not_canceled, -> { where.not(state: 'canceled') }
 
     # shows completed orders first, by their completed_at date, then uncompleted orders by their created_at
     scope :reverse_chronological, -> { order(Arel.sql('spree_orders.completed_at IS NULL'), completed_at: :desc, created_at: :desc) }

data/app/models/spree/payment.rb

@@ -14,7 +14,7 @@ module Spree
 
     with_options inverse_of: :payments do
       belongs_to :order, class_name: 'Spree::Order', touch: true
-      belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
+      belongs_to :payment_method, -> { with_deleted }, class_name: 'Spree::PaymentMethod'
     end
     belongs_to :source, polymorphic: true
 
@@ -195,14 +195,28 @@ module Spree
 
     def validate_source
       if source && !source.valid?
-        source.errors.each do |field, error|
-          field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
-          errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}")
+        if Rails::VERSION::STRING >= '6.1'
+          source.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|
+            next if err[:field].blank? || err[:message].blank?
+
+            add_source_error(err[:field], err[:message])
+          end
+        else
+          source.errors.messages.each do |field, error|
+            next if field.blank? || error.empty?
+
+            add_source_error(field, error.first)
+          end
         end
       end
       !errors.present?
     end
 
+    def add_source_error(field, message)
+      field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
+      errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{message}")
+    end
+
     def profiles_supported?
       payment_method.respond_to?(:payment_profiles_supported?) && payment_method.payment_profiles_supported?
     end

data/app/models/spree/payment/processing.rb

@@ -163,8 +163,8 @@ module Spree
                else
                  error.to_s
                end
-        logger.error(Spree.t(:gateway_error))
-        logger.error("  #{error.to_yaml}")
+        Rails.logger.error(Spree.t(:gateway_error))
+        Rails.logger.error("  #{error.to_yaml}")
         raise Core::GatewayError, text
       end
 

data/app/models/spree/payment_method.rb

@@ -12,7 +12,7 @@ module Spree
 
     validates :name, presence: true
 
-    belongs_to :store
+    has_and_belongs_to_many :stores
 
     with_options dependent: :restrict_with_error do
       has_many :payments, class_name: 'Spree::Payment', inverse_of: :payment_method
@@ -79,9 +79,9 @@ module Spree
     end
 
     def available_for_store?(store)
-      return true if store.blank? || store_id.blank?
+      return true if store.blank?
 
-      store_id == store.id
+      store_ids.include?(store.id)
     end
   end
 end

data/app/models/spree/price.rb

@@ -6,7 +6,7 @@ module Spree
 
     MAXIMUM_AMOUNT = BigDecimal('99_999_999.99')
 
-    belongs_to :variant, class_name: 'Spree::Variant', inverse_of: :prices, touch: true
+    belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', inverse_of: :prices, touch: true
 
     before_validation :ensure_currency
 
@@ -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)
@@ -63,11 +63,6 @@ module Spree
       Spree::Money.new(compare_at_price_including_vat_for(price_options), currency: currency)
     end
 
-    # Remove variant default_scope `deleted_at: nil`
-    def variant
-      Spree::Variant.unscoped { super }
-    end
-
     private
 
     def ensure_currency

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
@@ -411,8 +419,18 @@ module Spree
       # We call master.default_price here to ensure price is initialized.
       # Required to avoid Variant#check_price validation failing on create.
       unless master.default_price && master.valid?
-        master.errors.each do |att, error|
-          errors.add(att, error)
+        if Rails::VERSION::STRING >= '6.1'
+          master.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|
+            next if err[:field].blank? || err[:message].blank?
+
+            errors.add(err[:field], err[:message])
+          end
+        else
+          master.errors.messages.each do |field, error|
+            next if field.blank? || error.empty?
+
+            errors.add(field, error.first)
+          end
         end
       end
     end
@@ -430,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
@@ -461,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/promotion/rules/product.rb

@@ -58,7 +58,8 @@ module Spree
         end
 
         def product_ids_string=(s)
-          self.product_ids = s.to_s.split(',').map(&:strip)
+          # check this
+          self.product_ids = s
         end
       end
     end

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

@@ -22,7 +22,8 @@ module Spree
         end
 
         def user_ids_string=(s)
-          self.user_ids = s.to_s.split(',').map(&:strip)
+          # check this
+          self.user_ids = s
         end
       end
     end

data/app/models/spree/refund.rb

@@ -61,14 +61,14 @@ module Spree
                  end
 
       unless response.success?
-        logger.error(Spree.t(:gateway_error) + "  #{response.to_yaml}")
+        Rails.logger.error(Spree.t(:gateway_error) + "  #{response.to_yaml}")
         text = response.params['message'] || response.params['response_reason_text'] || response.message
         raise Core::GatewayError, text
       end
 
       response
     rescue ActiveMerchant::ConnectionError => e
-      logger.error(Spree.t(:gateway_error) + "  #{e.inspect}")
+      Rails.logger.error(Spree.t(:gateway_error) + "  #{e.inspect}")
       raise Core::GatewayError, Spree.t(:unable_to_connect_to_gateway)
     end
 

data/app/models/spree/return_item/eligibility_validator/default.rb

@@ -1,5 +1,3 @@
-require_relative 'r_m_a_required'
-
 module Spree
   class ReturnItem::EligibilityValidator::Default < Spree::ReturnItem::EligibilityValidator::BaseValidator
     class_attribute :permitted_eligibility_validators

data/app/models/spree/shipment.rb

@@ -362,7 +362,7 @@ module Spree
         desired_shipment: shipment_to_transfer_to,
         variant: variant,
         quantity: quantity
-      ).run!
+      )
     end
 
     private

data/app/models/spree/shipping_method.rb

@@ -19,7 +19,7 @@ module Spree
                                      foreign_key: 'shipping_method_id'
     has_many :zones, through: :shipping_method_zones, class_name: 'Spree::Zone'
 
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
+    belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory', optional: true
 
     validates :name, :display_on, presence: true
 
@@ -44,10 +44,6 @@ module Spree
         select { |c| c.to_s.constantize < Spree::ShippingCalculator }
     end
 
-    def tax_category
-      Spree::TaxCategory.unscoped { super }
-    end
-
     def available_to_display?(display_filter)
       (frontend? && display_filter == DISPLAY_ON_FRONT_END) ||
         (backend? && display_filter == DISPLAY_ON_BACK_END)

data/app/models/spree/shipping_rate.rb

@@ -1,9 +1,8 @@
 module Spree
   class ShippingRate < Spree::Base
     belongs_to :shipment, class_name: 'Spree::Shipment'
-    belongs_to :tax_rate, class_name: 'Spree::TaxRate'
-    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
-
+    belongs_to :tax_rate, -> { with_deleted }, class_name: 'Spree::TaxRate'
+    belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
     extend Spree::DisplayMoney
 
     money_methods :base_price, :final_price, :tax_amount
@@ -32,14 +31,6 @@ module Spree
       @tax_amount ||= tax_rate&.calculator&.compute_shipping_rate(self) || BigDecimal(0)
     end
 
-    def shipping_method
-      Spree::ShippingMethod.unscoped { super }
-    end
-
-    def tax_rate
-      Spree::TaxRate.unscoped { super }
-    end
-
     # returns base price - any available discounts for this Shipment
     # useful when you want to present a list of available shipping rates
     def final_price

data/app/models/spree/stock/availability_validator.rb

@@ -14,10 +14,9 @@ module Spree
         display_name = variant.name.to_s
         display_name += " (#{variant.options_text})" unless variant.options_text.blank?
 
-        line_item.errors[:quantity] << Spree.t(
-          :selected_quantity_not_available,
-          item: display_name.inspect
-        )
+        line_item.errors.add(:quantity,
+                             :selected_quantity_not_available,
+                             message: Spree.t(:selected_quantity_not_available, item: display_name.inspect))
       end
 
       private

data/app/models/spree/stock_item.rb

@@ -4,7 +4,7 @@ module Spree
 
     with_options inverse_of: :stock_items do
       belongs_to :stock_location, class_name: 'Spree::StockLocation'
-      belongs_to :variant, class_name: 'Spree::Variant'
+      belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
     end
     has_many :stock_movements, inverse_of: :stock_item
 
@@ -56,10 +56,6 @@ module Spree
       in_stock? || backorderable?
     end
 
-    def variant
-      Spree::Variant.unscoped { super }
-    end
-
     def reduce_count_on_hand_to_zero
       set_count_on_hand(0) if count_on_hand > 0
     end

data/app/models/spree/store.rb

@@ -24,12 +24,15 @@ 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}%") }
 
     after_commit :clear_cache
 
+    alias_attribute :contact_email, :customer_support_email
+
     def self.current(domain = nil)
       current_store = domain ? Store.by_url(domain).first : nil
       current_store || Store.default
@@ -41,14 +44,47 @@ 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?
+
+      @formatted_url ||= if url.match(/http:\/\/|https:\/\//)
+                           url
+                         else
+                           Rails.env.development? ? "http://#{url}" : "https://#{url}"
+                         end
+    end
+
+    def countries_available_for_checkout
+      @countries_available_for_checkout ||= checkout_zone_or_default.try(:country_list) || Spree::Country.all
+    end
+
+    def states_available_for_checkout(country)
+      checkout_zone_or_default.try(:state_list_for, country) || country.states
+    end
+
+    def checkout_zone_or_default
+      @checkout_zone_or_default ||= checkout_zone || Spree::Zone.default_checkout_zone
     end
 
     private
@@ -61,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)
@@ -70,6 +122,7 @@ module Spree
 
     def clear_cache
       Rails.cache.delete('default_store')
+      Rails.cache.delete('stores_available_locales')
     end
   end
 end