spree 0.6.0 → 0.7.0

data/{vendor/extensions/shipping/app → app}/models/shipping_method.rb

@@ -1,12 +1,14 @@
 class ShippingMethod < ActiveRecord::Base
   belongs_to :zone
 
-  def available?(shipment)
-    zone.include?(shipment.address)
-  end
-  
   def calculate_shipping(shipment)
     return 0 unless zone.include?(shipment.address)
     return shipping_calculator.constantize.new.send(:calculate_shipping, shipment)
+  end   
+  
+  def available?(order)
+    calculator = shipping_calculator.constantize.new                               
+    return true unless calculator.respond_to?(:available?)
+    calculator.available?(order)    
   end
 end

data/app/models/state.rb

@@ -3,4 +3,9 @@ class State < ActiveRecord::Base
   named_scope :order_by_name, :order => :name
   
   validates_presence_of [:country, :name]
+  
+  def <=>(other)
+    name <=> other.name
+  end
+   
 end

data/app/models/user.rb

@@ -4,6 +4,8 @@ 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'
@@ -111,8 +113,8 @@ class User < ActiveRecord::Base
     end
   end
   
-  def add_address(addy)
-    self.addresses << addy
+  def last_address
+    addresses.last
   end
   
   protected

data/app/models/variant.rb

@@ -23,6 +23,10 @@ class Variant < ActiveRecord::Base
     @new_level = new_level
   end
   
+  def on_backorder
+    inventory_units.with_state("backordered").size
+  end
+  
   def in_stock
     on_hand > 0
   end
@@ -43,6 +47,10 @@ class Variant < ActiveRecord::Base
       super
     end
   end
+  
+  def orderable?
+    self.in_stock || ( !self.in_stock && self.allow_backordering) || Spree::Config[:allow_backorders]
+  end
 
   private
 
@@ -51,7 +59,17 @@ class Variant < ActiveRecord::Base
       @new_level = @new_level.to_i
       # don't allow negative on_hand inventory
       return if @new_level < 0
-      adjustment = @new_level - on_hand
+      
+      # fill backordered orders first
+      inventory_units.with_state("backordered").each{|iu|
+        if @new_level > 0
+          iu.fill_backorder
+          @new_level = @new_level - 1
+        end
+        break if @new_level < 1
+        }
+      
+      adjustment = @new_level - on_hand 
       if adjustment > 0
         InventoryUnit.create_on_hand(self, adjustment)
         reload

data/app/presenters/checkout_presenter.rb

@@ -0,0 +1,58 @@
+class CheckoutPresenter < ActivePresenter::Base
+  presents :creditcard, {:bill_address => Address}, {:ship_address => Address} 
+
+  include ActionView::Helpers::NumberHelper # Needed for JS usable rate information 
+  
+  alias_method :old_initialize, :initialize 
+  attr_accessor :order
+  attr_accessor :shipping_method
+  attr_accessor :order_hash   
+  attr_accessor :final_answer
+  
+  def initialize(args = {})               
+    old_initialize(args)
+    default_country = Country.find_by_id Spree::Config[:default_country_id]
+    bill_address.country ||= default_country
+    ship_address.country ||= default_country    
+    # credit card needs to use some bill_address attributes
+    creditcard.address = bill_address  
+    creditcard.first_name = bill_address.firstname
+    creditcard.last_name = bill_address.lastname   
+    self.order_hash = {}   
+  end 
+  
+  def save           
+    return false if final_answer and not valid?
+    saved = false
+    ActiveRecord::Base.transaction do
+      # clear existing shipments (no orphans please)                             
+      order.shipments.clear
+      # clear existing addresses, eventually this won't be necessary (we'll have an address book)
+      order.user.addresses.clear
+      
+      order.user.addresses << bill_address.clone
+      
+      order.shipments.create(:address => ship_address, :shipping_method => shipping_method)
+      
+      order.ship_amount = order.shipment.shipping_method.calculate_shipping(order.shipment) if order.shipment and order.shipment.shipping_method
+      order.tax_amount = order.calculate_tax
+      order.save
+      
+      if final_answer
+        # authorize the credit card and then save (authorize first before number is cleared for security purposes)
+        creditcard.order = order
+        creditcard.authorize(order.total)
+        creditcard.save
+        order.complete
+      end      
+      saved = true
+    end  
+    # populate the order hash  
+    
+    order_hash[:ship_amount] = number_to_currency(order.ship_amount)
+    order_hash[:tax_amount] = number_to_currency(order.tax_amount)
+    order_hash[:order_total] = number_to_currency(order.total)
+    order_hash[:ship_method] = order.shipment.shipping_method.name if order.shipment and order.shipment.shipping_method
+    saved  
+  end
+end

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

