spree_core 1.1.3 → 1.1.4

data/app/models/spree/line_item.rb

@@ -80,6 +80,7 @@ module Spree
 
       def update_order
         # update the order totals, etc.
+        order.create_tax_charge!
         order.update!
       end
 
@@ -97,7 +98,7 @@ module Spree
       end
 
       def quantity_no_less_than_shipped
-        already_shipped = order.shipments.reduce(0) { |acc,s| acc + s.inventory_units.count { |i| i.variant == variant } }
+        already_shipped = order.shipments.reduce(0) { |acc,s| acc + s.inventory_units.select { |i| i.variant == variant }.count }
         unless quantity >= already_shipped
           errors.add(:quantity, I18n.t('validation.cannot_be_less_than_shipped_units'))
         end

data/app/models/spree/order.rb

@@ -19,7 +19,7 @@ module Spree
     belongs_to :shipping_method, :class_name => "Spree::ShippingMethod"
 
     has_many :state_changes, :as => :stateful
-    has_many :line_items, :dependent => :destroy
+    has_many :line_items, :dependent => :destroy, :order => "created_at ASC"
     has_many :inventory_units
     has_many :payments, :dependent => :destroy
     has_many :shipments, :dependent => :destroy
@@ -69,7 +69,7 @@ module Spree
         transition :to => 'canceled', :if => :allow_cancel?
       end
       event :return do
-        transition :to => 'returned', :from => 'awaiting_return'
+        transition :to => 'returned', :from => 'awaiting_return', :unless=>:awaiting_returns?
       end
       event :resume do
         transition :to => 'resumed', :from => 'canceled', :if => :allow_resume?
@@ -127,6 +127,14 @@ module Spree
       self.update_hooks.add(hook)
     end
 
+    def checkout_steps
+      if payment and payment.payment_method.payment_profiles_supported?
+        %w(address delivery payment confirm complete)
+      else
+        %w(address delivery payment complete)
+      end
+    end
+
     # For compatiblity with Calculator::PriceSack
     def amount
       line_items.map(&:amount).sum
@@ -271,6 +279,10 @@ module Spree
       true
     end
 
+    def awaiting_returns?
+      return_authorizations.any? { |return_authorization| return_authorization.authorized? }
+    end
+
     def add_variant(variant, quantity = 1)
       current_item = contains?(variant)
       if current_item
@@ -466,6 +478,11 @@ module Spree
       order.destroy
     end
 
+    def empty!
+      line_items.destroy_all
+      adjustments.destroy_all
+    end
+
     private
       def create_user
         self.email = user.email if self.user and not user.anonymous?
@@ -581,6 +598,10 @@ module Spree
       end
 
       def after_cancel
+        if shipment_state == 'pending'
+          self.update_attribute(:payment_state, 'credit_owed')
+        end
+
         restock_items!
 
         #TODO: make_shipments_pending

data/app/models/spree/payment/processing.rb

@@ -47,6 +47,7 @@ module Spree
       end
 
       def void_transaction!
+        return true if void?
         protect_from_connection_error do
           check_environment
 
@@ -104,8 +105,27 @@ module Spree
       credit!(amount)
     end
 
-    # This needs to be public so that gateway subclasses can use
-    # this to report errors
+    def gateway_options
+      options = { :email    => order.email,
+                  :customer => order.email,
+                  :ip       => '192.168.1.100', # TODO: Use an actual IP
+                  :order_id => order.number }
+
+      options.merge!({ :shipping => order.ship_total * 100,
+                       :tax      => order.tax_total * 100,
+                       :subtotal => order.item_total * 100 })
+      
+      options.merge!({ :currency => payment_method.preferences[:currency_code] }) if payment_method && payment_method.preferences[:currency_code]
+
+      options.merge!({ :billing_address  => order.bill_address.try(:active_merchant_hash),
+                      :shipping_address => order.ship_address.try(:active_merchant_hash) })
+
+      options.merge!(:discount => promo_total) if respond_to?(:promo_total)
+      options
+    end
+
+    private
+
     def gateway_error(error)
       if error.is_a? ActiveMerchant::Billing::Response
         text = error.params['message'] || error.params['response_reason_text'] || error.message
