spree_core 2.3.4 → 2.3.5

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

@@ -45,6 +45,7 @@ module Spree
               order.contents.add(item.variant, item.quantity - current_quantity)
             end
           end
+          true
         end
       end
     end

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

@@ -72,11 +72,15 @@ module Spree
           end
         }
 
+        # Check for applied adjustments.
         discount = order.line_item_adjustments.promotion.detect(&detector)
         discount ||= order.shipment_adjustments.promotion.detect(&detector)
         discount ||= order.adjustments.promotion.detect(&detector)
 
-        if discount.eligible
+        # Check for applied line items.
+        created_line_items = promotion.actions.detect { |a| a.type == 'Spree::Promotion::Actions::CreateLineItems' }
+
+        if (discount && discount.eligible) || created_line_items
           order.update_totals
           order.persist_totals
           self.success = Spree.t(:coupon_code_applied)

data/app/models/spree/return_authorization.rb

@@ -1,8 +1,8 @@
 module Spree
   class ReturnAuthorization < Spree::Base
-    belongs_to :order, class_name: 'Spree::Order'
+    belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations
 
-    has_many :inventory_units, dependent: :nullify
+    has_many :inventory_units, dependent: :nullify, inverse_of: :return_authorization
     belongs_to :stock_location
     before_create :generate_number
     before_save :force_positive_amount

data/app/models/spree/shipping_category.rb

@@ -2,7 +2,7 @@ module Spree
   class ShippingCategory < Spree::Base
     validates :name, presence: true
     has_many :products, inverse_of: :shipping_category
-    has_many :shipping_method_categories
+    has_many :shipping_method_categories, inverse_of: :shipping_method
     has_many :shipping_methods, through: :shipping_method_categories
   end
-end
+end

data/app/models/spree/shipping_method_category.rb

@@ -1,6 +1,6 @@
 module Spree
   class ShippingMethodCategory < Spree::Base
     belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
-    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory'
+    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories
   end
 end

data/app/models/spree/stock_item.rb

@@ -2,7 +2,7 @@ module Spree
   class StockItem < Spree::Base
     acts_as_paranoid
 
-    belongs_to :stock_location, class_name: 'Spree::StockLocation'
+    belongs_to :stock_location, class_name: 'Spree::StockLocation', inverse_of: :stock_items
     belongs_to :variant, class_name: 'Spree::Variant', inverse_of: :stock_items
     has_many :stock_movements, inverse_of: :stock_item
 

data/app/models/spree/stock_location.rb

@@ -1,7 +1,7 @@
 module Spree
   class StockLocation < Spree::Base
     has_many :shipments
-    has_many :stock_items, dependent: :delete_all
+    has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
     has_many :stock_movements, through: :stock_items
 
     belongs_to :state, class_name: 'Spree::State'

data/app/models/spree/store.rb

@@ -1,7 +1,7 @@
 module Spree
   class Store < Spree::Base
 
-    validates :code, presence: true, uniqueness: true
+    validates :code, presence: true, uniqueness: { allow_blank: true }
     validates :name, presence: true
     validates :url, presence: true
     validates :mail_from_address, presence: true

data/app/models/spree/tax_category.rb

@@ -1,9 +1,9 @@
 module Spree
   class TaxCategory < Spree::Base
     acts_as_paranoid
-    validates :name, presence: true, uniqueness: { scope: :deleted_at }
+    validates :name, presence: true, uniqueness: { scope: :deleted_at, allow_blank: true }
 
-    has_many :tax_rates, dependent: :destroy
+    has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category
 
     before_save :set_default_category
 

data/app/models/spree/tax_rate.rb

@@ -11,10 +11,15 @@ end
 module Spree
   class TaxRate < Spree::Base
     acts_as_paranoid
+
+    # Need to deal with adjustments before calculator is destroyed.
+    before_destroy :deals_with_adjustments_for_deleted_source
+
     include Spree::Core::CalculatedAdjustments
     include Spree::Core::AdjustmentSource
-    belongs_to :zone, class_name: "Spree::Zone"
-    belongs_to :tax_category, class_name: "Spree::TaxCategory"
+
+    belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates
+    belongs_to :tax_category, class_name: "Spree::TaxCategory", inverse_of: :tax_rates
 
     has_many :adjustments, as: :source
 
@@ -22,8 +27,6 @@ module Spree
     validates :tax_category_id, presence: true
     validates_with DefaultTaxZoneValidator
 
