spree_core 1.3.5 → 2.0.0.rc1

data/app/models/spree/adjustment.rb

@@ -1,45 +1,69 @@
-# Adjustments represent a change to the +item_total+ of an Order.  Each adjustment has an +amount+ that be either
-# positive or negative.  Adjustments have two useful boolean flags
+# Adjustments represent a change to the +item_total+ of an Order. Each adjustment
+# has an +amount+ that can be either positive or negative.
 #
-# +mandatory+
+# Adjustments can be open/closed/finalized
 #
-# If this flag is set to true then it means the the charge is required and will not be removed from the
-# order, even if the amount is zero.  In other words a record will be created even if the amount is zero.
-# This is  useful for representing things such as shipping and tax charges where you may want to make it explicitly
-# clear that no charge was made for such things.
+# Once an adjustment is finalized, it cannot be changed, but an adjustment can
+# toggle between open/closed as needed
 #
-# +locked+
+# Boolean attributes:
 #
-# The charge is never to be udpated.  Typically you would want to freeze certain adjustments after checkout.
-# One use case for this is if you want to lock a shipping adjustment so that its value does not change
-# in the future when making other trivial edits to the order (like an email change).
+# +mandatory+
 #
-# +eligible?+
+# If this flag is set to true then it means the the charge is required and will not
+# be removed from the order, even if the amount is zero. In other words a record
+# will be created even if the amount is zero. This is useful for representing things
+# such as shipping and tax charges where you may want to make it explicitly clear
+# that no charge was made for such things.
 #
-#  This boolean attributes stores whether this adjustment is currently eligible for its order. Only eligible
-#  adjustments count towards the order's adjustment total. This allows an adjustment to be preserved if it
-#  becomes ineligible so it might be reinstated.
+# +eligible?+
 #
+# This boolean attributes stores whether this adjustment is currently eligible
+# for its order. Only eligible adjustments count towards the order's adjustment
+# total. This allows an adjustment to be preserved if it becomes ineligible so
+# it might be reinstated.
 module Spree
   class Adjustment < ActiveRecord::Base
     attr_accessible :amount, :label
 
-    belongs_to :adjustable, :polymorphic => true
-    belongs_to :source, :polymorphic => true
-    belongs_to :originator, :polymorphic => true
+    belongs_to :adjustable, polymorphic: true
+    belongs_to :source, polymorphic: true
+    belongs_to :originator, polymorphic: true
 
-    validates :label, :presence => true
-    validates :amount, :numericality => true
+    validates :label, presence: true
+    validates :amount, numericality: true
 
     after_save :update_adjustable
     after_destroy :update_adjustable
 
-    # Update the boolean _eligible_ attribute which deterimes which adjustments count towards the order's
-    # adjustment_total.
+    state_machine :state, initial: :open do
+      event :close do
+        transition from: :open, to: :closed
+      end
+
+      event :open do
+        transition from: :closed, to: :open
+      end
+
+      event :finalize do
+        transition from: [:open, :closed], to: :finalized
+      end
+    end
+
+    scope :tax, -> { where(originator_type: 'Spree::TaxRate', adjustable_type: 'Spree::Order') }
+    scope :price, -> { where(adjustable_type: 'Spree::LineItem') }
+    scope :shipping, -> { where(originator_type: 'Spree::ShippingMethod') }
+    scope :optional, -> { where(mandatory: false) }
+    scope :eligible, -> { where(eligible: true) }
+    scope :charge, -> { where('amount >= 0') }
+    scope :credit, -> { where('amount < 0') }
+    scope :promotion, -> { where(originator_type: 'Spree::PromotionAction') }
+
+    # Update the boolean _eligible_ attribute which determines which adjustments
+    # count towards the order's adjustment_total.
     def set_eligibility
-      update_attribute_without_callbacks(:eligible,
-                                         mandatory ||
-                                         (amount != 0 && eligible_for_originator?))
+      result = self.mandatory || (self.amount != 0 && self.eligible_for_originator?)
+      update_attribute_without_callbacks(:eligible, result)
     end
 
     # Allow originator of the adjustment to perform an additional eligibility of the adjustment
