spree 0.7.1 → 0.8.0

data/app/helpers/admin/orders_helper.rb

@@ -11,7 +11,7 @@ module Admin::OrdersHelper
   def event_links
     links = []
     @order_events.sort.each do |event| 
-      links << (link_to event, fire_admin_order_url(@order, :e => event), {:method => :put, :confirm => "Are you sure you want to #{event}?"}) if @order.send("can_#{event}?")
+      links << (button_link_to event, fire_admin_order_url(@order, :e => event), {:method => :put, :confirm => "Are you sure you want to #{event}?"}) if @order.send("can_#{event}?")
     end
     return "" if links.empty?
     links.join(' &nbsp;')    

data/app/helpers/admin/zones_helper.rb

@@ -1,11 +1,11 @@
 module Admin::ZonesHelper
   def country_checked
-    return object.type == "country" ? "checked = 'true'" : ""
+    return object.kind == "country" ? "checked = 'true'" : ""
   end
   def state_checked
-    return object.type == "state" ? "checked = 'true'" : ""
+    return object.kind == "state" ? "checked = 'true'" : ""
   end
   def zone_checked
-    return object.type == "zone" ? "checked = 'true'" : ""
+    return object.kind == "zone" ? "checked = 'true'" : ""
   end
-end
+end

data/app/helpers/application_helper.rb

@@ -7,19 +7,6 @@ module ApplicationHelper
     false
   end
 
-  def stylesheets
-    stylesheets = [stylesheet_link_tag("spree"), stylesheet_link_tag("application")]
-    ["#{controller.controller_name}/_controller", "#{controller.controller_name}/#{:action_name}"].each do |stylesheet|
-      if File.exists? "#{RAILS_ROOT}/public/stylesheets/#{stylesheet}.css" 
-        stylesheets << stylesheet_link_tag(stylesheet)   
-      # TODO - consider bringing this back to use with stylesheets in the extension
-      #else
-      #  stylesheets << stylesheet_link_tag(stylesheet, :plugin=>"spree") if File.exists? "#{RAILS_ROOT}/public/plugin_assets/spree/stylesheets/#{stylesheet}.css"
-      end
-    end
-    stylesheets.compact.join("\n")
-  end  
-  
   # Renders all the extension partials that may have been specified in the extensions
   def render_extra_partials(f)
     @extension_partials.inject("") do |extras, partial|

data/app/helpers/orders_helper.rb

@@ -1,14 +1,3 @@
 module OrdersHelper  
-  def order_price(order, options={})
-    options.assert_valid_keys(:format_as_currency, :show_vat_text, :show_price_inc_vat)
-    options.reverse_merge! :format_as_currency => true, :show_vat_text => true
-    
-    # overwrite show_vat_text if show_price_inc_vat is false
-    options[:show_vat_text] = Spree::Tax::Config[:show_price_inc_vat]
 
-    amount =  order.item_total    
-    amount += Spree::VatCalculator.calculate_tax(order) if Spree::Tax::Config[:show_price_inc_vat]    
-
-    options.delete(:format_as_currency) ? format_price(amount, options) : amount
-  end
 end

data/app/helpers/spree/base_helper.rb

@@ -1,9 +1,44 @@
 module Spree::BaseHelper
 
+  # this should be cart_path since it returns path only
+  # didn't wan't to change until we know what breaks so
+  # I named new helpers differently below - WN
   def cart_link
     return new_order_url if session[:order_id].blank?
     return edit_order_url(Order.find_or_create_by_id(session[:order_id]))
   end
