spree_backend 2.2.0 → 2.2.1

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

@@ -1,15 +1,14 @@
 <fieldset class="no-border-bottom">
   <div class="field" data-hook="previous_cards">
-    <% @previous_cards.each do |card| %>
-      <label><%= radio_button_tag :card, card.id, card == @previous_cards.first %> <%= card.display_number %><br /></label>
+    <% if previous_cards.any? %>
+      <% previous_cards.each do |card| %>
+        <label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br /></label>
+      <% end %>
+      <label><%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= Spree.t(:use_new_cc) %></label>
     <% end %>
-    <label><%= radio_button_tag :card, 'new', @previous_cards.none? %> <%= Spree.t(:use_new_cc) %></label>
   </div>
-  <div id="card_form" data-hook>
-    <div class="nine columns">
-      <%= image_tag 'credit_cards/credit_card.gif', :id => 'credit-card-image' %>
-    </div>
 
+  <div id="card_form<%= payment_method.id %>" data-hook>
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
     <div class="clear"></div>
@@ -17,9 +16,9 @@
     <div class="alpha four columns">
       <div data-hook="card_number">
         <div class="field">
-          <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {:id => 'cc_type'} %>
-          <%= label_tag 'card_number', raw(Spree.t(:card_number) + content_tag(:span, ' *', :class => 'required')) %>
-          <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required fullwidth', :id => 'card_number', :maxlength => 19 %>
+          <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
+          <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + content_tag(:span, ' *', :class => 'required')) %>
+          <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required fullwidth cardNumber', :id => "card_number#{payment_method.id}", :maxlength => 19 %>
           <span id="card_type" style="display:none;">
             ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
               <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
@@ -31,28 +30,31 @@
     <div class="alpha four columns">
       <div data-hook="card_name">
         <div class="field">
-          <%= label_tag 'card_name', raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
-          <%= text_field_tag "#{param_prefix}[name]", '', :class => 'required fullwidth', :id => 'card_name', :maxlength => 19 %>
+          <%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
+          <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required fullwidth', maxlength: 19 %>
         </div>
       </div>
     </div>
     <div class="three columns">
       <div data-hook="card_expiration" class="field">
-        <%= label_tag 'card_expiry', raw(Spree.t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
-        <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "required", :placeholder => "MM / YY" %>
+        <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
+        <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry", placeholder: "MM / YY" %>
       </div>
     </div>
     <div class="omega two columns">
       <div data-hook="card_code" class="field">
-        <%= label_tag 'card_code', raw(Spree.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">
+        <%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + content_tag(:span, ' *', :class => "required")) %>
+        <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required fullwidth cardCode', size: 5 %>
+        <a href="/content/cvv" class="info cvvLink" target="_blank">
           (<%= Spree.t(:what_is_this) %>)
         </a>
       </div>
     </div>
 
+    <div class="nine columns">
+      <%= image_tag 'credit_cards/credit_card.gif', :class => 'credit-card-image' %>
+    </div>
+
     <div class="clear"></div>
   </div>
-
 </fieldset>

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

@@ -8,6 +8,48 @@
   </li>
 <% end %>
 
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_promotions_index_search">
+    <%= search_form_for [:admin, @search] do |f| %>
+      <div class="five columns">
+        <div class="field">
+          <%= label_tag nil, 'name' %>
+          <%= f.text_field :name_cont, tabindex: 1 %>
+        </div>
+      </div>
+
+      <div class="five columns">
+        <div class="field">
+          <%= label_tag nil, 'code' %>
+          <%= f.text_field :code_cont, tabindex: 1 %>
+        </div>
+      </div>
+
+      <div class="five columns">
+        <div class="field">
+          <%= label_tag nil, 'path' %>
+          <%= f.text_field :path_cont, tabindex: 1 %>
+        </div>
+      </div>
+
+      <div class="clearfix"></div>
+
+      <div class="actions filter-actions">
+        <div data-hook="admin_promotions_index_search_buttons">
+          <%= button Spree.t(:filter_results), 'icon-search' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+
+<%= paginate @promotions %>
+
 <% if @promotions.any? %>
   <table class="index">
     <colgroup>

data/app/views/spree/admin/shared/_destroy.js.erb

@@ -1,6 +1,5 @@
 <% success = flash.discard(:success)
 if success %>
-  console.log(show_flash)
   show_flash('success', "<%= success %>")
 <% end %>
 

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

@@ -11,3 +11,6 @@
 <% if can? :admin, Spree::Promotion %>
   <%= tab(:promotions, :url => spree.admin_promotions_path, :icon => 'icon-bullhorn') %>
 <% end %>
+<% if Spree.user_class && can?(:admin, Spree.user_class) %>
+  <%= tab(:users, :url => spree.admin_users_path, :icon => 'icon-user') %>
+<% end %>

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

@@ -18,6 +18,7 @@
                                          :scope => 'date_picker',
                                          :default => 0).to_i,
     :find_a_taxon             => Spree.t(:find_a_taxon),
