spree 0.4.1 → 0.5.0

data/app/models/order_filter.rb

@@ -11,6 +11,7 @@ class OrderFilter < ActiveRecord::Base
   column :number, :string
   column :state, :string
   column :customer, :string
+  column :checkout, :string
   
   def validate
     date_pattern = /^(0[1-9]|1[012])[\/][0-9]{2}[\/](19|20)[0-9]{2}$/

data/app/models/product.rb

@@ -48,6 +48,15 @@ class Product < ActiveRecord::Base
     @quantity = quantity
   end
   
+  # Pseduo attribute for SKU, similiar as on_hand above.
+  def sku
+    variant.sku if variant
+  end
+  
+  def sku=(sku)
+    variant.sku = sku if variant
+  end
+  
   def has_stock?
     variants.inject(false){ |tf, v| tf ||= v.in_stock }
   end

data/app/models/product_property.rb

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

data/app/models/property.rb

@@ -1,5 +1,4 @@
 class Property < ActiveRecord::Base
-  has_many :property_values
   has_and_belongs_to_many :prototypes
 
   validates_presence_of :name, :presentation

data/app/models/zone.rb

@@ -14,8 +14,14 @@ class Zone < ActiveRecord::Base
   def member_name
     # does nothing - just here to satisfy text_field_with_auto_complete (which requires a model property)
   end
-    
+  
+  # alias to the new include? method 
   def in_zone?(address)
+    $stderr.puts "Warning: calling deprecated method :in_zone? use :include? instead."
+    include?(address)  
+  end
+      
+  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
     when "country"
@@ -24,14 +30,22 @@ class Zone < ActiveRecord::Base
       return members.index(address.state).respond_to?(:integer?)
     end
     members.each do |zone|
-      return true if zone.in_zone?(address)
+      return true if zone.include?(address)
     end
     false
   end
   
   def self.match(address)
     zones = []
-    Zone.all.each {|zone| zones << zone if zone.in_zone?(address)}
+    Zone.all.each {|zone| zones << zone if zone.include?(address)}
     zones
   end
+  
+  # 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
+  end
 end

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

@@ -1,14 +1,2 @@
-<% form_tag do -%>
-<p><label for="email"><%= t("Email") %></label><br/>
-<%= text_field_tag 'email' %></p>
-
-<p><label for="password"><%= t("Password") %></label><br/>
-<%= password_field_tag 'password' %></p>
-
-<p>
-  <%= check_box_tag 'remember_me' %>
-  <label for="remember_me"><%= t("Remember me") %></label>
-</p>
-
-<p><%= submit_tag t("Log In") %> <%= t("or") %> <%= link_to t("Create a new account"), signup_path %> </p>
-<% end -%>
+<%= render :partial => 'shared/login' %>
+<%= t("or") %> <%= link_to t("Create a new account"), signup_path %> </p>

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

@@ -31,6 +31,10 @@
     <tr>
       <td><%= link_to t("Taxonomies"), admin_taxonomies_path %></td>
       <td><%= Globalite.localize(:taxonomies_setting_description) %></td>
+		</tr>
+		<tr>
+      <td><%= link_to t("Inventory Settings"), admin_inventory_settings_path %></td>
+      <td><%= Globalite.localize(:inventory_setting_description) %></td>
     </tr>
     <% @extension_links.each do |link_map| %>
       <tr>

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

@@ -0,0 +1,18 @@
+<% form_tag(admin_inventory_settings_path, :method => :put) do -%>
+
+<h2><%= t('Inventory Server Preferences') %></h2>
+
+<div>
+  <p>
+    <%= check_box_tag('preferences[show_zero_stock_products]', "1", Spree::Config[:show_zero_stock_products]) %>
+    <strong><%= t('Show Out-of-Stock Products') %></strong>
+    <input name="preferences[show_zero_stock_products]" type="hidden" value="0" />
+  </p>
+  <p>
+    <%= check_box_tag('preferences[allow_backorders]', "1", Spree::Config[:allow_backorders]) %>
+    <strong><%= t('Allow Backorders') %></strong>
+    <input name="preferences[allow_backorders]" type="hidden" value="0" />
+  </p>
+</div>
+<%= submit_tag t('Save Preferences') %>
+<% end -%>

