spree 0.7.1 → 0.8.0

data/app/models/product_property.rb

@@ -3,7 +3,6 @@ class ProductProperty < ActiveRecord::Base
   belongs_to :property
   
   validates_presence_of :property
-  validates_presence_of :value
   
   # virtual attributes for use with AJAX completion stuff
   def property_name

data/app/models/property.rb

@@ -1,6 +1,9 @@
 class Property < ActiveRecord::Base
   has_and_belongs_to_many :prototypes
 
+  has_many :product_properties, :dependent => :destroy, :attributes => true
+  has_many :products, :through => :product_properties
+
   validates_presence_of :name, :presentation
   
   named_scope :sorted, :order => :name

data/app/models/prototype.rb

@@ -1,4 +1,5 @@
 class Prototype < ActiveRecord::Base
   has_and_belongs_to_many :properties
+  has_and_belongs_to_many :option_types
   validates_presence_of :name
 end

data/app/models/shipment.rb

@@ -1,28 +1,21 @@
-class Shipment < ActiveRecord::Base      
-  include ActionView::Helpers::NumberHelper # Needed for JS usable rate information
-  
+class Shipment < ActiveRecord::Base        
   belongs_to :order
   belongs_to :shipping_method
-  has_one :address, :as => :addressable, :dependent => :destroy
+  belongs_to :address
 
   before_create :generate_shipment_number
   after_save :recalculate_tax
   after_save :transition_order
-    
+
+  accepts_nested_attributes_for :address 
+     
   def shipped?
     self.shipped_at
   end
-    
-  def shipping_methods
-    ShippingMethod.all.select { |method| method.zone.include?(address) && method.available?(order) }
-  end 
   
-  def rates
-    quotes = []
-    shipping_methods.each do |method|
-      quotes << {:id => method.id, :name => method.name, :rate => number_to_currency(method.calculate_shipping(self)) }
-    end
-    quotes
+  def shipped=(value)
+    return unless value == "1" && shipped_at.nil?
+    self.shipped_at = Time.now
   end
 
   private  
@@ -36,12 +29,15 @@ class Shipment < ActiveRecord::Base
   end
   
   def transition_order
+    # transition order to shipped if all shipments have been shipped
     return unless shipped_at_changed?
     order.shipments.each do |shipment|
       return unless shipment.shipped?
     end
-    # transition order to shipped if all shipments have been shipped
-    order.ship!
+    current_user_session = UserSession.find   
+    current_user = current_user_session.user if current_user_session    
+    order.ship!                                        
+    order.state_events.create(:name => I18n.t('ship'), :user => current_user, :previous_state => order.state_was)
   end
   
   def recalculate_tax

data/app/models/tax_category.rb

@@ -1,3 +1,4 @@
 class TaxCategory < ActiveRecord::Base
+  validates_presence_of :name
   validates_uniqueness_of :name
 end

data/app/models/user.rb

@@ -1,133 +1,48 @@
-require 'digest/sha1'
-require 'RFC822'
-class User < ActiveRecord::Base
-  # Virtual attribute for the unencrypted password
-  attr_accessor :password
-
-  has_many :addresses, :as => :addressable, :dependent => :destroy
-  
-  validates_presence_of     :email
-  validates_format_of       :email, :with => RFC822::EmailAddress, 
-                            :message => 'email must be valid'
-  validates_presence_of     :password,                   :if => :password_required?
-  validates_presence_of     :password_confirmation,      :if => :password_required?
-  validates_length_of       :password, :within => 4..40, :if => :password_required?
-  validates_confirmation_of :password,                   :if => :password_required?
-  validates_length_of       :email,    :within => 3..100
-  validates_uniqueness_of   :email, :case_sensitive => false
-  before_save :encrypt_password
+class User < ActiveRecord::Base           
+  before_validation :set_login  
+  before_save :add_user_role
   
-  has_many :orders
-  has_and_belongs_to_many :roles
+  acts_as_authentic do |c|
+     c.transition_from_restful_authentication = true
+     #AuthLogic defaults
+     #c.validate_email_field = true
+     #c.validates_length_of_email_field_options = {:within => 6..100} 
+     #c.validates_format_of_email_field_options = {:with => email_regex, :message => I18n.t(‘error_messages.email_invalid’, :default => “should look like an email address.”)}
+     #c.validate_password_field = true
+     #c.validates_length_of_password_field_options = {:minimum => 4, :if => :require_password?} 
+     #for more defaults check the AuthLogic documentation
+  end 
 
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
   attr_accessible :email, :password, :password_confirmation