@@ -49,28 +73,29 @@ module Spree
       !originator.respond_to?(:eligible?) || originator.eligible?(source)
     end
 
-    # Update both the eligibility and amount of the adjustment. Adjustments delegate updating of amount to their Originator
-    # when present, but only if +locked+ is false.  Adjustments that are +locked+ will never change their amount.
-    # The new adjustment amount will be set by by the +originator+ and is not automatically saved.  This makes it save
-    # to use this method in an after_save hook for other models without causing an infinite recursion problem.
+    # Update both the eligibility and amount of the adjustment. Adjustments 
+    # delegate updating of amount to their Originator when present, but only if
+    # +locked+ is false. Adjustments that are +locked+ will never change their amount.
     #
-    # order#update_adjustments passes self as the src, this is so calculations can be performed on the
-    # current values. If we used source it would load the old record from db for the association
-    def update!(src = nil)
-      src ||= source
-      return if locked?
-      if originator.present?
-        originator.update_adjustment(self, src)
-      end
+    # order#update_adjustments passes self as the src, this is so calculations can
+    # be performed on the # current values. If we used source it would load the old
+    # record from db for the association
+    def update!
+      return if immutable?
+      originator.update_adjustment(self, source) if originator.present?
       set_eligibility
     end
 
     def currency
-      adjustable.nil? ? Spree::Config[:currency] : adjustable.currency
+      adjustable ? adjustable.currency : Spree::Config[:currency]
     end
 
     def display_amount
-      Spree::Money.new(amount, { :currency => currency })
+      Spree::Money.new(amount, { currency: currency })
+    end
+
+    def immutable?
+      state != "open"
     end
 
     private
@@ -78,36 +103,5 @@ module Spree
       def update_adjustable
         adjustable.update! if adjustable.is_a? Order
       end
-
-      class << self
-        def tax
-          where(:originator_type => 'Spree::TaxRate', :adjustable_type => 'Spree::Order')
-        end
-
-        def price
-          where(:adjustable_type => 'Spree::LineItem')
-        end
-
-        def shipping
-          where(:originator_type => 'Spree::ShippingMethod')
-        end
-
-        def optional
-          where(:mandatory => false)
-        end
-
-        def eligible
-          where(:eligible => true)
-        end
-
-        def charge
-          where('amount >= 0')
-        end
-
-        def credit
-          where('amount < 0')
-        end
-      end
-
   end
 end

data/app/models/spree/alert.rb

@@ -1,14 +1,17 @@
-module Spree
-  class Alert < ActiveResource::Base
-    self.site = 'http://alerts.spreecommerce.com/'
-    self.format = :json
+require 'httparty'
 
+module Spree
+  class Alert
     def self.current(host)
-      find(:all, :params => { :version => Spree.version,
-                              :name => Spree::Config[:site_name],
-                              :host => host,
-                              :rails_env => Rails.env,
-                              :rails_version => Rails.version })
+      params = {
+        version: Spree.version,
+        name: Spree::Config[:site_name],
+        host: host,
+        rails_env: Rails.env,
+        rails_version: Rails.version
+      }
+
+      HTTParty.get('http://alerts.spreecommerce.com/alerts.json', body: params).parsed_response
     end
   end
 end

data/app/models/spree/app_configuration.rb