data/app/views/admin/inventory_settings/show.html.erb

@@ -0,0 +1,11 @@
+<h2><%= t("Inventory Server Settings") %></h2>
+
+<div id="inventory_settings">
+  <div id="show_zero_stock_products">
+    <h4>Products with a zero inventory will <%= show_not(Spree::Config[:show_zero_stock_products]) %> be displayed</h4>
+  </div>
+  <div id="allow_backorders">
+     <h4>Backordering is <%= show_not(Spree::Config[:allow_backorders]) %> allowed</h4>
+  </div>
+  <%= link_to t("Edit"), edit_admin_inventory_settings_path %>
+</div>

data/app/views/admin/orders/_address.html.erb

@@ -23,7 +23,7 @@
   </tr>
   <tr>
     <td>
-      <%=in_place_editor_field :address, :city %>, <%= @address.state.abbr %> <%=in_place_editor_field :address, :zipcode %>
+      <%=in_place_editor_field :address, :city %>, <%= @address.state.nil? ? in_place_editor_field(:address, :state_name) : @address.state.abbr %> <%=in_place_editor_field :address, :zipcode %>
     </td>
   </tr>
   <tr>

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

@@ -75,7 +75,7 @@
               <tr>
                 <td><%= t("Status") %></td>
                 <td>
-                  <%= f.select :state, %w{ authorized canceled captured paid pending_payment returned shipped }.collect {|status| status.titleize}, {:include_blank => true}, {:style => "width: 115px"}%>
+                  <%= f.select :state, Order.state_machines['state'].states.collect {|status| status.titleize}, {:include_blank => true}, {:style => "width: 115px"}%>
                 </td>
               </tr>
               <tr>
@@ -84,6 +84,10 @@
                   <%= f.text_field :customer, :size=>13 %>
                 </td>
               </tr>
+              <tr>
+                <td colspan="2"><%= t("Checkout Complete") %>&nbsp;<%= f.check_box :checkout, {:style => "vertical-align:middle;"}%>
+                </td>
+              </tr>
             </tbody>
           </table>
           <%=submit_tag t("Search") %>

data/app/views/admin/orders/show.html.erb

@@ -6,7 +6,7 @@
 
 <%= render :partial => 'shared/order_details', :locals => {:order => @order} -%>
 
-<% if @order.ship_address %>
+<% if @order.address || @order.creditcard_payment %>
   <table class="order-address">
     <tr>
       <th><%= t("Ship Address") %></th>
@@ -14,10 +14,10 @@
     </tr>
     <tr>
       <td width="50%">
-        <%= render :partial => 'address', :locals => {:address => @order.ship_address} -%>      
+        <%= render :partial => 'address', :locals => {:address => @order.address} if @order.address%>      
       </td>
       <td width="50%">
-        <%= render :partial => 'address', :locals => {:address => @order.bill_address} -%>
+        <%= render :partial => 'address', :locals => {:address => @order.creditcard_payment.address} if @order.creditcard_payment%>
       </td>
     </tr>
   </table>

data/app/views/admin/product_properties/_product_property.html.erb

@@ -1,10 +1,11 @@
+<% number ||= 0 %>
 <tr class="product_property">
   <td>
     <%= text_field_with_auto_complete :product_property, 
                                       :property_name,
                                       {:onkeypress => "return event.which == Event.KEY_RETURN ? false : true",
                                        :autocomplete => "off",
-                                       :name => property_fu_name(product_property),
+                                       :name => property_fu_name(product_property, number),
                                        :value => product_property.property ? product_property.property.name : ""
                                       },
                                       {:url => filtered_admin_properties_url,
@@ -13,8 +14,10 @@
                                       } %>  
   </td>
   <td>
-		<input type="test" size="25" name="product[product_property_attributes][<%= product_property.id %>][value]" 
-		       value="<%= product_property.value %>"/>
+    <%= text_field :product_property, :property_value, {
+                                       :name => property_fu_value(product_property, number),
+                                       :value => product_property.value
+                                      } %>
 	</td>	
   <td>
   	<a href='#' onclick="$(this).up('.product_property').remove();"><%= t("Remove") %></a>

data/app/views/admin/products/_form.html.erb