+  
+  has_many :orders
+  has_and_belongs_to_many :roles
+    
+  def deliver_password_reset_instructions!
+    reset_perishable_token!
+    UserMailer.deliver_password_reset_instructions(self)
+  end
 
   # has_role? simply needs to return true or false whether a user has a role or not.  
   def has_role?(role_in_question)
     @_list ||= self.roles.collect(&:name)
     (@_list.include?(role_in_question.to_s) )
   end
-
-  # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
-  def self.authenticate(email, password)
-    email = "spree@example.com" if email == "admin" # Hack for users who want to type in just admin to this field
-    u = find_by_email(email) # need to get the salt
-    u && u.authenticated?(password) ? u : nil
-  end
-
-  # Encrypts some data with the salt.
-  def self.encrypt(password, salt)
-    Digest::SHA1.hexdigest("--#{salt}--#{password}--")
-  end
-
-  # Encrypts the password with the user salt
-  def encrypt(password)
-    self.class.encrypt(password, salt)
-  end
-
-  def authenticated?(password)
-    crypted_password == encrypt(password)
-  end
-
-  def remember_token?
-    exp_time = ParseDate.parsedate(remember_token_expires_at)
-    remember_token_expires_at && Time.now.utc < Time.gm(*exp_time) 
-  end
-
-  # These create and unset the fields required for remembering users between browser closes
-  def remember_me
-    remember_me_for 2.weeks
-  end
-
-  def remember_me_for(time)
-    remember_me_until time.from_now.utc
-  end
-
-  def remember_me_until(time)
-    self.remember_token_expires_at = time
-    self.remember_token            = encrypt("#{email}--#{remember_token_expires_at}")
-    save(false)
-  end
-
-  def forget_me
-    self.remember_token_expires_at = nil
-    self.remember_token            = nil
-    save(false)
-  end
-  
-  # for anonymous customer support
-  def self.generate_login
-    record = true
-    while record
-      login = "anon_" + Array.new(6){rand(6)}.join + "@anon.com"
-      record = find(:first, :conditions => ["email = ?", email])
-    end
-    return login
-  end
-  
-  # I am not sure we want this, but if we do, here is a readymade user for anonymous login  
-  def self.anonymous_user
-    pw = Digest::SHA1.hexdigest("--#{Time.now.to_s}#{self.object_id}#{Array.new(256){rand(256)}.join}")
-    anonymous_user = User.new :password => pw,
-                     :password_confirmation => pw,
-                     :email => "anon_login_#{Time.now.to_s}@anon.com"
-    anonymous_user.roles.push(Role.find_by_name("anonymous").freeze).freeze
-  
-    # disallow saving the anonymous user by overwriting with singleton save methods
-    methods_to_overwrite =
-    "save
-    save!
-    save_with_transactions
-    save_with_transactions!
-    save_with_validation
-    save_with_validation!
-    save_without_transactions
-    save_without_transactions!
-    save_without_validation
-    save_without_validation!".split
-   
-    methods_to_overwrite.each do |method|
-      instance_eval("def anonymous_user.#{method}; true; end")
-    end
-  end
   
   def last_address
     addresses.last
-  end
+  end 
   
-  protected
-    # before filter 
-    def encrypt_password
-      return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
-      self.crypted_password = encrypt(password)
-    end
-      
-    def password_required?
-      crypted_password.blank? || !password.blank?
-    end
-    
-    
+  private 
+  def set_login
+    # for now force login to be same as email, eventually we will make this configurable, etc.
+    self.login = email
+  end 
+  
+  def add_user_role
+    user_role = Role.find_by_name("user")
+    self.roles << user_role if user_role and self.roles.empty?
+  end     
 end

data/app/models/user_mailer.rb

@@ -0,0 +1,11 @@
+class UserMailer < ActionMailer::Base
+  default_url_options[:host] = Spree::Config[:site_url]
+
+  def password_reset_instructions(user)
+    subject       Spree::Config[:site_name] + ' ' + I18n.t("password_reset_instructions")
+    from          Spree::Config[:order_from]
+    recipients    user.email
+    sent_on       Time.now
+    body          :edit_password_reset_url => edit_password_reset_url(user.perishable_token)
+  end
+end

