spree_core 3.3.6 → 3.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73e2d20d2e94ec8108511604d21d42356cc17e6f
-  data.tar.gz: 15a87566816c184d635ab8dfa37832206e7b5dd9
+  metadata.gz: c01ec77a94de597431df6260fdfe18a88817c241
+  data.tar.gz: 72dcbd2cd49f05b804e3bf427d47899d3f11a3a0
 SHA512:
-  metadata.gz: 114e9c29ef8f116cd2998cc3e8e008a8a369f35f5927f78067d153b31e02987e19d076099c302500d6245a27de76d281577dd4121f258086dd65e6566c4ba577
-  data.tar.gz: c1a0a77381b644cd78822fd7d34518cf304e0d7ccd9e81a9f9e424aec589ce3b6df47da707b061de156a7f28fddcec44a967143f11aa8be01c8bb1f7b31667ec
+  metadata.gz: 95ba01f3578d5bebce43b70a421996ca9b6c7a7493b03b27841fd45a08bddfdabc79eb31e266a8d33a0c870e48962f47f2a34735e8cf1eccac1cd849b239d8ab
+  data.tar.gz: 1ab924152669666ce1d0e1dd4bbfd6b056b6cd66149d19bdd26b8bb0c8244dbd583a31a7e9aebb8944650e49e00885d9da6fd3c582eb51d49133ff60c48998ab

data/app/helpers/spree/base_helper.rb

@@ -1,14 +1,13 @@
 module Spree
   module BaseHelper
-
     def available_countries
       checkout_zone = Zone.find_by(name: Spree::Config[:checkout_zone])
 
-      if checkout_zone && checkout_zone.kind == 'country'
-        countries = checkout_zone.country_list
-      else
-        countries = Country.all
-      end
+      countries = if checkout_zone && checkout_zone.kind == 'country'
+                    checkout_zone.country_list
+                  else
+                    Country.all
+                  end
 
       countries.collect do |country|
         country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
@@ -33,27 +32,27 @@ module Spree
       end
     end
 
-    def logo(image_path=Spree::Config[:logo])
+    def logo(image_path = Spree::Config[:logo])
       link_to image_tag(image_path), spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
     end
 
     def meta_data
-      object = instance_variable_get('@'+controller_name.singularize)
+      object = instance_variable_get('@' + controller_name.singularize)
       meta = {}
 
-      if object.kind_of? ApplicationRecord
+      if object.is_a? ApplicationRecord
         meta[:keywords] = object.meta_keywords if object[:meta_keywords].present?
         meta[:description] = object.meta_description if object[:meta_description].present?
       end
 
-      if meta[:description].blank? && object.kind_of?(Spree::Product)
+      if meta[:description].blank? && object.is_a?(Spree::Product)
         meta[:description] = truncate(strip_tags(object.description), length: 160, separator: ' ')
       end
 
-      meta.reverse_merge!({
-        keywords: current_store.meta_keywords,
-        description: current_store.meta_description,
-      }) if meta[:keywords].blank? or meta[:description].blank?
+      if meta[:keywords].blank? || meta[:description].blank?
+        meta.reverse_merge!(keywords: current_store.meta_keywords,
+                            description: current_store.meta_description)
+      end
       meta
     end
 
@@ -66,22 +65,22 @@ module Spree
     def method_missing(method_name, *args, &block)
       if image_style = image_style_from_method_name(method_name)
         define_image_method(image_style)
-        self.send(method_name, *args)
+        send(method_name, *args)
       else
         super
       end
     end
 
     def pretty_time(time)