+  
+  def cart_path
+    cart_link
+  end
+  
+  
+  def link_to_cart(text=t('cart'))
+    path = cart_path
+    order = Order.find_or_create_by_id(session[:order_id]) unless session[:order_id].blank?
+    css_class = ''
+    unless order.nil?
+      item_count = order.line_items.inject(0) { |kount, line_item| kount + line_item.quantity }
+      return "" if current_page?(path)
+      text = "#{text}: (#{item_count}) #{order_price(order)}"
+      css_class = 'full' if item_count > 0
+    end
+    link_to text, path, :class => css_class
+  end
+  
+  def order_price(order, options={})
+    options.assert_valid_keys(:format_as_currency, :show_vat_text, :show_price_inc_vat)
+    options.reverse_merge! :format_as_currency => true, :show_vat_text => true
+    
+    # overwrite show_vat_text if show_price_inc_vat is false
+    options[:show_vat_text] = Spree::Tax::Config[:show_price_inc_vat]
+
+    amount =  order.item_total    
+    amount += Spree::VatCalculator.calculate_tax(order) if Spree::Tax::Config[:show_price_inc_vat]    
+
+    options.delete(:format_as_currency) ? number_to_currency(amount) : amount
+  end
+  
 
   def add_product_link(text, product) 
     link_to_remote text, {:url => {:controller => "cart", 
@@ -32,9 +67,9 @@ module Spree::BaseHelper
   
 
   # human readable list of variant options
-  def variant_options(v, allow_back_orders = Spree::Config[:allow_backorders])
-    list = v.option_values.map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence({:connector => ","})
-    list = "<span class =\"out-of-stock\">(OUT OF STOCK) #{list}</span>" unless (v.in_stock or allow_back_orders)
+  def variant_options(v, allow_back_orders = Spree::Config[:allow_backorders], include_style = true)
+    list = v.option_values.map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence({:words_connector => ", ", :two_words_connector => ", "})
+    list = include_style ? "<span class =\"out-of-stock\">(" + t("out_of_stock") + ") #{list}</span>" : "#{t("out_of_stock")} #{list}" unless (v.in_stock or allow_back_orders)
     list
   end  
   
@@ -61,4 +96,17 @@ module Spree::BaseHelper
       image_tag product.images.first.attachment.url(:product)  
     end
   end
+  
+  def meta_data_tags
+    return unless self.respond_to?(:object) && 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
+    end
+  end
+  
 end

data/app/helpers/taxons_helper.rb

@@ -1,18 +1,19 @@
 module TaxonsHelper
-  def breadcrumbs(taxon)
-    crumbs = "<div class='breadcrumbs'>"
-    crumbs += link_to t('products'), products_url
-    unless taxon
-      return crumbs += "</div>"
+  def breadcrumbs(taxon, separator="&nbsp;&raquo;&nbsp;")
+    return "" if current_page?("/")
+    crumbs = [content_tag(:li, link_to("Home" , root_path) + separator)]
+    if taxon
+      crumbs << content_tag(:li, link_to(t('products') , products_path) + separator)
+      crumbs << taxon.ancestors.reverse.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
-    crumbs += image_tag("breadcrumb.gif")
-    unless taxon.ancestors.empty?
-      crumbs += taxon.ancestors.reverse.collect { |ancestor| link_to ancestor.name, seo_url(ancestor) }.join( image_tag("breadcrumb.gif") )
-      crumbs += image_tag("breadcrumb.gif")
-    end
-    crumbs += taxon.name
-    crumbs += "</div>"
+    crumb_list = content_tag(:ul, crumbs)
+
+    content_tag(:div, crumb_list + content_tag(:br, nil, :class => 'clear'), :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

data/app/models/address.rb

@@ -1,7 +1,6 @@
 class Address < ActiveRecord::Base
   belongs_to :country
   belongs_to :state
-  belongs_to :addressable, :polymorphic => true
   
   validates_presence_of :firstname
   validates_presence_of :lastname

data/app/models/app_configuration.rb

@@ -3,6 +3,8 @@ class AppConfiguration < Configuration
   MAIL_AUTH = ['none', 'plain', 'login', 'cram_md5']
   SECURE_CONNECTION_TYPES = ['None','SSL','TLS']
 
+  preference :site_name, :string, :default => 'Spree Demo Site'
+  preference :site_url, :string, :default => 'demo.spreecommerce.com'
   preference :enable_mail_delivery, :boolean, :default => false
   preference :mail_host, :string, :default => 'localhost'
   preference :mail_domain, :string, :default => 'localhost'
@@ -31,7 +33,8 @@ class AppConfiguration < Configuration
   preference :admin_interface_logo, :string, :default => "spree/spree.jpg"
   preference :allow_ssl_in_production, :boolean, :default => true
   preference :allow_ssl_in_development_and_test, :boolean, :default => false
-  preference :google_analytics_id, :string, :default => '12312312' # Replace with real Google Analytics Id
+  preference :google_analytics_id, :string, :default => '12312312' # Replace with real Google Analytics Id 
+  preference :allow_guest_checkout, :boolean, :default => true 
 
   validates_presence_of :name
   validates_uniqueness_of :name

data/app/models/country.rb

@@ -1,7 +1,7 @@
 class Country < ActiveRecord::Base
   has_many :states
-  named_scope :order_by_name, :order => :name
-  
+  named_scope :order_by_name, :order => :name  
+
   def <=>(other)
     name <=> other.name
   end

data/app/models/creditcard.rb

@@ -1,10 +1,12 @@
 class Creditcard < ActiveRecord::Base 
   before_create :filter_sensitive
   belongs_to :order
-  has_one :address, :as => :addressable, :dependent => :destroy
+  belongs_to :address
   has_many :creditcard_payments
   before_validation :prepare
-    
+
+  accepts_nested_attributes_for :address
+      
   include ActiveMerchant::Billing::CreditCardMethods
 
   class ExpiryDate #:nodoc:
@@ -75,9 +77,9 @@ class Creditcard < ActiveRecord::Base
   def validate 
     validate_essential_attributes
     validate_card_type
-    validate_card_number
-    validate_verification_value 
-    validate_switch_or_solo_attributes
+    #validate_card_number
+    #validate_verification_value 
+    #validate_switch_or_solo_attributes
   end
   
   def self.requires_verification_value?
@@ -99,7 +101,9 @@ class Creditcard < ActiveRecord::Base
     self.number = number.to_s.gsub(/[^\d]/, "")
     self.display_number = ActiveMerchant::Billing::CreditCard.mask(number)
     self.cc_type.downcase! if cc_type.respond_to?(:downcase)
-    self.cc_type = self.class.type?(number) if cc_type.blank?
+    self.cc_type = self.class.type?(number) if cc_type.blank?    
+    self.first_name = address.firstname if address
+    self.last_name = address.lastname if address
   end
   
   def validate_card_number #:nodoc:

data/app/models/creditcard_payment.rb

@@ -1,6 +1,7 @@
 class CreditcardPayment < Payment
   has_many :creditcard_txns
   belongs_to :creditcard
+  accepts_nested_attributes_for :creditcard
   
   alias :txns :creditcard_txns
   

data/app/models/image.rb

@@ -1,6 +1,6 @@
 class Image < Asset
   has_attached_file :attachment, 
-                    :styles => { :mini => '48x48>', :small => '100x100>', :product => '240x240>' }, 
+                    :styles => { :mini => '48x48>', :small => '100x100>', :product => '240x240>', :large => '600x600>' }, 
                     :default_style => :product,
                     :url => "/assets/products/:id/:style/:basename.:extension",
                     :path => ":rails_root/public/assets/products/:id/:style/:basename.:extension"

data/app/models/line_item.rb

@@ -2,6 +2,8 @@ class LineItem < ActiveRecord::Base
   before_validation :adjust_quantity
   belongs_to :order
   belongs_to :variant
+  
+  has_one :product, :through => :variant
 
   validates_presence_of :variant
   validates_numericality_of :quantity, :only_integer => true, :message => "must be an integer"

data/app/models/option_type.rb

@@ -1,4 +1,5 @@
 class OptionType < ActiveRecord::Base
   has_many :option_values, :order => :position, :dependent => :destroy, :attributes => true
+  has_and_belongs_to_many :prototypes
   validates_presence_of [:name, :presentation]
 end

data/app/models/order.rb

@@ -1,12 +1,9 @@
 class Order < ActiveRecord::Base  
 #  before_create :generate_order_number
-  before_save :update_line_items
+  before_save :update_line_items 
+  before_create :generate_token
   
-  has_many :line_items, :dependent => :destroy, :attributes => true do
-    def in_order(variant)
-      find :first, :conditions => ['variant_id = ?', variant.id]
-    end
-  end
+  has_many :line_items, :dependent => :destroy, :attributes => true
   has_many :inventory_units
   has_many :state_events
   has_many :payments
@@ -14,7 +11,11 @@ class Order < ActiveRecord::Base
   has_many :creditcards
   belongs_to :user
   has_many :shipments, :dependent => :destroy
-
+  belongs_to :bill_address, :foreign_key => "bill_address_id", :class_name => "Address"
+  belongs_to :ship_address, :foreign_key => "ship_address_id", :class_name => "Address"
+  accepts_nested_attributes_for :creditcards, :reject_if => proc { |attributes| attributes['number'].blank? }  
+  accepts_nested_attributes_for :ship_address, :bill_address
+  
   validates_associated :line_items, :message => "are not valid"
   validates_numericality_of :tax_amount
   validates_numericality_of :ship_amount
@@ -29,7 +30,7 @@ class Order < ActiveRecord::Base
   
   
   # attr_accessible is a nightmare with attachment_fu, so use attr_protected instead.
-  attr_protected :ship_amount, :tax_amount, :item_total, :total, :user, :number, :ip_address, :checkout_complete, :state
+  attr_protected :ship_amount, :tax_amount, :item_total, :total, :user, :number, :ip_address, :checkout_complete, :state, :token
   
   def to_param  
     self.number if self.number
@@ -87,7 +88,7 @@ class Order < ActiveRecord::Base
   end
   
   def add_variant(variant, quantity=1)
-    current_item = line_items.in_order(variant)
+    current_item = contains?(variant)
     if current_item
       current_item.increment_quantity unless quantity > 1
       current_item.quantity = (current_item.quantity + quantity) if quantity > 1
@@ -137,30 +138,37 @@ class Order < ActiveRecord::Base
     self.total = self.item_total + self.ship_amount + self.tax_amount
   end 
  
-  def bill_address
-    return nil if creditcards.empty?
-    return creditcards.last.address
-  end
-
   # convenience method since many stores will not allow user to create multiple shipments
   def shipment
     shipments.last
   end
   
-  def ship_address
-    return nil if shipments.empty?
-    return shipment.address
-  end      
- 
-  include Spree::ShippingCalculator
- 
-  private
-  def complete_order
-    self.update_attribute(:checkout_complete, true)
-    InventoryUnit.sell_units(self)
-    if user && user.email
-      OrderMailer.deliver_confirm(self)
-    end   
+  def contains?(variant)
+    line_items.select { |line_item| line_item.variant == variant }.first
+  end
+
+  def grant_access?(token=nil)
+    return true if token && token == self.token
+    return false unless current_user_session = UserSession.find   
+    return current_user_session.user == self.user
+  end
+  def mark_shipped
+    inventory_units.each do |inventory_unit|
+      inventory_unit.ship!
+    end
+  end
+      
+  # collection of available shipping countries
+  def shipping_countries
+    ShippingMethod.all.collect { |method| method.zone.country_list }.flatten.uniq.sort_by {|item| item.send 'name'}
+  end
+  
+  def shipping_methods
+    return [] unless ship_address
+    ShippingMethod.all.select { |method| method.zone.include?(ship_address) && method.available?(self) }
+  end
+   
+  def update_totals
     # finalize order totals 
     unless shipment.nil?
       calculator = shipment.shipping_method.shipping_calculator.constantize.new
@@ -169,8 +177,18 @@ class Order < ActiveRecord::Base
       self.ship_amount = 0
     end
     self.tax_amount = calculate_tax
+  end  
+
+  private
+  def complete_order
+    self.update_attribute(:checkout_complete, true)
+    InventoryUnit.sell_units(self)
+    if user && user.email
+      OrderMailer.deliver_confirm(self)
+    end   
+    update_totals
     save
-  end
+  end   
   
   def cancel_order
     restock_inventory
@@ -187,5 +205,9 @@ class Order < ActiveRecord::Base
     self.line_items.each do |line_item|
       LineItem.destroy(line_item.id) if line_item.quantity == 0
     end
+  end
+  
+  def generate_token
+    self.token = Authlogic::Random.friendly_token    
   end      
 end

data/app/models/order_mailer.rb

@@ -3,18 +3,18 @@ class OrderMailer < ActionMailer::Base
   
   def confirm(order, resend = false)
     @subject    = (resend ? "[RESEND] " : "") 
-    @subject    += 'Order Confirmation #' + order.number
+    @subject    += Spree::Config[:site_name] + ' ' + 'Order Confirmation #' + order.number
     @body       = {"order" => order}
-    @recipients = order.user.email
+    @recipients = order.email
     @from       = Spree::Config[:order_from]
     @bcc        = order_bcc
     @sent_on    = Time.now
   end
   
   def cancel(order)
-    @subject    = '[CANCEL] Order Confirmation #' + order.number
+    @subject    = '[CANCEL]' + Spree::Config[:site_name] + ' Order Confirmation #' + order.number
     @body       = {"order" => order}
-    @recipients = order.user.email
+    @recipients = order.email
     @from       = Spree::Config[:order_from]
     @bcc        = order_bcc
     @sent_on    = Time.now

data/app/models/product.rb

@@ -10,11 +10,13 @@ class Product < ActiveRecord::Base
   has_many :properties, :through => :product_properties
   belongs_to :tax_category
   has_and_belongs_to_many :taxons
+  belongs_to :shipping_category
   
 
   validates_presence_of :name
   validates_presence_of :master_price
-  validates_presence_of :description
+
+  accepts_nested_attributes_for :product_properties
   
   make_permalink
 
@@ -25,6 +27,10 @@ class Product < ActiveRecord::Base
   named_scope :not_deleted, lambda { |*args| { :conditions => ["products.deleted_at is null", (args.first || Time.zone.now)] } }
   
   named_scope :available, lambda { |*args| { :conditions => ["products.available_on <= ?", (args.first || Time.zone.now)] } }
+
+
+  named_scope :with_property_value, lambda { |property_id, value| { :include => :product_properties, :conditions => ["product_properties.property_id = ? AND product_properties.value = ?", property_id, value] } }
+
                  
   def to_param       
     return permalink unless permalink.blank?
@@ -69,6 +75,26 @@ class Product < ActiveRecord::Base
     variants.inject(false){ |tf, v| tf ||= v.in_stock }
   end
   
+  
+  # Adding properties and option types on creation based on a chosen prototype
+  
+  attr_reader :prototype_id
+  def prototype_id=(value)
+    @prototype_id = value.to_i
+  end
+  after_create :add_properties_and_option_types_from_prototype
+  
+  def add_properties_and_option_types_from_prototype
+    if prototype_id and prototype = Prototype.find_by_id(prototype_id)
+      prototype.properties.each do |property|
+        product_properties.create(:property => property)
+      end
+      self.option_types = prototype.option_types
+    end
+  end
+  
+  
+  
   private
 
     def adjust_inventory