spree_core 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b3832f1651011ef4d49aebec92add9c6fc8744d
-  data.tar.gz: 0f9032e0a7134479874ddda954c590cee31486a8
+  metadata.gz: 3c0e00c7f8d48f1f8f6a553128e0f324baf1b80b
+  data.tar.gz: 13ad6252099846dd0af9cb82e417d804199ecfa5
 SHA512:
-  metadata.gz: df88e26ab461edc8b6a6373a708386c359a051aec2e6a1715c26ef6b7318d90fec9be379abb911d2eb0171377076186210565fbd2408e8c6eb112a0eefb5c3f1
-  data.tar.gz: d8e1e60bb608201d98d4fcf89344716d4bbdd17347135b3ccad3e8b524d44d22ac515cd3d23a78c1dc5f55262083c63aec0ead934f0202d737ebcf7c845fa651
+  metadata.gz: c87d7b7176aa8f6447eba1897834beb1889741ab3b2a8fe6d0090d25559a96d2f104447a89ced51264099b4ed43e8cc8a9504e8c986bcb868bec309a73d5c71b
+  data.tar.gz: 884eef22bc8e8e9b6caf813c24b453582089d2966aab9cc924c62fcda7c8fefe0608513b464ed761c157f46047ec3b208b44c1d6e4fa3570e2ffdccdfe204ac9

data/app/helpers/spree/base_helper.rb

@@ -117,7 +117,7 @@ module Spree
       countries.collect do |country|
         country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
         country
-      end.sort { |a, b| a.name <=> b.name }
+      end.sort { |a, b| a.name.parameterize <=> b.name.parameterize }
     end
 
     def seo_url(taxon)

data/app/models/spree/adjustment.rb

@@ -82,23 +82,17 @@ module Spree
     # delegate updating of amount to their Originator when present, but only if
     # +locked+ is false. Adjustments that are +locked+ will never change their amount.
     #
-    # Adjustments delegate updating of amount to their Originator when present,
-    # but only if when they're in "open" state, closed or finalized adjustments
-    # 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 
-    # 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
-    # adjustment calculations would not performed on proper values
-    def update!(calculable = nil)
+    # 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!(calculable=nil)
       return if immutable?
       # Fix for #3381
       # If we attempt to call 'source' before the reload, then source is currently
       # the order object. After calling a reload, the source is the Shipment.
       reload
-      originator.update_adjustment(self, calculable || source) if originator.present?
+      calculable = source unless calculable == source
+      originator.update_adjustment(self, calculable) if originator.present?
       set_eligibility
     end
 

data/app/models/spree/app_configuration.rb

@@ -42,6 +42,7 @@ module Spree
     preference :currency, :string, default: "USD"
     preference :currency_decimal_mark, :string, default: "."
     preference :currency_symbol_position, :string, default: "before"
+    preference :currency_sign_before_symbol, :boolean, default: true
     preference :currency_thousands_separator, :string, default: ","
     preference :display_currency, :boolean, default: false
     preference :default_country_id, :integer

data/app/models/spree/credit_card.rb

@@ -7,7 +7,7 @@ module Spree
 
     attr_accessor :number, :verification_value
 
-    validates :month, :year, numericality: { only_integer: true }
+    validates :month, :year, numericality: { only_integer: true }, unless: :has_payment_profile?
     validates :number, presence: true, unless: :has_payment_profile?, on: :create
     validates :verification_value, presence: true, unless: :has_payment_profile?, on: :create
     validate :expiry_not_in_the_past
@@ -94,7 +94,7 @@ module Spree
     end
 
     def has_payment_profile?
-      gateway_customer_profile_id.present?
+      gateway_customer_profile_id.present? || gateway_payment_profile_id.present?
     end
 
     def spree_cc_type

data/app/models/spree/gateway/bogus_simple.rb

@@ -6,6 +6,14 @@ module Spree
       false
     end
 
