spree_core 2.2.0 → 2.2.1

data/app/models/spree/shipment.rb

@@ -6,7 +6,7 @@ module Spree
     belongs_to :address, class_name: 'Spree::Address', inverse_of: :shipments
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
 
-    has_many :shipping_rates, dependent: :delete_all
+    has_many :shipping_rates, -> { order('cost ASC') }, dependent: :delete_all
     has_many :shipping_methods, through: :shipping_rates
     has_many :state_changes, as: :stateful
     has_many :inventory_units, dependent: :delete_all, inverse_of: :shipment
@@ -94,7 +94,7 @@ module Spree
     end
 
     def add_shipping_method(shipping_method, selected = false)
-      shipping_rates.create(shipping_method: shipping_method, selected: selected)
+      shipping_rates.create(shipping_method: shipping_method, selected: selected, cost: cost)
     end
 
     def selected_shipping_rate
@@ -167,6 +167,10 @@ module Spree
       Spree::Money.new(discounted_cost, { currency: currency })
     end
 
+    def display_final_price
+      Spree::Money.new(final_price, { currency: currency })
+    end
+
     def display_item_cost
       Spree::Money.new(item_cost, { currency: currency })
     end
@@ -178,12 +182,16 @@ module Spree
     ManifestItem = Struct.new(:line_item, :variant, :quantity, :states)
 
     def manifest
-      inventory_units.group_by(&:variant).map do |variant, units|
-        units.group_by(&:line_item).map do |line_item, units|
+      # Grouping by the ID means that we don't have to call out to the association accessor
+      # This makes the grouping by faster because it results in less SQL cache hits.
+      inventory_units.group_by(&:variant_id).map do |variant_id, units|
+        units.group_by(&:line_item_id).map do |line_item_id, units|
 
           states = {}
           units.group_by(&:state).each { |state, iu| states[state] = iu.count }
 
+          line_item = units.first.line_item
+          variant = units.first.variant
           ManifestItem.new(line_item, variant, units.length, states)
         end
       end.flatten
@@ -269,17 +277,14 @@ module Spree
       )
     end
 
-    def persist_cost
-      self.cost = selected_shipping_rate.cost
-      update_amounts
-    end
-
     def update_amounts
-      self.update_columns(
-        cost: selected_shipping_rate.cost,
-        adjustment_total: adjustments.map(&:update!).compact.sum,
-        updated_at: Time.now,
-      )
+      if selected_shipping_rate
+        self.update_columns(
+          cost: selected_shipping_rate.cost,
+          adjustment_total: adjustments.additional.map(&:update!).compact.sum,
+          updated_at: Time.now,
+        )
+      end
     end
 
     private

data/app/models/spree/shipping_method.rb

@@ -1,15 +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 :adjustments, as: :source
-    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

@@ -4,11 +4,6 @@ module Spree
     belongs_to :shipping_method, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
     belongs_to :tax_rate, class_name: 'Spree::TaxRate'
 
-    scope :with_shipping_method,
-      -> { includes(:shipping_method).
-           references(:shipping_method).
-           order("cost ASC") }
-
     delegate :order, :currency, to: :shipment
     delegate :name, to: :shipping_method
 
@@ -16,17 +11,24 @@ module Spree
       Spree::Money.new(cost, currency: currency)
     end
 
-    def display_tax_amount
-      Spree::Money.new(tax_rate.calculator.compute_shipping_rate(self), currency: currency)
+    def calculate_tax_amount
+      tax_rate.calculator.compute_shipping_rate(self)
     end
 
     def display_price
       price = display_base_price.to_s
       if tax_rate
-        amount = "#{display_tax_amount} #{tax_rate.name}"
+        tax_amount = calculate_tax_amount
         if tax_rate.included_in_price?
-          price += " (incl. #{amount})"
+          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)} #{tax_rate.name}"
           price += " (+ #{amount})"
         end
       end
@@ -34,6 +36,10 @@ module Spree
     end
     alias_method :display_cost, :display_price
 
+    def display_tax_amount(tax_amount)
+      Spree::Money.new(tax_amount, currency: currency)
+    end
+
     def shipping_method
       Spree::ShippingMethod.unscoped { super }
     end

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

@@ -32,7 +32,10 @@ module Spree
           tax_category = shipping_method.tax_category
           if tax_category
             tax_rate = tax_category.tax_rates.detect do |rate|