data/app/models/user_session.rb

@@ -0,0 +1,2 @@
+class UserSession < Authlogic::Session::Base
+end

data/app/models/variant.rb

@@ -12,8 +12,12 @@ class Variant < ActiveRecord::Base
   # default variant scope only lists non-deleted variants
   named_scope :active, :conditions => "deleted_at is null"
   named_scope :deleted, :conditions => "not deleted_at is null"
-  
-  @fields =[]
+ 
+  # default extra fields for shipping purposes 
+  @fields = [ {:name => 'Weight', :only => [:variant], :format => "%.2f"},
+              {:name => 'Height', :only => [:variant], :format => "%.2f"},
+              {:name => 'Width',  :only => [:variant], :format => "%.2f"},
+              {:name => 'Depth',  :only => [:variant], :format => "%.2f"} ]
   
   def on_hand
     inventory_units.with_state("on_hand").size

data/app/models/zone.rb

@@ -1,18 +1,22 @@
 class Zone < ActiveRecord::Base
-  has_many_polymorphs :members, :from => [:states, :countries, :zones], :through => :zone_members, :as => :parent
+  has_many :zone_members
+  validates_presence_of :name
   validates_uniqueness_of :name
+  after_save :remove_defunct_members
+  
+  alias :members :zone_members
+  accepts_nested_attributes_for :zone_members, :allow_destroy => true, :reject_if => proc { |a| a['zoneable_id'].blank? }
   
   #attr_accessor :type
-  def type
+  def kind
     return "country" unless member = self.members.last
-    return "state" if member.class == State
-    return "zone" if member.class == Zone
+    return "state" if member.zoneable_type == "State"
+    return "zone" if member.zoneable_type == "Zone"
     "country"
-  end
+  end   
   
-  # virtual attributes for use with AJAX completion stuff
-  def member_name
-    # does nothing - just here to satisfy text_field_with_auto_complete (which requires a model property)
+  def kind=(value)
+    # do nothing - just here to satisfy the form
   end
   
   # alias to the new include? method 
@@ -21,16 +25,17 @@ class Zone < ActiveRecord::Base
     include?(address)  
   end
       
-  def include?(address)
+  def include?(address)        
     # NOTE: This is complicated by the fact that include? for HMP is broken in Rails 2.1 (so we use awkward index method)
-    case self.type
+    case self.kind
     when "country"
-      return members.index(address.country).respond_to?(:integer?)
+      return members.select { |zone_member| zone_member.zoneable == address.country }.any?
     when "state"
-      return members.index(address.state).respond_to?(:integer?)
+      return members.select { |zone_member| zone_member.zoneable == address.state }.any?
+      #members.index(address.state).respond_to?(:integer?)
     end
-    members.each do |zone|
-      return true if zone.include?(address)
+    members.each do |zone_member|
+      return true if zone_member.zoneable.include?(address)
     end
     false
   end
@@ -44,8 +49,19 @@ class Zone < ActiveRecord::Base
   # convenience method for returning the countries contained within a zone (different then the countries method which only 
   # returns the zones children and does not consider the grand children if the children themselves are zones)
   def country_list
-    return [] if type == "state"
-    return countries if type == "country"
-    members.collect { |zone| zone.country_list }.flatten
+    return [] if kind == "state"
+    return members.collect { |zone_member| zone_member.zoneable } if kind == "country"
+    members.collect { |zone_member| zone_member.zoneable.country_list }.flatten
+  end
+  
+  def <=>(other)
+    name <=> other.name
+  end  
+  
+  private
+  def remove_defunct_members
+    zone_members.each do |zone_member|
+      zone_member.destroy if zone_member.zoneable_id.nil?
+    end
   end
-end
+end

data/app/models/zone_member.rb

@@ -1,4 +1,10 @@
 class ZoneMember < ActiveRecord::Base
-  belongs_to :parent, :class_name => "Zone", :foreign_key => "parent_id"
-  belongs_to :member, :polymorphic => true
-end
+  belongs_to :zone
+  belongs_to :zoneable, :polymorphic => true    
+  
+  def name   
+    return nil if zoneable.nil?
+    zoneable.name
+  end
+
+end

data/app/views/account/login.html.erb

