spree_core 2.3.13 → 2.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01725f9ca0e549175b6eff9da2061ad94f0e24c6
-  data.tar.gz: 812d8b5e508a5ccbd8e0a53728335a5d43a25b30
+  metadata.gz: 3b41e23ca4232364a10edcb30ee1df77239ac6a6
+  data.tar.gz: 3ac2a1a353eb0d2d6b5130b773ebbdb115847b5b
 SHA512:
-  metadata.gz: a56c3a3d6b44d2b584668fbeebace2bcb389d2962a8959345fa84f676b315417eeedf61b56152e6a3b42ede1c0173efcb401715a5c244d0c99a27370cf93aa34
-  data.tar.gz: 0c4f145ce06584f368f388c3c7a1825a7f5458109abb68ba2c297b748428b7ff04e897568deb072fb55ccfaee5a3fa6e7badf6eda55014dd3a69fdeac0480ea2
+  metadata.gz: 47ae6a4ab3482c89afdee602d0b6951608e0f885690137815bddd5a20f6d91fa62e868e6f72d445289149117cbf658c41e276dbc7f1f54c78a1714fa836685ca
+  data.tar.gz: a8219fa078d69a3045bfdab968dc0c327a2c050253e5d779170a2770346e8f602005795ef14ee9d26fedf23f10838fba31df8194774e992f3c16d5e92b30d8bb

data/app/assets/javascripts/spree.js.coffee.erb

@@ -11,7 +11,7 @@ class window.Spree
     "#{locationOrigin}#{@mountedAt()}#{path}"
 
   # Helper function to take a URL and add query parameters to it
-  # Uses the JSUri library from here: https://code.google.com/p/jsuri/
+  # Uses the JSUri library from here: https://github.com/derek-watson/jsUri
   # Thanks to Jake Moffat for the suggestion: https://twitter.com/jakeonrails/statuses/321776992221544449
   @url: (uri, query) ->
     if uri.path == undefined
@@ -21,10 +21,6 @@ class window.Spree
         uri.addQueryParam(key, value)
     return uri
 
-  # Helper method in case people want to call uri rather than url
-  @uri: (uri, query) ->
-    url(uri, query)
-
   # This function automatically appends the API token
   # for the user to the end of any URL.
   # Immediately after, this string is then passed to jQuery.ajax.

data/app/helpers/spree/base_helper.rb

@@ -48,7 +48,7 @@ module Spree
       meta.reverse_merge!({
         keywords: current_store.meta_keywords,
         description: current_store.meta_description,
-      }) if meta[:keywords].blank? or meta[:description].blank?
+      })
       meta
     end
 
@@ -78,19 +78,30 @@ module Spree
       nil
     end
 
-    def breadcrumbs(taxon, separator=" » ")
+    def breadcrumbs(taxon, separator=" » ", breadcrumb_class="inline")
       return "" if current_page?("/") || taxon.nil?
-      separator = raw(separator)
-      crumbs = [content_tag(:li, link_to(Spree.t(:home), spree.root_path) + separator)]
+
+      crumbs = [[Spree.t(:home), spree.root_path]]
+
       if taxon
-        crumbs << content_tag(:li, link_to(Spree.t(:products), products_path) + separator)
-        crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, link_to(ancestor.name , seo_url(ancestor)) + separator) } unless taxon.ancestors.empty?
-        crumbs << content_tag(:li, content_tag(:span, link_to(taxon.name , seo_url(taxon))))
+        crumbs << [Spree.t(:products), products_path]
+        crumbs += taxon.ancestors.collect { |a| [a.name, spree.nested_taxons_path(a.permalink)] } unless taxon.ancestors.empty?
+        crumbs << [taxon.name, spree.nested_taxons_path(taxon.permalink)]
       else
-        crumbs << content_tag(:li, content_tag(:span, Spree.t(:products)))
+        crumbs << [Spree.t(:products), products_path]
       end