+    def capture(money, response_code, options = {})
+      if response_code == '12345'
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '67890')
+      else
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', :error => 'Bogus Gateway: Forced failure', :test => true)
+      end
+    end
+
     def authorize(money, credit_card, options = {})
       if VALID_CCS.include? credit_card.number
         ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })

data/app/models/spree/option_type.rb

@@ -2,6 +2,7 @@ module Spree
   class OptionType < ActiveRecord::Base
     has_many :option_values, order: :position, dependent: :destroy
     has_many :product_option_types, dependent: :destroy
+    has_many :products, through: :product_option_types
     has_and_belongs_to_many :prototypes, join_table: 'spree_option_types_prototypes'
 
     attr_accessible :name, :presentation, :option_values_attributes

data/app/models/spree/order_inventory.rb

@@ -65,10 +65,14 @@ module Spree
     end
 
     def add_to_shipment(shipment, variant, quantity)
-      on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
+      if Config.track_inventory_levels
+        on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
 
-      on_hand.times { shipment.set_up_inventory('on_hand', variant, order) }
-      back_order.times { shipment.set_up_inventory('backordered', variant, order) }
+        on_hand.times { shipment.set_up_inventory('on_hand', variant, order) }
+        back_order.times { shipment.set_up_inventory('backordered', variant, order) }
+      else
+        quantity.times { shipment.set_up_inventory('on_hand', variant, order) }
+      end
 
       # adding to this shipment, and removing from stock_location
       if order.completed?

data/app/models/spree/order_updater.rb

@@ -25,8 +25,7 @@ module Spree
         update_shipment_state
       end
       
-      update_promotion_adjustments
-      update_shipping_adjustments
+      update_adjustments
       # update totals a second time in case updated adjustments have an effect on the total
       update_totals
 
@@ -125,17 +124,11 @@ module Spree
     #
     # Adjustments will check if they are still eligible. Ineligible adjustments
     # are preserved but not counted towards adjustment_total.
-    def update_promotion_adjustments
-      order.adjustments.reload.promotion.each { |adjustment| adjustment.update!(order) }
+    def update_adjustments
+      order.adjustments.reload.each { |adjustment| adjustment.update!(order) }
       choose_best_promotion_adjustment
     end
 
-    # Shipping adjustments don't receive order on update! because they calculated
-    # over a shipping / package object rather than an order object
-    def update_shipping_adjustments
-      order.adjustments.reload.shipping.each { |adjustment| adjustment.update! }
-    end
-
     private
 
       # Picks one (and only one) promotion to be eligible for this order

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

@@ -13,7 +13,7 @@ module Spree
                 end
               else
                 invalidate!
-                raise Core::GatewayError.new(I18n.t(:payment_method_not_supported))
+                raise Core::GatewayError.new(Spree.t(:payment_method_not_supported))
               end
             end
           else
@@ -83,11 +83,12 @@ module Spree
 
           credit_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
           credit_amount = credit_amount.to_f
+          credit_cents = Spree::Money.new(credit_amount, currency: currency).money.cents
 
           if payment_method.payment_profiles_supported?
-            response = payment_method.credit((credit_amount * 100).round, source, response_code, gateway_options)
+            response = payment_method.credit(credit_cents, source, response_code, gateway_options)
           else
-            response = payment_method.credit((credit_amount * 100).round, response_code, gateway_options)
+            response = payment_method.credit(credit_cents, response_code, gateway_options)
           end
 
           record_response(response)
@@ -139,7 +140,7 @@ module Spree
         protect_from_connection_error do
           check_environment
 
