spree_core 2.0.3 → 2.0.4

data/app/models/spree/product.rb

@@ -20,6 +20,7 @@
 
 module Spree
   class Product < ActiveRecord::Base
+    acts_as_paranoid
     has_many :product_option_types, dependent: :destroy
     has_many :option_types, through: :product_option_types
     has_many :product_properties, dependent: :destroy
@@ -44,12 +45,11 @@ module Spree
 
     has_many :variants_including_master,
       class_name: 'Spree::Variant',
-      conditions: { deleted_at: nil },
-      dependent: :destroy
-
-    has_many :variants_including_master_and_deleted, class_name: 'Spree::Variant'
+      dependent: :destroy,
+      order: "#{::Spree::Variant.quoted_table_name}.position ASC"
 
     has_many :prices, through: :variants, order: 'spree_variants.position, spree_variants.id, currency'
+    has_many :stock_items, through: :variants
 
     delegate_belongs_to :master, :sku, :price, :currency, :display_amount, :display_price, :weight, :height, :width, :depth, :is_master, :has_default_price?, :cost_currency, :price_in, :amount_in
     delegate_belongs_to :master, :cost_price if Variant.table_exists? && Variant.column_names.include?('cost_price')
@@ -66,16 +66,35 @@ module Spree
 
     accepts_nested_attributes_for :variants, allow_destroy: true
 
-    validates :name, :permalink, presence: true
+    validates :name, presence: true
+    validates :permalink, presence: true
     validates :price, presence: true, if: proc { Spree::Config[:require_master_price] }
+    validates :shipping_category_id, presence: true
 
     attr_accessor :option_values_hash
 
-    attr_accessible :name, :description, :available_on, :permalink, :meta_description,
-                    :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
-                    :option_values_hash, :weight, :height, :width, :depth,
-                    :shipping_category_id, :tax_category_id, :product_properties_attributes,
-                    :variants_attributes, :taxon_ids, :option_type_ids, :cost_currency
+    attr_accessible :available_on,
+                    :cost_currency,
+                    :deleted_at,
+                    :depth,
+                    :description,
+                    :height,
+                    :meta_description,
+                    :meta_keywords,
+                    :name,
+                    :option_type_ids,
+                    :option_values_hash,
+                    :permalink,
+                    :price,
+                    :product_properties_attributes,
+                    :prototype_id,
+                    :shipping_category_id,
+                    :sku,
+                    :tax_category_id,
+                    :taxon_ids,
+                    :weight,
+                    :width,
+                    :variants_attributes
 
     attr_accessible :cost_price if Variant.table_exists? && Variant.column_names.include?('cost_price')
 
@@ -109,13 +128,6 @@ module Spree
       end
     end
 
-    # override the delete method to set deleted_at value
-    # instead of actually deleting the product.
-    def delete
-      self.update_column(:deleted_at, Time.now)
-      variants_including_master.update_all(deleted_at: Time.now)
-    end
-
     # Adding properties and option types on creation based on a chosen prototype
     attr_reader :prototype_id
     def prototype_id=(value)
@@ -197,6 +209,21 @@ module Spree
       Spree::Promotion.advertised.where(id: promotion_ids).reject(&:expired?)
     end
 
+    def total_on_hand
+      if Spree::Config.track_inventory_levels
+        self.stock_items.sum(&:count_on_hand)
+      else
+        Float::INFINITY
+      end
+    end
+
+    # Master variant may be deleted (i.e. when the product is deleted)
+    # which would make AR's default finder return nil.
+    # This is a stopgap for that little problem.
+    def master
+      super || variants_including_master.with_deleted.where(:is_master => true).first
+    end
+
     private
 
       # Builds variants from a hash of option types & values

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.promotion)
+          return if order.promotion_credit_exists?(self)
 
           self.create_adjustment("#{Spree.t(:promotion)} (#{promotion.name})", order, order)
         end

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

@@ -6,14 +6,44 @@ module Spree
         accepts_nested_attributes_for :promotion_action_line_items
         attr_accessible :promotion_action_line_items_attributes
 
