spree_core 1.3.2 → 1.3.3

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

@@ -10,7 +10,9 @@
   </li>
 <% end %>
 
-<%= form_for [:admin, @taxonomy, @taxon], :method => :put, :html => { :multipart => true } do |f| %>
+<% # Because otherwise the form would attempt to use to_param of @taxon %>
+<% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
+<%= form_for [:admin, @taxonomy, @taxon], :method => :put, :url => form_url, :html => { :multipart => true } do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
 
   <div class="form-buttons" data-hook="buttons">

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

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

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

@@ -36,7 +36,7 @@
         <tr id="<%= spree_dom_id tracker %>" data-hook="admin_trackers_index_rows" class="<%= cycle('odd', 'even')%>">
           <td><%= tracker.analytics_id %></td>
           <td><%= tracker.environment.to_s.titleize %></td>
-          <td class="align-center"><%= tracker.active ? t(:yes) : t(:no) %></td>
+          <td class="align-center"><%= tracker.active ? t(:say_yes) : t(:say_no) %></td>
           <td class="actions">
             <%= link_to_edit tracker, :no_text => true %>
             <%= link_to_delete tracker, :no_text => true %>
@@ -45,4 +45,4 @@
       <% end %>
     </tbody>
   </table>
-<% end%>
+<% end%>

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

@@ -0,0 +1,37 @@
+<div data-hook="admin_user_form_fields" class="row">
+  <div class="alpha five columns">
+    <%= f.field_container :email do %>
+      <%= f.label :email, t(:email) %>
+      <%= f.email_field :email, :class => 'fullwidth' %>
+      <%= error_message_on :user, :email %>
+    <% end %>
+
+    <div data-hook="admin_user_form_roles" class="field">      
+      <%= label_tag nil, t(:roles) %>
+      <ul>
+        <% @roles.each do |role| %>
+          <li>
+            <%= check_box_tag 'user[spree_role_ids][]', role.id, @user.spree_roles.include?(role), :id => "user_spree_role_#{role.name}" %>
+            <%= label_tag role.name %>  
+          </li>
+        <% end %>      
+      </ul>
+      <%= hidden_field_tag 'user[spree_role_ids][]', '' %>
+    </div>
+
+  </div>
+  
+  <div class="omega five columns">
+    <%= f.field_container :password do %>
+      <%= f.label :password, t(:password) %>
+      <%= f.password_field :password, :class => 'fullwidth' %>
+      <%= f.error_message_on :password %>
+    <% end %>
+
+    <%= f.field_container :password do %>
+      <%= f.label :password_confirmation, t(:confirm_password) %>
+      <%= f.password_field :password_confirmation, :class => 'fullwidth' %>
+      <%= f.error_message_on :password_confirmation %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,28 @@
+  <% content_for :page_title do %>
+    <%= t(:editing_user) %>
+  <% end %>
+
+  <% content_for :page_actions do %>
+    <li>
+      <%= button_link_to t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
+    </li>
+  <% end %>
+
+  <fieldset data-hook="admin_user_edit_general_settings" class="alpha ten columns">
+    <legend><%= t(:general_settings) %></legend>
+
+    <div data-hook="admin_user_edit_form_header">
+      <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+    </div>
+
+    <div data-hook="admin_user_edit_form">
+      <%= form_for [:admin, @user] do |f| %>
+        <%= render :partial => 'form', :locals => { :f => f } %>
+
+        <div data-hook="admin_user_edit_form_button">
+          <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+        </div>
+      <% end %>
+    </div>
+
+  </fieldset>

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

@@ -0,0 +1,53 @@
+<% content_for :page_title do %>
+  <%= t(:listing_users) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:new_user), new_object_url, :icon => 'icon-plus', :id => 'admin_new_user_link' %>
+  </li>
+<% end %>
+
+<table class="index" id="listing_users" data-hook>
+  <colgroup>
+    <col style="width: 85%">
+    <col style="width: 15%">
+  </colgroup>
+  <thead>
+    <tr data-hook="admin_users_index_headers">
+      <th><%= sort_link @search,:email, t(:user), {}, {:title => 'users_email_title'} %></th>
+      <th data-hook="admin_users_index_header_actions" class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @users.each do |user|%>
+      <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows" class="<%= cycle('odd', 'even')%>">
+        <td class='user_email'><%=link_to user.email, object_url(user) %></td>
+        <td data-hook="admin_users_index_row_actions" class="actions">
+          <%= link_to_edit user, :no_text => true %>
+          <%= link_to_delete user, :no_text => true %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= paginate @users %>
+
+<% content_for :sidebar_title do %>
+  <%= t(:search) %>
+<% end %>
+
+<% content_for :sidebar do %>
+  <div class="box align-center" data-hook="admin_users_index_search">    
+    <%= search_form_for [:admin, @search] do |f| %>
+      <div class="field">
+        <%= f.label t(:email) %> <br>
+        <%= f.text_field :email_cont, :class => 'fullwidth' %>
+      </div>
+      <div data-hook="admin_users_index_search_buttons">
+        <%= button t(:search), 'icon-search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,23 @@
+<% content_for :page_title do %>
+  <%= t(:new_user) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
+
+<div data-hook="admin_user_new_form_header">
+  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+</div>
+
+<div data-hook="admin_user_new_form">
+  <%= form_for [:admin, @user] do |f| %>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+
+    <div data-hook="admin_user_new_form_buttons">
+      <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/admin/users/show.html.erb