-          response = payment_method.send(action, (amount * 100).round,
+          response = payment_method.send(action, money.money.cents,
                                          source,
                                          gateway_options)
           handle_response(response, success_state, :failure)

data/app/models/spree/product.rb

@@ -202,8 +202,13 @@ module Spree
 
     def set_property(property_name, property_value)
       ActiveRecord::Base.transaction do
-        property = Property.where(name: property_name).first_or_create!(presentation: property_name)
-        product_property = ProductProperty.where(product_id: id, property_id: property.id).first_or_initialize
+        # Works around spree_i18n #301
+        property = if Property.exists?(name: property_name)
+          Property.where(name: property_name).first
+        else
+          Property.create(name: property_name, presentation: property_name)
+        end
+        product_property = ProductProperty.where(product_id: self.id, property_id: property.id).first_or_initialize
         product_property.value = property_value
         product_property.save!
       end

data/app/models/spree/promotion/rules/user.rb

@@ -9,7 +9,7 @@ module Spree
           has_and_belongs_to_many :users, class_name: Spree.user_class.to_s, join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id'
         else
           belongs_to :user
-          has_and_belongs_to_many :users, join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id'
+          has_and_belongs_to_many :users, join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id', :class_name => Spree.user_class
         end
 
         def eligible?(order, options = {})

data/app/models/spree/shipment.rb

@@ -66,9 +66,7 @@ module Spree
     end
 
     def to_param
-      number if number
-      generate_shipment_number unless number
-      number.to_s.to_url.upcase
+      number
     end
 
     def backordered?
@@ -104,6 +102,7 @@ module Spree
 
     def refresh_rates
       return shipping_rates if shipped?
+      return [] unless can_get_rates?
 
       # StockEstimator.new assigment below will replace the current shipping_method
       original_shipping_method_id = shipping_method.try(:id)
@@ -294,5 +293,9 @@ module Spree
       def update_order
         order.update!
       end
+
+      def can_get_rates?
+        order.ship_address && order.ship_address.valid?
+      end
   end
 end

data/app/models/spree/taxon.rb

@@ -8,8 +8,8 @@ module Spree
 
     before_create :set_permalink
 
-    attr_accessible :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id,
-                    :meta_description, :meta_keywords, :meta_title
+    attr_accessible :name, :parent_id, :icon, :description, :permalink, :taxonomy_id,
+                    :meta_description, :meta_keywords, :meta_title, :child_index
 
     validates :name, presence: true
 
@@ -72,5 +72,14 @@ module Spree
       ancestor_chain + "#{name}"
     end
 
+    # awesome_nested_set sorts by :lft and :rgt. This call re-inserts the child
+    # node so that its resulting position matches the observable 0-indexed position.
+    # ** Note ** no :position column needed - a_n_s doesn't handle the reordering if
+    #  you bring your own :order_column.
+    #
+    #  See #3390 for background.
+    def child_index=(idx)
+      move_to_child_with_index(parent, idx.to_i)
+    end
   end
 end

data/app/views/spree/payments/_payment.html.erb

@@ -4,7 +4,9 @@
     <% unless (cc_type = source.cc_type).blank? %>
       <%= image_tag "credit_cards/icons/#{cc_type}.png" %>
     <% end %>
-    <%= Spree.t(:ending_in) %> <%= source.last_digits %>
+    <% if source.last_digits %>
+      <%= Spree.t(:ending_in) %> <%= source.last_digits %>
+    <% end %>
   </span>
   <br />
   <span class="full-name">

data/config/locales/en.yml

@@ -790,6 +790,7 @@ en:
     payment_method: Payment Method
     payment_methods: Payment Methods
     payment_processing_failed: Payment could not be processed, please check the details you entered
+    payment_method_not_supported: That payment method is unsupported. Please choose another one.
     payment_processor_choose_banner_text: If you need help choosing a payment processor, please visit
     payment_processor_choose_link: our payments page
     payment_state: Payment State

data/db/migrate/20131113035136_add_channel_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddChannelToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :channel, :string, default: "spree"
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.0.6"
+    "2.0.7"
   end
 end

data/lib/spree/core.rb

@@ -16,9 +16,9 @@ module Spree
 
   def self.user_class
     if @@user_class.is_a?(Class)
-      raise "Spree.user_class MUST be a String object, not a Class object."
-    elsif @@user_class.is_a?(String)
-      @@user_class.constantize
+      raise "Spree.user_class MUST be a String or Symbol object, not a Class object."
+    elsif @@user_class.is_a?(String) || @@user_class.is_a?(Symbol)
+      @@user_class.to_s.constantize
     end
   end
 
@@ -54,3 +54,30 @@ require 'spree/core/product_duplicator'
 ActiveRecord::Base.class_eval do
   include CollectiveIdea::Acts::NestedSet
 end
+
+# Monkey patch to give us miliseconds precision in timestamps
+module ActiveSupport
+  class TimeWithZone
+    # Coerces time to a string for JSON encoding. The default format is ISO 8601. You can get
+    # %Y/%m/%d %H:%M:%S +offset style by setting <tt>ActiveSupport::JSON::Encoding.use_standard_json_time_format</tt>
+    # to false.
+    #
+    # ==== Examples
+    #
+    #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
+    #   Time.utc(2005,2,1,15,15,10).in_time_zone.to_json
+    #   # => "2005-02-01T15:15:10.001Z"
+    #
+    #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+    #   Time.utc(2005,2,1,15,15,10).in_time_zone.to_json
+    #   # => "2005/02/01 15:15:10 +0000"
+    #
+    def as_json(options = nil)
+      if ActiveSupport::JSON::Encoding.use_standard_json_time_format
+        xmlschema(3)
+      else
+        %(#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)})
+      end
+    end
+  end
+end

data/lib/spree/money.rb

@@ -14,6 +14,7 @@ module Spree
       @options[:no_cents] = Spree::Config[:hide_cents]
       @options[:decimal_mark] = Spree::Config[:currency_decimal_mark]
       @options[:thousands_separator] = Spree::Config[:currency_thousands_separator]
+      @options[:sign_before_symbol] = Spree::Config[:currency_sign_before_symbol]
       @options.merge!(options)
       # Must be a symbol because the Money gem doesn't do the conversion
       @options[:symbol_position] = @options[:symbol_position].to_sym

data/lib/spree/testing_support/capybara_ext.rb

@@ -13,11 +13,19 @@ module CapybaraExt
   end
 
   def within_row(num, &block)
-    within("table.index tbody tr:nth-child(#{num})", &block)
+    if example.metadata[:js]
+      within("table.index tbody tr:nth-child(#{num})", &block)
+    else
+      within(:xpath, all("table.index tbody tr")[num-1].path, &block)
+    end
   end
 
   def column_text(num)
-    find("td:nth-child(#{num})").text
+    if example.metadata[:js]
+      find("td:nth-child(#{num})").text
+    else
+      all("td")[num-1].text
+    end
   end
 
   def set_select2_field(field, value)
@@ -94,7 +102,7 @@ module CapybaraExt
 
   def wait_for_ajax
     counter = 0
-    while page.execute_script("return $.active").to_i > 0
+    while page.evaluate_script("$.active").to_i > 0
       counter += 1
       sleep(0.1)
       raise "AJAX request took longer than 5 seconds." if counter >= 50

data/lib/spree/testing_support/controller_requests.rb

@@ -4,9 +4,9 @@
 # Inside your spec_helper.rb, include this module inside the RSpec.configure
 # block by doing this:
 #
-#   require 'spree/core/testing_support/controller_requests'
+#   require 'spree/testing_support/controller_requests'
 #   RSpec.configure do |c|
-#     c.include Spree::Core::TestingSupport::ControllerRequests, :type => :controller
+#     c.include Spree::TestingSupport::ControllerRequests, :type => :controller
 #   end
 #
 # Then, in your controller tests, you can access spree routes like this:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.39.2
+        version: 1.42.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.39.2
+        version: 1.42.2
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.1.6
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: 1.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: 1.27.0
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.18
 - !ruby/object:Gem::Dependency
@@ -140,16 +140,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -168,14 +168,14 @@ dependencies:
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 5.1.1
 - !ruby/object:Gem::Dependency
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -619,6 +619,7 @@ files:
 - db/migrate/20130909115621_change_states_required_for_countries.rb
 - db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb
 - db/migrate/20131001013410_remove_unused_credit_card_fields.rb
+- db/migrate/20131113035136_add_channel_to_spree_orders.rb
 - db/seeds.rb
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_et.js