@@ -1,2 +1,4 @@
+<h1><%= t("login_name") %></h1>
+
 <%= render :partial => 'shared/login' %>
 <%= t("or") %> <%= link_to t("create_a_new_account"), signup_path %> </p>

data/app/views/admin/configurations/index.html.erb

@@ -1,6 +1,6 @@
 <h1><%= t("configurations") -%></h1>
 
-<table id="configurations" class="full-table" width="800px">
+<table class="index">
   <thead>
     <tr>
       <th><%= t("system") %></th>

data/app/views/admin/creditcard_payments/edit.html.erb

@@ -1,15 +1,18 @@
-<%= render :partial => 'shared/order_tabs', :locals => {:current => "Payments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Payments"} %>
 <br/>
 <h2><%= t("credit_card_payment")%></h2>
 <br/>
 <b><%= t("credit_card")%>: </b> &nbsp; #<%= @creditcard_payment.creditcard.display_number %><br/>
 <b><%= t("type")%> : </b> &nbsp; <%= @creditcard_payment.creditcard.cc_type.titleize %><br/>
-<br/>
-<% form_for(:payment_presenter, :url => object_url, :html => { :method => :put}) do |f| %>
+<br/>         
+<%=error_messages_for :creditcard_payment %>
+<% form_for(@creditcard_payment, :url => object_url, :html => { :method => :put}) do |payment_form| %>
 	<h4><%= t("billing_address")%></h4>
-	<%= render :partial => 'shared/form_address', :locals => {:f => f, :presenter_type => "payment"} %>
+	<% payment_form.fields_for :creditcard do |creditcard_form| %>
+	  <%= render :partial => 'admin/shared/form_address', :locals => {:f => creditcard_form} %>
+	<% end %>
 	<br/>
-	<table class="basic-table">
+	<table class="index">
 	  <tr>
 	    <th><%= t("transaction") %></th>
 	    <th><%= t("amount") %></th>
@@ -26,10 +29,9 @@
 	  <% end %>
 	</table>
 
-	<div align="right">
-		<br/>
-	  <%= submit_tag t('update') %>
-	</div>	
+	<p class="form-buttons">
+	  <%= button t('update') %>
+	</p>	
 
 <% end %>
 <%= link_to t("capture").titleize, capture_admin_order_creditcard_payment_url(@order, @creditcard_payment), :confirm => t('are_you_sure_you_want_to_capture') if @creditcard_payment.can_capture?  %> &nbsp;

data/app/views/admin/creditcard_payments/new.html.erb

@@ -1,28 +1,15 @@
-<%= render :partial => 'shared/order_tabs', :locals => {:current => "Payments"} %>
-<br/>
-<div id="creditcard">
-  <%=error_messages_for :payment_presenter %>
-  <h1><%= t("new_credit_card_payment")%></h1>
-  <br/>
-  <% form_for(:payment_presenter, :url => admin_order_creditcard_payments_url(@order)) do |f| %>
-    <table cellpadding="5" width="100%">
-      <tr>
-        <td valign="top" wdith="50%">
-          <%= render :partial => 'creditcards/form_credit_card', :locals => {:f => f} %>
-        </td>
-        <td>
-					<h4><%= t('billing_address')%></h4>
-					<%= render :partial => 'shared/form_address', :locals => {:f => f, :presenter_type => "payment"} %>
-        </td>
-      </tr>
-    </table>
-  	<div align="right" style="font-size:120%;">
-  		<br />
-  		<%= t("order_total_message") %> <input type="text" name="amount" value="<%= @amount %>">
-  	</div>
-    <div align="right">
-  		<br/>
-      <%= submit_tag t('continue') %>
-    </div>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Payments"} %>
+
+<h2><%= t("new_credit_card_payment")%></h2>
+                  
+<%=error_messages_for :creditcard_payment %>
+<% form_for @creditcard_payment, :url => collection_url do |payment_form| %>
+  <h4><%= t("billing_address")%></h4>
+  <% payment_form.fields_for :creditcard do |creditcard_form| %>
+    <%= render :partial => 'admin/shared/form_address', :locals => {:f => creditcard_form} %>
   <% end %>
-</div>
+  <p class="form-buttons">
+    <%= button t('continue') %>
+    or <%= link_to t("actions.cancel"), admin_order_payments_url(@order) %>
+  </p>  
+<% end %>