-    before_destroy :deals_with_adjustments_for_deleted_source
-
     scope :by_zone, ->(zone) { where(zone_id: zone) }
 
     # Gets the array of TaxRates appropriate for the specified order

data/app/models/spree/variant.rb

@@ -9,7 +9,7 @@ module Spree
                         :shipping_category_id, :meta_description, :meta_keywords,
                         :shipping_category
 
-    has_many :inventory_units
+    has_many :inventory_units, inverse_of: :variant
     has_many :line_items, inverse_of: :variant
     has_many :orders, through: :line_items
 
@@ -23,7 +23,8 @@ module Spree
     has_one :default_price,
       -> { where currency: Spree::Config[:currency] },
       class_name: 'Spree::Price',
-      dependent: :destroy
+      dependent: :destroy,
+      inverse_of: :variant
 
     delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency
 
@@ -32,16 +33,19 @@ module Spree
       dependent: :destroy,
       inverse_of: :variant
 
+    before_validation :set_cost_currency
+
     validate :check_price
+
     validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
-    validates :price, numericality: { greater_than_or_equal_to: 0 }
+    validates :price,      numericality: { greater_than_or_equal_to: 0, allow_nil: true }
     validates_uniqueness_of :sku, allow_blank: true, conditions: -> { where(deleted_at: nil) }
 
-    before_validation :set_cost_currency
     after_save :save_default_price
+
     after_create :create_stock_items
     after_create :set_position
-    after_create :set_master_out_of_stock, :unless => :is_master?
+    after_create :set_master_out_of_stock, unless: :is_master?
 
     after_touch :clear_in_stock_cache
 
@@ -58,7 +62,11 @@ module Spree
     end
 
     def cost_price=(price)
-      self[:cost_price] = parse_price(price) if price.present?
+      self[:cost_price] = Spree::LocalizedNumber.parse(price) if price.present?
+    end
+
+    def weight=(weight)
+      self[:weight] = Spree::LocalizedNumber.parse(weight) if weight.present?
     end
 
     # returns number of units currently on backorder for this variant.
@@ -66,6 +74,10 @@ module Spree
       inventory_units.with_state('backordered').size
     end
 
+    def is_backorderable?
+      Spree::Stock::Quantifier.new(self).backorderable?
+    end
+
     def options_text
       values = self.option_values.sort do |a, b|
         a.option_type.position <=> b.option_type.position
@@ -177,17 +189,6 @@ module Spree
     end
 
     private
