spree 0.11.0 → 0.11.1

data/vendor/extensions/theme_default/app/views/admin/shared/_product_tabs.html.erb

@@ -1,4 +1,4 @@
-<h1><%= t("editing_product") + " &ldquo;#{@product.name}&rdquo;" %></h1>
+<h1><%= raw(t("editing_product") + " &ldquo;#{@product.name}&rdquo;") %></h1>
 
 <% content_for :sidebar do %>
 

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

@@ -11,6 +11,12 @@
     <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {"style" => "width:200px"})  %>
     <%= error_message_on :shipping_method, :zone_id %>
   <% end %>
+
+  <% f.field_container :display_on do %>
+    <%= f.label :display_on, t("display") %><br />
+    <%= select(:shipping_method, :display_on, ShippingMethod::DISPLAY.collect {|display| [t(display), display == :both ? nil : display.to_s]})  %>
+    <%= error_message_on :shipping_method, :display_on %>
+  <% end %>
 <% end %>
 
 <% hook :admin_shipping_method_form_calculator_fields, locals do %>

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

@@ -18,6 +18,7 @@
       <th><%= t("name") %></th>
       <th><%= t("zone") %></th>
       <th><%= t("calculator") %></th>
+      <th><%= t("display") %></th>
     <% end %>
       <th>
         <% hook :admin_shipping_methods_index_header_actions %>
@@ -32,6 +33,7 @@
           <td><%= shipping_method.name %></td>
           <td><%= shipping_method.zone.name %></td>
           <td><%= shipping_method.calculator.description %></td>
+          <td><%= shipping_method.display_on.blank? ? "Both" : t(shipping_method.display_on) %></td>
         <% end %>
         <td width="140px">
           <% hook :admin_shipping_methods_index_row_actions, locals do %>

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

@@ -39,16 +39,16 @@ div.inner input[type=text], div.inner select { width: 80%; }
                bill_form.collection_select(:state_id, @states,
                                   :id, :name,
                                   {:include_blank => true},
-                                  {:class => have_states ? "required" : "hidden",
+                                  {:class => have_states ? "required" : "required hidden",
                                   :disabled => !have_states}) +
                 bill_form.text_field(:state_name,
-                                  :class => !have_states ? "required" : "hidden",
+                                  :class => !have_states ? "required" : "required hidden",
                                   :disabled => have_states)
                 ].join.gsub('"', "'").gsub("\n", "")
             -%>
             <script type="text/javascript" language="javascript" charset="utf-8">
             // <![CDATA[
-            document.write("<%= state_elements %>");
+            document.write("<%= raw state_elements %>");
             // ]]>
             </script>
           </span>
@@ -73,7 +73,6 @@ div.inner input[type=text], div.inner select { width: 80%; }
               <%= bill_form.text_field :alternative_phone -%>
             </p>
           <% end %>
-      </p>
     </div>
   <% end %>
 </fieldset>
@@ -118,16 +117,16 @@ div.inner input[type=text], div.inner select { width: 80%; }
                   ship_form.collection_select(:state_id, @states,
                                     :id, :name,
                                     {:include_blank => true},
-                                    {:class => have_states ? "required" : "hidden",
+                                    {:class => have_states ? "required" : "required hidden",
                                     :disabled => !have_states}) +
                   ship_form.text_field(:state_name,
-                                    :class => !have_states ? "required" : "hidden",
+                                    :class => !have_states ? "required" : "required hidden",
                                     :disabled => have_states)
                 ].join.gsub('"', "'").gsub("\n", "")
             -%>
             <script type="text/javascript" language="javascript" charset="utf-8">
             // <![CDATA[
-            document.write("<%= state_elements %>");
+            document.write("<%= raw state_elements %>");
             // ]]>
             </script>
           </span>
@@ -152,12 +151,11 @@ div.inner input[type=text], div.inner select { width: 80%; }
               <%= ship_form.text_field :alternative_phone -%>
             </p>
           <% end %>
-      </p>
     </div>
   <% end %>
 </fieldset>
 
 <hr class="space" />
 <div class="form-buttons">
-  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>" onclick="$('#checkout_form_address').validate();" />
+  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>" />
 </div>

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

@@ -4,20 +4,20 @@
   <% @payment_methods.each do |method| %>
   <p>
     <label>