-              rate.zone == package.order.tax_zone
+              # If the rate's zone matches the order's zone, a positive adjustment will be applied.
+              # If the rate is from the default tax zone, then a negative adjustment will be applied.
+              # See the tests in shipping_rate_spec.rb for an example of this.d
+              rate.zone == package.order.tax_zone || rate.zone.default_tax?
             end
           end
 

data/app/models/spree/stock_location.rb

@@ -1,5 +1,6 @@
 module Spree
   class StockLocation < ActiveRecord::Base
+    has_many :shipments
     has_many :stock_items, dependent: :delete_all
     has_many :stock_movements, through: :stock_items
 

data/app/models/spree/tax_rate.rb

@@ -26,9 +26,28 @@ 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.included_in_price && (rate.zone == order.tax_zone || rate.zone.contains?(order.tax_zone) || (order.tax_address.nil? && rate.zone.default_tax))) ||
-        rate.included_in_price
+      rates = all.select do |rate|
+        # Why "potentially"?
+        # Go see the documentation for that method.
+        rate.potentially_applicable?(order)
+      end
+
+      # Imagine with me this scenario:
+      # You are living in Spain and you have a store which ships to France.
+      # Spain is therefore your default tax rate.
+      # When you ship to Spain, you want the Spanish rate to apply.
+      # When you ship to France, you want the French rate to apply.
+      #
+      # Normally, Spree would notice that you have two potentially applicable
+      # tax rates for one particular item.
+      # When you ship to Spain, only the Spanish one will apply.
+      # When you ship to France, you'll see a Spanish refund AND a French tax.
+      # This little bit of code at the end stops the Spanish refund from appearing.
+      #
+      # For further discussion, see #4397 and #4327.
+      rates.delete_if do |rate|
+        rate.included_in_price? &&
+        (rates - [rate]).map(&:tax_category).include?(rate.tax_category)
       end
     end
 
@@ -48,6 +67,7 @@ module Spree
       end
     end
 
+    # This method is best described by the documentation on #potentially_applicable?
     def self.adjust(order, items)
       rates = self.match(order)
       tax_categories = rates.map(&:tax_category)
@@ -75,13 +95,62 @@ 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.
+    # For instance, if a rate passes the criteria outlined in this method,
+    # 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 
+    #   10% inclusive - "Food" - Spain
+    #   8% inclusive - "Food" - France
+    #   5% inclusive - "Hotels" - Spain
+    #   2% inclusive - "Hotels" - France
+    #
+    # 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
+    #
+    # Note here that the "Hotels" tax rates will not be used at all.
+    # This is because there are no items which have the tax category of "Hotels".
+    #
+    # Under no circumstances should negative adjustments be applied for the Spanish tax rates.
+    #
+    # Those rates should never come into play at all and only the French rates should apply.
+    def potentially_applicable?(order)
+      # If the rate's zone matches the order's tax zone, then it's applicable.
+      self.zone == order.tax_zone ||
+      # If the rate's zone *contains* the order's tax zone, then it's applicable.
+      self.zone.contains?(order.tax_zone) ||
+      # 1) The rate's zone is the default zone, then it's always applicable.
+      (self.included_in_price? && self.zone.default_tax)
+    end
+
     # Creates necessary tax adjustments for the order.
     def adjust(order, item)
-      amount = calculator.compute(item)
+      amount = compute_amount(item)
       return if amount == 0
 
-      included = included_in_price &&
-                 Zone.default_tax.contains?(item.order.tax_zone)
+      included = included_in_price && default_zone_or_zone_match?(item)
 
       if amount < 0
         label = Spree.t(:refund) + ' ' + create_label
@@ -99,7 +168,7 @@ module Spree
     # This method is used by Adjustment#update to recalculate the cost.
     def compute_amount(item)
       if included_in_price
-        if Zone.default_tax.contains? item.order.tax_zone
+        if default_zone_or_zone_match?(item)
           calculator.compute(item)
         else
           # In this case, it's a refund.
@@ -110,6 +179,11 @@ module Spree
       end
     end
 
+    def default_zone_or_zone_match?(item)
+      Zone.default_tax.contains?(item.order.tax_zone) ||
+      item.order.tax_zone == self.zone
+    end
+
     private
 
       def create_label

data/config/initializers/user_class_extensions.rb

