spree 0.10.0.beta → 0.10.0

data/vendor/extensions/theme_default/app/views/admin/option_types/selected.html.erb

@@ -21,7 +21,7 @@
       </tr>
     <% end %>
     <% if @option_types.empty? %>
-     <tr><td colspan="3">None.</td></tr>
+     <tr><td colspan="3"><%= t(:none) %></td></tr>
     <% end %>
   </table>
 

data/vendor/extensions/theme_default/app/views/admin/orders/edit.html.erb

@@ -20,6 +20,7 @@
 <% end %>
 
 <% content_for :head do %>
+  <%= javascript_tag "var expand_variants = true;" %>
   <%= javascript_include_tag 'admin/orders/edit.js' %>
   <%= stylesheet_link_tag 'admin/edit_orders.css' %>
 <% end %>

data/vendor/extensions/theme_default/app/views/admin/orders/new.html.erb

@@ -14,6 +14,7 @@
 <% end %>
 
 <% content_for :head do %>
+  <%= javascript_tag "var expand_variants = true;" %>
   <%= javascript_include_tag 'admin/orders/edit.js' %>
   <%= stylesheet_link_tag 'admin/edit_orders.css' %>
 <% end %>

data/vendor/extensions/theme_default/app/views/admin/payments/_form.html.erb

@@ -7,7 +7,7 @@
 
   <label>
     <%= radio_button_tag "payment[payment_method_id]", method.id, method == @payment_method %> 
-    <%= method.name %>
+    <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
   </label>
 
   <%= render "admin/payments/source_forms/#{method.method_type}", :payment_method => method %>

data/vendor/extensions/theme_default/app/views/admin/payments/source_forms/_gateway.html.erb

@@ -4,7 +4,7 @@
     <% for card in @previous_cards %>
       <label><%= radio_button_tag :card, card.id, card == @previous_cards.first %> <%= card.display_number %><br /></label>
     <% end %>
-    <label><%= radio_button_tag :card, 'new', @previous_cards.none? %> Use a new card</label>
+    <label><%= radio_button_tag :card, 'new', @previous_cards.none? %> <%= t(:use_new_cc) %></label>
   </p>
   
   <div id="card_form">
@@ -40,4 +40,4 @@
 
   </div>
 
-</fieldset>
+</fieldset>

data/vendor/extensions/theme_default/app/views/admin/products/_option_types.html.erb

@@ -23,7 +23,7 @@
 		<% end %>
 		<% if @product.selected_options.empty? %>
 			<tr>
-				<td colspan="3">None Selected.</td>
+				<td colspan="3"><%= t(:none) %></td>
 			</tr>
 		<% end %>
 	</tbody>

data/vendor/extensions/theme_default/app/views/admin/shipments/edit.html.erb

@@ -14,7 +14,7 @@
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
 
 <% hook :admin_shipment_edit_header do %>
-  <h2><%= t('shipment') %> #<%= @shipment.number%> (<%= @shipment.state.to_s.humanize %>)</h2>
+  <h2><%= t('shipment') %> #<%= @shipment.number%> (<%= t(@shipment.state.to_sym, :scope => :state_names, :default => @shipment.state.to_s.humanize) %>)</h2>
   <% if @shipment.shipping_charge %>
     <h3><%= t('charges') %> <%= number_to_currency @shipment.shipping_charge.amount %></h3>
   <% end %>

data/vendor/extensions/theme_default/app/views/admin/shipments/index.html.erb

@@ -29,7 +29,7 @@
         <td><%= shipment.shipping_method.name if shipment.shipping_method %></td>
         <td><%= number_to_currency shipment.cost %></td>
         <td><%= shipment.tracking %></td>
-        <td><%= shipment.state.to_s.humanize %></td>
+        <td><%= t(shipment.state.to_sym, :scope => :state_names, :default => shipment.state.to_s.humanize) %></td>
         <td><%= shipment.shipped_at.to_s(:date_time24) if shipment.shipped_at %></td>
       <% end %>
       <td class="actions">

data/vendor/extensions/theme_default/app/views/admin/states/_state_list.html.erb

@@ -18,7 +18,7 @@
       </tr>
     <% end %>
     <% if @states.empty? %>
-      <tr><td colspan="3">None.</td></tr>
+      <tr><td colspan="3"><%= t(:none) %></td></tr>
     <% end %>
   </tbody>
 </table>

data/vendor/extensions/theme_default/app/views/admin/tax_categories/index.html.erb

@@ -30,7 +30,7 @@
       </tr>
     <% end %>
     <% if @tax_categories.empty? %>
-      <tr><td colspan="3">None.</td></tr>
+      <tr><td colspan="3"><%= t(:none) %></td></tr>
     <% end %>    
   </tbody>
 </table>

data/vendor/extensions/theme_default/app/views/admin/zones/index.html.erb

@@ -31,7 +31,7 @@
       </tr>
     <% end %>
     <% if @collection.empty? %>
-      <tr><td colspan="2">None.</td></tr>
+      <tr><td colspan="2"><%= t(:none) %></td></tr>
     <% end %>
   </tbody>
 </table>

data/vendor/extensions/theme_default/app/views/checkouts/_payment.html.erb

@@ -1,17 +1,13 @@
 <fieldset id="payment">
   <legend><%= t("payment_information") %></legend>
 
