spree_core 2.2.1 → 2.2.2

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

@@ -28,6 +28,7 @@ module Spree
         def create_adjustment(adjustable, order)
           amount = self.compute_amount(adjustable)
           return if amount == 0
+          return if promotion.product_ids.present? and !promotion.product_ids.include?(adjustable.product.id)
           self.adjustments.create!(
             amount: amount,
             adjustable: adjustable,

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

@@ -7,7 +7,7 @@ module Spree
       class Product < PromotionRule
         has_and_belongs_to_many :products, class_name: '::Spree::Product', join_table: 'spree_products_promotion_rules', foreign_key: 'promotion_rule_id'
 
-        MATCH_POLICIES = %w(any all)
+        MATCH_POLICIES = %w(any all none)
         preference :match_policy, :string, default: MATCH_POLICIES.first
 
         # scope/association that is used to test eligibility
@@ -23,8 +23,10 @@ module Spree
           return true if eligible_products.empty?
           if preferred_match_policy == 'all'
             eligible_products.all? {|p| order.products.include?(p) }
-          else
+          elsif preferred_match_policy == 'any'
             order.products.any? {|p| eligible_products.include?(p) }
+          else
+            order.products.none? {|p| eligible_products.include?(p) }
           end
         end
 

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

@@ -2,8 +2,8 @@ module Spree
   class Promotion
     module Rules
       class User < PromotionRule
-        belongs_to :user, class_name: Spree.user_class
-        has_and_belongs_to_many :users, class_name: Spree.user_class, join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id'
+        belongs_to :user, class_name: "::#{Spree.user_class.to_s}"
+        has_and_belongs_to_many :users, class_name: "::#{Spree.user_class.to_s}", join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id'
 
         def applicable?(promotable)
           promotable.is_a?(Spree::Order)

data/app/models/spree/promotion_handler/coupon.rb

@@ -57,7 +57,12 @@ module Spree
       end
 
       def determine_promotion_application_result(result)
-        detector = lambda { |p| p.source.promotion.code.downcase == order.coupon_code.downcase }
+        detector = lambda { |p|
+          if p.source.promotion.code
+            p.source.promotion.code.downcase == order.coupon_code.downcase
+          end
+        }
+
         discount = order.line_item_adjustments.promotion.detect(&detector)
         discount ||= order.shipment_adjustments.promotion.detect(&detector)
         discount ||= order.adjustments.promotion.detect(&detector)

data/app/models/spree/shipment.rb

@@ -336,7 +336,6 @@ module Spree
         self.cost = 0 unless self.cost
       end
 
-
       def update_adjustments
         if cost_changed? && state != 'shipped'
           recalculate_adjustments

data/app/models/spree/shipping_rate.rb

@@ -19,17 +19,19 @@ module Spree
       price = display_base_price.to_s
       if tax_rate
         tax_amount = calculate_tax_amount
-        if tax_rate.included_in_price?
-          if tax_amount > 0
-            amount = "#{display_tax_amount(tax_amount)} #{tax_rate.name}"
-            price += " (incl. #{amount})"
+        if tax_amount != 0
+          if tax_rate.included_in_price?
+            if tax_amount > 0
+              amount = "#{display_tax_amount(tax_amount)} #{tax_rate.name}"
+              price += " (incl. #{amount})"
+            else
+              amount = "#{display_tax_amount(tax_amount*-1)} #{tax_rate.name}"
+              price += " (excl. #{amount})"
+            end
           else
-            amount = "#{display_tax_amount(tax_amount*-1)} #{tax_rate.name}"
-            price += " (excl. #{amount})"
+            amount = "#{display_tax_amount(tax_amount)} #{tax_rate.name}"
+            price += " (+ #{amount})"
           end
-        else
-          amount = "#{display_tax_amount(tax_amount)} #{tax_rate.name}"
-          price += " (+ #{amount})"
         end
       end
       price

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

@@ -47,6 +47,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

@@ -25,8 +25,9 @@ module Spree
 
     # Gets the array of TaxRates appropriate for the specified order
     def self.match(order)
-      return [] unless order.tax_zone
-      rates = all.select do |rate|
+      order_zone = order.tax_zone
+      return [] unless order_zone
+      rates = includes(zone: { zone_members: :zoneable }).load.select do |rate|
         # Why "potentially"?
         # Go see the documentation for that method.
         rate.potentially_applicable?(order)
@@ -51,7 +52,7 @@ module Spree
       end
     end
 
-    # Pre-tax amounts must be stored so that we can calculate 
+    # Pre-tax amounts must be stored so that we can calculate
     # correct rate amounts in the future. For example:
     # https://github.com/spree/spree/issues/4318#issuecomment-34723428
     def self.store_pre_tax_amount(item, rates)
@@ -95,7 +96,7 @@ module Spree
       rate || 0
     end
 
-    
+
     # Tax rates can *potentially* be applicable to an order.
     # We do not know if they are/aren't until we attempt to apply these rates to
     # the items contained within the Order itself.
@@ -103,14 +104,14 @@ module Spree
     # but then has a tax category that doesn't match against any of the line items
     # inside of the order, then that tax rate will not be applicable to anything.
     # For instance:
-    # 
+    #
     # Zones:
     #   - Spain (default tax zone)
     #   - France
     #
     # Tax rates: (note: amounts below do not actually reflect real VAT rates)
     #   21% inclusive - "Clothing" - Spain
-    #   18% inclusive - "Clothing" - France 
+    #   18% inclusive - "Clothing" - France
     #   10% inclusive - "Food" - Spain
     #   8% inclusive - "Food" - France
     #   5% inclusive - "Hotels" - Spain
@@ -119,14 +120,14 @@ module Spree
     # Order has:
     #   Line Item #1 - Tax Category: Clothing
     #   Line Item #2 - Tax Category: Food
-    # 
+    #
     # Tax rates that should be selected:
     #
     #  21% inclusive - "Clothing" - Spain
     #  10% inclusive - "Food" - Spain
     #
     # If the order's address changes to one in France, then the tax will be recalculated:
-    #  
+    #
     #  18% inclusive - "Clothing" - France
     #  8% inclusive - "Food" - France
     #

data/app/models/spree/taxon.rb

@@ -19,6 +19,9 @@ module Spree
       path: ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
       default_url: '/assets/default_taxon.png'
 
+    validates_attachment :icon,
+      content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
+
     include Spree::Core::ProductFilters  # for detailed defs of filters
 
     # indicate which filters should be used for a taxon

data/app/models/spree/variant.rb

@@ -79,15 +79,11 @@ module Spree
       values.to_sentence({ words_connector: ", ", two_words_connector: ", " })
     end
 
-    def gross_profit
-      cost_price.nil? ? 0 : (price - cost_price)
-    end
-
     # use deleted? rather than checking the attribute directly. this
     # allows extensions to override deleted? if they want to provide
     # their own definition.
     def deleted?
-      deleted_at
+      !!deleted_at
     end
 
     # Product may be created with deleted_at already set,

data/config/locales/en.yml

@@ -896,6 +896,7 @@ en:
       label: Order must contain %{select} of these products
       match_all: all
       match_any: at least one
+      match_none: none 
       product_source:
         group: From product group
         manual: Manually choose

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/generators/spree/dummy/dummy_generator.rb

@@ -122,7 +122,13 @@ end
     end
 
     def gemfile_path
-      '../../../../../Gemfile'
+      core_gems = ["spree/core", "spree/api", "spree/backend", "spree/frontend"]
+
+      if core_gems.include?(lib_name)
+        '../../../../../Gemfile'
+      else
+        '../../../../Gemfile'
+      end
     end
   end
 end
@@ -131,4 +137,3 @@ module Spree::DummyGeneratorHelper
   mattr_accessor :inject_extension_requirements
   self.inject_extension_requirements = false
 end
-

data/lib/spree/core.rb

@@ -5,11 +5,13 @@ require 'awesome_nested_set'
 require 'cancan'
 require 'kaminari'
 require 'mail'
+require 'monetize'
 require 'paperclip'
 require 'paranoia'
 require 'ransack'
 require 'state_machine'
 require 'friendly_id'
+require 'font-awesome-rails'
 
 module Spree
 

data/lib/spree/core/engine.rb

@@ -58,7 +58,7 @@ module Spree
         app.config.spree.calculators.promotion_actions_create_adjustments = [
           Spree::Calculator::FlatPercentItemTotal,
           Spree::Calculator::FlatRate,
-          Spree::Calculator::FlexiRate,
+          Spree::Calculator::FlexiRate
         ]
 
         app.config.spree.calculators.add_class('promotion_actions_create_item_adjustments')

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

@@ -18,12 +18,21 @@ module Spree
             create_adjustments_from_params(params.delete(:adjustments_attributes), order)
             create_payments_from_params(params.delete(:payments_attributes), order)
 
+
             if(completed_at = params.delete(:completed_at))
               order.completed_at = completed_at
               order.state = 'complete'
             end
 
+            user_id = params.delete(:user_id)
+            if user.has_spree_role? "admin"
+              order.user_id = user_id
+            end
+
             order.update_attributes!(params)
+            # Really ensure that the order totals are correct
+            order.update_totals
+            order.persist_totals
             order.reload
           rescue Exception => e
             order.destroy if order && order.persisted?
@@ -51,8 +60,10 @@ module Spree
               shipment.save!
 
               shipping_method = Spree::ShippingMethod.find_by_name!(s[:shipping_method])
-              shipment.shipping_rates.create!(:shipping_method => shipping_method,
-                                              :cost => s[:cost])
+              rate = shipment.shipping_rates.create!(:shipping_method => shipping_method,
+                                                     :cost => s[:cost])
+              shipment.selected_shipping_rate_id = rate.id
+
             rescue Exception => e
               raise "Order import shipments: #{e.message} #{s}"
             end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.2.1"
+    "2.2.2"
   end
 end

data/lib/spree/migrations.rb

@@ -24,7 +24,7 @@ module Spree
       if File.exists?("config/spree.yml") && File.directory?("db/migrate")
         engine_in_app = app_migrations.map do |file_name|
           name, engine = file_name.split(".", 2)
-          next unless engine == "#{engine_name}.rb"
+          next unless match_engine?(engine)
           name
         end.compact! || []
 
@@ -51,5 +51,14 @@ module Spree
           name.empty? ? next : name
         end.compact! || []
       end
+
+      def match_engine?(engine)
+        if engine_name == "spree"
+          # Avoid stores upgrading from 1.3 getting wrong warnings
+          ["spree.rb", "spree_promo.rb"].include? engine
+        else
+          engine == "#{engine_name}.rb"
+        end
+      end
   end
 end

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"

data/lib/spree/testing_support/capybara_ext.rb

@@ -4,7 +4,7 @@ module CapybaraExt
   end
 
   def click_icon(type)
-    find(".icon-#{type}").click
+    find(".fa-#{type}").click
   end
 
   def eventually_fill_in(field, options={})

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

@@ -6,7 +6,7 @@ FactoryGirl.define do
     address1 '10 Lovely Street'
     address2 'Northwest'
     city 'Herndon'
-    zipcode '20170'
+    zipcode '35005'
     phone '123-456-7890'
     alternative_phone '123-456-7899'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 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
@@ -178,6 +178,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
@@ -212,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.5
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +290,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: font-awesome-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: The bare bones necessary for Spree.
 email: sean@spreecommerce.com
 executables: []
@@ -561,6 +589,7 @@ files:
 - db/migrate/20140213184916_add_more_indexes.rb
 - db/migrate/20140219060952_add_considered_risky_to_orders.rb
 - db/migrate/20140307235515_add_user_id_to_spree_credit_cards.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
@@ -671,11 +700,6 @@ files:
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
-- vendor/assets/fonts/FontAwesome.otf
-- vendor/assets/fonts/fontawesome-webfont.eot
-- vendor/assets/fonts/fontawesome-webfont.svg
-- vendor/assets/fonts/fontawesome-webfont.ttf
-- vendor/assets/fonts/fontawesome-webfont.woff
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_et.js
@@ -692,7 +716,6 @@ files:
 - vendor/assets/javascripts/jquery.validate/localization/messages_zh.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_zh_TW.js
 - vendor/assets/javascripts/jsuri.js
-- vendor/assets/stylesheets/font-awesome.scss
 - vendor/assets/stylesheets/normalize.css
 - vendor/assets/stylesheets/skeleton.css
 homepage: http://spreecommerce.com
@@ -715,7 +738,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.