@@ -1,6 +1,9 @@
 Spree::Core::Engine.config.to_prepare do
   if Spree.user_class
     Spree.user_class.class_eval do
+
+      include Spree::UserReporting
+      include Spree::UserApiAuthentication
       has_and_belongs_to_many :spree_roles,
                               :join_table => 'spree_roles_users',
                               :foreign_key => "user_id",

data/config/locales/en.yml

@@ -189,6 +189,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
@@ -229,6 +232,10 @@ en:
           attributes:
             base:
               card_expired: "Card has expired"
+        spree/line_item:
+          attributes:
+            currency:
+              must_match_order_currency: "Must match order currency"
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
@@ -339,6 +346,15 @@ en:
         taxonomies: Taxonomies
         taxons: Taxons
         users: Users
+      user:
+        account: Account
+        addresses: Addresses
+        items: Items
+        items_purchased: Items Purchased
+        order_history: Order History
+        order_num: "Order #"
+        orders: Orders
+        user_information: User Information
     administration: Administration
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
@@ -370,6 +386,7 @@ en:
     authorization_failure: Authorization Failure
     auto_capture: Auto Capture
     available_on: Available On
+    average_order_value: Average Order Value
     avs_response: AVS Response
     back: Back
     back_end: Backend
@@ -430,6 +447,7 @@ en:
     choose_a_taxon_to_sort_products_for: "Choose a taxon to sort products for"
     choose_currency: Choose Currency
     choose_dashboard_locale: Choose Dashboard Locale
+    choose_location: Choose location
     city: City
     clone: Clone
     close: Close
@@ -571,6 +589,7 @@ en:
       count_on_hand_setter: Cannot set count_on_hand manually, as it is set automatically by the recalculate_count_on_hand callback. Please use `update_column(:count_on_hand, value)` instead.
     expiration: Expiration
     extension: Extension
+    existing_shipments: Existing shipments
     failed_payment_attempts: Failed Payment Attempts
     filename: Filename
     fill_in_customer_info: Please fill in customer info
@@ -624,6 +643,7 @@ en:
     intercept_email_address: Intercept Email Address
     intercept_email_instructions: Override email recipient and replace with this address.
     internal_name: Internal Name
+    invalid_credit_card: Invalid credit card.
     invalid_payment_provider: Invalid payment provider.
     invalid_promotion_action: Invalid promotion action.
     invalid_promotion_rule: Invalid promotion rule.
@@ -646,6 +666,7 @@ en:
     last_name: Last Name
     last_name_begins_with: Last Name Begins With
     learn_more: Learn More
+    lifetime_stats: Lifetime Stats
     line_item_adjustments: "Line item adjustments"
     list: List
     listing_countries: Listing Countries
@@ -686,6 +707,7 @@ en:
       all: All
       none: None
     max_items: Max Items
+    member_since: Member Since
     meta_description: Meta Description
     meta_keywords: Meta Keywords
     metadata: Metadata
@@ -715,6 +737,7 @@ en:
     new_return_authorization: New Return Authorization
     new_shipping_category: New Shipping Category
     new_shipping_method: New Shipping Method
+    new_shipment_at_location: New shipment at location
     new_state: New State
     new_stock_location: New Stock Location
     new_stock_movement: New Stock Movement
@@ -755,6 +778,7 @@ en:
       product_not_deleted: Product could not be deleted
       variant_deleted: Variant has been deleted
       variant_not_deleted: Variant could not be deleted
+    num_orders: "# Orders"
     on_hand: On Hand
     open: Open
     open_all_adjustments: Open All Adjustments
@@ -1055,6 +1079,7 @@ en:
     stock_location: Stock Location
     stock_location_info: Stock location info
     stock_locations: Stock Locations
+    stock_locations_need_a_default_country: You must create a default country before creating a stock location.
     stock_management: Stock Management
     stock_management_requires_a_stock_location: Please create a stock location in order to manage stock.
     stock_movements: Stock Movements
@@ -1104,6 +1129,7 @@ en:
     to_add_variants_you_must_first_define: To add variants, you must first define
     total: Total
     total_price: Total price
+    total_sales: Total Sales
     track_inventory: Track Inventory
     tracking: Tracking
     tracking_number: Tracking Number

data/db/default/spree/countries.rb

