solidus_core 1.2.3 → 1.3.0.beta1

data/app/models/spree/payment.rb

@@ -16,7 +16,7 @@ module Spree
     has_many :offsets, -> { offset_payment }, class_name: "Spree::Payment", foreign_key: :source_id
     has_many :log_entries, as: :source
     has_many :state_changes, as: :stateful
-    has_many :capture_events, :class_name => 'Spree::PaymentCaptureEvent'
+    has_many :capture_events, class_name: 'Spree::PaymentCaptureEvent'
     has_many :refunds, inverse_of: :payment
 
     before_validation :validate_source, unless: :invalid?
@@ -39,7 +39,6 @@ module Spree
 
     validates :amount, numericality: true
     validates :source, presence: true, if: :source_required?
-    validates :payment_method, presence: true
 
     default_scope -> { order(:created_at) }
 
@@ -94,7 +93,7 @@ module Spree
         payment.state_changes.create!(
           previous_state: transition.from,
           next_state:     transition.to,
-          name:           'payment',
+          name:           'payment'
         )
       end
     end
@@ -162,7 +161,7 @@ deprecated. Instead use either the PaymentCreate class or the
 OrderUpdateAttributes class.
 WARN
 
-      PaymentCreate.new(order, {source_attributes: source_attributes}, payment: self, request_env: request_env).build
+      PaymentCreate.new(order, { source_attributes: source_attributes }, payment: self, request_env: request_env).build
     end
 
     # @return [Array<String>] the actions available on this payment
@@ -181,7 +180,7 @@ WARN
     # @return [Boolean] true when this payment is risky based on address
     def is_avs_risky?
       return false if avs_response.blank? || NON_RISKY_AVS_CODES.include?(avs_response)
-      return true
+      true
     end
 
     # @return [Boolean] true when this payment is risky based on cvv
@@ -189,7 +188,7 @@ WARN
       return false if cvv_response_code == "M"
       return false if cvv_response_code.nil?
       return false if cvv_response_message.present?
-      return true
+      true
     end
 
     # @return [BigDecimal] the total amount captured on this payment
@@ -209,85 +208,83 @@ WARN
 
     private
 
-      def source_actions
-        return [] unless payment_source and payment_source.respond_to? :actions
-        payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") or payment_source.send("can_#{action}?", self) }
-      end
+    def source_actions
+      return [] unless payment_source && payment_source.respond_to?(:actions)
+      payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") || payment_source.send("can_#{action}?", self) }
+    end
 
-      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}")
-            self.errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}")
-          end
+    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}")
         end
-        return !errors.present?
       end
+      !errors.present?
+    end
 
-      def source_required?
-        payment_method.present? && payment_method.source_required?
-      end
+    def source_required?
+      payment_method.present? && payment_method.source_required?
+    end
 
-      def profiles_supported?
-        payment_method.respond_to?(:payment_profiles_supported?) && payment_method.payment_profiles_supported?
-      end
+    def profiles_supported?
+      payment_method.respond_to?(:payment_profiles_supported?) && payment_method.payment_profiles_supported?
+    end
 
-      def create_payment_profile
-        # Don't attempt to create on bad payments.
-        return if %w(invalid failed).include?(state)
-        # Payment profile cannot be created without source
-        return unless source
-        # Imported payments shouldn't create a payment profile.
-        return if source.imported
-
-        payment_method.create_profile(self)
-      rescue ActiveMerchant::ConnectionError => e
-        gateway_error e
-      end
+    def create_payment_profile
+      # Don't attempt to create on bad payments.
+      return if %w(invalid failed).include?(state)
+      # Payment profile cannot be created without source
+      return unless source
+      # Imported payments shouldn't create a payment profile.
+      return if source.imported
+
+      payment_method.create_profile(self)
+    rescue ActiveMerchant::ConnectionError => e
+      gateway_error e
+    end
 
-      def invalidate_old_payments
-        if !store_credit? && !['invalid', 'failed'].include?(state)
-          order.payments.checkout.where(payment_method: payment_method).where("id != ?", self.id).each do |payment|
-            payment.invalidate!
-          end
-        end
+    def invalidate_old_payments
+      if !store_credit? && !['invalid', 'failed'].include?(state)
+        order.payments.checkout.where(payment_method: payment_method).where("id != ?", id).each(&:invalidate!)
       end