@@ -0,0 +1,21 @@
+<h1><%= t(:user_account) %></h1>
+
+<table>
+  <tr data-hook="email">
+    <th><%= t(:email) %></th>
+    <td>
+      <%= @user.email %>
+    </td>
+  </tr>
+  <tr data-hook="roles">
+    <th><%= t(:roles) %></th>
+    <td>
+      <%= @user.spree_roles.pluck(:name).join(', ') %>
+    </td>
+  </tr>
+</table>
+
+<p>
+  <%= link_to_edit @user, :class => 'edit_user' %> <%= t(:or) %>
+  <%= link_to t(:back), collection_url %>
+</p>

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

@@ -5,9 +5,11 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @variant } %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
-  <div data-hook="admin_variant_edit_form">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-  </div>
+  <fieldset class="no-border-top">
+    <div data-hook="admin_variant_edit_form">
+      <%= render :partial => 'form', :locals => { :f => f } %>
+    </div>
 
-  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
 <% end %>

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

@@ -33,7 +33,7 @@
             <span class="handle"></span>
           </td>
           <td><%= variant.options_text %></td>
-          <td class="align-center"><%= variant.display_price %></td>
+          <td class="align-center"><%= variant.display_price.to_html %></td>
           <td class="align-center"><%= variant.sku %></td>
           <td class="align-center"><%= variant.on_hand %></td>
           <td class="actions">

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

@@ -14,7 +14,7 @@
 
     <div data-hook="default" class="field">
       <%= zone_form.check_box :default_tax %>
-      <%= label_tag t(:default_tax_zone) %>      
+      <%= label_tag t(:default_tax_zone) %>
     </div>
 
     <div data-hook="type" class="field">
@@ -22,13 +22,13 @@
       <ul>
         <li>
           <%= zone_form.radio_button('kind', 'country', { :id => 'country_based' }) %>
-          <%= label_tag t(:country_based) %>
+          <%= label_tag :country_based, t(:country_based) %>
         </li>
         <li>
           <%= zone_form.radio_button('kind', 'state', { :id => 'state_based' }) %>
-          <%= label_tag t(:state_based) %>
+          <%= label_tag :state_based, t(:state_based) %>
         </li>
-      </ul>      
+      </ul>
     </div>
   </fieldset>
 </div>

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

@@ -10,7 +10,9 @@
   </li>
 <% end %>
 
- <% if @zones.empty? %>
+<%= paginate @zones %>
+
+<% if @zones.empty? %>
   <div class="no-objects-found">
     <%= t(:none) %>
   </div>

data/app/views/spree/checkout/_delivery.html.erb

@@ -6,7 +6,7 @@
         <% @order.rate_hash.each do |shipping_method| %>
           <label>
             <%= radio_button(:order, :shipping_method_id, shipping_method[:id]) %>
-            <%= shipping_method.name %> <%= shipping_method.display_price %>
+            <%= shipping_method.name %> <%= shipping_method.display_price.to_html %>
           </label>
         <% end %>
       </p>

data/app/views/spree/checkout/_payment.html.erb

@@ -4,7 +4,7 @@
     <% @order.available_payment_methods.each do |method| %>
     <p>
       <label>
-        <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.payment_method %>
+        <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.available_payment_methods.first %>
         <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
       </label>
     </p>

data/app/views/spree/checkout/_summary.html.erb

@@ -11,13 +11,13 @@
       <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
         <tr>
           <td><%= adjustment.label %>: </td>
-          <td><%= adjustment.display_amount %></td>
+          <td><%= adjustment.display_amount.to_html %></td>
         </tr>
       <% end %>
     </tbody>
     <tr data-hook="order_total">
       <td><strong><%= t(:order_total) %>:</strong></td>
-      <td><strong><span id='summary-order-total'><%= @order.display_total %></span></strong></td>
+      <td><strong><span id='summary-order-total'><%= @order.display_total.to_html %></span></strong></td>
     </tr>
     <% if order.price_adjustment_totals.present? %>
       <tbody id="price-adjustments" data-hook="order_details_price_adjustments">

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -2,7 +2,7 @@
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
 <p class="field" data-hook="card_number">
-  <%= label_tag nil, t(:card_number) %><span class="required">*</span><br />
+  <%= label_tag "card_number", t(:card_number) %><span class="required">*</span><br />
   <% options_hash = Rails.env.production? ? {:autocomplete => 'off'} : {} %>
   <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'required', :size => 19, :maxlength => 19, :autocomplete => "off") %>
   &nbsp;
@@ -13,14 +13,14 @@
   </span>
 </p>
 <p class="field" data-hook="card_expiration">
