spree_core 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b6ba75da732715ef975c684a089a3586b67cec1
-  data.tar.gz: 4afbf2136510cb63bab7f1b60e2192c03a10a48c
+  metadata.gz: d4be9412583b406e2838b0edc12866be3d271b6a
+  data.tar.gz: e519d7bff34aaa8c73de122d6d27c4cfc7b2da78
 SHA512:
-  metadata.gz: 33a1fe7fdb7080cac31739ec3202a51d3d6e6ffb1da1bf80ea76688ac796b2a545326eba10f6773fcd1d80bbcc57a7abe0353fa610df2daeeab3209bad473f8d
-  data.tar.gz: 2a9c302304140f816e3f1236790b147de50d96b1816e91208a2808b7ad9818ac426d389d53a6b4b978f3d86b888728d2cf7125f46cce75486ce7d7d2c391de46
+  metadata.gz: 11462b98f62e9ef52fcdb7c8327285f0c024e7c9a72d6ee19eee45e62e66d60a0b1141fc85bf0ee1aa846be067a075b517824affbb97cacf47bb3fd1cb4642c1
+  data.tar.gz: 6aa0a801e656d7381dfeb0f75960ddae08de7036c358ae3978b3be5632181f702c5e75efb1cc74df17edc1c2492edc8f004c9589e1e480812e869ae965bbb278

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

@@ -30,6 +30,17 @@ module Spree
           end
         end
 
+        def actionable?(line_item)
+          case preferred_match_policy
+          when 'any', 'all'
+            product_ids.include? line_item.variant.product_id
+          when 'none'
+            product_ids.exclude? line_item.variant.product_id
+          else
+            raise "unexpected match policy: #{preferred_match_policy.inspect}"
+          end
+        end
+
         def product_ids_string
           product_ids.join(',')
         end

data/app/models/spree/stock_location.rb

@@ -16,7 +16,7 @@ module Spree
     def state_text
       state.try(:abbr) || state.try(:name) || state_name
     end
-    
+
     # Wrapper for creating a new stock item respecting the backorderable config
     def propagate_variant(variant)
       self.stock_items.create!(variant: variant, backorderable: self.backorderable_default)
@@ -29,12 +29,31 @@ module Spree
       self.stock_item(variant) || propagate_variant(variant)
     end
 
-    def stock_item(variant)
-      stock_items.where(variant_id: variant).order(:id).first
+    # Returns an instance of StockItem for the variant id.
+    #
+    # @param variant_id [String] The id of a variant.
+    #
+    # @return [StockItem] Corresponding StockItem for the StockLocation's variant.
+    def stock_item(variant_id)
+      stock_items.where(variant_id: variant_id).order(:id).first
     end
 
-    def stock_item_or_create(variant)
-      stock_item(variant) || stock_items.create(variant: variant)
+    # Attempts to look up StockItem for the variant, and creates one if not found.
+    # This method accepts an id or instance of the variant since it is used in
+    # multiple ways. Other methods in this model attempt to pass a variant,
+    # but controller actions can pass just the variant id as a parameter.
+    #
+    # @param variant_or_id [Variant|String] Variant instance or string id of a variant.
+    #
+    # @return [StockItem] Corresponding StockItem for the StockLocation's variant.
+    def stock_item_or_create(variant_or_id)
+      vid = if variant_or_id.is_a?(Variant)
+        variant_or_id.id
+      else
+        ActiveSupport::Deprecation.warn "Passing a Variant ID is deprecated, and will be removed in Spree 3. Please pass a variant instance instead.", caller
+        variant_or_id
+      end
+      stock_item(vid) || stock_items.create(variant_id: vid)
     end
 
     def count_on_hand(variant)

data/app/models/spree/taxon.rb

@@ -20,7 +20,7 @@ module Spree
       default_url: '/assets/default_taxon.png'
 
     validates_attachment :icon,
-      content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
+      content_type: { content_type: ["image/jpg", "image/jpeg", "image/png", "image/gif"] }
 
     # indicate which filters should be used for a taxon
     # this method should be customized to your own site

data/config/locales/en.yml

@@ -343,7 +343,7 @@ en:
     add_stock_management: Add Stock Management
     add_to_cart: Add To Cart
     add_variant: Add Variant
-    additional_item: Additional Item Cost
+    additional_item: Additional Item
     address1: Address
     address2: Address (contd.)
     adjustable: Adjustable
@@ -623,7 +623,7 @@ en:
     finalize: Finalize
     find_a_taxon: Find a Taxon
     finalized: Finalized
-    first_item: First Item Cost
+    first_item: First Item
     first_name: First Name
     first_name_begins_with: First Name Begins With
     flat_percent: Flat Percent

data/db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddGuestTokenIndexToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_index :spree_orders, :guest_token
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '2.3.5'
+    '2.3.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -621,6 +621,7 @@ files:
 - db/migrate/20141021194502_add_state_lock_version_to_order.rb
 - db/migrate/20141101231208_fix_adjustment_order_presence.rb
 - db/migrate/20141105213646_update_classifications_positions.rb
+- db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt