spree_core 0.60.6 → 0.70.RC1

data/app/controllers/admin/variants_controller.rb

@@ -1,6 +1,14 @@
 class Admin::VariantsController < Admin::ResourceController
   belongs_to :product, :find_by => :permalink
   create.before :create_before
+  new_action.before :new_before
+
+  def index
+    respond_with(collection) do |format|
+      format.html
+      format.json { render :json => json_data }
+    end
+  end
 
   # override the destory method to set deleted_at value
   # instead of actually deleting the product.
@@ -38,6 +46,12 @@ class Admin::VariantsController < Admin::ResourceController
     @object.save
   end
 
+
+  def new_before
+    @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
+                                                                  'sku', 'is_master', 'count_on_hand')
+  end
+
   def collection
     @deleted = (params.key?(:deleted)  && params[:deleted] == "on") ? "checked" : ""
 
@@ -48,4 +62,12 @@ class Admin::VariantsController < Admin::ResourceController
     end
     @collection
   end
+
+  def json_data
+    ( parent.variants.presence || [parent.master] ).map do |v|
+      { :label => v.options_text.presence || v.name, :id => v.id }
+    end
+  end
+
 end
+

data/app/controllers/admin/zones_controller.rb

@@ -12,7 +12,7 @@ class Admin::ZonesController < Admin::ResourceController
     params[:search] ||= {}
     params[:search][:meta_sort] ||= "ascend_by_name"
     @search = super.metasearch(params[:search])
-    @zones = @search.paginate(:per_page => Spree::Config[:orders_per_page], :page => params[:page])
+    @zones = @search.relation.page(params[:page]).per(Spree::Config[:orders_per_page])
   end
 
   def load_data

data/app/controllers/checkout_controller.rb

@@ -12,6 +12,12 @@ class CheckoutController < Spree::BaseController
   # Updates the order and advances to the next state (when possible.)
   def update
     if @order.update_attributes(object_params)
+
+      fire_event('spree.checkout.update')
+      if @order.respond_to?(:coupon_code) && @order.coupon_code.present?
+        fire_event('spree.checkout.coupon_code_added', :coupon_code => @order.coupon_code)
+      end
+
       if @order.next
         state_callback(:after)
       else

data/app/controllers/content_controller.rb

@@ -9,7 +9,7 @@ class ContentController < Spree::BaseController
 
   def show
     respond_with do |format|
-      format.html { render :template => params[:path] }
+      format.html { render :action => params[:path] }
     end
   end
 

data/app/controllers/home_controller.rb

@@ -0,0 +1,10 @@
+class HomeController < Spree::BaseController
+  helper :products
+  respond_to :html
+  
+  def index
+    @searcher = Spree::Config.searcher_class.new(params)
+    @products = @searcher.retrieve_products
+    respond_with(@products)
+  end
+end

data/app/controllers/orders_controller.rb

@@ -1,20 +1,22 @@
 class OrdersController < Spree::BaseController
-  respond_to :html
-
+  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
   helper :products
 
+  respond_to :html
 
   def show
-    @order = Order.find_by_number(params[:id])
+    @order = Order.find_by_number!(params[:id])
+    respond_with(@order)
   end
 
   def update
     @order = current_order
     if @order.update_attributes(params[:order])
       @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
+      fire_event('spree.order.contents_changed')
       respond_with(@order) { |format| format.html { redirect_to cart_path } }
     else
-      respond_with(@order) 
+      respond_with(@order)
     end
   end
 
@@ -38,7 +40,7 @@ class OrdersController < Spree::BaseController
 
     params[:products].each do |product_id,variant_id|
       quantity = params[:quantity].to_i if !params[:quantity].is_a?(Hash)
-      quantity = params[:quantity][variant_id].to_i if params[:quantity].is_a?(Hash)
+      quantity = params[:quantity][variant_id.to_i].to_i if params[:quantity].is_a?(Hash)
       @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0
     end if params[:products]
 
@@ -47,6 +49,8 @@ class OrdersController < Spree::BaseController
       @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0
     end if params[:variants]
 
+    fire_event('spree.cart.add')
+    fire_event('spree.order.contents_changed')
     respond_with(@order) { |format| format.html { redirect_to cart_path } }
   end
 
@@ -54,11 +58,11 @@ class OrdersController < Spree::BaseController
     if @order = current_order
       @order.line_items.destroy_all
     end
-    
+
     respond_with(@order) { |format| format.html { redirect_to cart_path } }
   end
 
   def accurate_title
-    @order && @order.completed? ? "#{Order.human_name} #{@order.number}" : I18n.t(:shopping_cart)
+    @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : I18n.t(:shopping_cart)
   end
 end

data/app/controllers/products_controller.rb