@@ -33,7 +33,9 @@
   <% if @product.variant %>
     <tr>
       <td><%=t("SKU")%>: </td>
-      <td><input type="text" name="variant[<%= @product.variant.id %>][sku]" value="<%= @product.variant.sku %>"/></td>
+      <td>
+				<%= f.text_field :sku, :size => 16 %>
+			</td>
     </tr>
     <tr>
       <td><%=t("On Hand")%>: </td>
@@ -42,6 +44,12 @@
       </td>
     </tr>
   <% end %>
+  <tr>
+    <td nowrap><%=t("Shipping Category")%>: </td>
+    <td>
+      <%= collection_select(:product, :shipping_category_id, @shipping_categories, :id, :name, {:include_blank => true}, {"style" => "width:200px"}) %>        
+    </td>
+  </tr>
   <tr>
     <td nowrap><%=t("Tax Category")%>: </td>
     <td>

data/app/views/admin/prototypes/select.rjs

@@ -1,5 +1,7 @@
+number = 0
 @prototype.properties.each do |property|
   page.insert_html :bottom, 'product_properties', 
                    :partial => 'admin/product_properties/product_property',
-                   :locals => {:product_property => ProductProperty.new (:property => property)}
+                   :locals => {:product_property => ProductProperty.new (:property => property), :number => number}
+  number += 1
 end

data/app/views/admin/variants/_form.html.erb

@@ -29,4 +29,10 @@
     <td><%= t("On Hand") %>: </td>
     <td><%= f.text_field :on_hand %></td>
   </tr>  
+  <% @additional_fields.each do |field| %>
+  <tr>
+    <td><%= t(field.titleize) %>: </td>
+    <td><%= f.text_field field %></td>
+  </tr>  
+  <% end %>
 </table>

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

@@ -1,12 +1,15 @@
 <%= render :partial => 'shared/product_sub_menu' %>
 <h1><%= t("Editing Product") %></h1>
 <%= render :partial => 'shared/product_tabs', :locals => {:current => "Variants"} %>
-<table class="basic-table">
+<table class="full-table">
 	<thead>
 		<tr>
 			<th><%= t("Options") %></th>
 			<th><%= t("Price") %></th>
 		  <th><%= t("SKU") %></th>
+		  <% @additional_fields.each do |field| %>
+		    <th><%= field.titleize %></th>
+		  <% end %>
 		  <th><%= t("On Hand") %></th>
 			<th><%= t("Action") %></th>
 		</tr>
@@ -19,6 +22,9 @@
       	<td><%= variant_options variant %></td>
       	<td><%= variant.price %>
         <td><%= variant.sku %></td>
+        <% @additional_fields.each do |field| %>        
+  		    <td><%= variant[field] %></td>
+  		  <% end %>
         <td><%= variant.on_hand %></td>
 		    <td valign="top">
 		      <%= link_to_edit(variant) %>

data/app/views/creditcard_payments/_form_credit_card.html.erb

@@ -8,7 +8,7 @@
   <tr>
     <!-- use this sample (visa) cc# for testing 4111111111111111 -->
     <td width="120"><%= t("Card Number") %></td>
-    <td><%= f.text_field :creditcard_number, :maxlength => 17 -%></td>
+    <td><%= f.text_field :creditcard_number, :size=> 19 -%></td>
   </tr>
   <tr>
     <td><%= t("Expiration Month") %></td>

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

@@ -1,9 +1,9 @@
 <%=error_messages_for :payment_presenter %>
 <h1><%= t("Payment")%></h1>
 <% form_for(:payment_presenter, :url => order_creditcard_payment_url(@order)) do |f| %>
-  <table cellpadding="5">
+  <table cellpadding="5" width="100%">
     <tr>
-      <td valign="top">
+      <td valign="top" wdith="50%">
         <%= render :partial => 'form_credit_card', :locals => {:f => f} %>
       </td>
       <td>
@@ -11,7 +11,12 @@
       </td>
     </tr>
   </table>
+	<div align="right" style="font-size:120%;">
+		<br />
+		<%= Globalite.localize(:order_total_message) %> <strong><%= number_to_currency @order.total%></strong>
+	</div>
   <div align="right">