+    end
 
-      def update_order
-        if order.completed? || completed? || void?
-          order.update!
-        end
+    def update_order
+      if order.completed? || completed? || void?
+        order.update!
       end
+    end
 
-      # Necessary because some payment gateways will refuse payments with
-      # duplicate IDs. We *were* using the Order number, but that's set once and
-      # is unchanging. What we need is a unique identifier on a per-payment basis,
-      # and this is it. Related to https://github.com/spree/spree/issues/1998.
-      # See https://github.com/spree/spree/issues/1998#issuecomment-12869105
-      def set_unique_identifier
-        begin
-          self.number = generate_identifier
-        end while self.class.exists?(number: self.number)
+    # Necessary because some payment gateways will refuse payments with
+    # duplicate IDs. We *were* using the Order number, but that's set once and
+    # is unchanging. What we need is a unique identifier on a per-payment basis,
+    # and this is it. Related to https://github.com/spree/spree/issues/1998.
+    # See https://github.com/spree/spree/issues/1998#issuecomment-12869105
+    def set_unique_identifier
+      loop do
+        self.number = generate_identifier
+        break unless self.class.exists?(number: number)
       end
+    end
 
-      def generate_identifier
-        Array.new(8){ IDENTIFIER_CHARS.sample }.join
-      end
+    def generate_identifier
+      Array.new(8){ IDENTIFIER_CHARS.sample }.join
+    end
 
-      def create_eligible_credit_event
-        # When cancelling an order, a payment with the negative amount
-        # of the payment total is created to refund the customer. That
-        # payment has a source of itself (Spree::Payment) no matter the
-        # type of payment getting refunded, hence the additional check
-        # if the source is a store credit.
-        if store_credit? && source.is_a?(Spree::StoreCredit)
-          source.update_attributes!({
-            action: Spree::StoreCredit::ELIGIBLE_ACTION,
-            action_amount: amount,
-            action_authorization_code: response_code,
-          })
-        end
+    def create_eligible_credit_event
+      # When cancelling an order, a payment with the negative amount
+      # of the payment total is created to refund the customer. That
+      # payment has a source of itself (Spree::Payment) no matter the
+      # type of payment getting refunded, hence the additional check
+      # if the source is a store credit.
+      if store_credit? && source.is_a?(Spree::StoreCredit)
+        source.update_attributes!({
+          action: Spree::StoreCredit::ELIGIBLE_ACTION,
+          action_amount: amount,
+          action_authorization_code: response_code
+        })
       end
-
+    end
   end
 end

data/app/models/spree/payment_method/check.rb

@@ -14,13 +14,13 @@ module Spree
       payment.state != 'void'
     end
 
-    def capture(*args)
+    def capture(*_args)
       ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end
 
     def cancel(response); end
 
-    def void(*args)
+    def void(*_args)
       ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end
 

data/app/models/spree/payment_method/store_credit.rb

@@ -1,6 +1,5 @@
 module Spree
   class PaymentMethod::StoreCredit < PaymentMethod
-
     def payment_source_class
       ::Spree::StoreCredit
     end
@@ -13,8 +12,8 @@ module Spree
       payment.pending?
     end
 
-    def authorize(amount_in_cents, store_credit, gateway_options = {})
-      if store_credit.nil?
+    def authorize(amount_in_cents, provided_store_credit, gateway_options = {})
+      if provided_store_credit.nil?
         ActiveMerchant::Billing::Response.new(false, Spree.t('store_credit.unable_to_find'), {}, {})
       else
         action = -> (store_credit) {
@@ -24,7 +23,7 @@ module Spree
             action_originator: gateway_options[:originator]
           )
         }
-        handle_action_call(store_credit, action, :authorize)
+        handle_action_call(provided_store_credit, action, :authorize)
       end
     end
 
@@ -55,7 +54,7 @@ module Spree
       end
     end
 
-    def void(auth_code, gateway_options={})
+    def void(auth_code, gateway_options = {})
       action = -> (store_credit) {
         store_credit.void(auth_code, action_originator: gateway_options[:originator])
       }