+    :item_stock_placeholder   => Spree.t(:choose_location),
     :loading                  => Spree.t(:loading),
     :month_names              => I18n.t(:month_names, :scope => :date).reject(&:blank?),
     :more                     => Spree.t(:more),
@@ -40,3 +41,7 @@
   }.to_json
 %>
 </script>
+
+<% if I18n.locale != :en %>
+  <%= javascript_include_tag "select2_locale_#{I18n.locale}" %>
+<% end %>

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

@@ -0,0 +1,19 @@
+<div data-hook="bill_address_wrapper" class="alpha six columns">
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:billing_address) %></legend>
+    <%= f.fields_for :bill_address, (@user.bill_address || Spree::Address.default(@user, "bill")) do |ba_form| %>
+      <% ba_form.object ||= Spree::Address.new(country: Spree::Country.new) %>
+      <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
+    <% end %>
+  </fieldset>
+</div>
+
+<div data-hook="ship_address_wrapper" class="alpha six columns">
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:shipping_address) %></legend>
+    <%= f.fields_for :ship_address, (@user.ship_address || Spree::Address.default(@user, "ship")) do |sa_form| %>
+      <% sa_form.object ||= Spree::Address.new(country: Spree::Country.new) %>
+      <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => "shipping" } %>
+    <% end %>
+  </fieldset>
+</div>

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 six columns">
+    <%= f.field_container :email do %>
+      <%= f.label :email, Spree.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, Spree.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 six columns">
+    <%= f.field_container :password do %>
+      <%= f.label :password, Spree.t(:password) %>
+      <%= f.password_field :password, :class => 'fullwidth' %>
+      <%= f.error_message_on :password %>
+    <% end %>
+
+    <%= f.field_container :password do %>
+      <%= f.label :password_confirmation, Spree.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/_sidebar.html.erb

@@ -0,0 +1,36 @@
+<% content_for :sidebar_title do %>
+  <%= Spree.t(:"admin.user.user_information") %>
+<% end %>
+
+<% content_for :sidebar do %>
+  <nav class="menu">
+    <ul data-hook="admin_user_tab_options">
+      <li<%== ' class="active"' if current == :account %>>
+        <%= link_to_with_icon 'icon-user', Spree.t(:"admin.user.account"), edit_admin_user_path(@user) %>
+      </li>
+      <li<%== ' class="active"' if current == :address %>>
+        <%= link_to_with_icon 'icon-user', Spree.t(:"admin.user.addresses"), addresses_admin_user_path(@user) %>
+      </li>
+      <li<%== ' class="active"' if current == :orders %>>
+        <%= link_to_with_icon 'icon-shopping-cart', Spree.t(:"admin.user.orders"), orders_admin_user_path(@user) %>
+      </li>
+      <li<%== ' class="active"' if current == :items %>>
+        <%= link_to_with_icon 'icon-edit', Spree.t(:"admin.user.items"), items_admin_user_path(@user) %>
+      </li>
+    </ul>
+
+    <fieldset data-hook="admin_user_lifetime_stats">
+      <legend><%= Spree.t(:lifetime_stats) %></legend>
+      <dl id="user-lifetime-stats">
+        <dt><%= Spree.t(:total_sales) %>:</dt>
+          <dd><%= @user.display_lifetime_value.to_html %></dd>
+        <dt><%= Spree.t(:num_orders) %>:</dt>
+          <dd><%= @user.order_count.to_i %></dd>
+        <dt><%= Spree.t(:average_order_value) %>:</dt>
+          <dd><%= @user.display_average_order_value.to_html %></dd>
+        <dt><%= Spree.t(:member_since) %>:</dt>
+          <dd><%= l @user.created_at.to_date %></dd>
+      </dl>
+    </fieldset>
+  </nav>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>

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