@@ -21,7 +21,7 @@
 	      <td><%=CreditcardTxn::TxnType.from_value t.txn_type.to_i%></td>
 	      <td><%=number_to_currency t.amount%></td>
 	      <td><%=t.response_code%></td>
-	      <td><%=t.created_at.to_s(:db)%></td>
+	      <td><%=t.created_at.to_s(:date_time24)%></td>
 	    </tr>
 	  <% end %>
 	</table>

data/app/views/admin/option_types/available.html.erb

@@ -25,7 +25,7 @@
     <% end %>
     <% if @available_option_types.empty? %>
     <tr>
-      <td colspan="3"><%= :none_available.l %></td>
+      <td colspan="3"><%= t('none_available') %></td>
     </tr>
     <% end %>		
   </tbody>

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

@@ -10,11 +10,11 @@
         <table class="admin-report" width="545">
           <thead>
             <tr>
-              <th><%= t("order_date") %></th>
-              <th><%= t("order_number") %></th>
-              <th><%= t("status") %></th>
-              <th><%= t("customer") %></th>
-              <th><%= t("total") %></th>
+              <th><%= order_by_link :created_at, :text => t("order_date") %></th>
+              <th><%= order_by_link :number, :text => t("order_number") %></th>
+              <th><%= order_by_link :state, :text => t("status") %></th>
+              <th><%= order_by_link ({:user => :email}, :text => t("customer")) %></th>
+              <th><%= order_by_link :total, :text =>t("total") %></th>
             </tr>
           </thead>
           <tbody>
@@ -32,7 +32,8 @@
       </div>
     </td>
     <td valign="top">
-      <% form_for :filter, :url => admin_orders_url, :html => { :method => :get } do |f| %>
+	  <% form_for [:admin, @search] do |f| %>
+	  	<% f.fields_for @search.conditions do |orders| %>
         <div id="search-col">
           <table class="admin-search">
             <thead>
@@ -44,15 +45,15 @@
               <tr>
                 <td><%= t("start") %>:</td>
                 <td>
-                  <%= error_message_on :filter, :start%>
-                  <%= calendar_date_select :filter, :start, :style=>"width:100px" %>
+                  <%#= error_message_on :search, :start%>
+                  <%= orders.calendar_date_select :created_at_after, :style=>"width:100px" %>
                 </td>
               </tr>
               <tr>
                 <td><%= t("stop") %>:</td>
                 <td>
-                  <%= error_message_on :filter, :stop%>
-                  <%= calendar_date_select :filter, :stop, :style=>"width:100px" %>
+                  <%#= error_message_on :search, :stop%>
+                  <%= orders.calendar_date_select :created_at_before, :style=>"width:100px" %>
                 </td>
               </tr>
             </tbody>
@@ -67,43 +68,52 @@
               <tr>
                 <td><%= t("order_number") %></td>
                 <td>
-                  <%= f.text_field :number, :size=>13 %>
+                  <%= orders.text_field :number, :size=>13 %>
                 </td>
               </tr>
               <tr>
                 <td><%= t("status") %></td>
                 <td>
