spree_core 1.1.1 → 1.1.2.rc1

data/app/helpers/spree/admin/navigation_helper.rb

@@ -56,47 +56,12 @@ module Spree
         link_to_with_icon('exclamation', t(:clone), clone_admin_product_url(resource), options)
       end
 
-      def link_to_delete(resource, options = {}, html_options={})
-        options.assert_valid_keys(:url, :caption, :title, :dataType, :success, :error, :name)
-
-        options.reverse_merge! :url => object_url(resource) unless options.key? :url
-        options.reverse_merge! :caption => t(:are_you_sure)
-        options.reverse_merge! :title => t(:confirm_delete)
-        options.reverse_merge! :dataType => 'script'
-        options.reverse_merge! :success => "function(r){ $('##{spree_dom_id resource}').fadeOut('hide'); }"
-        options.reverse_merge! :error => "function(jqXHR, textStatus, errorThrown){ show_flash_error(jqXHR.responseText); }"
-        options.reverse_merge! :name => icon('delete') + ' ' + t(:delete)
-
-        link_to_function_delete(options, html_options)
-        #link_to_function_delete_native(options, html_options)
-      end
-
-      # this function does not use jConfirm
-      def link_to_function_delete_native(options, html_options)
-        fn = %Q{
-          var answer = confirm("#{t(:are_you_sure)}");
-          if (!!answer) { #{link_to_function_delete_ajax(options)} };
-        }
-        link_to_function options[:name], fn, html_options
-      end
-
-      def link_to_function_delete(options, html_options)
-        link_to_function options[:name], "jConfirm('#{options[:caption]}', '#{options[:title]}', function(r) {
-          if(r){ #{link_to_function_delete_ajax(options)} }
-        });", html_options
-      end
-
-      def link_to_function_delete_ajax(options)
-        %Q{
-          $.ajax({
-            type: 'POST',
-            url: '#{options[:url]}',
-            data: ({_method: 'delete', authenticity_token: AUTH_TOKEN}),
-            dataType:'#{options[:dataType]}',
-            success: #{options[:success]},
-            error: #{options[:error]}
-          });
-        }
+      def link_to_delete(resource, options={})
+        url = options[:url] || object_url(resource)
+        name = options[:name] || icon('delete') + ' ' + t(:delete)
+        link_to name, url,
+          :class => "delete-resource",
+          :data => { :confirm => t(:are_you_sure) }
       end
 
       def link_to_with_icon(icon_name, text, url, options = {})
@@ -129,10 +94,6 @@ module Spree
         end
       end
 
-      def button_link_to_function(text, function, html_options = {})
-        link_to_function(text_for_button_link(text, html_options), function, html_options_for_button_link(html_options))
-      end
-
       def text_for_button_link(text, html_options)
         s = ''
         if html_options[:icon]

data/app/helpers/spree/products_helper.rb

@@ -14,7 +14,7 @@ module Spree
 
     # converts line breaks in product description into <p> tags (for html display purposes)
     def product_description(product)
-      raw(product.description.gsub(/^(.*)$/, '<p>\1</p>'))
+      raw(product.description.gsub(/(.*?)\n\n/m, '<p>\1</p>\n\n'))
     end
 
     def variant_images_hash(product)

data/app/models/spree/address.rb

@@ -1,9 +1,9 @@
 module Spree
   class Address < ActiveRecord::Base
-    belongs_to :country
-    belongs_to :state
+    belongs_to :country, :class_name => "Spree::Country"
+    belongs_to :state, :class_name => "Spree::State"
 
-    has_many :shipments
+    has_many :shipments, :class_name => "Spree::Shipment"
 
     validates :firstname, :lastname, :address1, :city, :zipcode, :country, :phone, :presence => true
     validate :state_validate

data/app/models/spree/app_configuration.rb

@@ -68,6 +68,7 @@ module Spree
     # Preferences related to image settings
     preference :attachment_default_url, :string, :default => '/spree/products/:id/:style/:basename.:extension'
     preference :attachment_path, :string, :default => ':rails_root/public/spree/products/:id/:style/:basename.:extension'
+    preference :attachment_url, :string, :default => '/spree/products/:id/:style/:basename.:extension'
     preference :attachment_styles, :string, :default => "{\"mini\":\"48x48>\",\"small\":\"100x100>\",\"product\":\"240x240>\",\"large\":\"600x600>\"}"
     preference :attachment_default_style, :string, :default => 'product'
     preference :s3_access_key, :string