-      crumb_list = content_tag(:ul, raw(crumbs.flatten.map{|li| li.mb_chars}.join), class: 'inline')
-      content_tag(:nav, crumb_list, id: 'breadcrumbs', class: 'sixteen columns')
+
+      separator = raw(separator)
+
+      crumbs.map! do |crumb|
+        content_tag(:li, itemscope:"itemscope", itemtype:"http://data-vocabulary.org/Breadcrumb") do
+          link_to(crumb.last, itemprop: "url") do
+            content_tag(:span, crumb.first, itemprop: "title")
+          end + (crumb == crumbs.last ? '' : separator)
+        end
+      end
+
+      content_tag(:nav, content_tag(:ul, raw(crumbs.map(&:mb_chars).join), class: breadcrumb_class), id: 'breadcrumbs', class: 'sixteen columns')
     end
 
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
@@ -152,7 +163,7 @@ module Spree
     end
 
     def link_to_tracking(shipment, options = {})
-      return unless shipment.tracking
+      return unless shipment.tracking && shipment.shipping_method
 
       if shipment.tracking_url
         link_to(shipment.tracking, shipment.tracking_url, options)

data/app/helpers/spree/products_helper.rb

@@ -11,13 +11,14 @@ module Spree
 
     # returns the formatted price for the specified variant as a difference from product price
     def variant_price_diff(variant)
-      variant_amount = variant.amount_in(current_currency)
-      product_amount = variant.product.amount_in(current_currency)
-      return if variant_amount == product_amount || product_amount.nil?
-      diff   = variant.amount_in(current_currency) - product_amount
-      amount = Spree::Money.new(diff.abs, currency: current_currency).to_html
-      label  = diff > 0 ? :add : :subtract
-      "(#{Spree.t(label)}: #{amount})".html_safe
+      diff = variant.amount_in(current_currency) - variant.product.amount_in(current_currency)
+      return nil if diff == 0
+      amount = Spree::Money.new(diff.abs, { currency: current_currency }).to_html
+      if diff > 0
+        "(#{Spree.t(:add)}: #{amount})".html_safe
+      else
+        "(#{Spree.t(:subtract)}: #{amount})".html_safe
+      end
     end
 
     # returns the formatted full price for the variant, if at least one variant price differs from product price

data/app/mailers/spree/base_mailer.rb

@@ -1,5 +1,6 @@
 module Spree
   class BaseMailer < ActionMailer::Base
+
     def from_address
       Spree::Config[:mails_from]
     end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -0,0 +1,10 @@
+module Spree
+  class ReimbursementMailer < BaseMailer
+      def reimbursement_email(reimbursement, resend = false)
+        @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
+        subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+        subject += "#{Spree::Store.current.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@reimbursement.order.number}"
+        mail(to: @reimbursement.order.email, from: from_address, subject: subject)
+      end
+  end
+end

data/app/mailers/spree/test_mailer.rb

@@ -1,9 +1,8 @@
 module Spree
   class TestMailer < BaseMailer
-    def test_email(user)
-      recipient = user.respond_to?(:id) ? user : Spree.user_class.find(user)
+    def test_email(email)
       subject = "#{Spree::Store.current.name} #{Spree.t('test_mailer.test_email.subject')}"
-      mail(to: recipient.email, from: from_address, subject: subject)
+      mail(to: email, from: from_address, subject: subject)
     end
   end
 end

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