-                  <%= f.select :state, Order.state_machines['state'].states.collect {|status| status.titleize}, {:include_blank => true}, {:style => "width: 115px"}%>
+                  <%= orders.select :state, Order.state_machines['state'].states.collect {|status| [status.titleize, status]}, {:include_blank => true}, {:style => "width: 115px"}%>
                 </td>
               </tr>
+            <% orders.fields_for orders.object.user do |user| %>
               <tr>
                 <td><%= t("email") %></td>
                 <td>
-                  <%= f.text_field :customer, :size=>13 %>
+                  <%= user.text_field :email, :size=>13 %>
                 </td>
               </tr>
+            <% end %>
+            <% orders.fields_for orders.object.creditcards do |cc| %>
+            	<% cc.fields_for cc.object.address do |address| %>
               <tr>
                 <td><%= t("first_name") %></td>
                 <td>
-                  <%= f.text_field :firstname, :size=>13 %>
+                  <%= address.text_field :lower_of_firstname_contains, :size=>13 %>
                 </td>
               </tr>
               <tr>
                 <td><%= t("last_name") %></td>
                 <td>
-                  <%= f.text_field :lastname, :size=>13 %>
+                  <%= address.text_field :lower_of_lastname_contains, :size=>13 %>
                 </td>
               </tr>
+				<% end %>
+			<% end %>
               <tr>
-                <td colspan="2"><%= t("show_incomplete_orders") %>&nbsp;<%= f.check_box :checkout, {:style => "vertical-align:middle;"}%>
+                <td colspan="2">
+                  <%= t("show_only_complete_orders") %>&nbsp;
+				          <%= orders.check_box :checkout_complete, {:style => "vertical-align:middle;"}, "1", "" %>
                 </td>
               </tr>
             </tbody>
           </table>
-          <%=submit_tag t("search") %>
+		  <%= f.submit t("search") %>
         </div>
+      	<% end %>
       <% end %>
     </td>
   </tr>
 </table>
