spree_core 1.1.0.rc1 → 1.1.0.rc2

data/app/assets/javascripts/admin/shipping_methods.js

@@ -3,9 +3,10 @@ $(document).ready(function() {
     $('input[type=checkbox]:not(:checked)').attr('disabled', true);
   }
 
-  $('.categories input[type=checkbox]').change(function(){
+  categoryCheckboxes = '.categories input[type=checkbox]';
+  $(categoryCheckboxes).change(function(){
     if($(this).is(':checked')) {
-      $('input[type=checkbox]').attr('disabled', true);
+      $(categoryCheckboxes + ':not(:checked)').attr('disabled', true);
       $(this).removeAttr('disabled');
     } else {
       $('input[type=checkbox]').removeAttr('disabled');

data/app/assets/javascripts/admin/spree_core.js

@@ -1,5 +1,3 @@
-//= require jquery
-//= require jquery_ujs
 //= require jquery-ui
 //= require jquery.cookie
 //= require jquery.tokeninput

data/app/assets/javascripts/store/spree_core.js

@@ -1,5 +1,3 @@
-//= require jquery
-//= require jquery_ujs
 //= require jquery.validate/jquery.validate.min
 //= require jquery.formalize.min
 //= require store/checkout

data/app/controllers/spree/admin/option_types_controller.rb

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class OptionTypesController < ResourceController
-      before_filter :load_product, :only => [:selected, :available, :remove]
+      before_filter :load_product, :only => [:select, :selected, :available, :remove]
 
       def available
         set_available_option_types
@@ -32,7 +32,6 @@ module Spree
 
       # AJAX method for selecting an existing option type and associating with the current product
       def select
-        @product = Product.find_by_param!(params[:product_id])
         @product.option_types << OptionType.find(params[:id])
         @product.reload
         @option_types = @product.option_types
@@ -55,13 +54,12 @@ module Spree
           @product = Product.find_by_param!(params[:product_id])
         end
   
-        def set_available_option_types
-          @available_option_types = OptionType.all
-          selected_option_types = []
-          @product.options.each do |option|
-            selected_option_types << option.option_type
+        def set_available_option_types     
+          @available_option_types = if @product.option_type_ids.any?
+            OptionType.where('id NOT IN (?)', @product.option_type_ids)
+          else
+            OptionType.all
           end
-          @available_option_types.delete_if {|ot| selected_option_types.include? ot}
         end
     end
   end

data/app/controllers/spree/admin/payments_controller.rb

@@ -51,9 +51,8 @@ module Spree
       end
 
       def fire
-        # TODO: consider finer-grained control for this type of action (right now anyone in admin role can perform)
         return unless event = params[:e] and @payment.payment_source
-        if @payment.payment_source.send("#{event}", @payment)
+        if @payment.send("#{event}!")
           flash.notice = t(:payment_updated)
         else
           flash[:error] = t(:cannot_perform_operation)

data/app/controllers/spree/admin/products_controller.rb

@@ -85,7 +85,18 @@ module Spree
             params[:q][:s] ||= "name asc"
 
             @search = super.search(params[:q])
-            @collection = @search.result.group_by_products_id.includes([:master, {:variants => [:images, :option_values]}]).page(params[:page]).per(Spree::Config[:admin_products_per_page])
+            @collection = @search.result.
+              group_by_products_id.
+              includes([:master, {:variants => [:images, :option_values]}]).
+              page(params[:page]).
+              per(Spree::Config[:admin_products_per_page])
+
+            if params[:q][:s].include?("master_price")
+              # By applying the group in the main query we get an undefined method gsub for Arel::Nodes::Descending
+              # It seems to only work when the price is actually being sorted in the query
+              # To be investigated later.
+              @collection = @collection.group("spree_variants.price")
+            end
           else
             includes = [{:variants => [:images,  {:option_values => :option_type}]}, {:master => :images}]
 
@@ -95,10 +106,8 @@ module Spree
             tmp = super.where(["#{Variant.table_name}.sku #{LIKE} ?", "%#{params[:q]}%"])
             tmp = tmp.includes(:variants_including_master).limit(params[:limit] || 10)
             @collection.concat(tmp)
-
-            @collection
           end
-
+          @collection
         end
 
         def create_before

data/app/controllers/spree/products_controller.rb

@@ -13,7 +13,7 @@ module Spree
     end
 
     def show
-      @product = Product.find_by_permalink!(params[:id])
+      @product = Product.active.find_by_permalink!(params[:id])
       return unless @product
 
       @variants = Variant.active.includes([:option_values, :images]).where(:product_id => @product.id)

data/app/controllers/spree/states_controller.rb

@@ -7,7 +7,7 @@ module Spree
     def index
       # we return ALL known information, since billing country isn't restricted
       # by shipping country
-      respond_with @state_info = Spree::State.states_group_by_country_id.to_json
+      respond_with @state_info = Spree::State.states_group_by_country_id.to_json, :layout => nil
     end
   end
 end

data/app/helpers/spree/base_helper.rb

@@ -64,6 +64,11 @@ module Spree
     end
 
     Spree::Image.attachment_definitions[:attachment][:styles].each do |style, v|
+      # Defines these methods by default:
+      # def mini_image
+      # def small_image
+      # def product_image
+      # def large_image
       define_method "#{style}_image" do |product, *options|
         options = options.first || {}
         if product.images.empty?
@@ -100,13 +105,10 @@ module Spree
     end
 
     def flash_messages
-      [:notice, :error].map do |msg_type|
-        if flash[msg_type]
-          content_tag :div, flash[msg_type], :class => "flash #{msg_type}"
-        else
-          ''
-        end
-      end.join("\n").html_safe
+      flash.each do |msg_type, text|
+        concat(content_tag :div, text, :class => "flash #{msg_type}")
+      end
+      nil
     end
 
     def breadcrumbs(taxon, separator=" » ")

data/app/helpers/spree/products_helper.rb

@@ -12,12 +12,6 @@ module Spree
       end
     end
 
-    # returns the price of the product to show for display purposes
-    def product_price(product_or_variant, options={})
-       ActiveSupport::Deprecation.warn('product_price is deprecated and no longer calculates
-                                        tax.  Use number_to_currency instead.', caller)
-    end
-
     # converts line breaks in product description into <p> tags (for html display purposes)
     def product_description(product)
       raw(product.description.gsub(/^(.*)$/, '<p>\1</p>'))

data/app/mailers/spree/order_mailer.rb

@@ -2,17 +2,17 @@ module Spree
   class OrderMailer < ActionMailer::Base
     helper 'spree/base'
 
-    def confirm_email(order, resend=false)
+    def confirm_email(order, resend = false)
       @order = order
-      subject = (resend ? "[#{t(:resend).upcase}] " : "")
+      subject = (resend ? "[#{t(:resend).upcase}] " : '')
       subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{order.number}"
       mail(:to => order.email,
            :subject => subject)
     end
 
-    def cancel_email(order, resend=false)
+    def cancel_email(order, resend = false)
       @order = order
-      subject = (resend ? "[#{t(:resend).upcase}] " : "")
+      subject = (resend ? "[#{t(:resend).upcase}] " : '')
       subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{order.number}"
       mail(:to => order.email,
            :subject => subject)

data/app/mailers/spree/shipment_mailer.rb

@@ -2,9 +2,9 @@ module Spree
   class ShipmentMailer < ActionMailer::Base
     helper 'spree/base'
 
-    def shipped_email(shipment, resend=false)
+    def shipped_email(shipment, resend = false)
       @shipment = shipment
-      subject = (resend ? "[#{t(:resend).upcase}] " : "")
+      subject = (resend ? "[#{t(:resend).upcase}] " : '')
       subject += "#{Spree::Config[:site_name]} #{t('shipment_mailer.shipped_email.subject')} ##{shipment.order.number}"
       mail(:to => shipment.order.email,
            :subject => subject)

data/app/models/spree/address.rb

@@ -13,14 +13,12 @@ module Spree
                     :country, :state, :phone, :state_name,
                     :company, :alternative_phone
 
-    # disconnected since there's no code to display error messages yet OR matching client-side validation
+    # Disconnected since there's no code to display error messages yet OR matching client-side validation
     def phone_validate
       return if phone.blank?
       n_digits = phone.scan(/[0-9]/).size
       valid_chars = (phone =~ /^[-+()\/\s\d]+$/)
-      if !(n_digits > 5 && valid_chars)
-        errors.add(:phone, :invalid)
-      end
+      errors.add :phone, :invalid unless (n_digits > 5 && valid_chars)
     end
 
     def self.default
@@ -28,7 +26,7 @@ module Spree
       new({:country => country}, :without_protection => true)
     end
 
-    # can modify an address if it's not been used in an order (but checkouts controller has finer control)
+    # Can modify an address if it's not been used in an order (but checkouts controller has finer control)
     # def editable?
     #   new_record? || (shipments.empty? && checkouts.empty?)
     # end
@@ -51,7 +49,7 @@ module Spree
 
     def same_as?(other)
       return false if other.nil?
-      attributes.except('id', 'updated_at', 'created_at') ==  other.attributes.except('id', 'updated_at', 'created_at')
+      attributes.except('id', 'updated_at', 'created_at') == other.attributes.except('id', 'updated_at', 'created_at')
     end
 
     alias same_as same_as?
@@ -77,14 +75,28 @@ module Spree
       attributes.except('id', 'created_at', 'updated_at', 'order_id', 'country_id').all? { |_, v| v.nil? }
     end
 
+    # Generates an ActiveMerchant compatible address hash
+    def active_merchant_hash
+      {
+        :name => full_name,
+        :address1 => address1,
+        :address2 => address2,
+        :city => city,
+        :state => state_text,
+        :zip => zipcode,
+        :country => country.try(:iso),
+        :phone => phone
+      }
+    end
+
     private
 
       def state_validate
-        #skip state validation without country (also required)
-        #or when disabled by perfernce
-        return if !country.present? || !Spree::Config[:address_requires_state]
+        # Skip state validation without country (also required)
+        # or when disabled by preference
+        return if country.blank? || !Spree::Config[:address_requires_state]
 
-        #ensure associated state belongs to country
+        # ensure associated state belongs to country
         if state.present?
           if state.country == country
             self.state_name = nil #not required as we have a valid state and country combo
@@ -97,7 +109,7 @@ module Spree
           end
         end
 
-        #ensure state_name belongs to country without states, or that it matches a predefined state name/abbr
+        # ensure state_name belongs to country without states, or that it matches a predefined state name/abbr
         if state_name.present?
           if country.states.present?
             states = country.states.find_all_by_name_or_abbr(state_name)
@@ -111,10 +123,8 @@ module Spree
           end
         end
 
-        #ensure at least one state field is populated
-        if !state.present? && state_name.blank?
-          errors.add(:state, :blank)
-        end
+        # ensure at least one state field is populated
+        errors.add :state, :blank if state.blank? && state_name.blank?
       end
 
   end

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

@@ -9,7 +9,10 @@ module Spree
     end
 
     def compute(object=nil)
-      self.preferred_amount * object.line_items.length
+      return 0 if object.nil?
+      self.preferred_amount * object.line_items.reduce(0) do |sum, value|
+        sum + value.quantity
+      end
     end
   end
 end

data/app/models/spree/calculator.rb

@@ -11,7 +11,7 @@ module Spree
 
     # overwrite to provide description for your calculators
     def self.description
-      "Base Caclulator"
+      'Base Calculator'
     end
 
     ###################################################################

data/app/models/spree/creditcard.rb

@@ -11,19 +11,14 @@ module Spree
     validates :number, :presence => true, :unless => :has_payment_profile?, :on => :create
     validates :verification_value, :presence => true, :unless => :has_payment_profile?, :on => :create
 
-    attr_accessible :first_name, :last_name, :number, :verification_value, :year, :month, :gateway_customer_profile_id
+    attr_accessible :first_name, :last_name, :number, :verification_value, :year,
+                    :month, :gateway_customer_profile_id
 
-    def process!(payment)
-      if Spree::Config[:auto_capture]
-        purchase(payment.amount.to_f, payment)
-      else
-        authorize(payment.amount.to_f, payment)
-      end
-    end
+    scope :with_payment_profile, where('gateway_customer_profile_id IS NOT NULL')
 
     def set_last_digits
-      number.to_s.gsub!(/\s/,'') unless number.nil?
-      verification_value.to_s.gsub!(/\s/,'') unless number.nil?
+      number.to_s.gsub!(/\s/,'')
+      verification_value.to_s.gsub!(/\s/,'')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end
 
@@ -37,7 +32,7 @@ module Spree
 
     # sets self.cc_type while we still have the card number
     def set_card_type
-      self.cc_type ||= CardDetector.type?(self.number)
+      self.cc_type ||= CardDetector.type?(number)
     end
 
     def name?
@@ -65,127 +60,11 @@ module Spree
       "XXXX-XXXX-XXXX-#{last_digits}"
     end
 
-    #RAILS 3 TODO
-    #alias :attributes_with_quotes_default :attributes_with_quotes
-
     # needed for some of the ActiveMerchant gateways (eg. SagePay)
     def brand
       cc_type
     end
 
-    scope :with_payment_profile, where('gateway_customer_profile_id IS NOT NULL')
-
-    def authorize(amount, payment)
-      # ActiveMerchant is configured to use cents so we need to multiply order total by 100
-      payment_gateway = payment.payment_method
-      check_environment(payment_gateway)
-
-      response = payment_gateway.authorize((amount * 100).round, self, gateway_options(payment))
-      record_log payment, response
-
-      if response.success?
-        payment.response_code = response.authorization
-        payment.avs_response = response.avs_result['code']
-        payment.pend
-      else
-        payment.failure
-        gateway_error(response)
-      end
-    rescue ActiveMerchant::ConnectionError => e
-      gateway_error e
-    end
-
-    def purchase(amount, payment)
-      #combined Authorize and Capture that gets processed by the ActiveMerchant gateway as one single transaction.
-      payment_gateway = payment.payment_method
-      check_environment(payment_gateway)
-
-      response = payment_gateway.purchase((amount * 100).round, self, gateway_options(payment))
-      record_log payment, response
-
-      if response.success?
-        payment.response_code = response.authorization
-        payment.avs_response = response.avs_result['code']
-        payment.complete
-      else
-        payment.failure
-        gateway_error(response) unless response.success?
-      end
-    rescue ActiveMerchant::ConnectionError => e
-      gateway_error e
-    end
-
-    def capture(payment)
-      return unless payment.pending?
-      payment_gateway = payment.payment_method
-      check_environment(payment_gateway)
-
-      if payment_gateway.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_gateway.capture(payment, self, minimal_gateway_options(payment, false))
-      else
-        # Standard ActiveMerchant capture usage
-        response = payment_gateway.capture((payment.amount * 100).round, payment.response_code, minimal_gateway_options(payment, false))
-      end
-
-      record_log payment, response
-
-      if response.success?
-        payment.response_code = response.authorization
-        payment.complete
-      else
-        payment.failure
-        gateway_error(response)
-      end
-    rescue ActiveMerchant::ConnectionError => e
-      gateway_error e
-    end
-
-    def void(payment)
-      payment_gateway = payment.payment_method
-      check_environment(payment_gateway)
-
-      response = payment_gateway.void(payment.response_code, minimal_gateway_options(payment, false))
-      record_log payment, response
-
-      if response.success?
-        payment.response_code = response.authorization
-        payment.void
-      else
-        gateway_error(response)
-      end
-    rescue ActiveMerchant::ConnectionError => e
-      gateway_error e
-    end
-
-    def credit(payment)
-      payment_gateway = payment.payment_method
-      check_environment(payment_gateway)
-
-      amount = payment.credit_allowed >= payment.order.outstanding_balance.abs ? payment.order.outstanding_balance.abs : payment.credit_allowed.abs
-      if payment_gateway.payment_profiles_supported?
-        response = payment_gateway.credit((amount * 100).round, self, payment.response_code, minimal_gateway_options(payment, false))
-      else
-        response = payment_gateway.credit((amount * 100).round, payment.response_code, minimal_gateway_options(payment, false))
-      end
-
-      record_log payment, response
-
-      if response.success?
-        Payment.create({:order => payment.order,
-                       :source => payment,
-                       :payment_method => payment.payment_method,
-                       :amount => amount.abs * -1,
-                       :response_code => response.authorization,
-                       :state => 'completed'}, :without_protection => true)
-      else
-        gateway_error(response)
-      end
-    rescue ActiveMerchant::ConnectionError => e
-      gateway_error e
-    end
-
     def actions
       %w{capture void credit}
     end
@@ -197,7 +76,7 @@ module Spree
 
     # Indicates whether its possible to void the payment.
     def can_void?(payment)
-      payment.state == 'void' ? false : true
+      payment.state != 'void'
     end
 
     # Indicates whether its possible to credit the payment.  Note that most gateways require that the
@@ -212,64 +91,9 @@ module Spree
       gateway_customer_profile_id.present?
     end
 
-    def record_log(payment, response)
-      payment.log_entries.create({:details => response.to_yaml}, :without_protection => true)
-    end
-
-    def gateway_error(error)
-      if error.is_a? ActiveMerchant::Billing::Response
-        text = error.params['message'] || error.params['response_reason_text'] || error.message
-      elsif error.is_a? ActiveMerchant::ConnectionError
-        text = I18n.t(:unable_to_connect_to_gateway)
-      else
-        text = error.to_s
-      end
-      logger.error(I18n.t(:gateway_error))
-      logger.error("  #{error.to_yaml}")
-      raise Core::GatewayError.new(text)
-    end
-
-    def gateway_options(payment)
-      options = { :billing_address  => generate_address_hash(payment.order.bill_address),
-                  :shipping_address => generate_address_hash(payment.order.ship_address) }
-      options.merge minimal_gateway_options(payment)
-    end
-
-    # Generates an ActiveMerchant compatible address hash from one of Spree's address objects
-    def generate_address_hash(address)
-      return {} if address.nil?
-      { :name => address.full_name, :address1 => address.address1, :address2 => address.address2, :city => address.city,
-        :state => address.state_text, :zip => address.zipcode, :country => address.country.iso, :phone => address.phone }
-    end
-
-    # Generates a minimal set of gateway options.  There appears to be some issues with passing in
-    # a billing address when authorizing/voiding a previously captured transaction.  So omits these
-    # options in this case since they aren't necessary.
-    def minimal_gateway_options(payment, totals=true)
-
-      options = { :email    => payment.order.email,
-                  :customer => payment.order.email,
-                  :ip       => payment.order.ip_address,
-                  :order_id => payment.order.number }
-      if totals
-        options.merge!({ :shipping => payment.order.ship_total * 100,
-                         :tax      => payment.order.tax_total * 100,
-                         :subtotal => payment.order.item_total * 100 })
-      end
-      options
-    end
-
     def spree_cc_type
       return 'visa' if Rails.env.development?
-      self.cc_type
-    end
-
-    # Saftey check to make sure we're not accidentally performing operations on a live gateway.
-    # Ex. When testing in staging environment with a copy of production data.
-    def check_environment(gateway)
-      return if gateway.environment == Rails.env
-      message = I18n.t(:gateway_config_unavailable) + " - #{Rails.env}"
-      raise Core::GatewayError.new(message)
+      cc_type
     end
   end
 end

data/app/models/spree/gateway/bogus.rb

@@ -1,7 +1,7 @@
 module Spree
   class Gateway::Bogus < Gateway
     TEST_VISA = '4111111111111111'
-    TEST_MC = '5500000000000004'
+    TEST_MC   = '5500000000000004'
     TEST_AMEX = '340000000000009'
     TEST_DISC = '6011000000000004'
 

data/app/models/spree/gateway.rb

@@ -6,6 +6,8 @@ module Spree
 
     preference :server, :string, :default => 'test'
     preference :test_mode, :boolean, :default => true
+    
+    attr_accessible :preferred_server, :preferred_test_mode
 
     def payment_source_class
       Creditcard
@@ -25,7 +27,7 @@ module Spree
 
     def options
       options_hash = {}
-      self.preferences.each do |key,value|
+      self.preferences.each do |key, value|
         options_hash[key.to_sym] = value
       end
       options_hash

data/app/models/spree/inventory_unit.rb

@@ -106,12 +106,12 @@ module Spree
       end
 
       def update_order
-        self.order.update!
+        order.update!
       end
 
       def restock_variant
-        self.variant.on_hand = (self.variant.on_hand + 1)
-        self.variant.save
+        variant.on_hand = (variant.on_hand + 1)
+        variant.save
       end
   end
 end

data/app/models/spree/line_item.rb

@@ -24,7 +24,7 @@ module Spree
     after_destroy :update_order
 
     def copy_price
-      self.price = variant.price if variant && self.price.nil?
+      self.price = variant.price if variant && price.nil?
     end
 
     def increment_quantity
@@ -36,16 +36,16 @@ module Spree
     end
 
     def amount
-      self.price * self.quantity
+      price * quantity
     end
     alias total amount
 
     def adjust_quantity
-      self.quantity = 0 if self.quantity.nil? || self.quantity < 0
+      self.quantity = 0 if quantity.nil? || quantity < 0
     end
 
     def sufficient_stock?
-      Spree::Config[:allow_backorders] ? true : (self.variant.on_hand >= self.quantity)
+      Spree::Config[:allow_backorders] ? true : (variant.on_hand >= quantity)
     end
 
     def insufficient_stock?
@@ -54,23 +54,23 @@ module Spree
 
     private
       def update_inventory
-        return true unless self.order.completed?
+        return true unless order.completed?
 
-        if self.new_record?
-          InventoryUnit.increase(self.order, self.variant, self.quantity)
+        if new_record?
+          InventoryUnit.increase(order, variant, quantity)
         elsif old_quantity = self.changed_attributes['quantity']
-          if old_quantity < self.quantity
-            InventoryUnit.increase(self.order, self.variant, (self.quantity - old_quantity))
-          elsif old_quantity > self.quantity
-            InventoryUnit.decrease(self.order, self.variant, (old_quantity - self.quantity))
+          if old_quantity < quantity
+            InventoryUnit.increase(order, variant, (quantity - old_quantity))
+          elsif old_quantity > quantity
+            InventoryUnit.decrease(order, variant, (old_quantity - quantity))
           end
         end
       end
 
       def remove_inventory
-        return true unless self.order.completed?
+        return true unless order.completed?
 
-        InventoryUnit.decrease(self.order, self.variant, self.quantity)
+        InventoryUnit.decrease(order, variant, quantity)
       end
 
       def update_order
@@ -79,7 +79,7 @@ module Spree
       end
 
       def ensure_not_shipped
-        if order.try(:inventory_units).to_a.any?{|unit| unit.variant_id == variant_id && unit.shipped?}
+        if order.try(:inventory_units).to_a.any?{ |unit| unit.variant_id == variant_id && unit.shipped? }
           errors.add :base, I18n.t('validation.cannot_destory_line_item_as_inventory_units_have_shipped')
           return false
         end