@@ -21,74 +21,87 @@ 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 :admin_interface_logo, :string, :default => 'admin/bg/spree_50.png'
-    preference :admin_products_per_page, :integer, :default => 10
-    preference :allow_backorder_shipping, :boolean, :default => false # should only be true if you don't need to track inventory
-    preference :allow_backorders, :boolean, :default => true
-    preference :allow_checkout_on_gateway_error, :boolean, :default => false
-    preference :allow_guest_checkout, :boolean, :default => true
-    preference :allow_ssl_in_development_and_test, :boolean, :default => false
-    preference :allow_ssl_in_production, :boolean, :default => true
-    preference :allow_ssl_in_staging, :boolean, :default => true
-    preference :alternative_billing_phone, :boolean, :default => false # Request extra phone for bill addr
-    preference :alternative_shipping_phone, :boolean, :default => false # Request extra phone for ship addr
-    preference :always_put_site_name_in_title, :boolean, :default => true
-    preference :auto_capture, :boolean, :default => false # automatically capture the credit card (as opposed to just authorize and capture later)
-    preference :cache_static_content, :boolean, :default => true
-    preference :check_for_spree_alerts, :boolean, :default => true
-    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 :create_inventory_units, :boolean, :default => true # should only be false when track_inventory_levels is false, also disables RMA's
-    preference :currency, :string, :default => "USD"
-    preference :currency_decimal_mark, :string, :default => "."
-    preference :currency_symbol_position, :string, :default => "before"
-    preference :currency_thousands_separator, :string, :default => ","
-    preference :display_currency, :boolean, :default => false
+    preference :address_requires_state, :boolean, default: true # should state/state_name be required
+    preference :admin_interface_logo, :string, default: 'admin/bg/spree_50.png'
+    preference :admin_products_per_page, :integer, default: 10
+    preference :allow_backorder_shipping, :boolean, default: false # should only be true if you don't need to track inventory
+    preference :allow_backorders, :boolean, default: true
+    preference :allow_checkout_on_gateway_error, :boolean, default: false
+    preference :allow_guest_checkout, :boolean, default: true
+    preference :allow_ssl_in_development_and_test, :boolean, default: false
+    preference :allow_ssl_in_production, :boolean, default: true
+    preference :allow_ssl_in_staging, :boolean, default: true
+    preference :alternative_billing_phone, :boolean, default: false # Request extra phone for bill addr
+    preference :alternative_shipping_phone, :boolean, default: false # Request extra phone for ship addr
+    preference :always_put_site_name_in_title, :boolean, default: true
+    preference :auto_capture, :boolean, default: false # automatically capture the credit card (as opposed to just authorize and capture later)
+    preference :cache_static_content, :boolean, default: true
+    preference :check_for_spree_alerts, :boolean, default: true
+    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 :create_inventory_units, :boolean, default: true # should only be false when track_inventory_levels is false, also disables RMA's
+    preference :currency, :string, default: "USD"
+    preference :currency_decimal_mark, :string, default: "."
+    preference :currency_symbol_position, :string, default: "before"
+    preference :currency_thousands_separator, :string, default: ","
+    preference :display_currency, :boolean, default: false
     preference :default_country_id, :integer
-    preference :default_meta_description, :string, :default => 'Spree demo site'
-    preference :default_meta_keywords, :string, :default => 'spree, demo'
-    preference :default_seo_title, :string, :default => ''
-    preference :dismissed_spree_alerts, :string, :default => ''
-    preference :emails_sent_from, :string, :default => 'spree@example.com'
-    preference :hide_cents, :boolean, :default => false
-    preference :last_check_for_spree_alerts, :string, :default => nil
-    preference :layout, :string, :default => 'spree/layouts/spree_application'
-    preference :logo, :string, :default => 'admin/bg/spree_50.png'
-    preference :max_level_in_taxons_menu, :integer, :default => 1 # maximum nesting level in taxons menu
-    preference :max_quantity, :integer, :default => 1000 # Maximum allowable quantity when checking out
-    preference :override_actionmailer_config, :boolean, :default => true
-    preference :orders_per_page, :integer, :default => 15
-    preference :prices_inc_tax, :boolean, :default => false
-    preference :products_per_page, :integer, :default => 12
-    preference :require_master_price, :boolean, :default => true
-    preference :shipment_inc_vat, :boolean, :default => false
-    preference :shipping_instructions, :boolean, :default => false # Request instructions/info for shipping
-    preference :show_descendents, :boolean, :default => true
-    preference :show_only_complete_orders_by_default, :boolean, :default => true
+    preference :default_meta_description, :string, default: 'Spree demo site'
+    preference :default_meta_keywords, :string, default: 'spree, demo'
+    preference :default_seo_title, :string, default: ''
+    preference :dismissed_spree_alerts, :string, default: ''
+    preference :hide_cents, :boolean, default: false
+    preference :last_check_for_spree_alerts, :string, default: nil
+    preference :layout, :string, default: 'spree/layouts/spree_application'
+    preference :logo, :string, default: 'admin/bg/spree_50.png'
+    preference :max_level_in_taxons_menu, :integer, default: 1 # maximum nesting level in taxons menu
+    preference :orders_per_page, :integer, default: 15
+    preference :prices_inc_tax, :boolean, default: false
+    preference :products_per_page, :integer, default: 12
+    preference :redirect_https_to_http, :boolean, :default => false
+    preference :require_master_price, :boolean, default: true
+    preference :shipment_inc_vat, :boolean, default: false
+    preference :shipping_instructions, :boolean, default: false # Request instructions/info for shipping
+    preference :show_descendents, :boolean, default: true
+    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_products_without_price, :boolean, default: false
     preference :show_raw_product_description, :boolean, :default => false