-      [I18n.l(time.to_date, format: :long), time.strftime("%l:%M %p")].join(" ")
+      [I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p')].join(' ')
     end
 
     def seo_url(taxon)
-      return spree.nested_taxons_path(taxon.permalink)
+      spree.nested_taxons_path(taxon.permalink)
     end
 
     # human readable list of variant options
-    def variant_options(v, options={})
+    def variant_options(v, _options = {})
       v.options_text
     end
 

data/app/helpers/spree/products_helper.rb

@@ -24,7 +24,7 @@ module Spree
     def variant_full_price(variant)
       product = variant.product
       unless product.variants.active(current_currency).all? { |v| v.price == product.price }
-        Spree::Money.new(variant.price, { currency: current_currency }).to_html
+        Spree::Money.new(variant.price, currency: current_currency).to_html
       end
     end
 
@@ -38,7 +38,7 @@ module Spree
       description.blank? ? Spree.t(:product_has_no_description) : raw(description)
     end
 
-    def line_item_description_text description_text
+    def line_item_description_text(description_text)
       if description_text.present?
         truncate(strip_tags(description_text.gsub(' ', ' ').squish), length: 100)
       else
@@ -50,16 +50,16 @@ module Spree
       count = @products.count
       max_updated_at = (@products.maximum(:updated_at) || Date.today).to_s(:number)
       products_cache_keys = "spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
-      (common_product_cache_keys + [products_cache_keys]).compact.join("/")
+      (common_product_cache_keys + [products_cache_keys]).compact.join('/')
     end
 
     def cache_key_for_product(product = @product)
-      (common_product_cache_keys + [product.cache_key, product.possible_promotions]).compact.join("/")
+      (common_product_cache_keys + [product.cache_key, product.possible_promotions]).compact.join('/')
     end
 
     def available_status(product) # will return a human readable string
       return Spree.t(:discontinued)  if product.discontinued?
-      return Spree.t(:deleted)  if product.deleted?
+      return Spree.t(:deleted) if product.deleted?
 
       if product.available?
         Spree.t(:available)

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

@@ -3,7 +3,7 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      has_one   :calculator, class_name: "Spree::Calculator", as: :calculable, inverse_of: :calculable, dependent: :destroy, autosave: true
+      has_one :calculator, class_name: 'Spree::Calculator', as: :calculable, inverse_of: :calculable, dependent: :destroy, autosave: true
       accepts_nested_attributes_for :calculator
       validates :calculator, presence: true
       delegate :compute, to: :calculator
@@ -18,12 +18,13 @@ module Spree
 
       def calculator_type=(calculator_type)
         klass = calculator_type.constantize if calculator_type
-        self.calculator = klass.new if klass && !self.calculator.is_a?(klass)
+        self.calculator = klass.new if klass && !calculator.is_a?(klass)
       end
 
       private
+
       def self.model_name_without_spree_namespace
-        self.to_s.tableize.gsub('/', '_').sub('spree_', '')
+        to_s.tableize.tr('/', '_').sub('spree_', '')
       end
 
       def self.spree_calculators

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

@@ -4,9 +4,9 @@ module Spree
 
     included do
       has_one :default_price,
-        -> { where currency: Spree::Config[:currency] },
-        class_name: 'Spree::Price',
-        dependent: :destroy
+              -> { where currency: Spree::Config[:currency] },
+              class_name: 'Spree::Price',
+              dependent: :destroy
 
       delegate :display_price, :display_amount, :price, :currency, :price=,
                :price_including_vat_for, :currency=, to: :find_or_build_default_price
@@ -18,10 +18,9 @@ module Spree
       end
 
       def has_default_price?
-        !self.default_price.nil?
+        !default_price.nil?
       end
 
-
       def find_or_build_default_price
         default_price || build_default_price
       end

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

@@ -8,7 +8,7 @@ module Spree
     #
     #
     # ==== Examples
-    # Decorate a method, with the default option of using the base object's 
+    # Decorate a method, with the default option of using the base object's
     # currency
     #
     #     extend Spree::DisplayMoney

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

@@ -4,7 +4,7 @@ module Spree
 
     included do
       scope :active, -> { where(active: true) }
-      default_scope { order("LOWER(#{self.table_name}.name)") }
+      default_scope { order("LOWER(#{table_name}.name)") }
 
       validates :name, presence: true, uniqueness: { case_sensitive: false }
     end

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

@@ -8,17 +8,16 @@ module Spree::RansackableAttributes
     class_attribute :default_ransackable_attributes
     self.default_ransackable_attributes = %w[id name updated_at created_at]
 
-    def self.ransackable_associations(*args)
-      self.whitelisted_ransackable_associations || []
+    def self.ransackable_associations(*_args)
+      whitelisted_ransackable_associations || []
     end
 
-    def self.ransackable_attributes(*args)
-      self.default_ransackable_attributes | (self.whitelisted_ransackable_attributes || [])
+    def self.ransackable_attributes(*_args)
+      default_ransackable_attributes | (whitelisted_ransackable_attributes || [])
     end
 
-    def self.ransackable_scopes(*args)
+    def self.ransackable_scopes(*_args)
       whitelisted_ransackable_scopes || []
     end
   end
-
 end

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

@@ -4,27 +4,27 @@ module Spree
 
     included do
       belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address',
-                 optional: true
+                                optional: true
       alias_attribute :billing_address, :bill_address
 
       belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address',
-                 optional: true
+                                optional: true
       alias_attribute :shipping_address, :ship_address
 
       accepts_nested_attributes_for :ship_address, :bill_address
 
       def persist_order_address(order)
-        b_address = self.bill_address || self.build_bill_address
+        b_address = bill_address || build_bill_address
         b_address.attributes = order.bill_address.attributes.except('id', 'updated_at', 'created_at')
         b_address.save
-        self.update_attributes(bill_address_id: b_address.id)
+        update_attributes(bill_address_id: b_address.id)
 
         # May not be present if delivery step has been removed
         if order.ship_address
-          s_address = self.ship_address || self.build_ship_address
+          s_address = ship_address || build_ship_address
           s_address.attributes = order.ship_address.attributes.except('id', 'updated_at', 'created_at')
           s_address.save
-          self.update_attributes(ship_address_id: s_address.id)
+          update_attributes(ship_address_id: s_address.id)
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Spree
       has_many :promotion_rule_users, class_name: 'Spree::PromotionRuleUser', foreign_key: :user_id, dependent: :destroy
       has_many :promotion_rules, through: :promotion_rule_users, class_name: 'Spree::PromotionRule'
 
-      has_many :orders, foreign_key: :user_id, class_name: "Spree::Order"
+      has_many :orders, foreign_key: :user_id, class_name: 'Spree::Order'
       has_many :store_credits, foreign_key: :user_id, class_name: 'Spree::StoreCredit'
 
       belongs_to :ship_address, class_name: 'Spree::Address', optional: true
@@ -32,8 +32,8 @@ module Spree
       spree_roles.any? { |role| role.name == role_in_question.to_s }
     end
 
-    def last_incomplete_spree_order
-      orders.incomplete.
+    def last_incomplete_spree_order(store)
+      orders.where(store: store).incomplete.
         includes(line_items: [variant: [:images, :option_values, :product]]).
         order('created_at DESC').
         first

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

@@ -3,8 +3,10 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      has_many :credit_cards, class_name: "Spree::CreditCard", foreign_key: :user_id
-      def default_credit_card; credit_cards.default.first; end
+      has_many :credit_cards, class_name: 'Spree::CreditCard', foreign_key: :user_id
+      def default_credit_card
+        credit_cards.default.first
+      end
 
       def payment_sources
         credit_cards.with_payment_profile

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

@@ -15,7 +15,7 @@ module Spree
       if order_count.to_i > 0
         lifetime_value / order_count
       else
-        BigDecimal("0.00")
+        BigDecimal('0.00')
       end
     end
   end

data/app/models/spree/ability.rb

@@ -15,15 +15,15 @@ module Spree
     # the +CanCan::Ability+ module.  The registered ability should behave properly as a stand-alone class
     # and therefore should be easy to test in isolation.
     def self.register_ability(ability)
-      self.abilities.add(ability)
+      abilities.add(ability)
     end
 
     def self.remove_ability(ability)
-      self.abilities.delete(ability)
+      abilities.delete(ability)
     end
 
     def initialize(user)
-      self.clear_aliased_actions
+      clear_aliased_actions
 
       # override cancan default aliasing (we don't want to differentiate between read and index)
       alias_action :delete, to: :destroy

data/app/models/spree/address.rb

@@ -10,8 +10,8 @@ module Spree
       'TO', 'TV', 'UG', 'AE', 'VU', 'YE', 'ZW'
     ].freeze
 