+		<br/>
     <%= submit_tag t('Continue') %>
   </div>
 <% end %>

data/app/views/products/show.html.erb

@@ -33,7 +33,7 @@
 										<% @product.variants.each do |v| %>
 											<% next if v.option_values.empty? %>
 											<li>
-                        <input type="radio" name="id" value="<%= v.id %>" <%= @product.variants.first == v ? 'checked="checked"' : '' %> <%= 'disabled' unless v.in_stock or Spree::Config[:allow_backorders]  %> />
+                        <input type="radio" name="id" value="<%= v.id %>" <%= @product.variants.first == v ? 'checked="checked"' : '' %> <%= 'disabled' unless v.in_stock or Spree::Config[:show_zero_stock_products]  %> />
 											  <%= variant_options v %>
 											  <% if variant_price_diff v %>
 											  	<span class="price-diff"><%= variant_price_diff v %></span>
@@ -49,7 +49,13 @@
 					<% end%>						
 					<tr>
 					  <td>
-					    <%= submit_tag t('Add To Cart') %>
+              <%=
+                if @product.has_stock? || Spree::Config[:allow_backorders]
+                  submit_tag t('Add To Cart')
+                else
+                  content_tag('strong', 'Out of Stock')
+                end
+            %>
 					  </td>
 					</tr>
 				</table>

data/app/views/shared/_login.html.erb

@@ -0,0 +1,17 @@
+<% form_tag '/login' do %>
+  <table>
+    <tr>
+      <td><%= t("Email") %>: </td>
+      <td>
+        <%= text_field_tag 'email' %>
+      </td>
+    </tr>
+    <tr>
+      <td><%= t("Password") %>:</td>
+      <td>
+        <%= password_field_tag 'password' %>
+      </td>
+    </tr>
+  </table>
+  <p><%= submit_tag t("Log In") %>
+<% end %>

data/app/views/shared/_products.html.erb

@@ -1,7 +1,7 @@
 <div id="product-listing">
   <ul class="product-listing">
     <% products.each do |product| %>
-      <% if Spree::Config[:allow_backorders] || product.has_stock? %>
+      <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
         <li class="product preview" id="product_<%= product.id %>">
           <%= link_to small_image(product), product %>
           <%= link_to product.name, product %>

data/app/views/users/_form.html.erb

@@ -1,4 +1,4 @@
-<table>
+<table id="user-form">
   <tr>
     <td><%= t("Email") %>: </td>
     <td>

data/app/views/users/new.html.erb

@@ -1,9 +1,20 @@
 <%= error_messages_for :user %>
-<h1><%= t("New User") %></h1>
-<br/>
-<% form_for(@user) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <p>
-    <%= submit_tag t("Create") %> or <%= link_to "Login to existing account", login_path %>
-  </p>
-<% end %>
+<table width="100%">
+  <tr>
+    <td width="50%"><h2><%= t("New Customer") %></h2></td>
+    <td><h2><%= t("Existing Customer") %></h2></td>
+  </tr>
+  <tr>
+    <td valign="top">
+      <% form_for(@user) do |f| %>
+        <%= render :partial => "form", :locals => { :f => f } %>
+        <p>
+          <%= submit_tag t("Create") %> 
+        </p>
+      <% end %>
+    </td>
+    <td valign="top">
+      <%= render :partial => 'shared/login' %>
+    </td>
+  </tr>
+</table>

data/config/boot.rb

@@ -55,7 +55,7 @@ module Spree
   class Boot 
     include Spree::RubyGemsLoader
     def run
-      load_rails("2.1.0") # note: spree requires a specific rails version (change at your own risk)
+      load_rails("2.1.2") # note: spree requires a specific rails version (change at your own risk)
       load_initializer
       Spree::Initializer.run(:set_load_path)
     end

data/config/database.yml

@@ -19,9 +19,13 @@ development:
 #  database: db/development.sqlite3
 
 staging:
-  adapter: sqlite3
-  database: db/staging.sqlite3
-
+  #adapter: sqlite3
+  #database: db/staging.sqlite3
+  adapter: mysql
+  database: spree_dev
+  username: spree
+  password: spree
+  host: localhost
 test:
   adapter: mysql
   database: spree_test