spree_core 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48dc9ada13cae9de3d32bcb9c76e95872dfdfcd2
-  data.tar.gz: 665071b4c805498e9c03d4a02f4a3b7af84f7b3a
+  metadata.gz: 3ab1a9b77dfdfc7b40bb62c108eadc067ea71124
+  data.tar.gz: c2183c55225bf1d1d23c06e61807ee0c08690c39
 SHA512:
-  metadata.gz: ede3b69166c6172c17786e982aa34b5b983178fc4f83e43eaa4acd5306ea70ae895d1cdbb3861997ef2154df22b0afcb4b801e6ba02cd5df7cddec61cad03d07
-  data.tar.gz: 57c30112d37519af4a1ee58d07dc63a4bb3a61456b1ee27e88c9d02aa13165e300c5bae4a61051d2bfe718f13635e97d759f31f106179d6b4ccda086b8628158
+  metadata.gz: 723eadefb8438e4953836ff989f6c95e12b2c5b4a677e38b2402994c58e346886f45c7c7389b888a9ad1fafc0bdf60d1d7788982df9296fbf9a155e929053f59
+  data.tar.gz: 664c6401e80f75ecac438efc557ac374578b933f5c453a439e075a8a9046b0c65abf9dcecfcfa1a8d0167a6d818f2f711273af5b5d108fd01991df6ac7f42994

data/app/controllers/spree/base_controller.rb

@@ -8,9 +8,8 @@ class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Search
   include Spree::Core::ControllerHelpers::StrongParameters
-  include Spree::Core::ControllerHelpers::Search
 
   respond_to :html
 end
 
-require 'spree/i18n/initializer'
+require 'spree/i18n/initializer'

data/app/helpers/spree/products_helper.rb

@@ -40,9 +40,14 @@ module Spree
     end
 
     def line_item_description(variant)
-      description = variant.product.description
-      if description.present?
-        truncate(strip_tags(description.gsub(' ', ' ')), length: 100)
+      ActiveSupport::Deprecation.warn "line_item_description(variant) is deprecated and may be removed from future releases, use line_item_description_text(line_item.description) instead.", caller
+
+      line_item_description_text(variant.product.description)
+    end
+
+    def line_item_description_text description_text
+      if description_text.present?
+        truncate(strip_tags(description_text.gsub(' ', ' ')), length: 100)
       else
         Spree.t(:product_has_no_description)
       end

data/app/mailers/spree/base_mailer.rb

@@ -8,5 +8,10 @@ module Spree
       Spree::Money.new(amount).to_s
     end
     helper_method :money
+
+    def mail(headers={}, &block)
+      super if Spree::Config[:send_core_emails]
+    end
+
   end
 end

data/app/models/spree/ability.rb

@@ -53,9 +53,6 @@ module Spree
         can :create, Spree.user_class
         can [:read, :update, :destroy], Spree.user_class, id: user.id
         can [:index, :read], State
-        can [:index, :read], StockItem
-        can [:index, :read], StockLocation
-        can [:index, :read], StockMovement
         can [:index, :read], Taxon
         can [:index, :read], Taxonomy
         can [:index, :read], Variant

data/app/models/spree/adjustment.rb

@@ -56,6 +56,7 @@ module Spree
     scope :charge, -> { where('amount >= 0') }
     scope :credit, -> { where('amount < 0') }
     scope :promotion, -> { where(originator_type: 'Spree::PromotionAction') }
+    scope :manual, -> { where(originator_type: nil) }
     scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
 
     def promotion?
@@ -85,7 +86,7 @@ module Spree
     # are not recalculated.
     #
     # It receives +calculable+ as the updated source here so calculations can be
-    # performed on the current values of that source. If we used +source+ it 
+    # performed on the current values of that source. If we used +source+ it
     # could load the old record from db for the association. e.g. when updating
     # more than on line items at once via accepted_nested_attributes the order
     # object on the association would be in a old state and therefore the