@@ -94,7 +93,7 @@ module Spree
 
     private
 
-    def handle_action_call(store_credit, action, action_name, auth_code=nil)
+    def handle_action_call(store_credit, action, action_name, auth_code = nil)
       store_credit.with_lock do
         if response = action.call(store_credit)
           # note that we only need to return the auth code on an 'auth', but it's innocuous to always return
@@ -121,7 +120,7 @@ module Spree
     def auth_or_capture_event(auth_code)
       capture_event = StoreCreditEvent.find_by(authorization_code: auth_code, action: Spree::StoreCredit::CAPTURE_ACTION)
       auth_event = StoreCreditEvent.find_by(authorization_code: auth_code, action: Spree::StoreCredit::AUTHORIZE_ACTION)
-      return capture_event || auth_event
+      capture_event || auth_event
     end
   end
 end

data/app/models/spree/payment_method.rb

@@ -1,6 +1,7 @@
 module Spree
   class PaymentMethod < Spree::Base
     acts_as_paranoid
+    acts_as_list
     DISPLAY = [:both, :front_end, :back_end]
 
     validates :name, presence: true
@@ -10,6 +11,8 @@ module Spree
     has_many :store_payment_methods, inverse_of: :payment_method
     has_many :payment_methods, through: :store_payment_methods
 
+    scope :ordered_by_position, -> { order(:position) }
+
     include Spree::Preferences::StaticallyConfigurable
 
     def self.providers
@@ -30,20 +33,20 @@ module Spree
     def self.available(display_on = 'both', store: nil)
       all.select do |p|
         p.active &&
-        (p.display_on == display_on.to_s || p.display_on.blank?) &&
-        (store.nil? || store.payment_methods.empty? || store.payment_methods.include?(p))
+          (p.display_on == display_on.to_s || p.display_on.blank?) &&
+          (store.nil? || store.payment_methods.empty? || store.payment_methods.include?(p))
       end
     end
 
     def self.active?
-      where(type: self.to_s, active: true).count > 0
+      where(type: to_s, active: true).count > 0
     end
 
     def method_type
       type.demodulize.downcase
     end
 
-    def self.find_with_destroyed *args
+    def self.find_with_destroyed(*args)
       unscoped { find(*args) }
     end
 
@@ -57,19 +60,19 @@ module Spree
 
     # Custom gateways should redefine this method. See Gateway implementation
     # as an example
-    def reusable_sources(order)
+    def reusable_sources(_order)
       []
     end
 
     def auto_capture?
-      self.auto_capture.nil? ? Spree::Config[:auto_capture] : self.auto_capture
+      auto_capture.nil? ? Spree::Config[:auto_capture] : auto_capture
     end
 
-    def supports?(source)
+    def supports?(_source)
       true
     end
 
-    def cancel(response)
+    def cancel(_response)
       raise ::NotImplementedError, 'You must implement cancel method for this payment method.'
     end
 

data/app/models/spree/preferences/configuration.rb

@@ -69,9 +69,9 @@ module Spree::Preferences
       end
     end
 
-    def self.preference name, type, options={}
+    def self.preference(name, type, options = {})
       super
-      alias_method "#{name}", "preferred_#{name}"
+      alias_method name.to_s, "preferred_#{name}"
       alias_method "#{name}=", "preferred_#{name}="
     end
   end

data/app/models/spree/preferences/preferable.rb

@@ -110,7 +110,7 @@ module Spree::Preferences::Preferable
       if !value ||
          value == 0 ||
          value =~ /\A(f|false|0)\Z/i ||
-         (value.respond_to? :empty? and value.empty?)
+         (value.respond_to?(:empty?) && value.empty?)
          false
       else
          true

data/app/models/spree/preferences/preferable_class_methods.rb

@@ -4,7 +4,7 @@ module Spree::Preferences
       []
     end
 
-    def preference(name, type, options={})
+    def preference(name, type, options = {})
       options.assert_valid_keys(:default)
       default = options[:default]
       default = ->{ options[:default] } unless default.is_a?(Proc)

data/app/models/spree/preferences/scoped_store.rb