-  <% if @payment_methods.many? %>
-    <% @payment_methods.each do |method| %>
-    <p>
-      <label>
-        <%= radio_button_tag "checkout[payments_attributes][][payment_method_id]", method.id, method == @payment_method %> 
-        <%= method.name %>
-      </label>
-    </p>
-    <% end %>
-  <% else %>
-    <%= hidden_field_tag "checkout[payments_attributes][][payment_method_id]", @payment_method.id %> 
+  <% @payment_methods.each do |method| %>
+  <p>
+    <label>
+      <%= radio_button_tag "checkout[payments_attributes][][payment_method_id]", method.id, method == @payment_method %> 
+      <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
+    </label>
+  </p>
   <% end %>
 
   <ul id="payment-methods">              

data/vendor/extensions/theme_default/app/views/checkouts/_summary.html.erb

@@ -27,10 +27,13 @@
     </tr>
   </tbody>
 </table>
-<% form_for @checkout, :url => object_url, :html => { :id => 'checkout-summary-form'} do |summary_form| %>  
-  <label><%= t(:coupon_code) %></label>
-  <%= summary_form.text_field :coupon_code, :id => 'coupon-code', :size => 14 %>
-  <input id="post-summary" type="submit" style="display:none"/>
-  <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'coupon_busy_indicator' %>
-<% end %> 
+<% unless @prev_state.blank? %>
+  <% form_for @checkout, :url => object_url, :html => { :id => 'checkout-summary-form'} do |summary_form| %>  
+    <label><%= t(:coupon_code) %></label>
+    <%= summary_form.text_field :coupon_code, :id => 'coupon-code', :size => 14 %>
+    <input id="post-summary" type="submit" style="display:none"/>
+    <input type="hidden" name="step" value="<%= @prev_state %>"/>
+    <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'coupon_busy_indicator' %>
+  <% end -%>
+<% end -%>
 <div id="coupon-error"></div>

data/vendor/extensions/theme_default/app/views/layouts/spree_application.html.erb

@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [<!ATTLIST input autocomplete CDATA #IMPLIED>]>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <% hook :inside_head do %>

data/vendor/extensions/theme_default/app/views/shared/_login.html.erb

@@ -1,4 +1,3 @@
-<%= stylesheet_link_tag "open_id.css" %>
 <% form_tag user_session_path do  %>
   <div id='password-credentials'>
     <p>

data/vendor/extensions/theme_default/app/views/users/_openid_identifier.html.erb

@@ -1,5 +1,4 @@
 <% if Spree::Config[:allow_openid] %>
-  <%= stylesheet_link_tag "open_id.css" %>
   <% unless params[:user] && params[:user][:openid_identifier] %>
     <p><%= t(:or) %></p>
   <% end %>  

data/vendor/extensions/theme_default/public/javascripts/admin/orders/edit.js

@@ -50,7 +50,7 @@ jQuery(document).ready(function(){
 
       var product = row['product'];
 
-      if(product['variants'].length>0){
+      if(product['variants'].length>0 && expand_variants){
         //variants
         return $.map(product['variants'], function(variant){
 

data/vendor/extensions/theme_default/theme_default_extension.rb

@@ -14,22 +14,6 @@ class ThemeDefaultExtension < Spree::Extension
   
   def activate
 
-    # Add your extension tab to the admin.
-    # Requires that you have defined an admin controller:
-    # app/controllers/admin/yourextension_controller
-    # and that you mapped your admin in config/routes
-
-    #Admin::BaseController.class_eval do
-    #  before_filter :add_yourextension_tab
-    #
-    #  def add_yourextension_tab
-    #    # add_extension_admin_tab takes an array containing the same arguments expected
-    #    # by the tab helper method:
-    #    #   [ :extension_name, { :label => "Your Extension", :route => "/some/non/standard/route" } ]
-    #    add_extension_admin_tab [ :yourextension ]
-    #  end
-    #end
-
     # make your helper avaliable in all views
     # Spree::BaseController.class_eval do
     #   helper YourHelper

data/vendor/plugins/resource_controller/lib/resource_controller/controller.rb

@@ -40,21 +40,21 @@ module ResourceController
           end
 
           create do
-            flash I18n.t('resource_controller.successfully_created')
+            flash { I18n.t('resource_controller.successfully_created') }
             wants.html { redirect_to object_url }
 
             failure.wants.html { render :action => "new" }
           end
 
           update do
-            flash I18n.t('resource_controller.successfully_updated')
+            flash { I18n.t('resource_controller.successfully_updated') }
             wants.html { redirect_to object_url }
 
             failure.wants.html { render :action => "edit" }
           end
 
           destroy do
-            flash I18n.t('resource_controller.successfully_removed')
+            flash { I18n.t('resource_controller.successfully_removed') }
             wants.html { redirect_to collection_url }
           end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spree
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 10
   - 0
-  - beta
-  version: 0.10.0.beta
+  version: 0.10.0
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -05:00
+date: 2010-03-13 00:00:00 -05:00
 default_executable: spree
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1495,6 +1494,7 @@ files:
 - test/functional/line_items_controller_test.rb
 - test/functional/products_controller_test.rb
 - test/functional/users_controller_test.rb
+- test/integration/checkout_test.rb
 - test/integration/searching_test.rb
 - test/shoulda_macros/should_redirect.rb
 - test/test_helper.rb
@@ -3004,13 +3004,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: spree
@@ -3091,6 +3089,7 @@ test_files:
 - test/functional/line_items_controller_test.rb
 - test/functional/products_controller_test.rb
 - test/functional/users_controller_test.rb
+- test/integration/checkout_test.rb
 - test/integration/searching_test.rb
 - test/shoulda_macros/should_redirect.rb
 - test/test_helper.rb