-  <%= label_tag nil, t(:expiration) %><span class="required">*</span><br />
-  <%= select_month(Date.today, { :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true }, :class => 'required') %>
-  <%= select_year(Date.today, { :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15 }, :class => 'required') %>
+  <%= label_tag "card_month", t(:expiration) %><span class="required">*</span><br />
+  <%= select_month(Date.today, { :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true }, :class => 'required', :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', :id => "card_year") %>
 </p>
 <p class="field" data-hook="card_code">
-  <%= label_tag nil, t(:card_code) %><span class="required">*</span><br />
+  <%= label_tag "card_code", t(:card_code) %><span class="required">*</span><br />
   <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'required', :size => 5) %>
-  <%= link_to "(#{t(:whats_this)})", spree.content_path('cvv'), :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", "data-hook" => "cvv_link" %>
+  <%= link_to "(#{t(:what_is_this)})", spree.content_path('cvv'), :target => '_blank', "data-hook" => "cvv_link", :id => "cvv_link" %>
 </p>
 <%= hidden_field param_prefix, 'first_name', :value => @order.billing_firstname %>
 <%= hidden_field param_prefix, 'last_name', :value => @order.billing_lastname %>

data/app/views/spree/layouts/spree_application.html.erb

@@ -31,6 +31,5 @@
     </div>
 
     <%= render :partial => 'spree/shared/google_analytics' %>
-
   </body>
 </html>

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -6,7 +6,7 @@
 <%= t('order_mailer.cancel_email.order_summary_canceled') %>
 ============================================================
 <% @order.line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.variant.display_amount %> = <%= item.display_amount %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
 <%= t('order_mailer.cancel_email.subtotal', :subtotal => @order.display_item_total) %>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -6,7 +6,7 @@
 <%= t('order_mailer.confirm_email.order_summary') %>
 ============================================================
 <% @order.line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.variant.display_amount %> = <%= item.display_amount %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
 <%= t('order_mailer.confirm_email.subtotal', :subtotal => @order.display_item_total) %>

data/app/views/spree/orders/_adjustments.html.erb

@@ -7,7 +7,7 @@
   <% @order.adjustments.eligible.each do |adjustment| %>
     <tr>
       <td colspan="4"><%= adjustment.label %></td>
-      <td><%= adjustment.display_amount %></td>
+      <td><%= adjustment.display_amount.to_html %></td>
       <td></td>
     </tr>
   <% end %>

data/app/views/spree/orders/_line_item.html.erb

@@ -17,13 +17,13 @@
     <%= line_item_description(variant) %>
   </td>
   <td class="cart-item-price" data-hook="cart_item_price">
-    <%= line_item.single_money %>
+    <%= line_item.single_money.to_html %>
   </td>
   <td class="cart-item-quantity" data-hook="cart_item_quantity">
     <%= item_form.number_field :quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
   </td>
   <td class="cart-item-total" data-hook="cart_item_total">
-    <%= line_item.display_amount unless line_item.quantity.nil? %>
+    <%= line_item.display_amount.to_html unless line_item.quantity.nil? %>
   </td>
   <td class="cart-item-delete" data-hook="cart_item_delete">
     <%= link_to image_tag('icons/delete.png'), '#', :class => 'delete', :id => "delete_#{dom_id(line_item)}" %>

data/app/views/spree/orders/edit.html.erb

@@ -19,7 +19,7 @@
         </div>
 
         <div id="subtotal" data-hook class="columns sixteen alpha omega">
-          <h5><%= t(:subtotal) %>: <span class="order-total"><%= @order.display_total %></span></h5>
+          <h5><%= t(:subtotal) %>: <span class="order-total"><%= @order.display_total.to_html %></span></h5>
         </div>
 
         <div class="links columns sixteen alpha omega" data-hook="cart_buttons">

data/app/views/spree/payments/_payment.html.erb

@@ -0,0 +1,16 @@
+<% source = payment.source %>
+<% if source.is_a?(Spree::CreditCard) %>
+  <span class="cc-type">
+    <% unless (cc_type = source.cc_type).blank? %>
+      <%= image_tag "credit_cards/icons/#{cc_type}.png" %>
+    <% end %>
+    <%= t(:ending_in) %> <%= source.last_digits %>
+  </span>
+  <br />
+  <span class="full-name">
+    <%= source.first_name %>
+    <%= source.last_name %>
+  </span>
+<% else %>
+  <%= content_tag(:span, payment.payment_method.name) %>
+<% end %>

data/app/views/spree/products/_cart_form.html.erb

@@ -31,13 +31,13 @@
         
         <div id="product-price">
           <h6 class="product-section-title"><%= t(:price) %></h6>
-          <div><span class="price selling" itemprop="price"><%= @product.price_in(current_currency).display_price %></span></div>
+          <div><span class="price selling" itemprop="price"><%= display_price(@product) %></span></div>
         </div>
 
         <div class="add-to-cart">
           <% if @product.on_sale? %>      
             <%= number_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
-              1, :class => 'title', :in => 1..@product.on_hand, :min => 1 %>
+              1, :class => 'title', :in => 1..Spree::Config[:max_quantity], :min => 1 %>
             <%= button_tag :class => 'large primary', :id => 'add-to-cart-button', :type => :submit do %>
               <%= t(:add_to_cart) %>
             <% end %>