spree_core 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5b6037980373f52370687e88e0ee18fed5d9d8f
-  data.tar.gz: 7a422916efeb60a2d5260f65c96c8183aad094fa
+  metadata.gz: ce81644f3167d18676644b782d34b38282cc43a4
+  data.tar.gz: 97ee622222799fab84efe8e61782361e569cf88e
 SHA512:
-  metadata.gz: 54e078aeffabf703f9e6dd38cd6949169378ecff49aee0694c23989e028b7ef4dccc9acf0ba13bfbf7626febabe814e7c76c0b8369f333252aabff811aeee559
-  data.tar.gz: a3f479ad64b7055f9b7612d85a71af7c5467e4bc08954bbf599d3189c05f3ca5164b5f3e4f11ac1809a0dd717adf6da2f2ed0ce8e74fefdb274680b5bf2a4d7f
+  metadata.gz: 45a8a9e3e94291dae3b17df911b1253303765f11ee78758d1daa66db2b49201735942db84817782f50af9df92ed38580dd427b9b7bbd03b4af208dab8aab4d2d
+  data.tar.gz: 1cf648e2e2680bb4c055913ed9a856844abde7e59b635f27adadca4b2b4e7f1e110582fbe6e3bacf5a69297d8011b531f8ed83c7b1b40a50e0f6be1f376709fa

data/app/models/spree/line_item.rb

@@ -75,7 +75,7 @@ module Spree
     end
 
     def sufficient_stock?
-      Stock::Quantifier.new(variant_id).can_supply? quantity
+      Stock::Quantifier.new(variant).can_supply? quantity
     end
 
     def insufficient_stock?

data/app/models/spree/order.rb

@@ -90,8 +90,12 @@ module Spree
       where(number: number)
     end
 
+    scope :created_between, ->(start_date, end_date) { where(created_at: start_date..end_date) }
+    scope :completed_between, ->(start_date, end_date) { where(completed_at: start_date..end_date) }
+
     def self.between(start_date, end_date)
-      where(created_at: start_date..end_date)
+      ActiveSupport::Deprecation.warn("Order#between will be deprecated in Spree 2.3, please use either Order#created_between or Order#completed_between instead.")
+      self.created_between(start_date, end_date)
     end
 
     def self.by_customer(customer)
@@ -458,7 +462,7 @@ module Spree
     end
 
     def insufficient_stock_lines
-     @insufficient_stock_lines ||= line_items.select(&:insufficient_stock?)
+     line_items.select(&:insufficient_stock?)
     end
 
     def merge!(order, user = nil)
@@ -598,7 +602,7 @@ module Spree
 
       def after_cancel
         shipments.each { |shipment| shipment.cancel! }
-        payments.completed.each { |payment| payment.credit! }
+        payments.completed.each { |payment| payment.cancel! }
 
         send_cancel_email
         self.update_column(:payment_state, 'credit_owed') unless shipped?

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

@@ -106,6 +106,14 @@ module Spree
         end
       end
 
+      def cancel!
+        if payment_method.respond_to?(:cancel)
+          payment_method.cancel(response_code)
+        else
+          credit!
+        end
+      end
+
       def partial_credit(amount)
         return if amount > credit_allowed
         started_processing!

data/app/models/spree/stock/availability_validator.rb

@@ -10,7 +10,7 @@ module Spree
           quantity = line_item.quantity
         end
 
-        quantifier = Stock::Quantifier.new(line_item.variant_id)
+        quantifier = Stock::Quantifier.new(line_item.variant)
 
         unless quantifier.can_supply? quantity
           variant = line_item.variant

data/app/models/spree/stock/quantifier.rb

@@ -4,7 +4,7 @@ module Spree
       attr_reader :stock_items
 
       def initialize(variant)
-        @variant = resolve_variant_id(variant)
+        @variant = variant
         @stock_items = Spree::StockItem.joins(:stock_location).where(:variant_id => @variant, Spree::StockLocation.table_name =>{ :active => true})
       end
 