@@ -225,6 +225,7 @@ Spree::Country.create!([
   { name: "Macedonia", iso3: "MKD", iso: "MK", iso_name: "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF", numcode: "807" },
   { name: "New Zealand", iso3: "NZL", iso: "NZ", iso_name: "NEW ZEALAND", numcode: "554" },
   { name: "Saint Kitts and Nevis", iso3: "KNA", iso: "KN", iso_name: "SAINT KITTS AND NEVIS", numcode: "659", states_required: true },
-  { name: "Serbia", iso3: "SRB", iso: "RS", "iso_name" => "SERBIA", numcode: "999" }
+  { name: "Serbia", iso3: "SRB", iso: "RS", "iso_name" => "SERBIA", numcode: "999" },
+  { name: "Montenegro", iso3: "MNE", iso: "ME", iso_name: "MONTENEGRO", numcode: "499" }
 ])
 Spree::Config[:default_country_id] = Spree::Country.find_by(name: "United States").id

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/db/migrate/20140307235515_add_user_id_to_spree_credit_cards.rb

@@ -0,0 +1,13 @@
+class AddUserIdToSpreeCreditCards < ActiveRecord::Migration
+  def change
+    unless Spree::CreditCard.column_names.include? "user_id"
+      add_column :spree_credit_cards, :user_id, :integer
+      add_index :spree_credit_cards, :user_id
+    end
+
+    unless Spree::CreditCard.column_names.include? "payment_method_id"
+      add_column :spree_credit_cards, :payment_method_id, :integer
+      add_index :spree_credit_cards, :payment_method_id
+    end
+  end
+end

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -16,21 +16,21 @@ production:
 <% when 'mysql' %>
 development:
   adapter: mysql2
-  database: <%= database_prefix %>spree_development
+  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
   encoding: utf8
 test:
   adapter: mysql2
-  database: <%= database_prefix %>spree_test
+  database: <%= database_prefix %><%= options[:lib_name] %>_spree_test
   encoding: utf8
 production:
   adapter: mysql2
-  database: <%= database_prefix %>spree_production
+  database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
   encoding: utf8
 <% when 'postgres' %>
 <% db_host = ENV['DB_HOST'] -%>
 development:
   adapter: postgresql
-  database: <%= database_prefix %>spree_development
+  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
   username: postgres
   min_messages: warning
 <% unless db_host.blank? %>
@@ -38,7 +38,7 @@ development:
 <% end %>
 test:
   adapter: postgresql
-  database: <%= database_prefix %>spree_test
+  database: <%= database_prefix %><%= options[:lib_name] %>_spree_test
   username: postgres
   min_messages: warning
 <% unless db_host.blank? %>
@@ -46,7 +46,7 @@ test:
 <% end %>
 production:
   adapter: postgresql
-  database: <%= database_prefix %>spree_production
+  database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
   username: postgres
   min_messages: warning
 <% unless db_host.blank? %>

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

@@ -53,7 +53,16 @@ module Spree
         # proxy method to *possible* spree_current_user method
         # Authentication extensions (such as spree_auth_devise) are meant to provide spree_current_user
         def try_spree_current_user
-          respond_to?(:spree_current_user) ? spree_current_user : nil
+          # This one will be defined by apps looking to hook into Spree
+          # As per authentication_helpers.rb
+          if respond_to?(:spree_current_user)
+            spree_current_user
+          # This one will be defined by Devise
+          elsif respond_to?(:current_spree_user)
+            current_spree_user
+          else
+            nil
+          end
         end
 
         def redirect_back_or_default(default)

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

@@ -73,7 +73,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/controller_helpers/respond_with.rb

@@ -1,3 +1,5 @@
+require 'spree/responder'
+
 module ActionController
   class Base
     def respond_with(*resources, &block)
@@ -17,7 +19,8 @@ module ActionController
           # The action name is needed for processing
           options.merge!(:action_name => action_name.to_sym)
           # If responder is not specified then pass in Spree::Responder
-          (options.delete(:responder) || Spree::Responder).call(self, resources, options)
+          responder = options.delete(:responder) || self.responder
+          responder.call(self, resources, options)
         end
       end
     end
@@ -33,6 +36,8 @@ module Spree
         included do
           cattr_accessor :spree_responders
           self.spree_responders = {}
+
+          self.responder = Spree::Responder
         end
 
         module ClassMethods