-    preference :show_zero_stock_products, :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_products_without_price, :boolean, :default => false
-    preference :site_name, :string, :default => 'Spree Demo Site'
-    preference :site_url, :string, :default => 'demo.spreecommerce.com'
-    preference :tax_using_ship_address, :boolean, :default => true
-    preference :track_inventory_levels, :boolean, :default => true # will not track on_hand values for variants /products
+    preference :site_name, :string, default: 'Spree Demo Site'
+    preference :site_url, :string, default: 'demo.spreecommerce.com'
+    preference :tax_using_ship_address, :boolean, default: true
+    preference :track_inventory_levels, :boolean, default: true # will not track on_hand values for variants /products
 
     # Preferences related to image settings
-    preference :attachment_default_url, :string, :default => '/spree/products/:id/:style/:basename.:extension'
-    preference :attachment_path, :string, :default => ':rails_root/public/spree/products/:id/:style/:basename.:extension'
-    preference :attachment_url, :string, :default => '/spree/products/:id/:style/:basename.:extension'
-    preference :attachment_styles, :string, :default => "{\"mini\":\"48x48>\",\"small\":\"100x100>\",\"product\":\"240x240>\",\"large\":\"600x600>\"}"
-    preference :attachment_default_style, :string, :default => 'product'
+    preference :attachment_default_url, :string, default: '/spree/products/:id/:style/:basename.:extension'
+    preference :attachment_path, :string, default: ':rails_root/public/spree/products/:id/:style/:basename.:extension'
+    preference :attachment_url, :string, default: '/spree/products/:id/:style/:basename.:extension'
+    preference :attachment_styles, :string, default: "{\"mini\":\"48x48>\",\"small\":\"100x100>\",\"product\":\"240x240>\",\"large\":\"600x600>\"}"
+    preference :attachment_default_style, :string, default: 'product'
     preference :s3_access_key, :string
     preference :s3_bucket, :string
     preference :s3_secret, :string
-    preference :s3_headers, :string, :default => "{\"Cache-Control\":\"max-age=31557600\"}"
-    preference :use_s3, :boolean, :default => false # Use S3 for images rather than the file system
+    preference :s3_headers, :string, default: "{\"Cache-Control\":\"max-age=31557600\"}"
+    preference :use_s3, :boolean, default: false # Use S3 for images rather than the file system
     preference :s3_protocol, :string
     preference :s3_host_alias, :string
 