data/app/models/spree/calculator/default_tax.rb

@@ -1,3 +1,5 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::DefaultTax < Calculator
     def self.description

data/app/models/spree/calculator/flat_percent_item_total.rb

@@ -1,3 +1,5 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::FlatPercentItemTotal < Calculator
     preference :flat_percent, :decimal, :default => 0

data/app/models/spree/calculator/flat_rate.rb

@@ -1,3 +1,5 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::FlatRate < Calculator
     preference :amount, :decimal, :default => 0

data/app/models/spree/calculator/flexi_rate.rb

@@ -1,3 +1,5 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::FlexiRate < Calculator
     preference :first_item,      :decimal, :default => 0.0

data/app/models/spree/calculator/per_item.rb

@@ -1,3 +1,5 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::PerItem < Calculator
     preference :amount, :decimal, :default => 0
@@ -11,14 +13,28 @@ module Spree
     def compute(object=nil)
       return 0 if object.nil?
       self.preferred_amount * object.line_items.reduce(0) do |sum, value|
-        value_to_add = (target_products().include?(value.product) ? value.quantity : 0)
+        if !matching_products || matching_products.include?(value.product)
+          value_to_add = value.quantity
+        else
+          value_to_add = 0
+        end
         sum + value_to_add
       end
     end
 
-    def target_products
-      #TODO: product groups?
-      self.calculable.promotion.rules.map(&:products).flatten
+    # Returns all products that match this calculator, but only if the calculator
+    # is attached to a promotion. If attached to a ShippingMethod, nil is returned.
+    def matching_products
+      # Regression check for #1596
+      # Calculator::PerItem can be used in two cases.
+      # The first is in a typical promotion, providing a discount per item of a particular item
+      # The second is a ShippingMethod, where it applies to an entire order
+      #
+      # Shipping methods do not have promotions attached, but promotions do
+      # Therefore we must check for promotions
+      if self.calculable.respond_to?(:promotion)
+        self.calculable.promotion.rules.map(&:products).flatten
+      end
     end
   end
 end

data/app/models/spree/calculator/price_sack.rb

@@ -1,3 +1,5 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::PriceSack < Calculator
     preference :minimal_amount, :decimal, :default => 0

data/app/models/spree/country.rb

@@ -1,9 +1,9 @@
 module Spree
   class Country < ActiveRecord::Base
-    has_many :states, :order => "name ASC"
+    has_many :states, :order => "name ASC", :class_name => "Spree::State"
 
-    has_one :zone_member, :as => :zoneable
-    has_one :zone, :through => :zone_member
+    has_one :zone_member, :as => :zoneable, :class_name => "Spree::ZoneMember"
+    has_one :zone, :through => :zone_member, :class_name => "Spree::Zone"
 
     validates :name, :iso_name, :presence => true
 

data/app/models/spree/creditcard.rb

@@ -1,6 +1,6 @@
 module Spree
   class Creditcard < ActiveRecord::Base
-    has_many :payments, :as => :source
+    has_many :payments, :as => :source, :class_name => "Spree::Payment"
 
     before_save :set_last_digits
     after_validation :set_card_type

data/app/models/spree/image.rb

@@ -25,6 +25,7 @@ module Spree
 
     Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
     Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+    Spree::Image.attachment_definitions[:attachment][:url] = Spree::Config[:attachment_url]
     Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
     Spree::Image.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
 

data/app/models/spree/inventory_unit.rb

@@ -1,9 +1,9 @@
 module Spree
   class InventoryUnit < ActiveRecord::Base
-    belongs_to :variant
-    belongs_to :order
-    belongs_to :shipment
-    belongs_to :return_authorization
+    belongs_to :variant, :class_name => "Spree::Variant"
+    belongs_to :order, :class_name => "Spree::Order"
+    belongs_to :shipment, :class_name => "Spree::Shipment"
+    belongs_to :return_authorization, :class_name => "Spree::ReturnAuthorization"
 
     scope :backorder, where(:state => 'backordered')
 
@@ -81,7 +81,9 @@ module Spree
         variant_units = order.inventory_units.group_by(&:variant_id)
         return unless variant_units.include? variant.id
 
-        variant_units = variant_units[variant.id].sort_by(&:state)
+        variant_units = variant_units[variant.id].reject do |variant_unit|
+          variant_unit.state == 'shipped'
+        end.sort_by(&:state)
 
         quantity.times do
           inventory_unit = variant_units.shift