-<%= render :partial => 'shared/paginate', :locals => {:collection => @orders, :options => generate_search_options(@filter)} unless @orders.empty? -%>
+<%= page_links(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") if @search.page_count > 1 %>

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

@@ -61,7 +61,7 @@
     <tr>
       <td><%=t("#{event.name}") %></td>
       <td><%=event.user.email if event.user %></td>
-      <td><%=event.created_at.to_s(:db) %></td>
+      <td><%=event.created_at.to_s(:date_time24) %></td>
     </tr>
   <% end %>
   <% if @order.state_events.empty? %>

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

@@ -8,7 +8,7 @@
   </tr>
   <% @payments.each do |payment| %>
     <tr>
-      <td><%= payment.created_at.to_s(:db) %></td>
+      <td><%= payment.created_at.to_s(:date_time24) %></td>
       <td><%= number_to_currency(payment.amount) %></td>
       <td><%= payment.class.to_s %></td>
       <!-- TODO: don't assume credit card, make it possible to edit other kinds of payments -->

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

@@ -17,7 +17,7 @@
             :method => 'delete',
             :before => "Element.show('img_busy_indicator')", 
             :complete => "Element.hide('img_busy_indicator')",
-            :confirm => t("are_you_sure_you_want_to_delete_this_image"),
+            :confirm => t("are_you_sure_delete_image"),
             :update => 'image-listing' %>
         <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'img_busy_indicator' %>
       </td>

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

@@ -6,11 +6,11 @@
 			<table class="admin-report" width="545">
 			  <tr>
 			    <td><b><%= t("image") %></b></td>
-			    <td><b><%= t("name") %></b></td>
-			    <td><b><%= t("master_price") %></b></td>
+			    <td><b><%= order_by_link :name, :text => t("name") %></b></td>
+			    <td><b><%= order_by_link :master_price, :text => t("master_price") %></b></td>
 			    <td/>
 			  </tr>
-			<% @products.each do |product| %>
+			<% @collection.each do |product| %>
 			  <tr <%= 'style="color:red;"' unless product.deleted_at.nil? %>>
 			    <td><%= mini_image(product) %></td>
 			    <td valign="top"><%=product.name%></td>
@@ -23,10 +23,10 @@
 			  </tr>
 			<% end %>
 			</table>
-			<%= render :partial => 'shared/paginate', :locals => {:collection => @collection, :options => search_options} -%>						
+	        <%= page_links(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") if @search.page_count > 1 %>						
 		</td>
     <td valign="top">
-      <form action="/admin/products" method="GET">
+	 <% form_for [:admin, @search] do |f| %>		
         <div id="search-col">
           <table class="admin-search">
             <thead>
@@ -35,27 +35,31 @@
               </tr>
             </thead>
             <tbody>
+		   <% f.fields_for @search.conditions do |products| %>
+	
               <tr>
                 <td><%= t("name") %></td>
                 <td>
-                  <input name="name" size="15" value="<%=@name%>"/>
+				  <%= products.text_field :name_contains, :size => 15 %>
                 </td>
               </tr>
               <tr>
+
+            <% products.fields_for products.object.variants do |variants| %>
                 <td><%= t("sku") %></td>
-                <td>
-                  <input name="sku" size="15" value="<%=@sku%>"/>
-                </td>
+                <td><%= variants.text_field :sku_contains, :size => 15 %></td>
+            <% end %>                
               </tr>
               <tr>
-   							<td><%= t("show_deleted") %></td>
-								<td><input name="deleted" type="checkbox" <%= @deleted %>/></td>
+   				<td><%= t("show_deleted") %></td>
+				<td><%= products.check_box :deleted_at_is_not_null, {}, "1", "" %></td>
               </tr>
+			<%end%>
             </tbody>
           </table>
-          <%=submit_tag t("search")%>
+		  <%= f.submit t("search") %>
         </div>
-      </form>
+      <% end %>
     </td>		
 	</tr>
 </table>

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

@@ -5,11 +5,11 @@
     <td valign="top">
       <table class="admin-report">
         <thead>
-          <th><%= t("user") %></th>
+          <th><%= order_by_link :email, :text => t("user") %></th>
           <th><%= t("action") %></th>
         </thead>
         <tbody>
-          <%- @users.each do |user|%>
+          <%- @collection.each do |user|%>
           <tr>
             <td width="350px"><%=link_to user.email, object_url(user) %></td>
             <td>
@@ -22,7 +22,8 @@
       </table>
     </td>
     <td valign="top">
-      <% form_for :filter, :url => admin_users_url, :html => { :method => :get } do |f| %>
+      <% form_for [:admin, @search] do |f| %>
+	  	<% f.fields_for @search.conditions do |user| %>
         <div id="search-col">
           <table class="admin-search">
             <thead>
@@ -34,19 +35,18 @@
               <tr>
                 <td><%= t("email") %></td>
                 <td>
-                  <%= f.text_field :email, :size=>18 %>
+                  <%= user.text_field :lower_of_email, :size=>18 %>
                 </td>
               </tr>
             </tbody>
           </table>
-          <%=submit_tag t("search") %>
+		  <%= f.submit t("search") %>
         </div>
+      	<% end %>
       <% end %>
     </td>
   </tr>
 </table>
-<%= render :partial => 'shared/paginate', :locals => {:collection => @users, :options => generate_search_options(@filter)} unless @users.empty? %>            
-
-
+<%= page_links(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") if @search.page_count > 1 %>
 <%= link_to t('new_user'), new_object_url %>
 

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

@@ -2,8 +2,8 @@
 <table class="admin-report" width="545">
   <thead>
     <tr>
-      <th><%= t("name") %></th>
-      <th><%= t("description") %></th>
+      <th><%= order_by_link :name, :text => t("name") %></th>
+      <th><%= order_by_link :description, :text => t("description") %></th>
       <th><%= t("action") %></th>
     </tr>
   </thead>
@@ -23,4 +23,7 @@
     <% end %>
   </tbody>
 </table>
+
+<%= page_links(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") if @search.page_count > 1 %>
+
 <%= link_to t("new_zone"), new_object_url %>

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

@@ -0,0 +1,165 @@
+<% content_for :head do %>
+  <%= javascript_include_tag 'jquery-1.3.2.min' %>
+  <%= javascript_include_tag 'jquery.validate.pack.js' %>
+  <%= javascript_include_tag 'checkout' %> 
+  <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
+  <%= stylesheet_link_tag 'checkout.css' %>
+<% end %>                 
+
+<input type="hidden" id="hidden_bstate" name="hidden_bstate" value="<%= @object.bill_address.state_id || @object.bill_address.state_name %>" />
+<input type="hidden" id="hidden_bcountry" name="hidden_bcountry" value="<%= @object.bill_address.country_id %>" />
+<input type="hidden" id="hidden_sstate" name="hidden_sstate" value="<%= @object.ship_address.state_id || @object.ship_address.state_name %>" />
+<input type="hidden" id="hidden_scountry" name="hidden_scountry" value="<%= @object.ship_address.country_id %>" />
+
+<%= error_messages_for :checkout_presenter %>
+<div id="billing">
+  <h2><%= t("billing_address")%></h2>
+  <div class="inner">
+  <p id="bfname">
+    <label for="<%= t("first_name") %>"><%= t("first_name") %></label>
+    <%= f.text_field :bill_address_firstname, :class => 'required' -%><span class="req">*</span>
+  </p>
+  <p id="blname">
+    <label for="<%= t("last_name") %>"><%= t("last_name") %></label>
+    <%= f.text_field :bill_address_lastname, :class => 'required' -%><span class="req">*</span>
+  </p>
+  <p id="baddress">
+    <label for=""><%= t("street_address") %></label>
+    <%= f.text_field :bill_address_address1, :class => 'required' -%><span class="req">*</span>
+  </p>
+  <p id="baddress2">
+    <label for=""><%= t("street_address_2") %></label>
+    <%= f.text_field :bill_address_address2 %>
+  </p>
+  <p id="bcity">
+    <label for=""><%= t("city") %></label>
+    <%= f.text_field :bill_address_city, :class => 'required' -%><span class="req">*</span>
+  </p>                        
+  <p>
+    <label for=""><%= t("state") %></label>
+    <span id="bstate">
+      <%= collection_select("checkout_presenter", 
+        :bill_address_state_id, 
+        @states, 
+        :id, 
+        :name, 
+        {:include_blank => true}, 
+        {:style=> 'width:150px;'}) %>
+    </span>
+    <span class="req">*</span>
+  </p>
+  <p id="bzip">
+    <label for=""><%= t("zip") %></label>
+    <%= f.text_field :bill_address_zipcode, :class => 'required' -%><span class="req">*</span>
+  </p>    
+  <p id="bcountry">
+    <label for=""><%= t("country") %></label>
+    <span id="bcountry"><%= f.collection_select :bill_address_country_id, @countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
+  </p>
+  <p id="bphone">
+    <label for=""><%= t("phone") %></label>
+    <%= f.text_field :bill_address_phone, :class => 'required' -%><span class="req">*</span>
+  </p>
+  <p><input id="validate_billing" type="button" value="<%=t("continue")%>"/></p>
+  </div>
+</div>
+
+<div id="shipping" class="checkout_disabled">
+  <h2><%= t("shipping_address")%></h2>
+  <div class="inner">
+  <p><label for="<%= t("use_billing_address") %>" id="use_billing"><%= t("use_billing_address") %></label><input id="checkout_presenter_same_address" name="checkout_presenter_same_address" type="checkbox" /></p> 
+  <p id="sfname">
+      <label for="<%= t("first_name") %>"><%= t("first_name") %></label>
+      <%= f.text_field :ship_address_firstname, :class => 'required' -%><span class="req">*</span>
+  </p>
+  <p id="slname">
+    <label for="<%= t("last_name") %>"><%= t("last_name") %></label>
+    <%= f.text_field :ship_address_lastname, :class => 'required' -%><span class="req">*</span>
+  </p>
+  <p id="saddress">
+    <label for="<%= t("street_address") %>"><%= t("street_address") %></label>
+    <%= f.text_field :ship_address_address1, :class => 'required' -%><span class="req">*</span>
+  </p>
+  <p id="saddress2">
+    <label for="<%= t("street_address_2") %>"><%= t("street_address_2") %></label>
+    <%= f.text_field :ship_address_address2 %>
+  </p>
+  <p id="scity">
+    <label for="<%= t("city") %>"><%= t("city") %></label>
+    <%= f.text_field :ship_address_city, :class => 'required' -%><span class="req">*</span>
+  </p>    
+  <p>
+    <label for="<%= t("state") %>"><%= t("state") %></label>
+    <span id="sstate">
+        <%= collection_select("checkout_presenter", 
+          :ship_address_state_id, 
+          @states, 
+          :id, 
+          :name, 
+          {:include_blank => true}, 
+          {:style=> 'width:150px;'}) %>
+    </span>
+    <span class="req">*</span>
+  </p>  
+  <p id="szip">
+    <label for="<%=t ("zip") %>"><%= t("zip") %></label>
+    <%= f.text_field :ship_address_zipcode, :class => 'required' -%><span class="req">*</span>
+  </p>
+  <p id="scountry">
+    <label for="<%= t("country") %>"><%= t("country") %></label>
+    <span id="scountry"><%= f.collection_select :ship_address_country_id, @shipping_countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
+  </p>
+  <p id="sphone">
+    <label for="<%= t("phone") %>"><%= t("phone") %></label>
+    <%= f.text_field :ship_address_phone, :class => 'required' -%><span class="req">*</span>
+  </p>
+  <p><input id="validate_shipping" type="button" value="<%=t("continue")%>"/></p>
+  </div>
+</div>
+            
+<div id="shipping_method" class="checkout_disabled">
+  <h2><%= t("shipping_method") %></h2>
+  <div class="inner">
+    <div id="methods"></div>
+    <p><input id="select_shipping_method" type="button" value="<%=t("continue")%>"/></p>
+  </div>  
+</div>
+
+<div id="creditcard" class="checkout_disabled">
+  <h2><%= t("payment_information") %></h2>
+  <div class="inner">
+  <p>
+    <%= image_tag "creditcard.gif", :id => 'creditcard-image' %>
+  </p>
+  <p>
+    <label for=""><%= t("card_number") %></label>
+    <%= f.text_field :creditcard_number, :size=> 19, :class => 'required' -%><span class="req">*</span>
+  </p>
+  <p>
+    <label for=""><%= t("expiration") %></label>
+    <%= select_month(@date, :prefix => 'checkout_presenter', :field_name => 'creditcard_month', :use_month_numbers => true, :class => 'required') -%>
+    <%= select_year(@date, :prefix => 'checkout_presenter', :field_name => 'creditcard_year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') -%>
+    <span class="req">*</span>
+  </p>
+  <p>
+    <label for=""><%= t("card_code") %></label>
+    <%= f.text_field :creditcard_verification_value, {:style => 'width:40px', :class => 'required'} -%><span class="req">*</span>
+      <a href="" onclick="window.open('/checkout/cvv','mywin','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false">
+	(<%= t("whats_this") %>)
+      </a>
+  </p>
+  <p><input id="confirm_payment" type="button" value="<%=t("continue")%>"/></p>
+  </div>
+</div>
+
+<div id="confirm_order" class="checkout_disabled">
+  <h2><%= t("confirm") %></h2>
+  <div class="inner">         
+    <input id="final_answer" name="final_answer" type="hidden">
+    <div id="bdisplay"><img src="/images/ajax_loader.gif" id="bconfirm_loader" /></div>
+    <div id="sdisplay"><img src="/images/ajax_loader.gif" id="sconfirm_loader" /></div>
+    <div class="clear"></div>
+    <%= render :partial => 'shared/order_details', :locals => {:order => @order} -%>
+    <%= submit_tag t('place_order') %>
+  </div>
+</div>