@@ -8,7 +8,6 @@ class ProductsController < Spree::BaseController
   def index
     @searcher = Spree::Config.searcher_class.new(params)
     @products = @searcher.retrieve_products
-
     respond_with(@products)
   end
 

data/app/helpers/admin/base_helper.rb

@@ -1,10 +1,11 @@
 module Admin::BaseHelper
 
   def field_container(model, method, options = {}, &block)
-    unless error_message_on(model, method).blank?
-      css_class = 'withError'
+    css_classes = options[:class].to_a
+    if error_message_on(model, method).present?
+      css_classes << 'withError'
     end
-    content_tag('p', capture(&block), :class => css_class)
+    content_tag('p', capture(&block), :class => css_classes.join(' '), :id => "#{model}_#{method}_field")
   end
 
   def error_message_on(object, method, options = {})
@@ -19,11 +20,6 @@ module Admin::BaseHelper
     end
   end
 
-  def spree_date_picker(object, method, options = {}, html_options = {})
-    options.merge!(:format => "y-m-d")
-    unobtrusive_date_text_picker(object, method, options, html_options)
-  end
-
   def class_for_error(model, method)
     if error_message_on :product, :name
     end

data/app/helpers/admin/navigation_helper.rb

@@ -15,7 +15,7 @@ module Admin::NavigationHelper
     destination_url = send("#{options[:route]}_path")
 
     ## if more than one form, it'll capitalize all words
-    label_with_first_letters_capitalized = t(options[:label]).gsub(/\b\w/){$&.upcase}
+    label_with_first_letters_capitalized = t(options[:label], :default => options[:label]).gsub(/\b\w/){$&.upcase}
 
     link = link_to(label_with_first_letters_capitalized, destination_url)
 
@@ -98,7 +98,7 @@ module Admin::NavigationHelper
   end
 
   def icon(icon_name)
-    icon_name ? image_tag("/images/admin/icons/#{icon_name}.png") : ''
+    icon_name ? image_tag("admin/icons/#{icon_name}.png") : ''
   end
 
   def button(text, icon_name = nil, button_type = 'submit', options={})
@@ -158,5 +158,12 @@ module Admin::NavigationHelper
     </tr>
     ).html_safe
   end
+  
+  def configurations_sidebar_menu_item(link_text, url, options = {})
+    options.merge!(:class => url.include?(controller.controller_name) ? 'active' : nil)
+    content_tag(:li, options) do
+      link_to(link_text, url)
+    end
+  end
 
 end

data/app/helpers/checkout_helper.rb

@@ -1,11 +1,15 @@
 module CheckoutHelper
 
-  def checkout_progress
+  def checkout_states
     if Gateway.current and Gateway.current.payment_profiles_supported?
-      states = %w(address delivery payment confirm complete)
+      %w(address delivery payment confirm complete)
     else
-      states = %w(address delivery payment complete)
+      %w(address delivery payment complete)
     end
+  end
+
+  def checkout_progress
+    states = checkout_states
     items = states.map do |state|
       text = t("order_state.#{state}").titleize
 

data/app/helpers/hook_helper.rb

@@ -1,20 +1,10 @@
 module HookHelper
 
-  # Allow hooks to be used in views like this:
-  #
-  #   <%= hook :some_hook %>
-  #
-  #   <%= hook :some_hook do %>
-  #     <p>Some HTML</p>
-  #   <% end %>
-  #
+  # This method is deprecated, left in place
+  # to prevent views from breaking
   def hook(hook_name, locals = {}, &block)
+    warn "[DEPRECATION] `hook` is deprecated"
     content = block_given? ? capture(&block) : ''
-    Spree::ThemeSupport::Hook.render_hook(hook_name, content, self, locals)
+    content
   end
-
-  def locals_hash(names, binding)
-    names.inject({}) {|memo, key| memo[key.to_sym] = eval(key, binding); memo}
-  end
-
-end
+end

data/app/helpers/products_helper.rb

@@ -27,4 +27,8 @@ module ProductsHelper
     raw(product.description.gsub(/^(.*)$/, '<p>\1</p>'))
   end
 
+  def variant_images_hash(product)
+    product.variant_images.inject({}){|h, img| (h[img.viewable_id] ||= []) << img; h }
+  end
+
 end

data/app/helpers/spree/base_helper.rb

@@ -20,8 +20,7 @@ module Spree::BaseHelper
     # overwrite show_vat_text if show_price_inc_vat is false
     options[:show_vat_text] = Spree::Config[:show_price_inc_vat]
 
-    amount =  order.item_total
-    amount += Calculator::Vat.calculate_tax(order) if Spree::Config[:show_price_inc_vat]
+    amount =  order.total
 
     options.delete(:format_as_currency) ? number_to_currency(amount) : amount
   end