-    belongs_to :country, class_name: "Spree::Country"
-    belongs_to :state, class_name: "Spree::State", optional: true
+    belongs_to :country, class_name: 'Spree::Country'
+    belongs_to :state, class_name: 'Spree::State', optional: true
 
     has_many :shipments, inverse_of: :address
 
@@ -31,11 +31,15 @@ module Spree
     self.whitelisted_ransackable_attributes = %w[firstname lastname company]
 
     def self.build_default
-      country = Spree::Country.find(Spree::Config[:default_country_id]) rescue Spree::Country.first
+      country = begin
+                  Spree::Country.find(Spree::Config[:default_country_id])
+                rescue
+                  Spree::Country.first
+                end
       new(country: country)
     end
 
-    def self.default(user = nil, kind = "bill")
+    def self.default(user = nil, kind = 'bill')
       if user && user_address = user.public_send(:"#{kind}_address")
         user_address.clone
       else
@@ -68,11 +72,11 @@ module Spree
     end
 
     def clone
-      self.class.new(self.attributes.except('id', 'updated_at', 'created_at'))
+      self.class.new(attributes.except('id', 'updated_at', 'created_at'))
     end
 
     def ==(other_address)
-      self_attrs = self.attributes
+      self_attrs = attributes
       other_attrs = other_address.respond_to?(:attributes) ? other_address.attributes : {}
 
       [self_attrs, other_attrs].each { |attrs| attrs.except!('id', 'created_at', 'updated_at') }