@@ -1,6 +1,6 @@
 module Spree::Preferences
   class ScopedStore
-    def initialize prefix, suffix=nil
+    def initialize(prefix, suffix = nil)
       @prefix = prefix
       @suffix = suffix
     end
@@ -9,20 +9,21 @@ module Spree::Preferences
       Spree::Preferences::Store.instance
     end
 
-    def fetch key, &block
+    def fetch(key, &block)
       store.fetch(key_for(key), &block)
     end
 
-    def []= key, value
+    def []=(key, value)
       store[key_for(key)] = value
     end
 
-    def delete key
+    def delete(key)
       store.delete(key_for(key))
     end
 
     private
-    def key_for key
+
+    def key_for(key)
       [rails_cache_id, @prefix, key, @suffix].compact.join('/')
     end
 

data/app/models/spree/preferences/static_model_preferences.rb

@@ -28,7 +28,7 @@ module Spree
       end
 
       def initialize
-        @store = Hash.new do |h,klass|
+        @store = Hash.new do |h, klass|
           h[klass] = {}
         end
       end

data/app/models/spree/preferences/statically_configurable.rb

@@ -22,14 +22,14 @@ module Spree
         if respond_to?(:preference_source) && preference_source
           self.class.preference_sources[preference_source] || {}
         else
-          self[:preferences]
+          super
         end
       end
 
       def preferences=(val)
         if respond_to?(:preference_source) && preference_source
         else
-          self[:preferences] = val
+          super
         end
       end
     end

data/app/models/spree/preferences/store.rb

@@ -4,9 +4,7 @@
 require 'singleton'
 
 module Spree::Preferences
-
   class StoreInstance
-
     def initialize
       @cache = Rails.cache
     end
@@ -19,7 +17,7 @@ module Spree::Preferences
 
     def exist?(key)
       @cache.exist?(key) ||
-      should_persist? && Spree::Preference.where(:key => key).exists?
+        should_persist? && Spree::Preference.where(key: key).exists?
     end
 
     def get(key)
@@ -68,7 +66,7 @@ module Spree::Preferences
     def persist(cache_key, value)
       return unless should_persist?
 
-      preference = Spree::Preference.where(:key => cache_key).first_or_initialize
+      preference = Spree::Preference.where(key: cache_key).first_or_initialize
       preference.value = value
       preference.save
     end
@@ -83,11 +81,9 @@ module Spree::Preferences
     def should_persist?
       Spree::Preference.table_exists?
     end
-
   end
 
   class Store < StoreInstance
     include Singleton
   end
-
 end

data/app/models/spree/price.rb

@@ -1,23 +1,27 @@
 module Spree
   class Price < Spree::Base
     acts_as_paranoid
+
+    MAXIMUM_AMOUNT = BigDecimal('99_999_999.99')
+
     belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', touch: true
 
     validate :check_price
-    validates :amount, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
-    validate :validate_amount_maximum
+    validates :amount, allow_nil: true, numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: MAXIMUM_AMOUNT
+    }
+
+    scope :currently_valid, -> { where(is_default: true) }
+    scope :with_default_attributes, -> { where(Spree::Config.default_pricing_options.desired_attributes) }
     after_save :set_default_price
 
     extend DisplayMoney
     money_methods :amount, :price
+    alias_method :money, :display_amount
 
     self.whitelisted_ransackable_attributes = ['amount']
 
-    # @return [Spree::Money] this price as a Spree::Money object
-    def money
-      Spree::Money.new(amount || 0, { currency: currency })
-    end
-
     # An alias for #amount
     def price
       amount
@@ -37,21 +41,15 @@ module Spree
       self.currency ||= Spree::Config[:currency]
     end
 
-    def maximum_amount
-      BigDecimal '999999.99'
-    end
-
-    def validate_amount_maximum
-      if amount && amount > maximum_amount
-        errors.add :amount, I18n.t('errors.messages.less_than_or_equal_to', count: maximum_amount)
-      end
-    end
-
     def set_default_price
       if is_default?
-        other_default_prices = variant.prices.where(currency: self.currency, is_default: true).where.not(id: self.id)
-        other_default_prices.each { |p| p.update_attributes!(is_default: false) }
+        other_default_prices = variant.prices.currently_valid.where(pricing_options.desired_attributes).where.not(id: id)
+        other_default_prices.update_all(is_default: false)
       end
     end