@@ -37,7 +36,7 @@ module Spree::BaseHelper
   # human readable list of variant options
   def variant_options(v, allow_back_orders = Spree::Config[:allow_backorders], include_style = true)
     list = v.options_text
-    list = include_style ? "<span class =\"out-of-stock\">(" + t("out_of_stock") + ") #{list}</span>" : "#{t("out_of_stock")} #{list}" unless (allow_back_orders || v.in_stock?)
+    list = include_style ? content_tag(:span, "(#{t(:out_of_stock)}) #{list}", :class => "out-of-stock") : "#{t(:out_of_stock)} #{list}" unless (allow_back_orders || v.in_stock?)
     list
   end
 
@@ -45,7 +44,7 @@ module Spree::BaseHelper
     define_method "#{style}_image" do |product, *options|
       options = options.first || {}
       if product.images.empty?
-        image_tag "noimage/#{style}.jpg", options
+        image_tag "noimage/#{style}.png", options
       else
         image = product.images.first
         options.reverse_merge! :alt => image.alt.blank? ? product.name : image.alt
@@ -56,15 +55,21 @@ module Spree::BaseHelper
 
   def meta_data_tags
     object = instance_variable_get('@'+controller_name.singularize)
-    return unless object
-    "".tap do |tags|
-      if object.respond_to?(:meta_keywords) and object.meta_keywords.present?
-        tags << tag('meta', :name => 'keywords', :content => object.meta_keywords) + "\n"
-      end
-      if object.respond_to?(:meta_description) and object.meta_description.present?
-        tags << tag('meta', :name => 'description', :content => object.meta_description) + "\n"
-      end
+    meta = { :keywords => Spree::Config[:default_meta_keywords], :description => Spree::Config[:default_meta_description] }
+    
+    if object.kind_of?(ActiveRecord::Base)
+      meta[:keywords] = object.meta_keywords if object[:meta_keywords].present?
+      meta[:description] = object.meta_description if object[:meta_description].present?
     end
+    
+    meta.map do |name, content|
+      tag('meta', :name => name, :content => content)
+    end.join("\n")
+  end
+
+  def body_class
+    @body_class ||= content_for?(:sidebar) ? 'two-col' : 'one-col'
+    @body_class
   end
 
   def stylesheet_tags(paths=stylesheet_paths)
@@ -83,6 +88,44 @@ module Spree::BaseHelper
   def logo(image_path=Spree::Config[:logo])
     link_to image_tag(image_path), root_path
   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
+  end
+  
+  def breadcrumbs(taxon, separator="&nbsp;&raquo;&nbsp;")
+    return "" if current_page?("/") || taxon.nil?
+    separator = raw(separator)
+    crumbs = [content_tag(:li, link_to(t(:home) , root_path) + separator)]
+    if taxon
+      crumbs << content_tag(:li, link_to(t('products') , products_path) + separator)
+      crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, link_to(ancestor.name , seo_url(ancestor)) + separator) } unless taxon.ancestors.empty?
+      crumbs << content_tag(:li, content_tag(:span, taxon.name))
+    else
+      crumbs << content_tag(:li, content_tag(:span, t('products')))
+    end
+    crumb_list = content_tag(:ul, raw(crumbs.flatten.map{|li| li.mb_chars}.join))
+    content_tag(:div, crumb_list + tag(:br, {:class => 'clear'}, false, true), :id => 'breadcrumbs')
+  end
+
+  def taxons_tree(root_taxon, current_taxon, max_level = 1)
+    return '' if max_level < 1 || root_taxon.children.empty?
+    content_tag :ul, :class => 'taxons-list' do
+      root_taxon.children.map do |taxon|
+        css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil
+        content_tag :li, :class => css_class do
+         link_to(taxon.name, seo_url(taxon)) + 
+         taxons_tree(taxon, current_taxon, max_level - 1) 
+        end
+      end.join("\n").html_safe
+    end
+  end
 
   def available_countries
     return Country.all unless zone = Zone.find_by_name(Spree::Config[:checkout_zone])

data/app/helpers/taxons_helper.rb

@@ -1,20 +1,4 @@
 module TaxonsHelper
-  def breadcrumbs(taxon, separator=" » ")
-    return "" if current_page?("/")
-    separator = raw(separator)
-    crumbs = [content_tag(:li, link_to(t(:home) , root_path) + separator)]
-    if taxon
-      crumbs << content_tag(:li, link_to(t('products') , products_path) + separator)
-      crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, link_to(ancestor.name , seo_url(ancestor)) + separator) } unless taxon.ancestors.empty?
-      crumbs << content_tag(:li, content_tag(:span, taxon.name))
-    else
-      crumbs << content_tag(:li, content_tag(:span, t('products')))
-    end
-    crumb_list = content_tag(:ul, raw(crumbs.flatten.map{|li| li.mb_chars}.join))
-    content_tag(:div, crumb_list + tag(:br, {:class => 'clear'}, false, true), :class => 'breadcrumbs')
-  end
-
-
   # Retrieves the collection of products to display when "previewing" a taxon.  This is abstracted into a helper so
   # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
   # to show the most popular products for a particular taxon (that is an exercise left to the developer.)