+        delegate :eligible?, :to => :promotion
 
+        # Adds a line item to the Order if the promotion is eligible
+        #
+        # This doesn't play right with Add to Cart events because at the moment
+        # the item was added to cart the promo may not be eligible. However it
+        # might become eligible as the order gets updated.
+        #
+        # e.g.
+        #   - A promo adds a line item to cart if order total greater then $30
+        #   - Customer add 1 item of $10 to cart
+        #   - This action shouldn't perform because the order is not eligible
+        #   - Customer increases item quantity to 5 (order total goes to $50)
+        #   - Now the order is eligible for the promo and the action should perform
+        #
+        # Another complication is when the same line item created by the promo
+        # is also added to cart on a separate action.
+        #
+        # e.g.
+        #   - Promo adds 1 item A to cart if order total greater then $30
+        #   - Customer add 2 items B to cart, current order total is $40
+        #   - This action performs adding item A to cart since order is eligible
+        #   - Customer changes his mind and updates item B quantity to 1
+        #   - At this point order is no longer eligible and one might expect
+        #     that item A should be removed
+        #
+        # It doesn't remove items from the order here because there's no way
+        # it can know whether that item was added via this promo action or if
+        # it was manually populated somewhere else. In that case the item
+        # needs to be manually removed from the order by the customer
         def perform(options = {})
-          return unless order = options[:order]
+          order = options[:order]
+          return unless self.eligible? order
+
           promotion_action_line_items.each do |item|
             current_quantity = order.quantity_of(item.variant)
             if current_quantity < item.quantity
               order.contents.add(item.variant, item.quantity - current_quantity)
-              order.update!
             end
           end
         end

data/app/models/spree/promotion.rb

@@ -44,9 +44,10 @@ module Spree
     def activate(payload)
       return unless order_activatable? payload[:order]
 
+      # make sure code is always downcased (old databases might have mixed case codes)
       if code.present?
         event_code = payload[:coupon_code]
-        return unless event_code == self.code
+        return unless event_code == self.code.downcase.strip
       end
 
       if path.present?

data/app/models/spree/shipment.rb

@@ -6,7 +6,7 @@ module Spree
     belongs_to :address, class_name: 'Spree::Address'
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
 
-    has_many :shipping_rates
+    has_many :shipping_rates, dependent: :destroy
     has_many :shipping_methods, through: :shipping_rates
     has_many :state_changes, as: :stateful
     has_many :inventory_units, dependent: :destroy
@@ -16,7 +16,7 @@ module Spree
     after_save :ensure_correct_adjustment, :update_order
 
     attr_accessor :special_instructions
-    attr_accessible :order, :special_instructions, :stock_location_id,
+    attr_accessible :order, :special_instructions, :stock_location_id, :number,
                     :tracking, :address, :inventory_units, :selected_shipping_rate_id
 
     accepts_nested_attributes_for :address
@@ -158,7 +158,7 @@ module Spree
     end
 
     def manifest
-      inventory_units.group_by(&:variant).map do |variant, units|
+      inventory_units.includes(:variant).group_by(&:variant).map do |variant, units|
         states = {}
         units.group_by(&:state).each { |state, iu| states[state] = iu.count }
         OpenStruct.new(variant: variant, quantity: units.length, states: states)
@@ -223,8 +223,8 @@ module Spree
 
     def to_package
       package = Stock::Package.new(stock_location, order)
-      inventory_units.each do |inventory_unit|
-        package.add inventory_unit.variant, 1, inventory_unit.state
+      inventory_units.includes(:variant).each do |inventory_unit|
+        package.add inventory_unit.variant, 1, inventory_unit.state_name
       end
       package
     end

data/app/models/spree/shipping_adjustment.rb

@@ -0,0 +1,4 @@
+module Spree
+  class ShippingAdjustment < Spree::Adjustment
+  end
+end

data/app/models/spree/shipping_method.rb

