spree_core 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 729f9d4f394bb9bbd17cf7dbb7142ae574a9183e
-  data.tar.gz: ae2d1dcd731873c1ae6523bf46a1eb6a63db882e
+  metadata.gz: b4c8f9444abee12730e46a75f58276b4a89a54ce
+  data.tar.gz: 02d28150421a8deb02c47a16a514ceea6e6775ce
 SHA512:
-  metadata.gz: d3527af7dec8d2acdf7736713929387e3c099fa6776227640bd9089d2a5814da0c0f41eb54a822e5b80662f9f41126aeea5f155b82c2bfbe8d3b6ba331737b2a
-  data.tar.gz: 238f664949e01954bf25eb9cf8cb14f1a5236b615100c8961d0ee445d9e712022e1527e19ce3ce27c1082751128d2b9f99cf2d6ee8108b5b6452108fedeab6d3
+  metadata.gz: 94c500d3cba6d3c9388d64f5304dd43391ecd9fc8aabf0c694cec4f3678f7e808039e7dd082aa932623ddfbf200c1e3ca525e34861fc82a2302650f09c0db57e
+  data.tar.gz: 81aa93fc583a3eefaeea0804812ad174ecd359b4a1445f030a1ab40e54fb1290c8c9c570099b2e5ad5f8e12d46a0c91fda2a0682a07735a1883051a5c5da0276

data/app/helpers/spree/taxons_helper.rb

@@ -4,12 +4,12 @@ module Spree
     # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max=4)
-      products = taxon.active_products.limit(max)
+      products = taxon.active_products.limit(max).uniq
       if (products.size < max)
+        products_arel = Spree::Product.arel_table
         taxon.descendants.each do |taxon|
           to_get = max - products.length
-          products += taxon.active_products.limit(to_get)
-          products = products.uniq
+          products += taxon.active_products.where(products_arel[:id].not_in(products.map(&:id))).limit(to_get).uniq
           break if products.size >= max
         end
       end

data/app/models/spree/order.rb

@@ -508,7 +508,7 @@ module Spree
     # to delivery again so that proper updated shipments are created.
     # e.g. customer goes back from payment step and changes order items
     def ensure_updated_shipments
-      if shipments.any?
+      if shipments.any? && !self.completed?
         self.shipments.destroy_all
         restart_checkout_flow
       end

data/app/models/spree/payment.rb

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

data/app/models/spree/product.rb

@@ -131,8 +131,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/promotion.rb

@@ -83,7 +83,7 @@ module Spree
 
     def adjusted_credits_count(order)
       return credits_count if order.nil?
-      credits_count - (order.promotion_credit_exists?(self) ? 1 : 0)
+      credits_count - (exists_on_order?(order) ? 1 : 0)
     end
 
     def credits
@@ -97,5 +97,9 @@ module Spree
     def code=(coupon_code)
       write_attribute(:code, (coupon_code.downcase.strip rescue nil))
     end
+    
+    def exists_on_order?(order)
+      actions.any? { |a| a.credit_exists_on_order?(order) }
+    end
   end
 end

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -17,7 +17,7 @@ module Spree
         # through options hash
         def perform(options = {})
           order = options[:order]
-          return if order.promotion_credit_exists?(self)
+          return if credit_exists_on_order?(order)
 
           self.create_adjustment("#{Spree.t(:promotion)} (#{promotion.name})", order, order)
         end

data/app/models/spree/promotion_action.rb

@@ -13,5 +13,9 @@ module Spree
     def perform(options = {})
       raise 'perform should be implemented in a sub-class of PromotionAction'
     end
+
+    def credit_exists_on_order?(order)
+      !!order.promotion_credit_exists?(self)
+    end
   end
 end

data/app/models/spree/shipping_method.rb

@@ -1,14 +1,15 @@
 module Spree
   class ShippingMethod < ActiveRecord::Base
+    acts_as_paranoid
     include Spree::Core::CalculatedAdjustments
     DISPLAY = [:both, :front_end, :back_end]
 
     default_scope -> { where(deleted_at: nil) }
 
-    has_many :shipments
     has_many :shipping_method_categories, :dependent => :destroy
     has_many :shipping_categories, through: :shipping_method_categories
     has_many :shipping_rates, inverse_of: :shipping_method
+    has_many :shipments, :through => :shipping_rates
 
     has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
                                     :class_name => 'Spree::Zone',

data/app/models/spree/shipping_rate.rb

@@ -3,11 +3,6 @@ module Spree
     belongs_to :shipment, class_name: 'Spree::Shipment'
     belongs_to :shipping_method, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
 
-    scope :with_shipping_method,
-      -> { includes(:shipping_method).
-           references(:shipping_method).
-           order("cost ASC") }
-
     delegate :order, :currency, to: :shipment
     delegate :name, to: :shipping_method
 

data/config/locales/en.yml

@@ -182,6 +182,9 @@ en:
       spree/state:
         one: State
         other: States
+      spree/stock_movement:
+        one: Stock Movement
+        other: Stock Movements
       spree/stock_location:
         one: Stock Location
         other: Stock Locations

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,12 +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|
-        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
+    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/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.1.5"
+    "2.1.6"
   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.1.5
+  version: 2.1.6
 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: 4.0.0
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -663,7 +663,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.