+    # Default mail headers settings
+    preference :enable_mail_delivery, :boolean, :default => false
+    preference :mails_from, :string, :default => 'spree@example.com'
+    preference :mail_bcc, :string, :default => 'spree@example.com'
+    preference :intercept_email, :string, :default => nil
+
+    # Default smtp settings
+    preference :override_actionmailer_config, :boolean, :default => true
+    preference :mail_host, :string, :default => 'localhost'
+    preference :mail_domain, :string, :default => 'localhost'
+    preference :mail_port, :integer, :default => 25
+    preference :secure_connection_type, :string, :default => Core::MailSettings::SECURE_CONNECTION_TYPES[0]
+    preference :mail_auth_type, :string, :default => Core::MailSettings::MAIL_AUTH[0]
+    preference :smtp_username, :string
+    preference :smtp_password, :string
+
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class
       @searcher_class ||= Spree::Core::Search::Base

data/app/models/spree/asset.rb

@@ -1,6 +1,6 @@
 module Spree
   class Asset < ActiveRecord::Base
-    belongs_to :viewable, :polymorphic => true
-    acts_as_list :scope => :viewable
+    belongs_to :viewable, polymorphic: true
+    acts_as_list scope: :viewable
   end
 end

data/app/models/spree/billing_integration.rb

@@ -1,9 +1,9 @@
 module Spree
   class BillingIntegration < PaymentMethod
-    validates :name, :presence => true
+    validates :name, presence: true
 
-    preference :server, :string, :default => 'test'
-    preference :test_mode, :boolean, :default => true
+    preference :server, :string, default: 'test'
+    preference :test_mode, :boolean, default: true
 
     def provider
       integration_options = options
@@ -15,9 +15,7 @@ module Spree
 
     def options
       options_hash = {}
-      self.preferences.each do |key,value|
-        options_hash[key.to_sym] = value
-      end
+      preferences.each { |key, value| options_hash[key.to_sym] = value }
       options_hash
     end
   end

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

@@ -3,7 +3,7 @@ require_dependency 'spree/calculator'
 module Spree
   class Calculator::DefaultTax < Calculator
     def self.description
-      I18n.t(:default_tax)
+      Spree.t(:default_tax)
     end
 
     def compute(computable)

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

@@ -7,12 +7,12 @@ module Spree
     attr_accessible :preferred_flat_percent
 
     def self.description
-      I18n.t(:flat_percent)
+      Spree.t(:flat_percent)
     end
 
     def compute(object)
-      return unless object.present? and object.line_items.present?
-      item_total = object.line_items.map(&:amount).sum
+      return unless object.present? and object.respond_to?(:item_total)
+      item_total = object.item_total
       value = item_total * BigDecimal(self.preferred_flat_percent.to_s) / 100.0
       (value * 100).round.to_f / 100
     end

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

@@ -8,7 +8,7 @@ module Spree
     attr_accessible :preferred_amount, :preferred_currency
 
     def self.description
-      I18n.t(:flat_rate_per_order)
+      Spree.t(:flat_rate_per_order)
     end
 
     def compute(object=nil)

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

@@ -10,7 +10,7 @@ module Spree
     attr_accessible :preferred_first_item, :preferred_additional_item, :preferred_max_items, :preferred_currency
 
     def self.description
-      I18n.t(:flexible_rate)
+      Spree.t(:flexible_rate)
     end
 
     def self.available?(object)

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

@@ -0,0 +1,19 @@
+module Spree
+  class Calculator::FreeShipping < Calculator
+    def self.description
+      Spree.t(:free_shipping)
+    end
+
+    def compute(object)
+      if object.is_a?(Array)
+        return if object.empty?
+        order = object.first.order
+      else
+        order = object
+      end
+
+      order.ship_total
+    end
+  end
+end
+

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

@@ -8,7 +8,7 @@ module Spree
     attr_accessible :preferred_amount, :preferred_currency
 
     def self.description
-      I18n.t(:flat_rate_per_item)
+      Spree.t(:flat_rate_per_item)
     end
 
     def compute(object=nil)

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