data/app/mailers/test_mailer.rb

@@ -0,0 +1,10 @@
+class TestMailer < ActionMailer::Base
+
+  def test_email(mail_method, user)
+    @mail_method = mail_method
+    subject = "#{Spree::Config[:site_name]} #{t('subject', :scope => 'test_mailer.test_email')}"
+    mail(:to => user.email,
+         :subject => subject)
+  end
+
+end

data/app/models/activator.rb

@@ -0,0 +1,27 @@
+class Activator < ActiveRecord::Base
+
+  cattr_accessor :event_names
+
+  self.event_names = [
+    'spree.cart.add',
+    'spree.checkout.coupon_code_added',
+    'spree.order.contents_changed',
+    'spree.user.signup'
+  ]
+
+  def self.register_event_name(name)
+    self.event_names << name
+  end
+
+  scope :event_name_starts_with, lambda{|name| where('event_name like ?', "#{name}%") }
+  scope :active, where('( starts_at IS NULL OR starts_at < ? ) AND ( expires_at IS NULL OR expires_at > ?)', Time.now, Time.now)
+
+  def activate(payload)
+  end
+
+  def expired?
+    starts_at && Time.now < starts_at ||
+    expires_at && Time.now > expires_at
+  end
+
+end

data/app/models/adjustment.rb

@@ -1,4 +1,4 @@
-# Adjustments represent a change to the +item_total+ of an Order.  Each adjustment has an +amount+ that be either
+
 # positive or negative.  Adjustments have two useful boolean flags
 #
 # +mandatory+
@@ -13,6 +13,13 @@
 # The charge is never to be udpated.  Typically you would want to freeze certain adjustments after checkout.
 # One use case for this is if you want to lock a shipping adjustment so that its value does not change
 # in the future when making other trivial edits to the order (like an email change).
+#
+# +eligible?+
+#
+#  This boolean attributes stores whether this adjustment is currently eligible for its order. Only eligible
+#  adjustments count towards the order's adjustment total. This allows an adjustment to be preserved if it
+#  becomes ineligible so it might be reinstated.
+#
 class Adjustment < ActiveRecord::Base
   belongs_to :order
   belongs_to :source, :polymorphic => true
@@ -21,27 +28,40 @@ class Adjustment < ActiveRecord::Base
   validates :label, :presence => true
   validates :amount, :numericality => true
 
-  scope :tax, lambda { where(:label => I18n.t(:tax)) }
+  scope :tax, lambda { where(:originator_type => "TaxRate") }
   scope :shipping, lambda { where(:label => I18n.t(:shipping)) }
   scope :optional, where(:mandatory => false)
+  scope :eligible, where(:eligible => true)
 
   after_save { order.update! }
   after_destroy { order.update! }
 
-  # Checks if adjustment is applicable for the order. Should return _true_ if adjustment should be preserved and
-  # _false_ if removed. Default behaviour is to preserve adjustment if amount is present and non 0.  Exceptions
-  # are made if the adjustment is considered +mandatory+.
-  def applicable?
-    mandatory || amount != 0
+  # Update the boolean _eligible_ attribute which deterimes which adjustments count towards the order's
+  # adjustment_total.
+  def set_eligibility
+    update_attribute_without_callbacks(:eligible,
+                                       mandatory ||
+                                       (amount != 0 && eligible_for_originator?))
   end
 
-  # Tells the adjustment that its time to update itself.  Adjustments will delegate this request to their Originator
+  # Allow originator of the adjustment to perform an additional eligibility of the adjustment
+  # Should return _true_ if originator is absent or doesn't implement _eligible?_
+  def eligible_for_originator?
+    return true if originator.nil?
+    !originator.respond_to?(:eligible?) || originator.eligible?(source)
+  end
+
+
+  # Update both the eligibility and amount of the adjustment. Adjustments delegate updating of amount to their Originator
   # when present, but only if +locked+ is false.  Adjustments that are +locked+ will never change their amount.
   # The new adjustment amount will be set by by the +originator+ and is not automatically saved.  This makes it save
-  # to use this method in an after_save hook for other models without causing an infinite recursion problem.  If there
-  # is no +originator+ then this method will have no effect.
+  # to use this method in an after_save hook for other models without causing an infinite recursion problem.
   def update!
-    return if locked? || originator.nil?
-    originator.update_adjustment(self, source)
+    return if locked?
+    set_eligibility
+    if originator.present?
+      originator.update_adjustment(self, source)
+    end
   end
+
 end