@@ -0,0 +1,24 @@
+<% content_for :page_title do %>
+  <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
+<% end %>
+
+<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :address } %>
+<%= render :partial => 'spree/admin/users/user_page_actions' %>
+
+<fieldset data-hook="admin_user_addresses" id="admin_user_edit_addresses" class="alpha twelve columns">
+  <legend><%= Spree.t('addresses', :scope => 'admin.user') %></legend>
+
+  <div data-hook="admin_user_edit_form_header">
+    <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+  </div>
+
+  <div data-hook="admin_user_address_edit_form">
+    <%= form_for [:admin, @user], as: :user, url: addresses_admin_user_url(@user), method: :put do |f| %>
+      <%= render :partial => 'addresses_form', :locals => { :f => f } %>
+
+      <div data-hook="admin_user_edit_form_button">
+        <%= render :partial => 'spree/admin/shared/edit_resource_links', :locals => { :collection_url => admin_users_url } %>
+      </div>
+    <% end %>
+  </div>
+</fieldset>

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

@@ -0,0 +1,55 @@
+<% content_for :page_title do %>
+  <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
+<% end %>
+
+<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :account } %>
+<%= render :partial => 'spree/admin/users/user_page_actions' %>
+
+<fieldset data-hook="admin_user_edit_general_settings" class="alpha twelve columns">
+  <legend><%= Spree.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], as: :user, url: admin_user_url(@user), method: :put do |f| %>
+      <%= render :partial => 'form', :locals => { :f => f } %>
+
+      <div data-hook="admin_user_edit_form_button">
+        <%= render :partial => 'spree/admin/shared/edit_resource_links', :locals => { :collection_url => admin_users_url } %>
+      </div>
+    <% end %>
+  </div>
+</fieldset>
+
+<fieldset data-hook="admin_user_api_key" id="admin_user_edit_api_key" class="alpha twelve columns">
+  <legend><%= Spree.t('access', :scope => 'api') %></legend>
+
+  <% if @user.spree_api_key.present? %>
+    <div class="field">
+      <div id="current-api-key"><%= Spree.t('key', :scope => 'api') %>: <%= @user.spree_api_key %></div>
+    </div>
+    <div class="filter-actions actions">
+      <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
+        <%= button Spree.t('clear_key', :scope => 'api'), 'icon-trash' %>
+      <% end %>
+
+      <span class="or"><%= Spree.t(:or)%></span>
+
+      <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
+        <%= button Spree.t('regenerate_key', :scope => 'api'), 'icon-refresh' %>
+      <% end %>
+    </div>
+
+  <% else %>
+
+    <div class="no-objects-found"><%= Spree.t('no_key', :scope => 'api') %></div>
+
+    <div class="filter-actions actions">
+      <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
+        <%= button Spree.t('generate_key', :scope => 'api'), 'icon-key' %>
+      <% end %>
+    </div>
+  <% end %>
+</fieldset>

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