data/app/models/spree/app_configuration.rb

@@ -32,6 +32,7 @@ module Spree
     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_include_confirm_step, :boolean, default: false # Ensures confirmation step is always in checkout_progress bar, but does not force a confirm step if your payment methods do not support it.
     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 :check_for_spree_alerts, :boolean, default: true
@@ -84,6 +85,7 @@ module Spree
 
     # Default mail headers settings
     preference :enable_mail_delivery, :boolean, :default => false
+    preference :send_core_emails, :boolean, :default => true
     preference :mails_from, :string, :default => 'spree@example.com'
     preference :mail_bcc, :string, :default => 'spree@example.com'
     preference :intercept_email, :string, :default => nil

data/app/models/spree/classification.rb

@@ -3,5 +3,8 @@ module Spree
     self.table_name = 'spree_products_taxons'
     belongs_to :product, class_name: "Spree::Product"
     belongs_to :taxon, class_name: "Spree::Taxon"
+
+    # For #3494
+    validates_uniqueness_of :taxon_id, :scope => :product_id, :message => :already_linked
   end
 end

data/app/models/spree/country.rb

@@ -1,6 +1,7 @@
 module Spree
   class Country < ActiveRecord::Base
-    has_many :states, -> { order('name ASC') }
+    has_many :states, -> { order('name ASC') }, dependent: :destroy
+    has_many :addresses, dependent: :nullify
 
     validates :name, :iso_name, presence: true
 

data/app/models/spree/image.rb

@@ -8,7 +8,7 @@ module Spree
                       default_style: :product,
                       url: '/spree/products/:id/:style/:basename.:extension',
                       path: ':rails_root/public/spree/products/:id/:style/:basename.:extension',
-                      convert_options: { all: '-strip -auto-orient -colorspace RGB' }
+                      convert_options: { all: '-strip -auto-orient -colorspace sRGB' }
 
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet

data/app/models/spree/line_item.rb

@@ -25,6 +25,8 @@ module Spree
     after_save :update_order
     after_destroy :update_order
 
+    delegate :name, :description, to: :variant
+
     attr_accessor :target_shipment
 
     def copy_price

data/app/models/spree/order.rb

@@ -41,6 +41,7 @@ module Spree
     has_many :return_authorizations, dependent: :destroy
     has_many :adjustments, -> { order("#{Adjustment.table_name}.created_at ASC") }, as: :adjustable, dependent: :destroy
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
+    has_many :inventory_units
 
     has_many :shipments, dependent: :destroy do
       def states
@@ -141,7 +142,7 @@ module Spree
     end
 
     def completed?
-      completed_at.present?
+      completed_at.present? || complete?
     end
 
     # Indicates whether or not the user is allowed to proceed to checkout.
@@ -159,7 +160,11 @@ module Spree
 
     # If true, causes the confirmation step to happen during the checkout process
     def confirmation_required?
-      payments.map(&:payment_method).compact.any?(&:payment_profiles_supported?)
+      if payments.empty? and Spree::Config[:always_include_confirm_step]
+        true
+      else
+        payments.map(&:payment_method).compact.any?(&:payment_profiles_supported?)
+      end
     end
 
     # Indicates the number of items in the order
@@ -226,13 +231,6 @@ module Spree
       shipment_state.nil? || %w{ready backorder pending}.include?(shipment_state)
     end
 
-    def allow_resume?
-      # we shouldn't allow resume for legacy orders b/c we lack the information
-      # necessary to restore to a previous state
-      return false if state_changes.empty? || state_changes.last.previous_state.nil?
-      true
-    end
-
     def awaiting_returns?
       return_authorizations.any? { |return_authorization| return_authorization.authorized? }
     end
@@ -282,11 +280,11 @@ module Spree
     end
 
     def ship_total
-      adjustments.shipping.map(&:amount).sum
+      adjustments.shipping.sum(:amount)
     end
 
     def tax_total