data/app/models/spree/line_item.rb

@@ -1,11 +1,11 @@
 module Spree
   class LineItem < ActiveRecord::Base
     before_validation :adjust_quantity
-    belongs_to :order
-    belongs_to :variant
+    belongs_to :order, :class_name => "Spree::Order"
+    belongs_to :variant, :class_name => "Spree::Variant"
 
     has_one :product, :through => :variant
-    has_many :adjustments, :as => :adjustable
+    has_many :adjustments, :as => :adjustable, :class_name => "Spree::Adjustment"
 
     before_validation :copy_price
 

data/app/models/spree/option_type.rb

@@ -1,8 +1,8 @@
 module Spree
   class OptionType < ActiveRecord::Base
-    has_many :option_values, :order => :position, :dependent => :destroy
-    has_many :product_option_types, :dependent => :destroy
-    has_and_belongs_to_many :prototypes, :join_table => 'spree_option_types_prototypes'
+    has_many :option_values, :order => :position, :dependent => :destroy, :class_name => "Spree::OptionValue"
+    has_many :product_option_types, :dependent => :destroy, :class_name => "Spree::ProductOptionType"
+    has_and_belongs_to_many :prototypes, :join_table => 'spree_option_types_prototypes', :class_name => "Spree::Prototype"
 
     attr_accessible :name, :presentation
 

data/app/models/spree/option_value.rb

@@ -1,8 +1,8 @@
 module Spree
   class OptionValue < ActiveRecord::Base
-    belongs_to :option_type
+    belongs_to :option_type, :class_name => "Spree::OptionType"
     acts_as_list :scope => :option_type
-    has_and_belongs_to_many :variants, :join_table => 'spree_option_values_variants'
+    has_and_belongs_to_many :variants, :join_table => 'spree_option_values_variants', :class_name => "Spree::Variant"
 
     attr_accessible :name, :presentation
   end

data/app/models/spree/order.rb

@@ -6,7 +6,7 @@ module Spree
                     :ship_address, :bill_address, :line_items_attributes, :number,
                     :shipping_method_id, :email, :use_billing, :special_instructions
 
-    belongs_to :user
+    belongs_to :user, :class_name => "Spree::User"
 
     belongs_to :bill_address, :foreign_key => 'bill_address_id', :class_name => 'Spree::Address'
     alias_method :billing_address, :bill_address
@@ -16,7 +16,7 @@ module Spree
     alias_method :shipping_address, :ship_address
     alias_method :shipping_address=, :ship_address=
 
-    belongs_to :shipping_method
+    belongs_to :shipping_method, :class_name => "Spree::ShippingMethod"
 
     has_many :state_changes, :as => :stateful
     has_many :line_items, :dependent => :destroy
@@ -24,7 +24,7 @@ module Spree
     has_many :payments, :dependent => :destroy
     has_many :shipments, :dependent => :destroy
     has_many :return_authorizations, :dependent => :destroy
-    has_many :adjustments, :as => :adjustable, :dependent => :destroy
+    has_many :adjustments, :as => :adjustable, :dependent => :destroy, :order => "created_at ASC"
 
     accepts_nested_attributes_for :line_items
     accepts_nested_attributes_for :bill_address
@@ -43,18 +43,6 @@ module Spree
     validate :has_available_shipment
     validate :has_available_payment
 
-    #delegate :ip_address, :to => :checkout
-    def ip_address
-      '192.168.1.100'
-    end
-
-    scope :by_number, lambda { |number| where(:number => number) }
-    scope :between, lambda { |*dates| where('created_at BETWEEN ? AND ?', dates.first.to_date, dates.last.to_date) }
-    scope :by_customer, lambda { |customer| joins(:user).where("#{Spree::User.table_name}.email = ?", customer) }
-    scope :by_state, lambda { |state| where(:state => state) }
-    scope :complete, where('completed_at IS NOT NULL')
-    scope :incomplete, where(:completed_at => nil)
-
     make_permalink :field => :number
 
     class_attribute :update_hooks
@@ -110,6 +98,30 @@ module Spree
 
     end
 
+    def self.by_number(number)
+      where(:number => number)
+    end
+
+    def self.between(start_date, end_date)
+      where(:created_at => start_date..end_date)
+    end
+
+    def self.by_customer(customer)
+      joins(:user).where("#{Spree::User.table_name}.email" => customer)
+    end
+
+    def self.by_state(state)
+      where(:state => state)
+    end
+
+    def self.complete
+      where('completed_at IS NOT NULL')
+    end
+
+    def self.incomplete
+      where(:completed_at => nil)
+    end
+
     # Use this method in other gems that wish to register their own custom logic that should be called after Order#updat
     def self.register_update_hook(hook)
       self.update_hooks.add(hook)