@@ -8,6 +8,7 @@ module Spree
     has_many :shipments
     has_many :shipping_method_categories
     has_many :shipping_categories, through: :shipping_method_categories
+    has_many :shipping_rates
 
     has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
                                     :class_name => 'Spree::Zone',
@@ -49,6 +50,11 @@ module Spree
       spree_calculators.send(model_name_without_spree_namespace).select{|c| c.name.start_with?("Spree::Calculator::Shipping::")}
     end
 
+    # Some shipping methods are only meant to be set via backend
+    def frontend?
+      self.display_on != "back_end"
+    end
+
     private
       def at_least_one_shipping_category
         if self.shipping_categories.empty?

data/app/models/spree/shipping_rate.rb

@@ -21,5 +21,6 @@ module Spree
 
       Spree::Money.new(price, { currency: currency })
     end
+    alias_method :display_cost, :display_price
   end
 end

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

@@ -1,14 +1,16 @@
 module Spree
   module Stock
     class AvailabilityValidator < ActiveModel::Validator
-
       def validate(line_item)
         quantifier = Stock::Quantifier.new(line_item.variant_id)
 
         unless quantifier.can_supply? line_item.quantity
-          line_item.errors[:quantity] << I18n.t('validation.exceeds_available_stock')
-        end
+          variant = line_item.variant
+          display_name = %Q{#{variant.name}}
+          display_name += %Q{ (#{variant.options_text})} unless variant.options_text.blank?
 
+          line_item.errors[:quantity] << Spree.t(:out_of_stock, :scope => :order_populator, :item => display_name.inspect)
+        end
       end
     end
   end

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

@@ -8,21 +8,33 @@ module Spree
       end
 
       def packages
-        packages = Array.new
-        packages = build_packages(packages)
+        packages = build_packages
         packages = prioritize_packages(packages)
         packages = estimate_packages(packages)
       end
 
-      private
-      def build_packages(packages)
+      # Build packages as per stock location
+      #
+      # It needs to check whether each stock location holds at least one stock
+      # item for the order. In case none is found it wouldn't make any sense
+      # to build a package because it would be empty. Plus we avoid errors down
+      # the stack because it would assume the stock location has stock items
+      # for the given order
+      # 
+      # Returns an array of Package instances
+      def build_packages(packages = Array.new)
         StockLocation.active.each do |stock_location|
+          next unless order.line_items.any? do |item|
+            stock_location.stock_item(item.variant)
+          end
+
           packer = build_packer(stock_location, order)
           packages += packer.packages
         end
         packages
       end
 
+      private
       def prioritize_packages(packages)
         prioritizer = Prioritizer.new(order, packages)
         prioritizer.prioritized_packages

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

@@ -8,25 +8,35 @@ module Spree
         @currency = order.currency
       end
 
-      def shipping_rates(package)
+      def shipping_rates(package, frontend_only = true)
         shipping_rates = Array.new
         shipping_methods = shipping_methods(package)
         return [] unless shipping_methods
+
         shipping_methods.each do |shipping_method|
           cost = calculate_cost(shipping_method, package)
-
-          shipping_rates << ShippingRate.new( :shipping_method => shipping_method,
-                                              :cost => cost)
+          shipping_rates << shipping_method.shipping_rates.new(:cost => cost)
         end
+
         shipping_rates.sort_by! { |r| r.cost || 0 }
-        shipping_rates.first.selected = true unless shipping_rates.empty?
+
+        unless shipping_rates.empty?
+          if frontend_only
+            shipping_rates.each do |rate|
+              rate.selected = true and break if rate.shipping_method.frontend?
+            end
+          else
+            shipping_rates.first.selected = true
+          end
+        end
+
         shipping_rates
       end
 
       private
       def shipping_methods(package)
         shipping_methods = package.shipping_methods
-        shipping_methods.delete_if { |ship_method| !ship_method.calculator.available?(package.contents) }
+        shipping_methods.delete_if { |ship_method| !ship_method.calculator.available?(package) }
         shipping_methods.delete_if { |ship_method| !ship_method.include?(order.ship_address) }
         shipping_methods.delete_if { |ship_method| !(ship_method.calculator.preferences[:currency].nil? || ship_method.calculator.preferences[:currency] == currency) }
         shipping_methods

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

@@ -16,6 +16,8 @@ module Spree
       def default_package
         package = Package.new(stock_location, order)
         order.line_items.each do |line_item|
+          next unless stock_location.stock_item(line_item.variant)
+
           on_hand, backordered = stock_location.fill_status(line_item.variant, line_item.quantity)
           package.add line_item.variant, on_hand, :on_hand if on_hand > 0
           package.add line_item.variant, backordered, :backordered if backordered > 0
@@ -34,4 +36,3 @@ module Spree
     end
   end
 end
-

data/app/models/spree/stock_location.rb

@@ -9,11 +9,24 @@ module Spree
     validates_presence_of :name
 
     attr_accessible :name, :active, :address1, :address2, :city, :zipcode,
-                    :state_name, :state_id, :country_id, :phone, :country_id
+        :backorderable_default, :state_name, :state_id, :country_id, :phone,
+        :country_id, :propagate_all_variants
 
     scope :active, -> { where(active: true) }
 
-    after_create :create_stock_items
+    after_create :create_stock_items, :if => "self.propagate_all_variants?"
+
+    # 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)
+    end
+
+    # Return either an existing stock item or create a new one. Useful in
+    # scenarios where the user might not know whether there is already a stock
+    # item for a given variant
+    def set_up_stock_item(variant)
+      self.stock_item(variant) || propagate_variant(variant)
+    end
 
     def stock_item(variant)
       stock_items.where(variant_id: variant).order(:id).first
@@ -63,11 +76,8 @@ module Spree
     end
 
     private
-
       def create_stock_items
-        Spree::Variant.find_each do |v|
-          self.stock_items.create!(variant: v)
-        end
+        Variant.find_each { |variant| self.propagate_variant(variant) }
       end
   end
 end

data/app/models/spree/tax_category.rb

@@ -1,5 +1,6 @@
 module Spree
   class TaxCategory < ActiveRecord::Base
+    acts_as_paranoid
     validates :name, presence: true, uniqueness: { scope: :deleted_at }
 
     has_many :tax_rates, dependent: :destroy
@@ -8,8 +9,6 @@ module Spree
 
     before_save :set_default_category
 
-    default_scope where(deleted_at: nil)
-
     def set_default_category
       #set existing default tax category to false if this one has been marked as default
 
@@ -17,10 +16,5 @@ module Spree
         tax_category.update_column(:is_default, false) unless tax_category == self
       end
     end
-
-    def mark_deleted!
-      self.deleted_at = Time.now
-      save
-    end
   end
 end

data/app/models/spree/tax_rate.rb

@@ -10,6 +10,7 @@ end
 
 module Spree
   class TaxRate < ActiveRecord::Base
+    acts_as_paranoid
     include Spree::Core::CalculatedAdjustments
     belongs_to :zone, class_name: "Spree::Zone"
     belongs_to :tax_category, class_name: "Spree::TaxCategory"

data/app/models/spree/variant.rb

@@ -1,5 +1,7 @@
 module Spree
   class Variant < ActiveRecord::Base
+    acts_as_paranoid
+
     belongs_to :product, touch: true, class_name: 'Spree::Product'
 
     delegate_belongs_to :product, :name, :description, :permalink, :available_on,
@@ -14,7 +16,7 @@ module Spree
     has_many :inventory_units
     has_many :line_items
 
-    has_many :stock_items, dependent: :destroy
+    has_many :stock_items, dependent: :destroy, :order => "id ASC"
     has_many :stock_locations, through: :stock_items
     has_many :stock_movements
 
@@ -133,6 +135,17 @@ module Spree
       Spree::Stock::Quantifier.new(self).can_supply?(quantity)
     end
 
+    def total_on_hand
+      Spree::Stock::Quantifier.new(self).total_on_hand
+    end
+
+    # Product may be created with deleted_at already set,
+    # which would make AR's default finder return nil.
+    # This is a stopgap for that little problem.
+    def product
+      Spree::Product.unscoped { super }
+    end
+
     private
       # strips all non-price-like characters from the price, taking into account locale settings
       def parse_price(price)
@@ -167,8 +180,8 @@ module Spree
       end
 
       def create_stock_items
-        Spree::StockLocation.all.each do |stock_location|
-          stock_location.stock_items.create!(variant: self)
+        StockLocation.all.each do |stock_location|
+          stock_location.propagate_variant(self) if stock_location.propagate_all_variants?
         end
       end
 

data/app/models/spree/zone.rb

@@ -18,7 +18,7 @@ module Spree
 
     def kind
       if members.any? && !members.any? { |member| member.try(:zoneable_type).nil? }
-        members.last.zoneable_type.demodulize.downcase
+        members.last.zoneable_type.demodulize.underscore
       end
     end
 

data/config/initializers/user_class_extensions.rb

@@ -18,7 +18,7 @@ Spree::Core::Engine.config.to_prepare do
       end
 
       def last_incomplete_spree_order
-        spree_orders.incomplete.order('created_at DESC').first
+        spree_orders.incomplete.where(:created_by_id => self.id).order('created_at DESC').first
       end
     end
   end

data/config/locales/en.yml

@@ -193,6 +193,12 @@ en:
       spree/zone:
         one: Zone
         other: Zones
+    errors:
+      models:
+        spree/credit_card:
+          attributes:
+            base:
+              card_expired: "Card has expired"
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
@@ -295,6 +301,7 @@ en:
         reports: "Reports"
         configuration: "Configuration"
         promotions: "Promotions"
+        users: "Users"
     administration: Administration
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
@@ -343,7 +350,7 @@ en:
     back_to_shipping_categories: Back To Shipping Categories
     back_to_shipping_methods_list: Back To Shipping Methods List
     back_to_states_list: Back To States List
-    back_to_stock_locations_list: Back to Stock Movements List
+    back_to_stock_locations_list: Back to Stock Locations List
     back_to_stock_movements_list: Back to Stock Movements List
     back_to_stock_transfers_list: Back to Stock Transfers List
     back_to_store: Go Back To Store
@@ -583,6 +590,7 @@ en:
       operators:
         gt: greater than
         gte: greater than or equal to
+    items_cannot_be_shipped: We are unable to ship the selected items to your shipping address. Please choose another shipping address.
     jirafe: Jirafe
     landing_page_rule:
       path: Path
@@ -661,12 +669,14 @@ en:
     no_actions_added: No actions added
     no_orders_found: No orders found
     no_payment_methods_found: No payment methods found
+    no_pending_payments: No pending payments
     no_products_found: No products found
     no_promotions_found: No promotions found
     no_results: No results
     no_rules_added: No rules added
     no_shipping_methods_found: No shipping methods found
     no_trackers_found: No Trackers Found
+    no_stock_locations_found: No stock locations found
     no_tracking_present: No tracking details provided.
     none: None
     normal_amount: Normal Amount
@@ -685,6 +695,7 @@ en:
     open: Open
     open_all_adjustments: Open All Adjustments
     option_type: Option Type
+    option_type_placeholder: Choose an option type
     option_types: Option Types
     option_value: Option Value
     option_values: Option Values
@@ -965,6 +976,7 @@ en:
     stock_location_info: Stock location info
     stock_locations: Stock Locations
     stock_management: Stock Management
+    stock_management_requires_a_stock_location: Please create a stock location in order to manage stock.
     stock_movements: Stock Movements
     stock_movements_for_stock_location: Stock Movements for %{stock_location_name}
     stock_successfully_transferred: Stock was successfully transferred between locations.
@@ -1004,6 +1016,7 @@ en:
         subject: Test Mail
     test_mode: Test Mode
     thank_you_for_your_order: Thank you for your business.  Please print out a copy of this confirmation page for your records.
+    there_are_no_items_for_this_order: There are no items for this order. Please add an item to the order to continue.
     there_were_problems_with_the_following_fields: There were problems with the following fields
     thumbnail: Thumbnail
     time: Time
@@ -1043,6 +1056,7 @@ en:
       must_be_non_negative: must be a non-negative value
     value: Value
     variant: Variant
+    variant_placeholder: Choose a variant
     variants: Variants
     version: Version
     void: Void

data/db/migrate/20130228210442_create_shipping_method_zone.rb

@@ -4,7 +4,12 @@ class CreateShippingMethodZone < ActiveRecord::Migration
       t.integer :shipping_method_id
       t.integer :zone_id
     end
-
+    # This association has been corrected in a latter migration
+    # but when this database migration runs, the table is still incorrectly named
+    # 'shipping_methods_zones' instead of 'spre_shipping_methods_zones'
+    Spree::ShippingMethod.has_and_belongs_to_many :zones, :join_table => 'shipping_methods_zones',
+                                                          :class_name => 'Spree::Zone',
+                                                          :foreign_key => 'shipping_method_id'
     Spree::ShippingMethod.all.each{|sm| sm.zones << Spree::Zone.find(sm.zone_id)}
 
     remove_column :spree_shipping_methods, :zone_id

data/db/migrate/20130306181701_add_address_fields_to_stock_location.rb

@@ -13,7 +13,10 @@ class AddAddressFieldsToStockLocation < ActiveRecord::Migration
 
 
     usa = Spree::Country.where(:iso => 'US').first
+    # In case USA isn't found.
+    # See #3115
+    country = usa || Spree::Country.first
     Spree::Country.reset_column_information
-    Spree::StockLocation.update_all(:country_id => usa)
+    Spree::StockLocation.update_all(:country_id => country)
   end
 end

data/db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb

@@ -0,0 +1,5 @@
+class AddBackorderableDefaultToSpreeStockLocation < ActiveRecord::Migration
+  def change
+    add_column :spree_stock_locations, :backorderable_default, :boolean, default: true
+  end
+end

data/db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb

@@ -0,0 +1,5 @@
+class AddPropageAllVariantsToSpreeStockLocation < ActiveRecord::Migration
+  def change
+    add_column :spree_stock_locations, :propagate_all_variants, :boolean, default: true
+  end
+end

data/db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb

@@ -0,0 +1,6 @@
+class AddCvvResultCodeAndCvvResultMessageToSpreePayments < ActiveRecord::Migration
+  def change
+    add_column :spree_payments, :cvv_response_code, :string
+    add_column :spree_payments, :cvv_response_message, :string
+  end
+end

data/db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb

@@ -0,0 +1,5 @@
+class AddUniqueIndexToPermalinkOnSpreeProducts < ActiveRecord::Migration
+  def change
+    add_index "spree_products", ["permalink"], :name => "permalink_idx_unique", :unique => true
+  end
+end

data/db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb

@@ -0,0 +1,7 @@
+class AddUniqueIndexToOrdersShipmentsAndStockTransfers < ActiveRecord::Migration
+  def add
+    add_index "spree_orders", ["number"], :name => "number_idx_unique", :unique => true
+    add_index "spree_shipments", ["number"], :name => "number_idx_unique", :unique => true
+    add_index "spree_stock_transfers", ["number"], :name => "number_idx_unique", :unique => true
+  end
+end

data/db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb

@@ -0,0 +1,5 @@
+class AddDeletedAtToSpreeTaxRates < ActiveRecord::Migration
+  def change
+    add_column :spree_tax_rates, :deleted_at, :datetime
+  end
+end

data/db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb

@@ -0,0 +1,6 @@
+class RemoveLockVersionFromInventoryUnits < ActiveRecord::Migration
+  def change
+    # we are moving to pessimistic locking on stock_items
+    remove_column :spree_inventory_units, :lock_version
+  end
+end