-      <%= radio_button_tag "checkout[payments_attributes][][payment_method_id]", method.id, method == @payment_method %> 
+      <%= 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">              
+  <ul id="payment-methods">
     <% @payment_methods.each do |method| %>
       <li id="payment_method_<%= method.id %>"<%= ' class="last"' if method == @payment_methods.last %>>
         <fieldset>
           <%= render "checkouts/payment/#{method.method_type}", :payment_method => method %>
         </fieldset>
       </li>
-    <% end %>  
+    <% end %>
   </ul>
 
 </fieldset>
@@ -25,5 +25,5 @@
 <hr class="space" />
 
 <div class="form-buttons">
-  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>" onclick="$('#checkout_form_address').validate();" />
+  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>" />
 </div>

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

@@ -3,10 +3,10 @@
   <tbody>
     <tr>
       <td><strong><%= t('item_total') %>:</strong></td>
-      <td><strong><%= number_to_currency @order.item_total %></strong></td>
+      <td><strong><%= number_to_currency @checkout.order.item_total %></strong></td>
     </tr>
     <tbody id="summary-order-charges">
-      <% @order.charges.each do |charge| %>
+      <% @checkout.order.charges.each do |charge| %>
         <tr>
           <td><%= charge.description %>: </td>
           <td><%= number_to_currency charge.amount -%></td>
@@ -14,7 +14,7 @@
       <% end %>
     </tbody>
     <tbody id="summary-order-credits">
-      <% @order.credits.each do |credit| %>
+      <% @checkout.order.credits.each do |credit| %>
         <tr>
           <td><%= credit.description %>: </td>
           <td>(<%= number_to_currency credit.amount %>)</td>
@@ -23,7 +23,7 @@
     </tbody>
     <tr>
       <td><strong><%= t('order_total') %>:</strong></td>
-      <td><strong><span id='summary-order-total'><%= number_to_currency @order.total %></span></strong></td>
+      <td><strong><span id='summary-order-total'><%= number_to_currency @checkout.order.total %></span></strong></td>
     </tr>
   </tbody>
 </table>

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

@@ -12,8 +12,7 @@
 <![endif]-->
 <div id='wrapper'>
 
-  <div id="header" class="admin_header_bg">
-
+  <div id="header">
     <% if current_user -%>
     <ul id="login-nav">
       <li><%= t('logged_in_as') %>: <%= current_user.email %></li>
@@ -22,50 +21,52 @@
       <li><%= link_to t('store'), products_path %></li>
     </ul>
     <% end -%>
-    <h1 class='logo'><%= link_to t("administration"), admin_path %></h1>
+    <a href="<%= admin_path %>"><%= image_tag 'admin/bg/spree_50.png', :id => 'logo' %></a>
+    <h1><%= link_to t("administration"), admin_path %></h1>
     <div id="progress"><%= image_tag 'progress.gif' %> <%= t('loading') %>...</div>
   </div>
-<div class='tile_bg_img'>
-    <div id="admin-menu">
-      <ul>
-        <% hook :admin_tabs do %>
-          <%= render 'admin/shared/tabs' %>
-        <% end %>
-      </ul>
-      <br class="clear" />
-    </div>
 
-    <div id="sub-menu">
-      <%= yield :sub_menu %>
-      <br class="clear" />
-    </div>
+  <div id="admin-menu">
+    <ul>
+      <% hook :admin_tabs do %>
+        <%= render 'admin/shared/tabs' %>
+      <% end %>
+    </ul>
+    <br class="clear" />
+  </div>
 
-    <div class="<%= 'with-sidebar ' unless @content_for_sidebar.blank? %> clear tile_bg" id="content">
+  <div id="sub-menu">
+    <%= yield :sub_menu %>
+    <br class="clear" />
+  </div>
 
+  <div class="<%= 'with-sidebar ' unless @content_for_sidebar.blank? %> clear tile_bg" id="content">
 
-      <% if flash[:error] %>
-      <div class="flash error"><%= flash[:error] %></div>
-      <% end %>
-      <% if self.notice %>
-      <div class="flash notice"><%= self.notice %></div>
-      <% end %>
 
+    <% if flash[:error] %>
+    <div class="flash error"><%= flash[:error] %></div>
+    <% end %>
+    <% if self.notice %>
+    <div class="flash notice"><%= self.notice %></div>
+    <% end %>
 
-      <%= yield %>
 