-      # strips all non-price-like characters from the price, taking into account locale settings
-      def parse_price(price)
-        return price unless price.is_a?(String)
-
-        separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
-        non_price_characters = /[^0-9\-#{separator}]/
-        price.gsub!(non_price_characters, '') # strip everything else first
-        price.gsub!(separator, '.') unless separator == '.' # then replace the locale-specific decimal separator with the standard separator if necessary
-
-        price.to_d
-      end
 
       def set_master_out_of_stock
         if product.master && product.master.in_stock?

data/app/models/spree/zone.rb

@@ -1,10 +1,10 @@
 module Spree
   class Zone < Spree::Base
-    has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember"
-    has_many :tax_rates, dependent: :destroy
+    has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember", inverse_of: :zone
+    has_many :tax_rates, dependent: :destroy, inverse_of: :zone
     has_and_belongs_to_many :shipping_methods, :join_table => 'spree_shipping_methods_zones'
 
-    validates :name, presence: true, uniqueness: true
+    validates :name, presence: true, uniqueness: { allow_blank: true }
     after_save :remove_defunct_members
     after_save :remove_previous_default
 
@@ -92,23 +92,11 @@ module Spree
     end
 
     def country_ids=(ids)
-      zone_members.destroy_all
-      ids.reject{ |id| id.blank? }.map do |id|
-        member = ZoneMember.new
-        member.zoneable_type = 'Spree::Country'
-        member.zoneable_id = id
-        members << member
-      end
+      set_zone_members(ids, 'Spree::Country')
     end
 
     def state_ids=(ids)
-      zone_members.destroy_all
-      ids.reject{ |id| id.blank? }.map do |id|
-        member = ZoneMember.new
-        member.zoneable_type = 'Spree::State'
-        member.zoneable_id = id
-        members << member
-      end
+      set_zone_members(ids, 'Spree::State')
     end
 
     # Indicates whether the specified zone falls entirely within the zone performing
@@ -136,5 +124,15 @@ module Spree
       def remove_previous_default
         Spree::Zone.where('id != ?', self.id).update_all(default_tax: false) if default_tax
       end
+
+      def set_zone_members(ids, type)
+        zone_members.destroy_all
+        ids.reject{ |id| id.blank? }.map do |id|
+          member = ZoneMember.new
+          member.zoneable_type = type
+          member.zoneable_id = id
+          members << member
+        end
+      end
   end
 end

data/app/models/spree/zone_member.rb

@@ -1,6 +1,6 @@
 module Spree
   class ZoneMember < Spree::Base
-    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true
+    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members
     belongs_to :zoneable, polymorphic: true
 
     def name

data/config/initializers/user_class_extensions.rb

@@ -2,25 +2,26 @@ Spree::Core::Engine.config.to_prepare do
   if Spree.user_class
     Spree.user_class.class_eval do
 
-      include Spree::UserReporting
       include Spree::UserApiAuthentication
+      include Spree::UserReporting
+
       has_and_belongs_to_many :spree_roles,
-                              :join_table => 'spree_roles_users',
-                              :foreign_key => "user_id",
-                              :class_name => "Spree::Role"
+                              join_table: 'spree_roles_users',
+                              foreign_key: "user_id",
+                              class_name: "Spree::Role"
 
-      has_many :spree_orders, :foreign_key => "user_id", :class_name => "Spree::Order"
+      has_many :spree_orders, foreign_key: "user_id", class_name: "Spree::Order"
 
-      belongs_to :ship_address, :class_name => 'Spree::Address'
-      belongs_to :bill_address, :class_name => 'Spree::Address'
+      belongs_to :ship_address, class_name: 'Spree::Address'
+      belongs_to :bill_address, class_name: 'Spree::Address'
 
       # has_spree_role? simply needs to return true or false whether a user has a role or not.
       def has_spree_role?(role_in_question)
-        spree_roles.where(:name => role_in_question.to_s).any?
+        spree_roles.where(name: role_in_question.to_s).any?
       end
 
       def last_incomplete_spree_order
-        spree_orders.incomplete.where(:created_by_id => self.id).order('created_at DESC').first
+        spree_orders.incomplete.where(user_id: self.id).order('created_at DESC').first
       end
     end
   end

data/config/locales/en.yml

@@ -474,7 +474,7 @@ en:
     choose_dashboard_locale: Choose Dashboard Locale
     choose_location: Choose location
     city: City
-    click_and_drag_on_the_products_to_sort_them: 'Click & drag on the products to sort them.'
+    click_and_drag_on_the_products_to_sort_them: Click and drag on the products to sort them
     clone: Clone
     close: Close
     close_all_adjustments: Close All Adjustments
@@ -719,6 +719,7 @@ en:
     logout: Logout
     look_for_similar_items: Look for similar items
     make_refund: Make refund
+    manage_variants: Manage Variants
     master_price: Master Price
     match_choices:
       all: All
@@ -812,6 +813,7 @@ en:
     or_over_price: ! '%{price} or over'
     order: Order
     order_adjustments: Order adjustments
+    order_already_updated: The order has already been updated.
     order_approved: Order approved
     order_canceled: Order canceled
     order_details: Order Details
@@ -1073,6 +1075,7 @@ en:
     show_only_considered_risky: Only show risky orders
     show_rate_in_label: Show rate in label
     sku: SKU
+    skus: SKU's
     slug: Slug
     source: Source
     special_instructions: Special Instructions

data/db/migrate/20140530024945_move_order_token_from_tokenized_permission.rb

@@ -10,7 +10,7 @@ class MoveOrderTokenFromTokenizedPermission < ActiveRecord::Migration
       Spree::Order.includes(:tokenized_permission).each do |o|
         o.update_column :guest_token, o.tokenized_permission.token
       end
-    when 'Mysql2'
+    when 'Mysql2', 'MySQL'
       execute "UPDATE spree_orders, spree_tokenized_permissions
                SET spree_orders.guest_token = spree_tokenized_permissions.token
                WHERE spree_tokenized_permissions.permissable_id = spree_orders.id

data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb

@@ -3,10 +3,8 @@ class SetShipmentTotalForUsersUpgrading < ActiveRecord::Migration
     # NOTE You might not need this at all unless you're upgrading from Spree 2.1.x
     # or below. For those upgrading this should populate the Order#shipment_total
     # for legacy orders
-    execute "UPDATE spree_orders
-             SET shipment_total = (SELECT SUM(spree_shipments.cost) AS sum_id
-                                   FROM spree_shipments
-                                   WHERE spree_shipments.order_id = spree_orders.id)
-             WHERE spree_orders.completed_at IS NOT NULL AND spree_orders.shipment_total = 0"
+    Spree::Order.complete.where('shipment_total = ?', 0).includes(:shipments).find_each do |order|
+      order.update_column(:shipment_total, order.shipments.sum(:cost))
+    end
   end
 end

data/db/migrate/20141021194502_add_state_lock_version_to_order.rb

@@ -0,0 +1,5 @@
+class AddStateLockVersionToOrder < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :state_lock_version, :integer, default: 0, null: false
+  end
+end

data/db/migrate/20141101231208_fix_adjustment_order_presence.rb

@@ -0,0 +1,13 @@
+class FixAdjustmentOrderPresence < ActiveRecord::Migration
+  def change
+    say 'Fixing adjustments without direct order reference'
+    Spree::Adjustment.where(order: nil).find_each do |adjustment|
+      adjustable = adjustment.adjustable
+      if adjustable.is_a? Spree::Order
+        adjustment.update_attributes!(order_id: adjustable.id)
+      else
+        adjustment.update_attributes!(adjustable: adjustable.order)
+      end
+    end
+  end
+end

data/db/migrate/20141105213646_update_classifications_positions.rb

@@ -0,0 +1,9 @@
+class UpdateClassificationsPositions < ActiveRecord::Migration
+  def up
+    Spree::Taxon.all.each do |taxon|
+      taxon.classifications.each_with_index do |c12n, i|
+        c12n.set_list_position(i + 1)
+      end
+    end
+  end
+end

data/lib/generators/spree/install/install_generator.rb

@@ -53,14 +53,10 @@ User-agent: *
 Disallow: /checkout
 Disallow: /cart
 Disallow: /orders
-Disallow: /countries
-Disallow: /line_items
-Disallow: /password_resets
-Disallow: /states
-Disallow: /user_sessions
-Disallow: /user_registrations
-Disallow: /users
+Disallow: /user
 Disallow: /account
+Disallow: /api
+Disallow: /password
       ROBOTS
     end
 

data/lib/spree/core.rb

@@ -57,12 +57,14 @@ require 'spree/migrations'
 require 'spree/core/engine'
 
 require 'spree/i18n'
+require 'spree/localized_number'
 require 'spree/money'
-
 require 'spree/permitted_attributes'
 require 'spree/core/user_address'
 require 'spree/core/user_payment_source'
+
 require 'spree/core/delegate_belongs_to'
+require 'spree/core/importer'
 require 'spree/core/permalinks'
 require 'spree/core/calculated_adjustments'
 require 'spree/core/adjustment_source'
@@ -73,8 +75,6 @@ require 'spree/core/controller_helpers/ssl'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 
-require 'spree/core/importer'
-
 # Hack waiting on https://github.com/pluginaweek/state_machine/pull/275
 module StateMachine
   module Integrations

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

@@ -22,13 +22,14 @@ module Spree
           if @simple_current_order
             @simple_current_order.last_ip_address = ip_address
             return @simple_current_order
+          else
+            @simple_current_order = Spree::Order.new
           end
         end
 
         # The current incomplete order from the guest_token for use in cart and during checkout
         def current_order(options = {})
           options[:create_order_if_necessary] ||= false
-          options[:lock] ||= false
 
           return @current_order if @current_order
 
@@ -56,11 +57,9 @@ module Spree
         end
 
         def set_current_order
-          if user = try_spree_current_user
-            if cookies.signed[:guest_token].nil? && last_incomplete_order
-              cookies.permanent.signed[:guest_token] = last_incomplete_order.guest_token
-            elsif current_order && last_incomplete_order && current_order != last_incomplete_order
-              current_order.merge!(last_incomplete_order, user)
+          if try_spree_current_user && current_order
+            try_spree_current_user.orders.incomplete.where('id != ?', current_order.id).each do |order|
+              current_order.merge!(order, try_spree_current_user)
             end
           end
         end
@@ -74,6 +73,7 @@ module Spree
         end
 
         private
+
         def last_incomplete_order
           @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order
         end
@@ -83,13 +83,14 @@ module Spree
         end
 
         def find_order_by_token_or_user(options={})
+          options[:lock] ||= false
 
           # Find any incomplete orders for the guest_token
           order = Spree::Order.incomplete.includes(:adjustments).lock(options[:lock]).find_by(current_order_params)
 
           # Find any incomplete orders for the current user
           if order.nil? && try_spree_current_user
-            order = Spree::Order.incomplete.order('id DESC').where({ currency: current_currency, user_id: try_spree_current_user.try(:id)}).first
+            order = last_incomplete_order
           end
 
           order