-      adjustments.tax.map(&:amount).sum
+      adjustments.tax.sum(:amount)
     end
 
     # Creates new tax charges if there are any applicable rates. If prices already
@@ -421,7 +419,7 @@ module Spree
       line_items.select &:insufficient_stock?
     end
 
-    def merge!(order)
+    def merge!(order, user = nil)
       order.line_items.each do |line_item|
         next unless line_item.currency == currency
         current_line_item = self.line_items.find_by(variant: line_item.variant)
@@ -433,14 +431,17 @@ module Spree
           line_item.save
         end
       end
+
+      self.associate_user!(user) if !self.user && !user.blank?
+
       # So that the destroy doesn't take out line items which may have been re-assigned
       order.line_items.reload
       order.destroy
     end
 
     def empty!
-      line_items.destroy_all
       adjustments.destroy_all
+      line_items.destroy_all
     end
 
     def clear_adjustments!
@@ -480,7 +481,15 @@ module Spree
     end
 
     def promo_total
-      adjustments.eligible.promotion.map(&:amount).sum
+      adjustments.eligible.promotion.sum(:amount)
+    end
+
+    def manual_adjustment_total
+      adjustments.eligible.manual.sum(:amount)
+    end
+
+    def discount_total
+      promo_total + manual_adjustment_total
     end
 
     def shipped?
@@ -503,7 +512,7 @@ module Spree
     #
     # At some point the might need to force the order to transition from address
     # to delivery again so that proper updated shipments are created.
-    # e.g. customer goes back from payment step and changes order items 
+    # e.g. customer goes back from payment step and changes order items
     def ensure_updated_shipments
       if shipments.any?
         self.shipments.destroy_all
@@ -515,6 +524,10 @@ module Spree
       shipments.map &:refresh_rates
     end
 
+    def shipping_eq_billing_address?
+      (bill_address.empty? && ship_address.empty?) || bill_address.same_as?(ship_address)
+    end
+
     private
 
       def link_by_email
@@ -553,10 +566,14 @@ module Spree
       def after_cancel
         shipments.each { |shipment| shipment.cancel! }
 
-        OrderMailer.cancel_email(self.id).deliver
+        send_cancel_email
         self.payment_state = 'credit_owed' unless shipped?
       end
 
+      def send_cancel_email
+        OrderMailer.cancel_email(self.id).deliver
+      end
+
       def after_resume
         shipments.each { |shipment| shipment.resume! }
       end

data/app/models/spree/order/checkout.rb

@@ -56,7 +56,7 @@ module Spree
               end
 
               event :resume do
-                transition :to => :resumed, :from => :canceled, :if => :allow_resume?
+                transition :to => :resumed, :from => :canceled, :if => :canceled?
               end
 
               event :authorize_return do

data/app/models/spree/payment.rb

@@ -13,7 +13,7 @@ module Spree
     has_many :log_entries, as: :source
 
     before_validation :validate_source
-    before_save :set_unique_identifier
+    before_create :set_unique_identifier
 
     after_save :create_payment_profile, if: :profiles_supported?
 
@@ -34,10 +34,12 @@ module Spree
 
     after_rollback :persist_invalid
 
+    validates :amount, numericality: true
+
     def persist_invalid
       return unless ['failed', 'invalid'].include?(state)
       state_will_change!
-      save 
+      save
     end
 
     # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
@@ -76,6 +78,16 @@ module Spree
     end
     alias display_amount money
 
+    def amount=(amount)
+      self[:amount] =
+        case amount
+        when String
+          separator = I18n.t('number.currency.format.separator')
+          number    = amount.delete("^0-9-#{separator}").tr(separator, '.')
+          number.to_d if number.present?
+        end || amount
+    end
+
     def offsets_total
       offsets.pluck(:amount).sum
     end

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

@@ -93,7 +93,7 @@ module Spree
           record_response(response)
 
           if response.success?