-      <% unless @content_for_sidebar.blank? %>
-        <br class='clear' />
-        <div id="sidebar">
-            <%= yield :sidebar %>
-        </div>
-      <% end %>
+    <%= yield %>
+
+    <% unless @content_for_sidebar.blank? %>
+      <br class='clear' />
+      <div id="sidebar">
+          <%= yield :sidebar %>
+      </div>
+    <% end %>
+
+  </div>
+
+  <div id="footer">
+    <p><%= t("icons_by") %> <a href='http://pinvoke.com'>pInvoke</a></p>
+  </div>
 
-    </div>
 
-    <div id="footer">
-      <p><%= t("icons_by") %> <a href='http://pinvoke.com'>pInvoke</a></p>
-    </div>
-</div>
 </div>
 <!--[if IE]>
 </div>

data/vendor/extensions/theme_default/app/views/products/_thumbnails.html.erb

@@ -33,7 +33,7 @@
     <% @variants.each do |v| %>
       images[<%= v.id.to_s %>] = new Array();
       <% v.images.each_with_index do |image, i| %>
-        images[<%= v.id.to_s %>][<%= i %>] = <%= link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)).to_json %>;
+        images[<%= v.id.to_s %>][<%= i %>] = <%= raw link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)).to_json %>;
       <% end %>
     <% end %>
   </script>

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

@@ -1,9 +1,9 @@
 <title><%= title %></title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<%= stylesheet_tags %>
+<%= raw stylesheet_tags %>
 <%= javascript_include_tag 'jquery-1.3.2.min', 'jquery.validate.min.js', :cache => 'jquery-core' %>
 <% unless I18n.locale.to_s[0..1] == 'en' -%>
   <%= javascript_include_tag ['localization/messages_', I18n.locale.to_s[0..1], '.js'].join %>
 <% end -%>  
-<%= meta_data_tags %> 
+<%= raw meta_data_tags %> 
 <%= yield :head %>

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

@@ -14,7 +14,7 @@
     <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
       <li id="product_<%= product.id %>">
         <%= link_to small_image(product), product %>
-        <%= link_to product.name + "<span class='price selling'>#{product_price(product)}</span>", product, :class => 'info' %>
+        <%= link_to raw(product.name + " <span class='price selling'>#{product_price(product)}</span>"), product, :class => 'info' %>
       </li>
     <% end %>
   <% end %>

data/vendor/extensions/theme_default/app/views/states/index.js.erb

@@ -1 +1 @@
-state_mapper = <%= @state_info.to_json %>
+state_mapper = <%= raw @state_info.to_json %>

data/vendor/extensions/theme_default/lib/tasks/theme_default_extension_tasks.rake

@@ -19,8 +19,8 @@ namespace :spree do
           path = file.sub(ThemeDefaultExtension.root, '')
           directory = File.dirname(path)
           puts "Copying #{path}..."
-          mkdir_p RAILS_ROOT + directory
-          cp file, RAILS_ROOT + path
+          mkdir_p Rails.root + directory
+          cp file, Rails.root + path
         end
       end  
     end

data/vendor/extensions/theme_default/public/javascripts/calculator.js

@@ -5,9 +5,11 @@ $j(function() {
     if ($j('#calc-type').attr('value') == original_calc_type) {
       $j('div.calculator-settings').show();
       $j('div#calculator-settings-warning').hide();
+      $j('.calculator-settings input').removeAttr('disabled');
     } else {
       $j('div.calculator-settings').hide();
       $j('div#calculator-settings-warning').show();
+      $j('.calculator-settings input').attr('disabled', 'disabled');
     }
   });
-})
+})

data/vendor/extensions/theme_default/public/javascripts/checkout.js