@@ -119,8 +139,6 @@ module Spree
       raise Core::GatewayError.new(text)
     end
 
-    private
-
     def gateway_action(source, action, success_state)
       protect_from_connection_error do
         check_environment
@@ -151,22 +169,6 @@ module Spree
       log_entries.create({:details => response.to_yaml}, :without_protection => true)
     end
 
-    def gateway_options
-      options = { :email    => order.email,
-                  :customer => order.email,
-                  :ip       => '192.168.1.100', # TODO: Use real IP address
-                  :order_id => order.number }
-
-      options.merge!({ :shipping => order.ship_total * 100,
-                       :tax      => order.tax_total * 100,
-                       :subtotal => order.item_total * 100 })
-      
-      options.merge!({ :currency => payment_method.preferences[:currency_code] }) if payment_method && payment_method.preferences[:currency_code]
-
-      options.merge({ :billing_address  => order.bill_address.try(:active_merchant_hash),
-                      :shipping_address => order.ship_address.try(:active_merchant_hash) })
-    end
-
     def protect_from_connection_error
       begin
         yield

data/app/models/spree/preferences/preferable_class_methods.rb

@@ -15,6 +15,8 @@ module Spree::Preferences
         else
           if get_pending_preference(name)
             get_pending_preference(name)
+          elsif Spree::Preference.table_exists? && preference = Spree::Preference.find_by_name(name)
+            preference.value
           else
             send self.class.preference_default_getter_method(name)
           end

data/app/models/spree/preferences/store.rb

@@ -23,11 +23,29 @@ module Spree::Preferences
     end
 
     def exist?(key)
-      @cache.exist? key
+      @cache.exist?(key) ||
+      should_persist? && Spree::Preference.where(:key => key).exists?
     end
 
     def get(key)
-      @cache.read(key)
+      # return the retrieved value, if it's in the cache
+      if (val = @cache.read(key)).present?
+        return val
+      end
+
+      return nil unless should_persist?
+
+      # If it's not in the cache, maybe it's in the database, but
+      # has been cleared from the cache
+
+      # does it exist in the database?
+      if preference = Spree::Preference.find_by_key(key)
+        # it does exist, so let's put it back into the cache
+        @cache.write(preference.key, preference.value)
+
+        # and return the value
+        preference.value
+      end
     end
 
     def delete(key)

data/app/models/spree/product.rb

@@ -23,13 +23,26 @@ module Spree
     has_many :option_types, :through => :product_option_types
     has_many :product_properties, :dependent => :destroy
     has_many :properties, :through => :product_properties
-    belongs_to :tax_category, :class_name => "Spree::TaxCategory"
+
     has_and_belongs_to_many :taxons, :join_table => 'spree_products_taxons'
-    belongs_to :shipping_category, :class_name => "Spree::ShippingCategory"
+
+    belongs_to :tax_category
+    belongs_to :shipping_category
 
     has_one :master,
       :class_name => 'Spree::Variant',
-      :conditions => ["#{Variant.quoted_table_name}.is_master = ?", true]
+      :conditions => { :is_master => true },
+      :dependent => :destroy
+
+    has_many :variants,
+      :class_name => 'Spree::Variant',
+      :conditions => { :is_master => false, :deleted_at => nil },
+      :order => :position
+
+    has_many :variants_including_master,
+      :class_name => 'Spree::Variant',
+      :conditions => { :deleted_at => nil },
+      :dependent => :destroy
 
     delegate_belongs_to :master, :sku, :price, :weight, :height, :width, :depth, :is_master
     delegate_belongs_to :master, :cost_price if Variant.table_exists? && Variant.column_names.include?('cost_price')
@@ -41,33 +54,13 @@ module Spree
     after_save :save_master
     after_save :set_master_on_hand_to_zero_when_product_has_variants
 