@@ -0,0 +1,53 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:listing_users) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:new_user), new_admin_user_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, Spree.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, edit_admin_user_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 %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :sidebar do %>
+  <div class="box align-center" data-hook="admin_users_index_search">
+    <%= search_form_for [:admin, @search], url: admin_users_url do |f| %>
+      <div class="field">
+        <%= f.label Spree.t(:email) %> <br>
+        <%= f.text_field :email_cont, :class => 'fullwidth' %>
+      </div>
+      <div data-hook="admin_users_index_search_buttons">
+        <%= button Spree.t(:search), 'icon-search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,74 @@
+<% content_for :page_title do %>
+  <%= link_to "#{Spree.t(:"admin.user.items_purchased")} #{@user.email}", edit_admin_user_url(@user) %>
+<% end %>
+
+<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :items } %>
+<%= render :partial => 'spree/admin/users/user_page_actions' %>
+
+<fieldset data-hook="admin_user_items_purchased" class="alpha twelve columns">
+  <legend><%= Spree.t(:"admin.user.items_purchased") %></legend>
+
+  <%= paginate @orders %>
+
+  <% if @orders.any? %>
+    <%# TODO add search interface %>
+    <table class="stock-contents index" id="listing_items" data-hook="stock-contents">
+      <colgroup>
+        <col style="width: 10%;" />
+        <col style="width: 10%;" />
+        <col style="width: 30%;" />
+        <col style="width: 8%;" />
+        <col style="width: 8%;" />
+        <col style="width: 10%;" />
+        <col style="width: 14%;" />
+      </colgroup>
+
+      <thead>
+        <th><%= sort_link @search, :completed_at, I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_completed_at_title'} %></th>
+        <th colspan=2><%= Spree.t(:description) %></th>
+        <th><%= I18n.t(:price, :scope => 'activerecord.attributes.spree/line_item') %></th>
+        <th><%= I18n.t(:quantity, :scope => 'activerecord.attributes.spree/line_item') %></th>
+        <th><%= Spree.t(:total) %></th>
+        <th><%= sort_link @search, :state, I18n.t(:state, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_state_title'} %></th>
+        <th><%= sort_link @search, :number, Spree.t(:order_num, :scope => 'admin.user'), {}, {:title => 'orders_number_title'} %></th>
+      </thead>
+
+      <tbody>
+        <% @orders.each do |order| %>
+          <% order.line_items.each do |item| %>
+            <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
+              <td class="align-center order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
+              <td class="item-image">
+                <%= mini_image(item.variant) %>
+              </td>
+              <td class="item-name">
+                <%= item.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+                <% if item.variant.sku.present? %>
+                  <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
+                <% end %>
+              </td>
+              <td class="align-center item-price"><%= item.single_money.to_html %></td>
+              <td class="align-center item-quantity"><%= item.quantity %></td>
+              <td class="align-center item-total"><%= item.money.to_html %></td>
+              <td class="align-center order-state">
+                <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
+                <% if order.payment_state %>
+                  <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
+                <% end %>
+                <% if Spree::Order.checkout_step_names.include?(:delivery) && order.shipment_state %>
+                  <div class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></div>
+                <% end %>
+              </td>
+              <td class="align-center order-number"><%= link_to order.number, edit_admin_order_url(order) %></td>
+            </tr>
+          <% end %>
+        <% end %>
+    </table>
+  <% else %>
+    <div class="alpha twelve columns no-objects-found">
+      <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/order')) %>,
+      <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
+    </div>
+  <% end %>
+  <%= paginate @orders %>
+</fieldset>

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

@@ -0,0 +1,23 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:new_user) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.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], url: admin_users_url, method: :post 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/orders.html.erb

