spree_core 1.3.2 → 1.3.3

data/app/views/spree/admin/payment_methods/_form.html.erb

@@ -30,11 +30,11 @@
         <ul>
           <li>
             <%= radio_button :payment_method, :active, true %>
-            <%= label_tag nil, t(:yes) %>
+            <%= label_tag nil, t(:say_yes) %>
           </li>        
           <li>
             <%= radio_button :payment_method, :active, false %>
-            <%= label_tag nil, t(:no) %>
+            <%= label_tag nil, t(:say_no) %>
           </li>
         </ul>
       </div>

data/app/views/spree/admin/payment_methods/index.html.erb

@@ -10,38 +10,42 @@
   </li>
 <% end %>
 
-<table class="index" id='listing_payment_methods'>
-  <colgroup>
-    <col style="width: 15%">
-    <col style="width: 35%">
-    <col style="width: 15%">
-    <col style="width: 10%">
-    <col style="width: 10%">
-    <col style="width: 15%">
-  </colgroup>
-  <thead>
-    <tr data-hook="admin_payment_methods_index_headers">
-      <th><%= t(:name) %></th>
-      <th><%= t(:provider) %></th>
-      <th><%= t(:environment) %></th>
-      <th><%= t(:display) %></th>
-      <th><%= t(:active) %></th>
-      <th data-hook="admin_payment_methods_index_header_actions" class="actions"></th>
-    </tr>  
-  </thead>
-  <tbody>
-    <% @payment_methods.each do |method|%>
-      <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center"><%= method.name %></td>
-        <td><%= method.type %></td>
-        <td class="align-center"><%= method.environment.to_s.titleize %></td>
-        <td class="align-center"><%= method.display_on.blank? ? t(:both) : t(method.display_on) %></td>
-        <td class="align-center"><%= method.active ? t(:yes) : t(:no) %></td>
-        <td data-hook="admin_payment_methods_index_row_actions" class="actions">
-          <%= link_to_edit method, :no_text => true %>
-          <%= link_to_delete method, :no_text => true  %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<% if @payment_methods.any? %>
+  <table class="index" id='listing_payment_methods'>
+    <colgroup>
+      <col style="width: 15%">
+      <col style="width: 35%">
+      <col style="width: 15%">
+      <col style="width: 10%">
+      <col style="width: 10%">
+      <col style="width: 15%">
+    </colgroup>
+    <thead>
+      <tr data-hook="admin_payment_methods_index_headers">
+        <th><%= t(:name) %></th>
+        <th><%= t(:provider) %></th>
+        <th><%= t(:environment) %></th>
+        <th><%= t(:display) %></th>
+        <th><%= t(:active) %></th>
+        <th data-hook="admin_payment_methods_index_header_actions" class="actions"></th>
+      </tr>  
+    </thead>
+    <tbody>
+      <% @payment_methods.each do |method|%>
+        <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows" class="<%= cycle('odd', 'even')%>">
+          <td class="align-center"><%= method.name %></td>
+          <td><%= method.type %></td>
+          <td class="align-center"><%= method.environment.to_s.titleize %></td>
+          <td class="align-center"><%= method.display_on.blank? ? t(:both) : t(method.display_on) %></td>
+          <td class="align-center"><%= method.active ? t(:say_yes) : t(:say_no) %></td>
+          <td data-hook="admin_payment_methods_index_row_actions" class="actions">
+            <%= link_to_edit method, :no_text => true %>
+            <%= link_to_delete method, :no_text => true  %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alpha twelve columns no-objects-found"><%= t(:no_payment_methods_found) %></div>
+<% end %>

data/app/views/spree/admin/payments/_list.html.erb

@@ -12,7 +12,7 @@
     <% payments.each do |payment| %>
       <tr data-hook="payments_row" class="<%= cycle('odd', 'even')%>">
         <td><%= pretty_time(payment.created_at) %></td>