-    has_many :variants,
-      :class_name => 'Spree::Variant',
-      :conditions => ["#{::Spree::Variant.quoted_table_name}.is_master = ? AND #{::Spree::Variant.quoted_table_name}.deleted_at IS NULL", false],
-      :order => "#{::Spree::Variant.quoted_table_name}.position ASC"
-
-    has_many :variants_including_master,
-      :class_name => 'Spree::Variant',
-      :conditions => ["#{::Spree::Variant.quoted_table_name}.deleted_at IS NULL"],
-      :dependent => :destroy
+    delegate :images, :to => :master, :prefix => true
+    alias_method :images, :master_images
 
-    has_many :variants_with_only_master,
-      :class_name => 'Spree::Variant',
-      :conditions => ["#{::Spree::Variant.quoted_table_name}.deleted_at IS NULL AND #{::Spree::Variant.quoted_table_name}.is_master = ?", true],
-      :dependent => :destroy
+    has_many :variant_images, :source => :images, :through => :variants_including_master, :order => :position
 
     accepts_nested_attributes_for :variants, :allow_destroy => true
 
-    def variant_images
-      Image.joins("LEFT JOIN #{Variant.quoted_table_name} ON #{Variant.quoted_table_name}.id = #{Asset.quoted_table_name}.viewable_id").
-      where("(#{Asset.quoted_table_name}.viewable_type = ? AND #{Asset.quoted_table_name}.viewable_id = ?) OR
-             (#{Asset.quoted_table_name}.viewable_type = ? AND #{Asset.quoted_table_name}.viewable_id = ?)", Variant.name, self.master.id, Product.name, self.id).
-      order("#{Asset.quoted_table_name}.position").
-      extend(Spree::Core::RelationSerialization)
-    end
-
-    alias_method :images, :variant_images
-
     validates :name, :price, :permalink, :presence => true
 
     attr_accessor :option_values_hash
@@ -89,11 +82,12 @@ module Spree
 
     after_initialize :ensure_master
 
-    def ensure_master
-      return unless new_record?
-      self.master ||= Variant.new
+    def variants_with_only_master
+      ActiveSupport::Deprecation.warn("[SPREE] Spree::Product#variants_with_only_master will be deprecated in Spree 1.3. Please use Spree::Product#master instead.")
+      master
     end
 
+
     def to_param
       permalink.present? ? permalink : (permalink_was || name.to_s.to_url)
     end
@@ -127,6 +121,13 @@ 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)
@@ -256,6 +257,11 @@ module Spree
       def save_master
         master.save if master && (master.changed? || master.new_record?)
       end
+
+      def ensure_master
+        return unless new_record?
+        self.master ||= Variant.new
+      end
   end
 end
 

data/app/models/spree/product/scopes.rb

@@ -27,11 +27,11 @@ module Spree
     end
 
     add_search_scope :ascend_by_master_price do
-      joins(:variants_with_only_master).order("#{variant_table_name}.price ASC")
+      joins(:master).order("#{variant_table_name}.price ASC")
     end
 
     add_search_scope :descend_by_master_price do
-      joins(:variants_with_only_master).order("#{variant_table_name}.price DESC")
+      joins(:master).order("#{variant_table_name}.price DESC")
     end
 
     add_search_scope :price_between do |low, high|
@@ -50,8 +50,23 @@ module Spree
     # If you need products only within one taxon use
     #
     #   Spree::Product.taxons_id_eq(x)
+    # 
+    # If you're using count on the result of this scope, you must use the
+    # `:distinct` option as well:
+    #
+    #   Spree::Product.in_taxon(taxon).count(:distinct => true)
+    #
+    # This is so that the count query is distinct'd:
+    #
+    #   SELECT COUNT(DISTINCT "spree_products"."id") ...
+    #
+    #   vs.
+    #
+    #   SELECT COUNT(*) ...
     add_search_scope :in_taxon do |taxon|
-      joins(:taxons).where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
+      select("DISTINCT(spree_products.id), spree_products.*").
+      joins(:taxons).
+      where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
     end
 
     # This scope selects products in all taxons AND all its descendants
@@ -113,7 +128,7 @@ module Spree
       end
 
       conditions = "#{option_values}.name = ? AND #{option_values}.option_type_id = ?", value, option_type_id
-      joins(:variants_including_master => :option_values).where(conditions)
+      group("spree_products.id").joins(:variants_including_master => :option_values).where(conditions)
     end
 
     # Finds all products which have either:
@@ -188,11 +203,11 @@ module Spree
 
     add_search_scope :on_hand do
       variants_table = Variant.table_name
-      where("#{table_name}.id in (select product_id from #{variants_table} where product_id = #{table_name}.id group by product_id having sum(count_on_hand) > 0)")
+      where("#{table_name}.id in (select product_id from #{variants_table} where product_id = #{table_name}.id and #{variants_table}.deleted_at IS NULL group by product_id having sum(count_on_hand) > 0)")
     end
 
     add_search_scope :taxons_name_eq do |name|
-      joins(:taxons).where(Taxon.arel_table[:name].eq(name))
+      group("spree_products.id").joins(:taxons).where(Taxon.arel_table[:name].eq(name))
     end
 
     if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')

data/app/models/spree/return_authorization.rb

@@ -71,6 +71,7 @@ module Spree
         credit.source = self
         credit.adjustable = order
         credit.save
+        order.return if inventory_units.all?{ |inventory_unit| inventory_unit.returned? }
       end
 
       def allow_receive?

data/app/models/spree/shipping_method.rb

@@ -1,6 +1,9 @@
 module Spree
   class ShippingMethod < ActiveRecord::Base
     DISPLAY = [:both, :front_end, :back_end]
+
+    default_scope where(:deleted_at => nil)
+
     has_many :shipments
     validates :name, :zone, :presence => true
 

data/app/models/spree/variant.rb

@@ -58,18 +58,12 @@ module Spree
       end
     end
 
-    # strips all non-price-like characters from the price.
     def price=(price)
-      if price.present?
-        self[:price] = price.to_s.gsub(/[^0-9\.-]/, '').to_f
-      end
+      self[:price] = parse_price(price) if price.present?
     end
 
-    # and cost_price
     def cost_price=(price)
-      if price.present?
-        self[:cost_price] = price.to_s.gsub(/[^0-9\.-]/, '').to_f
-      end
+      self[:cost_price] = parse_price(price) if price.present?
     end
 
     # returns number of units currently on backorder for this variant.
@@ -156,6 +150,19 @@ 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
+
       # Ensures a new variant takes the product master price when price is not supplied
       def check_price
         if price.nil?
@@ -169,7 +176,10 @@ module Spree
       end
 
       def recalculate_product_on_hand
-        product.update_column(:count_on_hand, product.on_hand)
+        on_hand = product.on_hand
+        if Spree::Config[:track_inventory_levels] && on_hand != (1.0 / 0) # Infinity
+          product.update_column(:count_on_hand, on_hand)
+        end
       end
   end
 end

data/app/views/spree/admin/images/_form.html.erb

@@ -3,14 +3,10 @@
     <td><%= t(:filename) %>:</td>
     <td><%= f.file_field :attachment %></td>
   </tr>
-  <% if @product.has_variants? %>
-    <tr data-hook="variant">
-      <td><%= Spree::Variant.model_name.human %>:</td>
-      <td><%= f.select :viewable_id, @variants %></td>
-    </tr>
-  <% else %>
-    <%= hidden_field_tag :product_id, @product.id %>
-  <% end %>
+  <tr data-hook="variant">
+    <td><%= Spree::Variant.model_name.human %>:</td>
+    <td><%= f.select :viewable_id, @variants %></td>
+  </tr>
   <tr data-hook="alt_text">
     <td><%= t(:alt_text) %>:</td>
     <td><%= f.text_area :alt %></td>