+
+    def pricing_options
+      Spree::Config.pricing_options_class.from_price(self)
+    end
   end
 end

data/app/models/spree/product/scopes.rb

@@ -5,16 +5,16 @@ module Spree
     end
 
     def self.add_search_scope(name, &block)
-      self.singleton_class.send(:define_method, name.to_sym, &block)
+      singleton_class.send(:define_method, name.to_sym, &block)
       search_scopes << name.to_sym
     end
 
     def self.property_conditions(property)
       properties = Property.table_name
-      conditions = case property
+      case property
       when String   then { "#{properties}.name" => property }
       when Property then { "#{properties}.id" => property.id }
-      else               { "#{properties}.id" => property.to_i }
+      else { "#{properties}.id" => property.to_i }
       end
     end
 
@@ -24,23 +24,23 @@ module Spree
     scope :descend_by_name, -> { order(name: :desc) }
 
     add_search_scope :ascend_by_master_price do
-      joins(:master => :default_price).order(Spree::Price.arel_table[:amount].asc)
+      joins(master: :default_price).order(Spree::Price.arel_table[:amount].asc)
     end
 
     add_search_scope :descend_by_master_price do
-      joins(:master => :default_price).order(Spree::Price.arel_table[:amount].desc)
+      joins(master: :default_price).order(Spree::Price.arel_table[:amount].desc)
     end
 
     add_search_scope :price_between do |low, high|
-      joins(:master => :default_price).where(Price.table_name => { :amount => low..high })
+      joins(master: :default_price).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)
+      joins(master: :default_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)
+      joins(master: :default_price).where("#{price_table_name}.amount >= ?", price)
     end
 
     # This scope selects products in taxon AND all its descendants
@@ -91,9 +91,9 @@ module Spree
     add_search_scope :with_option do |option|
       option_types = OptionType.table_name
       conditions = case option
-      when String     then { "#{option_types}.name" => option }
-      when OptionType then { "#{option_types}.id" => option.id }
-      else                 { "#{option_types}.id" => option.to_i }
+                   when String     then { "#{option_types}.name" => option }
+                   when OptionType then { "#{option_types}.id" => option.id }
+      else { "#{option_types}.id" => option.to_i }
       end
 
       joins(:option_types).where(conditions)
@@ -102,8 +102,8 @@ module Spree
     add_search_scope :with_option_value do |option, value|
       option_values = OptionValue.table_name
       option_type_id = case option
-        when String then OptionType.find_by(name: option) || option.to_i
-        when OptionType then option.id
+                       when String then OptionType.find_by(name: option) || option.to_i
+                       when OptionType then option.id
         else option.to_i
       end
 
@@ -151,7 +151,7 @@ module Spree
     # :order => 'COALESCE(cnt, 0) DESC'
     add_search_scope :descend_by_popularity do
       joins(:master).
-      order(%Q{
+      order(%{
            COALESCE((
              SELECT
                COUNT(#{LineItem.quoted_table_name}.id)
@@ -172,12 +172,13 @@ module Spree
     end
 
     # Can't use add_search_scope for this as it needs a default argument
-    def self.available(available_on = nil, currency = nil)
-      joins(:master => :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on || Time.current)
+    def self.available(available_on = nil, _currency = nil)
+      joins(master: :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on || Time.current)
     end
     search_scopes << :available
 
     def self.active(currency = nil)
+      Spree::Deprecation.warn("This scope is deprecated, please use .available instead", caller)
       not_deleted.available(nil, currency)
     end
     search_scopes << :active
@@ -240,7 +241,7 @@ module Spree
           when ActiveRecord::Base then t
           when String
             Taxon.find_by(name: t) ||
-            Taxon.where("#{taxons}.permalink LIKE ? OR #{taxons}.permalink = ?", "%/#{t}/", "#{t}/").first
+              Taxon.where("#{taxons}.permalink LIKE ? OR #{taxons}.permalink = ?", "%/#{t}/", "#{t}/").first
           end
         }.compact.flatten.uniq
       end