@@ -1,4 +1,4 @@
-jQuery(document).ready(function($){
+$(document).ready(function($){
 
   $('input#checkout_use_billing').click(function() {
     show_billing(!this.checked);
@@ -7,18 +7,30 @@ jQuery(document).ready(function($){
   var show_billing = function(show) {
     if(show) {
       $('#shipping .inner').show();
-      $('#shipping .inner input').removeAttr('disabled', 'disabled');
-      $('#shipping .inner select').removeAttr('disabled', 'disabled');
+      $('#shipping .inner select').removeAttr('disabled');
+      $('#shipping .inner input').removeAttr('disabled');
+
+      //only want to enable relevant field
+      if(get_states('s')){
+        $('span#sstate input').attr('disabled', true);
+      }else{
+        $('span#sstate select').attr('disabled', true);
+      }
+
     } else {
       $('#shipping .inner').hide();
-      $('#shipping .inner input').attr('disabled', 'disabled');
-      $('#shipping .inner select').attr('disabled', 'disabled');
+      $('#shipping .inner select').attr('disabled', true);
+      $('#shipping .inner input').attr('disabled', true);
     }
   }
 
-  var update_state = function(region) {
+  var get_states = function(region){
     var country        = $('span#' + region + 'country :only-child').val();
-    var states         = state_mapper[country];
+    return state_mapper[country];
+  }
+
+  var update_state = function(region) {
+    var states         = get_states(region);
 
     var state_select = $('span#' + region + 'state select');
     var state_input = $('span#' + region + 'state input');
@@ -37,29 +49,43 @@ jQuery(document).ready(function($){
         state_select.append(opt);
       });
       state_select.removeAttr('disabled').show();;
-      state_input.hide().attr('disabled', 'disabled');
+      state_input.hide().attr('disabled', true);
 
     } else {
       state_input.removeAttr('disabled').show();
-      state_select.hide().attr('disabled', 'disabled');
+      state_select.hide().attr('disabled', true);
     }
 
   };
 
-
   // Show fields for the selected payment method
   $("input[type='radio'][name='checkout[payments_attributes][][payment_method_id]']").click(function(){
-    $('#payment-methods li').hide();
-    if(this.checked){ $('#payment_method_'+this.value).show(); }
+    var payment_method_li = $('#payment-methods li:visible');
+    payment_method_li.hide();
+    payment_method_li.find('input,select').attr('disabled', true);
+
+    if(this.checked){
+      payment_method_li = $('#payment_method_'+this.value);
+      payment_method_li.find('input,select').removeAttr('disabled');
+      payment_method_li.show();
+    }
   }).triggerHandler('click');
 
+  $('span#bcountry select').change(function() { update_state('b'); });
+  $('span#scountry select').change(function() { update_state('s'); });
 
-  jQuery(document).ready(function(){
-    $('span#bcountry select').change(function() { update_state('b'); });
-    $('span#scountry select').change(function() { update_state('s'); });
-    show_billing(!$('input#checkout_use_billing').attr('checked'));
-    update_state('b');
-    update_state('s');
+  update_state('b');
+  update_state('s');
+  show_billing(!$('input#checkout_use_billing').attr('checked'));
+
+  $('form.edit_checkout').submit(function() {
+    var form = $(this);
+    if(form.valid()){
+      form.find(':submit, :image').attr('disabled', true).removeClass('primary').addClass('disabled');
+    }else{
+      return false;
+    }
   });
 
+
 });

data/vendor/extensions/theme_default/public/stylesheets/admin/admin.css

@@ -34,25 +34,22 @@ p.help-text {
 
 
 body {
-	margin-top: 0px;
-	  /*background: #ffffff;*/
-  /*background-color: #162F54;*/
-  color: #476D9B; }
-.tile_bg_img{
-width:100%;
-		 background: #ffffff url(../../images/tile-slider.png) top left repeat-x;
-}
-.admin_header_bg{
-	width:100%;
+  margin-top: 0px;
+  color: #476D9B; 
+  background: #0B72C1 url(../../images/admin/bg/header.png) top left repeat-x;
+ }
 
-height:95px;
-	background:url(../../images/tile-header.png) top left repeat-x;
-}
   a {
     color: #4884BD; }
     a:active,
     a:visited {
       color: #4884BD; }
+      
+  #header {
+	height:95px;
+	position: relative;
+	margin-bottom: 13px;
+  }
   #header,
   #footer {
     position: relative;
@@ -142,17 +139,25 @@ height:95px;
           #sidebar .order-status.canceled {
             background-color: #c00;
             color: #fff; }
-  h1.logo {
-    float: left;
-    margin: 10px 10px 10px 10px;   }
-    h1.logo a {
-      background: url(../../images/admin/bg/spree_50.png) left center no-repeat;
-      padding-left: 190px;
-      display: block;
-      height: 82px;
-      text-decoration: none;
-      line-height: 82px;
-      color: #BBDAFD; }
+
+  #header #logo {
+	position: absolute;
+	top: 0;
+	left: 10px;
+}
+  #header h1 {
+	position: absolute;
+	left: 200px;
+	bottom: 19px;
+    margin: 10px 10px 10px 10px;   
+    display: block;
+    text-decoration: none;
+    line-height: 100%;
+	
+  }
+  #header h1 a {
+	color: #8CB952;
+	}
   #admin-menu { clear: both; }
   #admin-menu,
   #sub-menu {