-            self.class.create(
+            self.class.create!(
               :order => order,
               :source => self,
               :payment_method => payment_method,
@@ -126,7 +126,7 @@ module Spree
         options.merge!({ :shipping => order.ship_total * 100,
                          :tax      => order.tax_total * 100,
                          :subtotal => order.item_total * 100,
-                         :discount => order.promo_total * 100,
+                         :discount => order.discount_total * 100,
                          :currency => currency })
 
         options.merge!({ :billing_address  => order.bill_address.try(:active_merchant_hash),
@@ -169,7 +169,7 @@ module Spree
       end
 
       def record_response(response)
-        log_entries.create(:details => response.to_yaml)
+        log_entries.create!(:details => response.to_yaml)
       end
 
       def protect_from_connection_error

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

@@ -29,7 +29,11 @@ module Spree::Preferences
     end
 
     def preference_cache_key(name)
-      [ENV['RAILS_CACHE_ID'], self.class.name, name].flatten.join('::').underscore
+      [rails_cache_id, self.class.name, name].compact.join('::').underscore
+    end
+
+    def rails_cache_id
+      ENV['RAILS_CACHE_ID']
     end
 
     def reset

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

@@ -78,7 +78,11 @@ module Spree::Preferences::Preferable
 
   def preference_cache_key(name)
     return unless id
-    [ENV["RAILS_CACHE_ID"], self.class.name, name, id].join('::').underscore
+    [rails_cache_id, self.class.name, name, id].compact.join('::').underscore
+  end
+
+  def rails_cache_id
+    ENV['RAILS_CACHE_ID']
   end
 
   def save_pending_preferences

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

@@ -39,23 +39,22 @@ module Spree::Preferences
         # has been cleared from the cache
 
         # does it exist in the database?
-        if Spree::Preference.table_exists? && preference = Spree::Preference.find_by_key(key)
-          # it does exist, so let's put it back into the cache
-          @cache.write(preference.key, preference.value)
-
-          # and return the value
-          return preference.value
+        if preference = Spree::Preference.find_by_key(key)
+          # it does exist
+          val = preference.value
+        else
+          # use the fallback value
+          val = fallback
         end
-      end
 
-      unless fallback.nil?
-        # cache fallback so we won't hit the db above on
-        # subsequent queries for the same key
-        #
-        @cache.write(key, fallback)
-      end
+        # Cache either the value from the db or the fallback value.
+        # This avoids hitting the db with subsequent queries.
+        @cache.write(key, val)
 
-      return fallback
+        return val
+      else
+        return fallback
+      end
     end
 
     def delete(key)
@@ -86,7 +85,7 @@ module Spree::Preferences
     end
 
     def should_persist?
-      @persistence && Spree::Preference.connected? && Spree::Preference.table_exists?
+      @persistence and Spree::Preference.table_exists?
     end
 
   end

data/app/models/spree/product.rb

@@ -49,10 +49,11 @@ module Spree
 
     has_many :prices, -> { order('spree_variants.position, spree_variants.id, currency') }, through: :variants
 
-    has_many :stock_items, through: :variants
+    has_many :stock_items, through: :variants_including_master
 
     delegate_belongs_to :master, :sku, :price, :currency, :display_amount, :display_price, :weight, :height, :width, :depth, :is_master, :has_default_price?, :cost_currency, :price_in, :amount_in
-    delegate_belongs_to :master, :cost_price if Variant.table_exists? && Variant.column_names.include?('cost_price')
+
+    delegate_belongs_to :master, :cost_price
 
     after_create :set_master_variant_defaults
     after_create :add_properties_and_option_types_from_prototype
@@ -233,7 +234,7 @@ module Spree
       # there's a weird quirk with the delegate stuff that does not automatically save the delegate object
       # when saving so we force a save using a hook.
       def save_master
-        master.save if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed || master.default_price.new_record)))
+        master.save if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed? || master.default_price.new_record?)))
       end
 
       def ensure_master