spree_core 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8221f56f22472a62ce9ca4606e761fd718fcc448
-  data.tar.gz: 2846b0e62b638dd5ae2071b3cf873dce9d7bd7a5
+  metadata.gz: f5b6037980373f52370687e88e0ee18fed5d9d8f
+  data.tar.gz: 7a422916efeb60a2d5260f65c96c8183aad094fa
 SHA512:
-  metadata.gz: d39dfb9985e2425eab9de5697248c3cf4d2640dca0b4a3d3d3bfeddfb6b25c27f265e78e397588a6a4ee1f9bbc8713520acf67fae100faa7dd2a3fb3b6a5e4ed
-  data.tar.gz: cb69f470e36ebc6b0cb24e1f047763b14e7574fd4a25ac462d7705e82b15e3724e361b84f813018b09ff01163747a7fc1f07d3b6dcb8b20106e9f6ebbc0e8377
+  metadata.gz: 54e078aeffabf703f9e6dd38cd6949169378ecff49aee0694c23989e028b7ef4dccc9acf0ba13bfbf7626febabe814e7c76c0b8369f333252aabff811aeee559
+  data.tar.gz: a3f479ad64b7055f9b7612d85a71af7c5467e4bc08954bbf599d3189c05f3ca5164b5f3e4f11ac1809a0dd717adf6da2f2ed0ce8e74fefdb274680b5bf2a4d7f

data/app/models/spree/order_updater.rb

@@ -101,13 +101,15 @@ module Spree
     # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
     def update_payment_state
 
-      #line_item are empty when user empties cart
+      # line_item are empty when user empties cart
       if line_items.empty? || round_money(order.payment_total) < round_money(order.total)
         if payments.present?
           if payments.last.state == 'failed'
             order.payment_state = 'failed'
           elsif payments.last.state == 'completed'
             order.payment_state = 'credit_owed'
+          else
+            order.payment_state = 'balance_due'
           end
         else
           order.payment_state = 'balance_due'

data/app/models/spree/payment.rb

@@ -94,7 +94,7 @@ module Spree
     end
 
     def credit_allowed
-      amount - offsets_total
+      amount - offsets_total.abs
     end
 
     def can_credit?

data/app/models/spree/product.rb

@@ -159,8 +159,11 @@ module Spree
       !!deleted_at
     end
 
+    # determine if product is available.
+    # deleted products and products with nil or future available_on date
+    # are not available
     def available?
-      !(available_on.nil? || available_on.future?)
+      !(available_on.nil? || available_on.future?) && !deleted?
     end
 
     # split variants list into hash which shows mapping of opt value onto matching variants

data/app/models/spree/shipping_method.rb

@@ -5,10 +5,10 @@ module Spree
 
     default_scope where(deleted_at: nil)
 
-    has_many :shipments
     has_many :shipping_method_categories
     has_many :shipping_categories, through: :shipping_method_categories
     has_many :shipping_rates
+    has_many :shipments, :through => :shipping_rates
 
     has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
                                     :class_name => 'Spree::Zone',

data/db/migrate/20130213191427_create_default_stock.rb

@@ -5,11 +5,11 @@ class CreateDefaultStock < ActiveRecord::Migration
     location = Spree::StockLocation.new(name: 'default')
     location.save(validate: false)
 
-    Spree::Variant.all.each do |variant|
+    Spree::Variant.find_each do |variant|
       stock_item = Spree::StockItem.unscoped.build(stock_location: location, variant: variant)
       stock_item.send(:count_on_hand=, variant.count_on_hand)
       # Avoid running default_scope defined by acts_as_paranoid, related to #3805,
-      # validations would run a query with a delete_at column tha might not be present yet
+      # validations would run a query with a delete_at column that might not be present yet
       stock_item.save! validate: false
     end
 
@@ -19,7 +19,7 @@ class CreateDefaultStock < ActiveRecord::Migration
   def down
     add_column :spree_variants, :count_on_hand, :integer
 
-    Spree::StockItem.all.each do |stock_item|
+    Spree::StockItem.find_each do |stock_item|
       stock_item.variant.update_column :count_on_hand, stock_item.count_on_hand
     end
 

data/db/migrate/20130417120035_update_adjustment_states.rb

@@ -1,10 +1,10 @@
 class UpdateAdjustmentStates < ActiveRecord::Migration
   def up
-    Spree::Order.complete.each do |order|
+    Spree::Order.complete.find_each do |order|
       order.adjustments.update_all(:state => 'closed')
     end
 
-    Spree::Shipment.shipped.each do |shipment|
+    Spree::Shipment.shipped.includes(:adjustment).find_each do |shipment|
       shipment.adjustment.update_column(:state, 'finalized') if shipment.adjustment
     end
 

data/db/migrate/20130417123427_add_shipping_rates_to_shipments.rb

@@ -1,6 +1,6 @@
 class AddShippingRatesToShipments < ActiveRecord::Migration
   def up
-    Spree::Shipment.all.each do |shipment|
+    Spree::Shipment.find_each do |shipment|
       shipment.shipping_rates.create(:shipping_method_id => shipment.shipping_method_id,
                                      :cost => shipment.cost,
                                      :selected => true)

data/db/migrate/20130509115210_add_number_to_stock_transfer.rb

@@ -6,7 +6,7 @@ class AddNumberToStockTransfer < ActiveRecord::Migration
     rename_column :spree_stock_transfers, :reference_number, :reference
     add_column :spree_stock_transfers, :number, :string
 
-    Spree::StockTransfer.all.each do |transfer|
+    Spree::StockTransfer.find_each do |transfer|
       transfer.send(:generate_stock_transfer_number)
       transfer.save!
     end

data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb

@@ -1,9 +1,10 @@
 class MigrateTaxCategoriesToLineItems < ActiveRecord::Migration
   def change
-  	Spree::LineItem.includes(:variant => { :product => :tax_category }).find_in_batches do |line_items|
-  	  line_items.each do |line_item|
-        line_item.update_column(:tax_category_id, line_item.product.tax_category_id)
-      end
+    Spree::LineItem.find_each do |line_item|
+      next if line_item.variant.nil?
+      next if line_item.variant.product.nil?
+      next if line_item.product.nil?
+      line_item.update_column(:tax_category_id, line_item.product.tax_category_id)
     end
   end
 end

data/lib/spree/core/controller_helpers/order.rb

@@ -74,7 +74,7 @@ module Spree
         end
 
         def ip_address
-          request.env['HTTP_X_REAL_IP'] || request.env['REMOTE_ADDR']
+          request.remote_ip
         end
       end
     end

data/lib/spree/core/version.rb

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

data/lib/spree/testing_support/factories/shipping_method_factory.rb

@@ -4,7 +4,9 @@ FactoryGirl.define do
     name 'UPS Ground'
 
     before(:create) do |shipping_method, evaluator|
-      shipping_method.shipping_categories << (Spree::ShippingCategory.first || create(:shipping_category))
+      if shipping_method.shipping_categories.empty?
+        shipping_method.shipping_categories << (Spree::ShippingCategory.first || create(:shipping_category))
+      end
     end
 
     factory :shipping_method, class: Spree::ShippingMethod do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 3.2.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 3.2.17
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -649,7 +649,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.