@@ -0,0 +1,45 @@
+module Spree
+
+  # A calculator for promotions that calculates a percent-off discount
+  # for all matching products in an order. This should not be used as a 
+  # shipping calculator since it would be the same thing as a flat percent
+  # off the entire order.
+  
+  class Calculator::PercentPerItem < Calculator
+    preference :percent, :decimal, :default => 0
+
+    attr_accessible :preferred_percent
+
+    def self.description
+      Spree.t(:percent_per_item)
+    end
+
+    def compute(object=nil)
+      return 0 if object.nil?
+      object.line_items.reduce(0) do |sum, line_item|
+        sum += value_for_line_item(line_item)
+      end
+    end
+
+  private
+
+    # Returns all products that match the promotion's rule. 
+    def matching_products
+      @matching_products ||= if compute_on_promotion?
+        self.calculable.promotion.rules.map(&:products).flatten
+      end
+    end
+
+    def value_for_line_item(line_item)
+      if compute_on_promotion?
+        return 0 unless matching_products.blank? or matching_products.include?(line_item.product)
+      end
+      ((line_item.price * line_item.quantity) * preferred_percent) / 100
+    end
+
+    # Determines wether or not the calculable object is a promotion
+    def compute_on_promotion?
+      @compute_on_promotion ||= self.calculable.respond_to?(:promotion)
+    end
+  end
+end

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

@@ -15,7 +15,7 @@ module Spree
                     :preferred_currency
 
     def self.description
-      I18n.t(:price_sack)
+      Spree.t(:price_sack)
     end
 
     # as object we always get line items, as calculable we have Coupon, ShippingMethod

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

@@ -0,0 +1,21 @@
+require_dependency 'spree/shipping_calculator'
+
+module Spree
+  module Calculator::Shipping
+    class FlatPercentItemTotal < ShippingCalculator
+      preference :flat_percent, :decimal, :default => 0
+      attr_accessible :preferred_flat_percent
+
+      def self.description
+        Spree.t(:flat_percent)
+      end
+
+      def compute_package(package)
+        content_items = package.contents
+        item_total = total(content_items)
+        value = item_total * BigDecimal(self.preferred_flat_percent.to_s) / 100.0
+        (value * 100).round.to_f / 100
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+require_dependency 'spree/shipping_calculator'
+
+module Spree
+  module Calculator::Shipping
+    class FlatRate < ShippingCalculator
+      preference :amount, :decimal, :default => 0
+      preference :currency, :string, :default => Spree::Config[:currency]
+
+      attr_accessible :preferred_amount, :preferred_currency
+
+      def self.description
+        Spree.t(:shipping_flat_rate_per_order)
+      end
+
+      def compute_package(package)
+        self.preferred_amount
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require_dependency 'spree/shipping_calculator'
+
+module Spree
+  module Calculator::Shipping
+    class FlexiRate < ShippingCalculator
+      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]
+
+      attr_accessible :preferred_first_item,
+                      :preferred_additional_item,
+                      :preferred_max_items,
+                      :preferred_currency
+
+      def self.description
+        Spree.t(:shipping_flexible_rate)
+      end
+
+      def compute_package(package)
+        content_items = package.contents
+        sum = 0
+        max = self.preferred_max_items.to_i
+        items_count = content_items.map(&:quantity).sum
+        items_count.times do |i|
+          # check max value to avoid divide by 0 errors
+          if (max == 0 && i == 0) || (max > 0) && (i % max == 0)
+            sum += self.preferred_first_item.to_f
+          else
+            sum += self.preferred_additional_item.to_f
+          end
+        end
+
+        sum
+      end
+    end
+  end
+end

data/app/models/spree/calculator/shipping/per_item.rb

@@ -0,0 +1,20 @@
+require_dependency 'spree/shipping_calculator'
+
+module Spree
+  module Calculator::Shipping
+    class PerItem < ShippingCalculator
+      preference :amount, :decimal, :default => 0
+      preference :currency, :string, :default => Spree::Config[:currency]
+      attr_accessible :preferred_amount, :preferred_currency
+
+      def self.description
+        Spree.t(:shipping_flat_rate_per_item)
+      end
+
+      def compute_package(package)
+        content_items = package.contents
+        self.preferred_amount * content_items.sum { |item| item.quantity }
+      end
+    end
+  end
+end