@@ -284,6 +296,7 @@ module Spree
         current_item.update_attribute(field[:name].gsub(' ', '_').downcase, value)
       end
 
+      self.reload
       current_item
     end
 
@@ -414,6 +427,10 @@ module Spree
       end.compact.sort_by { |r| r.cost }
     end
 
+    def paid?
+      payment_state == 'paid'
+    end
+
     def payment
       payments.first
     end
@@ -446,6 +463,13 @@ module Spree
       line_items.select &:insufficient_stock?
     end
 
+    def merge!(order)
+      order.line_items.each do |line_item|
+        self.add_variant(line_item.variant, line_item.quantity)
+      end
+      order.destroy
+    end
+
     private
       def create_user
         self.email = user.email if self.user and not user.anonymous?

data/app/models/spree/payment.rb

@@ -1,9 +1,9 @@
 module Spree
   class Payment < ActiveRecord::Base
     include Spree::Payment::Processing
-    belongs_to :order
+    belongs_to :order, :class_name => "Spree::Order"
     belongs_to :source, :polymorphic => true, :validate => true
-    belongs_to :payment_method
+    belongs_to :payment_method, :class_name => "Spree::PaymentMethod"
 
     has_many :offsets, :class_name => 'Spree::Payment', :foreign_key => 'source_id', :conditions => "source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'"
     has_many :log_entries, :as => :source

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

@@ -50,7 +50,14 @@ module Spree
         protect_from_connection_error do
           check_environment
 
-          response = payment_method.void(self.response_code, gateway_options)
+          if payment_method.payment_profiles_supported?
+            # Gateways supporting payment profiles will need access to creditcard object because this stores the payment profile information
+            # so supply the authorization itself as well as the creditcard, rather than just the authorization code
+            response = payment_method.void(self.response_code, source, gateway_options)
+          else
+            # Standard ActiveMerchant void usage
+            response = payment_method.void(self.response_code, gateway_options)
+          end
           record_response(response)
 
           if response.success?
@@ -129,8 +136,10 @@ module Spree
       record_response(response)
 
       if response.success?
-        self.response_code = response.authorization
-        self.avs_response = response.avs_result['code']
+        unless response.authorization.nil?
+          self.response_code = response.authorization
+          self.avs_response = response.avs_result['code']
+        end
         self.send("#{success_state}!")
       else
         self.send("#{failure_state}!")
@@ -145,7 +154,7 @@ module Spree
     def gateway_options
       options = { :email    => order.email,
                   :customer => order.email,
-                  :ip       => order.ip_address,
+                  :ip       => '192.168.1.100', # TODO: Use real IP address
                   :order_id => order.number }
 
       options.merge!({ :shipping => order.ship_total * 100,

data/app/models/spree/preference.rb

@@ -35,23 +35,24 @@ class Spree::Preference < ActiveRecord::Base
   # to preferences definition types. This code should eventually be removed.
   # it is called during the load_preferences of the Preferences::Store
   def self.convert_old_value_types(preference)
-    return unless [Symbol.to_s, Fixnum.to_s, Bignum.to_s,
-                   Float.to_s, TrueClass.to_s, FalseClass.to_s].include? preference.value_type
+    classes =  [Symbol.to_s, Fixnum.to_s, Bignum.to_s,
+                Float.to_s, TrueClass.to_s, FalseClass.to_s]
+    return unless classes.map(&:downcase).include? preference.value_type.downcase
 
-    case preference.value_type
-    when Symbol.to_s
+    case preference.value_type.downcase
+    when "symbol"
       preference.value_type = 'string'
-    when Fixnum.to_s
+    when "fixnum"
       preference.value_type = 'integer'
-    when Bignum.to_s
+    when "bignum"
       preference.value_type = 'integer'
       preference.value = preference.value.to_f.to_i
-    when Float.to_s
+    when "float"
       preference.value_type = 'decimal'
-    when TrueClass.to_s
+    when "trueclass"
       preference.value_type = 'boolean'
       preference.value = "true"
-    when FalseClass.to_s
+    when "falseclass"
       preference.value_type = 'boolean'
       preference.value = "false"
     end