-        <td class='align-center'><%= payment.display_amount %></td>
+        <td class='align-center'><%= payment.display_amount.to_html %></td>
         <td class="align-center"><%= link_to payment_method_name(payment), spree.admin_order_payment_path(@order, payment) %></td>
         <td class="align-center"> <span class="state <%= payment.state %>"><%= t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></span></td>
         <td class="actions">

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -9,7 +9,7 @@
     <div class="nine columns">
       <%= image_tag 'credit_cards/credit_card.gif', :id => 'credit-card-image' %>
     </div>
-    
+
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
     <div class="clear"></div>
@@ -17,8 +17,8 @@
     <div class="alpha four columns">
       <div data-hook="card_number">
         <div class="field">
-          <%= label_tag nil, raw(t(:card_number) + content_tag(:span, ' *', :class => 'required')) %>
-          <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required fullwidth', :maxlength => 19 %>
+          <%= label_tag 'card_number', raw(t(:card_number) + content_tag(:span, ' *', :class => 'required')) %>
+          <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required fullwidth', :id => 'card_number', :maxlength => 19 %>
           <span id="card_type" style="display:none;">
             ( <span id="looks_like" ><%= t(:card_type_is) %> <span id="type"></span></span>
               <span id="unrecognized"><%= t(:unrecognized_card_type) %></span>
@@ -29,17 +29,17 @@
     </div>
     <div class="three columns">
       <div data-hook="card_expiration" class="field">
-        <%= label_tag nil, raw(t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
-        <%= select_month(Date.today, :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true, :class => 'required select2') %>
-        <%= select_year(Date.today, :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required select2') %>
+        <%= label_tag 'card_month', raw(t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
+        <%= select_month(Date.today, { :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true }, :class => 'required select2', :id => 'card_month') %>
+        <%= select_year(Date.today, { :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15 }, :class => 'required select2', :id => 'card_year') %>
       </div>
     </div>
     <div class="omega two columns">
       <div data-hook="card_code" class="field">
-        <%= label_tag nil, raw(t(:card_code) + content_tag(:span, ' *', :class => "required")) %>
-        <%= text_field_tag "#{param_prefix}[verification_value]", '', :class => 'required fullwidth', :size => 5 %>
-        <a href="/content/cvv" class="info" target="_blank" onclick="window.open(this.href,'cvv_info','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false">
-          (<%= t(:whats_this) %>)
+        <%= label_tag 'card_code', raw(t(:card_code) + content_tag(:span, ' *', :class => "required")) %>
+        <%= text_field_tag "#{param_prefix}[verification_value]", '', :class => 'required fullwidth', :size => 5, :id => 'card_code' %>
+        <a href="/content/cvv" class="info" target="_blank" id="cvv_link">
+          (<%= t(:whats_is_this) %>)
         </a>
       </div>
     </div>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_product_form_fields">
-  
-  <div class="left eight columns alpha" data-hook="admin_product_form_left">    
+
+  <div class="left eight columns alpha" data-hook="admin_product_form_left">
     <%= f.field_container :name do %>
       <%= f.label :name, raw(t(:name) + content_tag(:span, ' *', :class => 'required')) %>
       <%= f.text_field :name, :class => 'fullwidth title' %>
@@ -56,7 +56,7 @@
         <%= f.text_field :sku, :size => 16 %>
       <% end %>
 
-      <% if Spree::Config[:track_inventory_levels] %>        
+      <% if Spree::Config[:track_inventory_levels] %>
         <div class="alpha two columns">
           <%= f.field_container :on_hand do %>
             <%= f.label :on_hand, t(:on_hand) %>
@@ -116,11 +116,10 @@
 
     <%= f.field_container :option_types do %>
       <%= f.label :option_type_ids, t(:option_types) %>
-      <%= f.select :option_type_ids, option_types_options_for(@product), {}, :class => "select2", :multiple => true %>
+      <%= f.select :option_type_ids, option_types_options_for(@product), {}, :multiple => true %>
     <% end %>
   </div>
 
-  <!-- <h2><%= t(:metadata) %></h2> -->
   <div data-hook="admin_product_form_meta" class="alpha omega twelve columns">
     <%= f.field_container :meta_keywords do %>
       <%= f.label :meta_keywords, t(:meta_keywords) %>
@@ -140,10 +139,6 @@
   <div class="clear"></div>
 </div>
 
-<% unless Rails.env.test? %>
-  <script>
-  $("#product_option_type_ids").select2();
-
-  $('.select2-container').css({width: '20em'})
-  </script>
-<% end %>
+<script>
+$("#product_option_type_ids").select2();
+</script>

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

@@ -3,13 +3,9 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <div class="toolbar" data-hook="toolbar">
-    <ul class="actions header-action-links inline-menu">
-      <li id="new_product_link">
-        <%= button_link_to t(:new_product), new_object_url, { :remote => true, :icon => 'icon-plus', :id => 'admin_new_product' } %>
-      </li>
-    </ul>
-  </div>
+  <li id="new_product_link">
+    <%= button_link_to t(:new_product), new_object_url, { :remote => true, :icon => 'icon-plus', :id => 'admin_new_product' } %>
+  </li>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>
@@ -20,8 +16,8 @@
 
 <% content_for :table_filter do %>
   <div data-hook="admin_products_sidebar">
-    
-    <%= search_form_for [:admin, @search] do |f| %>      
+
+    <%= search_form_for [:admin, @search] do |f| %>
 
         <%- locals = {:f => f} %>
 
@@ -30,7 +26,7 @@
             <div class="field">
               <%= f.label :name_cont, t(:name) %>
               <%= f.text_field :name_cont, :size => 15 %>
-            </div>  
+            </div>
           </div>
           <div class="four columns">
             <div class="field">
@@ -42,12 +38,12 @@
             <div class="field checkbox">
               <label>
                 <%= f.check_box :deleted_at_null, {:checked => params[:q][:deleted_at_null].blank?}, '', '1' %>
-                <%= t(:show_deleted) %>  
+                <%= t(:show_deleted) %>
               </label>
             </div>
           </div>
         </div>
-        
+
         <div class="clear"></div>
 
         <div class="form-buttons actions filter-actions" data-hook="admin_products_index_search_buttons">
@@ -59,6 +55,8 @@
 
 <div id="new_product" data-hook></div>
 
+<%= paginate @collection %>
+
 <% if @collection.any? %>
   <table class="index" id="listing_products">
     <colgroup>
@@ -74,15 +72,15 @@
         <th colspan="2"><%= sort_link @search,:name, t(:name), { :default_order => "desc" }, {:title => 'admin_products_listing_name_title'} %></th>
         <th><%= sort_link @search,:master_default_price_amount, t(:master_price), {}, {:title => 'admin_products_listing_price_title'} %></th>
         <th data-hook="admin_products_index_header_actions" class="actions"></th>
-      </tr>  
-    </thead>  
+      </tr>
+    </thead>
     <tbody>
       <% @collection.each do |product| %>
           <tr <%= "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
             <td class="align-center"><%= product.sku rescue '' %></td>
             <td class="align-center"><%= mini_image(product) %></td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
-            <td class="align-center"><%= product.display_price rescue '' %></td>
+            <td class="align-center"><%= product.display_price.to_html rescue '' %></td>
             <td class="actions" data-hook="admin_products_index_row_actions">
               <%= link_to_edit product, :no_text => true, :class => 'edit' unless product.deleted? %>
               &nbsp;

data/app/views/spree/admin/products/new.html.erb

@@ -67,7 +67,9 @@
     prototype_select.change(function() {
       var id = prototype_select.val();
       if (id.length) {
-        $('#product-from-prototype').load([ base_url, id ].join("/"));
+        var url = new Uri(base_url);
+        url.setPath(url.path() + '/' + id);
+        $('#product-from-prototype').load(url.toString());
       } else {
         $('#product-from-prototype').empty();
       }

data/app/views/spree/admin/return_authorizations/_form.html.erb

@@ -6,25 +6,25 @@
         <th><%= t(:quantity_shipped) %></th>
         <th><%= t(:quantity_returned) %></th>
         <th><%= t(:return_quantity) %></th>
-      </tr>  
+      </tr>
     </thead>
     <tbody>
       <% @return_authorization.order.inventory_units.group_by(&:variant).each do | variant, units| %>
         <tr id="<%= dom_id(variant) %>" data-hook="rma_row" class="<%= cycle('odd', 'even')%>">
           <td>
-            <h4 style="margin-bottom:0px;"><%= variant.name %></h4>
-            <%= variant.options_text %>
+            <div class="variant-name"><%= variant.name %></div>
+            <div class="variant-options"><%= variant.options_text %></div>
           </td>
-          <td><%= units.select(&:shipped?).size %></td>
-          <td><%= units.select(&:returned?).size %></td>
-          <td class="return_quantity">
+          <td class="align-center"><%= units.select(&:shipped?).size %></td>
+          <td class="align-center"><%= units.select(&:returned?).size %></td>
+          <td class="return_quantity align-center">
             <% if @return_authorization.received? %>
               <%= @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0 %>
             <% elsif units.select(&:shipped?).empty? %>
               0
             <% else %>
               <%= number_field_tag "return_quantity[#{variant.id}]",
-                @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:50px;', :min => 0} %>
+                @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:100px;', :min => 0} %>
             <% end %>
           </td>
         </tr>

data/app/views/spree/admin/return_authorizations/edit.html.erb

@@ -1,26 +1,32 @@
-<% content_for :page_title do %>
-  <%= t(:return_authorization) %> <%= @return_authorization.number %> (<%= t(@return_authorization.state.downcase) %>)
-<% end %>
-
 <% content_for :page_actions do %>
   <li>
     <% if @return_authorization.can_receive? %>
-      <%= button_link_to t(:receive), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :data => { :confirm => t(:are_you_sure) } %>
+      <%= button_link_to t(:receive), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :data => { :confirm => t(:are_you_sure) }, :icon => 'icon-download-alt' %>
     <% end %>
+  </li>
+  <li>
     <% if @return_authorization.can_cancel? %>
-      <%= button_link_to t(:cancel), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'cancel'), :method => :put, :data => { :confirm => t(:are_you_sure) } %>
+      <%= button_link_to t(:cancel), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'cancel'), :method => :put, :data => { :confirm => t(:are_you_sure) }, :icon => 'icon-remove' %>
     <% end %>
   </li>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
 
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i> <%= t(:return_authorization) %> <%= @return_authorization.number %> (<%= t(@return_authorization.state.downcase) %>)
+<% end %>
+
+
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
 <%= form_for [:admin, @order, @return_authorization] do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
 
-  <div class="form-buttons" data-hook="buttons">
-    <%= button t(:update) %>
-    <%= t(:or) %> <%= link_to t('actions.cancel'), admin_order_return_authorizations_url(@order) %>
-  </div>
+    <div class="form-buttons filter-actions actions" data-hook="buttons">
+      <%= button t(:update), 'icon-repeat' %>
+      <span class="or"><%= t(:or) %></span>
+      <%= button_link_to t(:cancel), admin_order_return_authorizations_url(@order), :icon => 'icon-remove' %>
+    </div>
+  </fieldset>
 <% end %>

data/app/views/spree/admin/return_authorizations/index.html.erb

@@ -13,7 +13,7 @@
   <i class="icon-arrow-right"></i> <%= t(:return_authorizations) %>
 <% end %>
 
-<% if @order.inventory_units.any?(&:shipped?) || @order.return_authorizations.any? %>
+<% if @order.inventory_units.any? &:shipped? %>
   <table class="index">
     <thead data-hook="rma_header">
       <tr>
@@ -21,15 +21,15 @@
         <th><%= t(:status) %></th>
         <th><%= t(:amount) %></th>
         <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-        <th class="action"></th>
-      </tr>  
+        <th class="actions"></th>
+      </tr>
     </thead>
     <tbody>
       <% @return_authorizations.each do |return_authorization| %>
         <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row" class="<%= cycle('odd', 'even')%>">
           <td><%= return_authorization.number %></td>
           <td><%= t(return_authorization.state.downcase) %></td>
-          <td><%= return_authorization.display_amount %></td>
+          <td><%= return_authorization.display_amount.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>
           <td class="actions">
             <%= link_to_edit return_authorization %>

data/app/views/spree/admin/return_authorizations/new.html.erb

@@ -1,15 +1,22 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
 
 <% content_for :page_title do %>
-  <%= t(:new_return_authorization) %>
+  <i class="icon-arrow-right"></i> <%= t(:new_return_authorization) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to t(:back_to_return_authorizations_list), spree.admin_order_return_authorizations_url, :icon => 'icon-arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
 <%= form_for [:admin, @order, @return_authorization] do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
 
-  <div class="form-buttons" data-hook="buttons">
-    <%= button t(:continue) %>
-    <%= t(:or) %> <%= link_to t('actions.cancel'), admin_order_return_authorizations_url(@order) %>
-  </div>
+    <div class="form-buttons filter-actions actions" data-hook="buttons">
+      <%= button t(:continue), 'icon-arrow-right' %>
+      <span class="or"><%= t(:or) %></span>
+      <%= button_link_to t(:cancel), admin_order_return_authorizations_url(@order), :icon => 'icon-remove' %>
+    </div>
+  </fieldset>
 <% end %>

data/app/views/spree/admin/shared/_alert.html.erb

@@ -1,5 +1,5 @@
 <div class="alert <%= alert.severity.downcase %>">
   <%= alert.message %> <%= link_to alert.url_name, alert.url if alert.url %>
-  <%= link_to 'X', dismiss_alert_admin_general_settings_path(:alert_id => alert.id),
+  <%= link_to 'X', spree.dismiss_alert_admin_general_settings_path(:alert_id => alert.id),
               :remote => true, :method => :post, :class => 'dismiss' %>
 </div>

data/app/views/spree/admin/shared/_configuration_menu.html.erb

@@ -6,14 +6,18 @@
   <nav class="menu">
     <ul class="sidebar" data-hook="admin_configurations_sidebar_menu">
       <%= configurations_sidebar_menu_item t(:general_settings), edit_admin_general_settings_path %>
-      <%= configurations_sidebar_menu_item t(:mail_methods), admin_mail_methods_path %>
+      <% if Spree::Config[:override_actionmailer_config] %>
+        <%= configurations_sidebar_menu_item t(:mail_methods), admin_mail_methods_path %>
+      <% end %>
       <%= configurations_sidebar_menu_item t(:image_settings), edit_admin_image_settings_path %>
       <%= configurations_sidebar_menu_item t(:tax_categories), admin_tax_categories_path %>
       <%= configurations_sidebar_menu_item t(:tax_rates), admin_tax_rates_path %>
       <%= configurations_sidebar_menu_item t(:tax_settings), edit_admin_tax_settings_path %>
       <%= configurations_sidebar_menu_item t(:zones), admin_zones_path %>
       <%= configurations_sidebar_menu_item t(:countries), admin_countries_path %>
-      <%= configurations_sidebar_menu_item t(:states), admin_country_states_path(Spree::Config[:default_country_id]) %>
+      <% if Spree::Config[:default_country_id] %>
+        <%= configurations_sidebar_menu_item t(:states), admin_country_states_path(Spree::Config[:default_country_id]) %>
+      <% end %>
       <%= configurations_sidebar_menu_item t(:payment_methods), admin_payment_methods_path %>
       <%= configurations_sidebar_menu_item t(:taxonomies), admin_taxonomies_path %>
       <%= configurations_sidebar_menu_item t(:shipping_methods), admin_shipping_methods_path %>