@@ -99,7 +103,7 @@ module Spree
     end
 
     def require_phone?
-      true
+      Spree::Config[:address_requires_phone]
     end
 
     def require_zipcode?
@@ -165,10 +169,10 @@ module Spree
 
     def postal_code_validate
       return if country.blank? || country.iso.blank? || !require_zipcode?
-      return if !TwitterCldr::Shared::PostalCodes.territories.include?(country.iso.downcase.to_sym)
+      return unless TwitterCldr::Shared::PostalCodes.territories.include?(country.iso.downcase.to_sym)
 
       postal_code = TwitterCldr::Shared::PostalCodes.for_territory(country.iso)
-      errors.add(:zipcode, :invalid) if !postal_code.valid?(zipcode.to_s.strip)
+      errors.add(:zipcode, :invalid) unless postal_code.valid?(zipcode.to_s.strip)
     end
   end
 end

data/app/models/spree/adjustable/adjuster/promotion.rb

@@ -26,7 +26,7 @@ module Spree
 
         def best_promo_adjustment
           @best_promo_adjustment ||= begin
-            adjustments.competing_promos.eligible.reorder("amount ASC, created_at DESC, id DESC").first
+            adjustments.competing_promos.eligible.reorder('amount ASC, created_at DESC, id DESC').first
           end
         end
 

data/app/models/spree/adjustable/adjustments_updater.rb

@@ -29,8 +29,8 @@ module Spree
       def persist_totals(totals)
         attributes = totals
         attributes[:adjustment_total] = totals[:non_taxable_adjustment_total] +
-                                        totals[:taxable_adjustment_total] +
-                                        totals[:additional_tax_total]
+          totals[:taxable_adjustment_total] +
+          totals[:additional_tax_total]
         attributes[:updated_at] = Time.current
         @adjustable.update_columns(totals)
       end

data/app/models/spree/adjustable/promotion_accumulator.rb

@@ -16,7 +16,9 @@ module Spree
 
       def initialize(adjustable)
         @adjustable = adjustable
-        @adjustments, @sources, @promotions = [], [], []
+        @adjustments = []
+        @sources = []
+        @promotions = []
         all_adjustments.each { |a| add_adjustment(a) }
       end
 
@@ -30,7 +32,7 @@ module Spree
         add(promotions, promotion, source.promotion_id)
       end
 