@@ -0,0 +1,24 @@
+module Spree
+  module AdjustmentSource
+    extend ActiveSupport::Concern
+
+    included do
+      def deals_with_adjustments_for_deleted_source
+        adjustment_scope = self.adjustments.includes(:order).references(:spree_orders)
+
+        # For incomplete orders, remove the adjustment completely.
+        adjustment_scope.where("spree_orders.completed_at IS NULL").destroy_all
+
+        # For complete orders, the source will be invalid.
+        # Therefore we nullify the source_id, leaving the adjustment in place.
+        # This would mean that the order's total is not altered at all.
+        adjustment_scope.where("spree_orders.completed_at IS NOT NULL").each do |adjustment|
+          adjustment.update_columns(
+            source_id: nil,
+            updated_at: Time.now,
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Spree
+  module CalculatedAdjustments
+    extend ActiveSupport::Concern
+
+    included do
+      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
+
+      def self.calculators
+        spree_calculators.send model_name_without_spree_namespace
+      end
+
+      def calculator_type
+        calculator.class.to_s if calculator
+      end
+
+      def calculator_type=(calculator_type)
+        klass = calculator_type.constantize if calculator_type
+        self.calculator = klass.new if klass && !self.calculator.is_a?(klass)
+      end
+
+      private
+      def self.model_name_without_spree_namespace
+        self.to_s.tableize.gsub('/', '_').sub('spree_', '')
+      end
+
+      def self.spree_calculators
+        Rails.application.config.spree.calculators
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Spree
+  module NamedType
+    extend ActiveSupport::Concern
+
+    included do
+      scope :active, -> { where(active: true) }
+      default_scope -> { order("LOWER(#{self.table_name}.name)") }
+
+      validates :name, presence: true, uniqueness: { case_sensitive: false }
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Spree
+  module UserAddress
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address'
+      alias_attribute :billing_address, :bill_address
+
+      belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address'
+      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.attributes = order.bill_address.attributes.except('id', 'updated_at', 'created_at')
+        b_address.save
+        self.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.attributes = order.ship_address.attributes.except('id', 'updated_at', 'created_at')
+          s_address.save
+          self.update_attributes(ship_address_id: s_address.id)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Spree
+  module UserPaymentSource
+    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
+
+      def payment_sources
+        credit_cards.with_payment_profile
+      end
+
+      def drop_payment_source(source)
+        gateway = source.payment_method
+        gateway.disable_customer_profile(source)
+      end
+    end
+  end
+end

data/app/models/spree/address.rb

@@ -1,5 +1,7 @@
 module Spree
   class Address < Spree::Base
+    require 'twitter_cldr'
+
     belongs_to :country, class_name: "Spree::Country"
     belongs_to :state, class_name: "Spree::State"
 
@@ -9,22 +11,19 @@ module Spree
     validates :zipcode, presence: true, if: :require_zipcode?
     validates :phone, presence: true, if: :require_phone?
 
-    validate :state_validate
+    validate :state_validate, :postal_code_validate
 
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
 
-
-    self.whitelisted_ransackable_attributes = %w[firstname lastname]
-
     def self.build_default
       country = Spree::Country.find(Spree::Config[:default_country_id]) rescue Spree::Country.first
       new(country: country)
     end
 
     def self.default(user = nil, kind = "bill")
-      if user
-        user.send(:"#{kind}_address") || build_default
+      if user && user_address = user.send(:"#{kind}_address")
+        user_address.clone
       else
         build_default
       end
@@ -130,5 +129,13 @@ module Spree
         # ensure at least one state field is populated
         errors.add :state, :blank if state.blank? && state_name.blank?
       end
+
+      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)
+
+        postal_code = TwitterCldr::Shared::PostalCodes.for_territory(country.iso)
+        errors.add(:zipcode, :invalid) if !postal_code.valid?(zipcode.to_s)
+      end
   end
 end

data/app/models/spree/adjustment.rb

@@ -24,10 +24,8 @@ module Spree
   class Adjustment < Spree::Base
     belongs_to :adjustable, polymorphic: true, touch: true
     belongs_to :source, polymorphic: true
-    belongs_to :order, class_name: 'Spree::Order', inverse_of: :all_adjustments
+    belongs_to :order, class_name: "Spree::Order"
 
-    validates :adjustable, presence: true
-    validates :order, presence: true
     validates :label, presence: true
     validates :amount, numericality: true
 
@@ -47,15 +45,17 @@ module Spree
     scope :open, -> { where(state: 'open') }
     scope :closed, -> { where(state: 'closed') }
     scope :tax, -> { where(source_type: 'Spree::TaxRate') }