@@ -0,0 +1,57 @@
+<% content_for :page_title do %>
+  <%= link_to "#{Spree.t(:"admin.user.order_history")} #{@user.email}", edit_admin_user_url(@user) %>
+<% end %>
+
+<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :orders } %>
+<%= render :partial => 'spree/admin/users/user_page_actions' %>
+
+<fieldset data-hook="admin_user_order_history" class="alpha twelve columns">
+  <legend><%= Spree.t(:"admin.user.order_history") %></legend>
+
+  <%= paginate @orders %>
+
+  <% if @orders.any? %>
+    <%# TODO add search interface %>
+    <table class="index responsive" id="listing_orders" data-hook>
+      <colgroup>
+         <col style="width: 25%;">
+         <col style="width: 25%;">
+         <col style="width: 25%;">
+         <col style="width: 25%;">
+      </colgroup>
+      <thead>
+        <tr data-hook="admin_orders_index_headers">
+          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_completed_at_title'} %></th>
+          <th><%= sort_link @search, :number,         I18n.t(:number, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_number_title'} %></th>
+          <th><%= sort_link @search, :state,          I18n.t(:state, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_state_title'} %></th>
+          <th><%= sort_link @search, :total,          I18n.t(:total, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_total_title'} %></th>
+        </tr>
+      </thead>
+      <tbody>
+      <% @orders.each do |order| %>
+        <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
+          <td class="align-center order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
+          <td class="align-center order-number"><%= link_to order.number, edit_admin_order_path(order) %></td>
+          <td class="align-center order-state">
+            <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
+            <% if order.payment_state %>
+              <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
+            <% end %>
+            <% if Spree::Order.checkout_step_names.include?(:delivery) && order.shipment_state %>
+              <div class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></div>
+            <% end %>
+          </td>
+          <td class="align-center order-total"><%= order.display_total.to_html %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <div class="alpha twelve columns no-objects-found">
+      <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/order')) %>,
+      <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
+    </div>
+  <% end %>
+
+  <%= paginate @orders %>
+</fieldset>

data/app/views/spree/admin/variants/_split.js.erb

@@ -1,17 +1,17 @@
 <script type='text/template' id='variant_split_template'>
   <tr class='stock-item-split' data-variant-id='{{variant.id}}'>
     <td colspan='2'>
-      Move {{variant.name}} to:
+      <%=Spree.t("move_variant_to", default: "Move {{variant.name}} to")%>
     </td>
     <td colspan='2'>
     <select name="item_stock_location" id='item_stock_location' style='width:100%;'>
       <option></option>
-      <optgroup label="Existing Shipments">
+      <optgroup label="<%=Spree.t('existing_shipments')%>">
         {{#each shipments}}
         <option data-shipment-number='{{this.number}}' value='{{this.stock_location_id}}'>{{this.stock_location.name}}({{this.number}})</option>
         {{/each}}
       </optgroup>
-      <optgroup label="New Shipment At Location">
+      <optgroup label="<%=Spree.t('new_shipment_at_location')%>">
         {{#each variant.stock_items}}
           <option data-new-shipment='true' value='{{this.stock_location_id}}'>{{this.stock_location_name}}</option>
         {{/each}}

data/config/routes.rb

@@ -146,5 +146,16 @@ Spree::Core::Engine.add_routes do
     resource :mail_method, :only => [:edit, :update] do
       post :testmail, :on => :collection
     end
+
+    resources :users do
+      member do
+        get :orders
+        get :items
+        get :addresses
+        put :addresses
+      end
+
+    end
+
   end
 end

data/lib/spree/backend/action_callbacks.rb

@@ -21,6 +21,6 @@ module Spree
     def fails(method)
       @fails_methods << method
     end
-  end
 
+  end
 end

data/lib/spree/backend/callbacks.rb

@@ -0,0 +1,47 @@
+module Spree
+  module Backend
+    module Callbacks
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+
+        attr_accessor :callbacks
+
+        protected
+
+        def new_action
+          @callbacks ||= {}
+          @callbacks[:new_action] ||= Spree::ActionCallbacks.new
+        end
+
+        def create
+          @callbacks ||= {}
+          @callbacks[:create] ||= Spree::ActionCallbacks.new
+        end
+
+        def update
+          @callbacks ||= {}
+          @callbacks[:update] ||= Spree::ActionCallbacks.new
+        end
+
+        def destroy
+          @callbacks ||= {}
+          @callbacks[:destroy] ||= Spree::ActionCallbacks.new
+        end
+      end
+
+      protected
+
+      def invoke_callbacks(action, callback_type)
+        callbacks = self.class.callbacks || {}
+        return if callbacks[action].nil?
+        case callback_type.to_sym
+          when :before then callbacks[action].before_methods.each {|method| send method }
+          when :after  then callbacks[action].after_methods.each  {|method| send method }
+          when :fails  then callbacks[action].fails_methods.each  {|method| send method }
+        end
+      end
+
+    end
+  end
+end