-      def promotions_adjustments(promotion_id, adjustments = adjustments())
+      def promotions_adjustments(promotion_id, adjustments = adjustments)
         where(sources, promotion_id: promotion_id).map do |source|
           where(adjustments, source_id: source.id)
         end.flatten
@@ -56,7 +58,7 @@ module Spree
 
       def all_adjustments
         order.all_adjustments.promotion.includes(source: [:promotion]).where.
-          not("adjustable_id = ? AND adjustable_type = ?", adjustable.id, adjustable.class.to_s)
+          not('adjustable_id = ? AND adjustable_type = ?', adjustable.id, adjustable.class.to_s)
       end
 
       def add(array, object, id)
@@ -64,7 +66,7 @@ module Spree
       end
 
       def item_adjustments
-        adjustments.select { |a| a.adjustable_type != 'Spree::Shipment' }
+        adjustments.reject { |a| a.adjustable_type == 'Spree::Shipment' }
       end
 
       def where(array, opts = {})

data/app/models/spree/adjustment.rb

@@ -53,7 +53,7 @@ module Spree
     scope :tax, -> { where(source_type: 'Spree::TaxRate') }
     scope :non_tax, -> do
       source_type = arel_table[:source_type]
-      where(source_type.not_eq('Spree::TaxRate').or source_type.eq(nil))
+      where(source_type.not_eq('Spree::TaxRate').or(source_type.eq(nil)))
     end
     scope :price, -> { where(adjustable_type: 'Spree::LineItem') }
     scope :shipping, -> { where(adjustable_type: 'Spree::Shipment') }
@@ -63,7 +63,7 @@ module Spree
     scope :credit, -> { where("#{quoted_table_name}.amount < 0") }
     scope :nonzero, -> { where("#{quoted_table_name}.amount != 0") }
     scope :promotion, -> { where(source_type: 'Spree::PromotionAction') }
-    scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
+    scope :return_authorization, -> { where(source_type: 'Spree::ReturnAuthorization') }
     scope :is_included, -> { where(included: true) }
     scope :additional, -> { where(included: false) }
     scope :competing_promos, -> { where(source_type: competing_promos_source_types) }
@@ -99,6 +99,5 @@ module Spree
       # Cause adjustable's total to be recalculated
       Adjustable::AdjustmentsUpdater.update(adjustable)
     end
-
   end
 end

data/app/models/spree/app_configuration.rb

@@ -15,12 +15,13 @@
 # a.get :color
 # a.preferred_color
 #
-require "spree/core/search/base"
+require 'spree/core/search/base'
 
 module Spree
   class AppConfiguration < Preferences::Configuration
     # Alphabetized to more easily lookup particular preferences
     preference :address_requires_state, :boolean, default: true # should state/state_name be required
+    preference :address_requires_phone, :boolean, default: true # Determines whether we require phone in address
     preference :admin_interface_logo, :string, default: 'admin/logo.png'
     preference :admin_path, :string, default: '/admin'
     preference :admin_products_per_page, :integer, default: Kaminari.config.default_per_page
@@ -41,7 +42,7 @@ module Spree
     preference :binary_inventory_cache, :boolean, default: false # only invalidate product cache when a stock item changes whether it is in_stock
     preference :checkout_zone, :string, default: nil # replace with the name of a zone if you would like to limit the countries
     preference :company, :boolean, default: false # Request company field for billing and shipping addr
-    preference :currency, :string, default: "USD"
+    preference :currency, :string, default: 'USD'
     preference :default_country_id, :integer
     preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
     preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
@@ -55,7 +56,7 @@ module Spree
     preference :send_core_emails, :boolean, default: true # Default mail headers settings
     preference :shipping_instructions, :boolean, default: false # Request instructions/info for shipping
     preference :show_only_complete_orders_by_default, :boolean, default: true
-    preference :show_variant_full_price, :boolean, default: false #Displays variant full price or difference with product price. Default false to be compatible with older behavior
+    preference :show_variant_full_price, :boolean, default: false # Displays variant full price or difference with product price. Default false to be compatible with older behavior
     preference :show_products_without_price, :boolean, default: false
     preference :show_raw_product_description, :boolean, default: false
     preference :tax_using_ship_address, :boolean, default: true