+    scope :non_tax, -> { where.not(source_type: 'Spree::TaxRate') }
     scope :price, -> { where(adjustable_type: 'Spree::LineItem') }
     scope :shipping, -> { where(adjustable_type: 'Spree::Shipment') }
     scope :optional, -> { where(mandatory: false) }
     scope :eligible, -> { where(eligible: true) }
     scope :charge, -> { where("#{quoted_table_name}.amount >= 0") }
     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 :is_included, -> { where(included: true)  }
+    scope :included, -> { where(included: true)  }
     scope :additional, -> { where(included: false) }
 
     def closed?
@@ -103,7 +103,7 @@ module Spree
 
     def update_adjustable_adjustment_total
       # Cause adjustable's total to be recalculated
-      ItemAdjustments.new(adjustable).update
+      Spree::ItemAdjustments.new(adjustable).update if adjustable
     end
 
   end

data/app/models/spree/app_configuration.rb

@@ -23,9 +23,9 @@ module Spree
     preference :address_requires_state, :boolean, default: true # should state/state_name be required
     preference :admin_interface_logo, :string, default: 'logo/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_checkout_on_gateway_error, :boolean, default: false
     preference :allow_guest_checkout, :boolean, default: true
+    preference :allow_return_item_amount_editing, :boolean, default: false # Determines whether an admin is allowed to change a return item's pre-calculated amount
     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
@@ -34,6 +34,7 @@ module Spree
     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 :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
     preference :binary_inventory_cache, :boolean, default: false # only invalidate product cache when a stock item changes whether it is in_stock
     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
@@ -46,6 +47,8 @@ module Spree
     preference :display_currency, :boolean, default: false
     preference :default_country_id, :integer
     preference :dismissed_spree_alerts, :string, default: ''
+    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
     preference :hide_cents, :boolean, default: false
     preference :last_check_for_spree_alerts, :string, default: nil
     preference :layout, :string, default: 'spree/layouts/spree_application'
@@ -55,8 +58,11 @@ module Spree
     preference :properties_per_page, :integer, default: 15
     preference :products_per_page, :integer, default: 12
     preference :promotions_per_page, :integer, default: 15
+    preference :customer_returns_per_page, :integer, default: 15
     preference :redirect_https_to_http, :boolean, :default => false
     preference :require_master_price, :boolean, default: true
+    preference :restock_inventory, :boolean, default: true # Determines if a return item is restocked automatically once it has been received
+    preference :return_eligibility_number_of_days, :integer, default: 365
     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
@@ -91,9 +97,7 @@ module Spree
       # support all the old preference methods with a warning
       define_method "preferred_#{old_preference_name}" do
         ActiveSupport::Deprecation.warn("#{old_preference_name} is no longer supported on Spree::Config, please access it through #{store_method} on Spree::Store")
-        if ActiveRecord::Base.connection.table_exists?("spree_stores") # guards against 2.2 upgraders unable to rake db migration
-          Store.default.send(store_method)
-        end
+        Store.default.send(store_method)
       end
     end
   end

data/app/models/spree/asset.rb

@@ -1,6 +1,6 @@
 module Spree
   class Asset < Spree::Base
     belongs_to :viewable, polymorphic: true, touch: true
-    acts_as_list scope: [:viewable_id, :viewable_type]
+    acts_as_list scope: :viewable
   end
 end

data/app/models/spree/base.rb

@@ -1,9 +1,6 @@
 class Spree::Base < ActiveRecord::Base
   include Spree::Preferences::Preferable
   serialize :preferences, Hash
-
-  include Spree::RansackableAttributes
-
   after_initialize do
     self.preferences = default_preferences.merge(preferences) if has_attribute?(:preferences)
   end

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

@@ -10,11 +10,7 @@ module Spree
     end
 
     def compute(object=nil)
-      if object && preferred_currency.upcase == object.currency.upcase
-        preferred_amount
-      else
-        0
-      end
+      self.preferred_amount
     end
   end
 end