@@ -24,14 +24,6 @@ module Spree
         total_on_hand >= required || backorderable?
       end
 
-      private
-
-      # return variant when passed either variant object or variant id
-      def resolve_variant_id(variant)
-        variant = Spree::Variant.find_by_id(variant) unless variant.respond_to?(:should_track_inventory?)
-        variant
-      end
-
     end
   end
 end

data/app/models/spree/stock_item.rb

@@ -46,6 +46,10 @@ module Spree
       self.in_stock? || self.backorderable?
     end
 
+    def variant
+      Spree::Variant.unscoped { super }
+    end
+
     private
       def count_on_hand=(value)
         write_attribute(:count_on_hand, value)

data/app/models/spree/tax_rate.rb

@@ -26,9 +26,10 @@ module Spree
 
     # Gets the array of TaxRates appropriate for the specified order
     def self.match(order)
-      return [] unless order.tax_zone
-      all.select do |rate|
-        rate.zone == order.tax_zone || rate.zone.contains?(order.tax_zone) || rate.zone.default_tax
+      order_zone = order.tax_zone
+      return [] unless order_zone
+      includes(zone: { zone_members: :zoneable }).all.select do |rate|
+        rate.zone == order_zone || rate.zone.contains?(order_zone) || rate.zone.default_tax
       end
     end
 

data/app/models/spree/variant.rb

@@ -78,7 +78,7 @@ module Spree
     # allows extensions to override deleted? if they want to provide
     # their own definition.
     def deleted?
-      deleted_at
+      !!deleted_at
     end
 
     def options=(options = {})

data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb

@@ -3,7 +3,7 @@ class MigrateOldShippingCalculators < ActiveRecord::Migration
     Spree::ShippingMethod.all.each do |shipping_method|
       old_calculator = shipping_method.calculator
       next if old_calculator.class < Spree::ShippingCalculator # We don't want to mess with new shipping calculators
-      new_calculator = eval("Spree::Calculator::Shipping::#{old_calculator.class.name.demodulize}").new
+      new_calculator = eval(old_calculator.class.name.sub("::Calculator::", "::Calculator::Shipping::")).new
       new_calculator.preferences.keys.each do |pref|
         # Preferences can't be read/set by name, you have to prefix preferred_
         pref_method = "preferred_#{pref}"

data/db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb

@@ -0,0 +1,5 @@
+class AddUserIdCreatedByIdIndexToOrder < ActiveRecord::Migration
+  def change
+    add_index :spree_orders, [:user_id, :created_by_id]
+  end
+end

data/lib/spree/core/product_duplicator.rb

@@ -49,7 +49,7 @@ module Spree
       new_variant = variant.dup
       new_variant.sku = "COPY OF #{new_variant.sku}"
       new_variant.deleted_at = nil
-      new_variant.option_values = variant.option_values.map { |option_value| option_value.dup}
+      new_variant.option_values = variant.option_values.map { |option_value| option_value}
       new_variant
     end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.0.10"
+    "2.0.11"
   end
 end

data/lib/spree/core.rb

@@ -5,6 +5,7 @@ require 'awesome_nested_set'
 require 'cancan'
 require 'kaminari'
 require 'mail'
+require 'monetize'
 require 'paperclip'
 require 'paranoia'
 require 'ransack'

data/lib/spree/money.rb

@@ -30,7 +30,7 @@ module Spree
 
       # Check the first character for a currency symbol, alternatively get it
       # from the stated currency string
-      c = if ::Money.assume_from_symbol && i =~ /^(\$|€|£)/
+      c = if ::Monetize.assume_from_symbol && i =~ /^(\$|€|£)/
         case i
         when /^\$/ then "USD"
         when /^€/ then "EUR"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: monetize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -505,6 +519,7 @@ files:
 - db/migrate/20131113035136_add_channel_to_spree_orders.rb
 - db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb
 - db/migrate/20140205181631_default_variant_weight_to_zero.rb
+- db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -649,7 +664,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.