@@ -70,8 +71,6 @@ module Spree
       @searcher_class ||= Spree::Core::Search::Base
     end
 
-    def searcher_class=(sclass)
-      @searcher_class = sclass
-    end
+    attr_writer :searcher_class
   end
 end

data/app/models/spree/base.rb

@@ -11,7 +11,7 @@ class Spree::Base < ApplicationRecord
   end
 
   if Kaminari.config.page_method_name != :page
-    def self.page num
+    def self.page(num)
       send Kaminari.config.page_method_name, num
     end
   end

data/app/models/spree/calculator/default_tax.rb

@@ -11,14 +11,13 @@ module Spree
     # Orders created before Spree 2.1 had tax adjustments applied to the order, as a whole.
     # Orders created with Spree 2.2 and after, have them applied to the line items individually.
     def compute_order(order)
-
       matched_line_items = order.line_items.select do |line_item|
         line_item.tax_category == rate.tax_category
       end
 
       line_items_total = matched_line_items.sum(&:total)
       if rate.included_in_price
-        round_to_two_places(line_items_total - ( line_items_total / (1 + rate.amount) ) )
+        round_to_two_places(line_items_total - (line_items_total / (1 + rate.amount)))
       else
         round_to_two_places(line_items_total * rate.amount)
       end
@@ -33,8 +32,8 @@ module Spree
       end
     end
 
-    alias_method :compute_shipment, :compute_shipment_or_line_item
-    alias_method :compute_line_item, :compute_shipment_or_line_item
+    alias compute_shipment compute_shipment_or_line_item
+    alias compute_line_item compute_shipment_or_line_item
 
     def compute_shipping_rate(shipping_rate)
       if rate.included_in_price
@@ -49,7 +48,7 @@ module Spree
     private
 
     def rate
-      self.calculable
+      calculable
     end
 
     def deduced_total_by_rate(pre_tax_amount, rate)

data/app/models/spree/calculator/flat_percent_item_total.rb

@@ -9,7 +9,7 @@ module Spree
     end
 
     def compute(object)
-      computed_amount  = (object.amount * preferred_flat_percent / 100).round(2)
+      computed_amount = (object.amount * preferred_flat_percent / 100).round(2)
 
       # We don't want to cause the promotion adjustments to push the order into a negative total.
       if computed_amount > object.amount

data/app/models/spree/calculator/flat_rate.rb

@@ -3,14 +3,14 @@ require_dependency 'spree/calculator'
 module Spree
   class Calculator::FlatRate < Calculator
     preference :amount, :decimal, default: 0
-    preference :currency, :string, default: ->{ Spree::Config[:currency] }
+    preference :currency, :string, default: -> { Spree::Config[:currency] }
 
     def self.description
       Spree.t(:flat_rate_per_order)
     end
 
-    def compute(object=nil)
-      if object && preferred_currency.upcase == object.currency.upcase
+    def compute(object = nil)
+      if object && preferred_currency.casecmp(object.currency.upcase).zero?
         preferred_amount
       else
         0

data/app/models/spree/calculator/flexi_rate.rb

@@ -5,25 +5,25 @@ module Spree
     preference :first_item,      :decimal, default: 0.0
     preference :additional_item, :decimal, default: 0.0
     preference :max_items,       :integer, default: 0
-    preference :currency,        :string,  default: ->{ Spree::Config[:currency] }
+    preference :currency,        :string,  default: -> { Spree::Config[:currency] }
 
     def self.description
       Spree.t(:flexible_rate)
     end
 
-    def self.available?(object)
+    def self.available?(_object)
       true
     end
 
     def compute(object)
       sum = 0
-      max = self.preferred_max_items.to_i
+      max = preferred_max_items.to_i
       items_count = object.quantity
       items_count.times do |i|
         if i == 0
-          sum += self.preferred_first_item.to_f
+          sum += preferred_first_item.to_f
         elsif ((max > 0) && (i <= (max - 1))) || (max == 0)
-          sum += self.preferred_additional_item.to_f
+          sum += preferred_additional_item.to_f
         end
       end