spree_backend 3.0.10 → 3.1.0.rc1

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:editing_resource, resource: Spree::Role.model_name.human) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::Role.model_name.human, admin_roles_path) %>
+<% end %>
+
 <%= form_for [:admin, @role] do |f| %>
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:new_role) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::Role.model_name.human, admin_roles_path) %>
+<% end %>
+
 <%= form_for [:admin, @role] do |f| %>
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>

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

@@ -1,6 +1,9 @@
-<% success = flash.discard(:success)
-if success %>
-  show_flash('success', "<%= j success %>")
+<% if success = flash.discard(:success) %>
+  show_flash('success', "<%= j success %>");
+<% end %>
+
+<% if error = flash.discard(:error) %>
+  show_flash('warning', "<%= j error %>");
 <% end %>
 
 <%= render :partial => '/spree/admin/shared/update_order_state' if @order %>

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

@@ -1,7 +1,7 @@
 <% if target && target.errors.any? %>
   <div id="errorExplanation" class="errorExplanation alert alert-danger" data-hook>
     <p>
-      <strong><%= Spree.t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</strong><br/>
+      <strong><%= Spree.t(:errors_prohibited_this_record_from_being_saved, count: target.errors.size) %>:</strong><br/>
     </p>
     <ul class="ul-with-markup">
      <% target.errors.full_messages.each do |msg| %>

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

@@ -1,10 +1,16 @@
+<% args = params.clone %>
+
+<% if defined?(per_page_action) %>
+  <% args.merge!(action: per_page_action) %>
+<% end %>
+
 <div class="row index-pagination-row">
   <div class="col-sm-6">
     <%= paginate collection %>
   </div>
   <div class="col-sm-6">
     <div class="pagination-wrap">
-      <%= form_tag(per_page_dropdown_params, { method: :get, class: 'js-per-page-form form-inline' }) do %>
+      <%= form_tag(per_page_dropdown_params(args), { method: :get, class: 'js-per-page-form form-inline' }) do %>
         <%= per_page_dropdown %>
       <% end %>
       <div class="clearfix"></div>

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

@@ -4,6 +4,12 @@
   </ul>
 <% end %>
 
+<% if can?(:admin, Spree::ReturnAuthorization) || can?(:admin, Spree::CustomerReturn) %>
+  <ul class="nav nav-sidebar">
+    <%= main_menu_tree Spree.t(:returns), icon: "transfer", sub_menu: "returns", url: "#sidebar-returns" %>
+  </ul>
+<% end %>
+
 <% if can? :admin, Spree::Product %>
   <ul class="nav nav-sidebar">
     <%= main_menu_tree Spree.t(:products), icon: "th-large", sub_menu: "product", url: "#sidebar-product" %>

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

@@ -5,7 +5,7 @@
 
 <% content_for :sidebar do %>
   <ul class="nav nav-pills nav-stacked" data-hook="admin_order_tabs">
-    <% if ((can? :update, @order) && (@order.shipments.count == 0 || @order.shipments.shipped.count == 0)) %>
+    <% if ((can? :update, @order) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
       <li<%== ' class="active"' if current == :cart %> data-hook='admin_order_tabs_cart_details'>
         <%= link_to_with_icon 'edit', Spree.t(:cart), cart_admin_order_url(@order) %>
       </li>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -15,7 +15,7 @@
         <th></th>
       </tr>
     </thead>
-    <tbody>
+    <tbody id="<%= resource_name.to_s.parameterize.underscore %>">
       <% @collection.each do |named_type| %>
         <tr id="<%= spree_dom_id named_type %>" data-hook="named_type_row">
           <td class="align-center">
@@ -27,6 +27,7 @@
           <td class="actions actions-1 text-right">
             <% if named_type.mutable? %>
               <%= link_to_edit(named_type, no_text: true) if can? :edit, named_type %>
+              <%= link_to_delete(named_type, no_text: true) if can? :delete, named_type %>
             <% end %>
           </td>
         </tr>

data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb

@@ -14,6 +14,7 @@
   <%= configurations_sidebar_menu_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can? :manage, Spree::ShippingCategory %>
   <%= configurations_sidebar_menu_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can? :manage, Spree::StockTransfer %>
   <%= configurations_sidebar_menu_item(Spree.t(:stock_locations), spree.admin_stock_locations_path) if can? :manage, Spree::StockLocation %>
+  <%= configurations_sidebar_menu_item(Spree.t(:store_credit_categories), spree.admin_store_credit_categories_path) if can? :manage, Spree::StoreCreditCategory %>
   <%= configurations_sidebar_menu_item(Spree.t(:analytics_trackers), spree.admin_trackers_path) if can? :manage, Spree::Tracker %>
   <%= configurations_sidebar_menu_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can? :manage, Spree::RefundReason %>
   <%= configurations_sidebar_menu_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can? :manage, Spree::ReimbursementType %>

data/app/views/spree/admin/shared/sub_menu/_returns.html.erb

@@ -0,0 +1,4 @@
+<ul id="sidebar-returns" class="collapse nav nav-pills nav-stacked" data-hook="admin_returns_sub_tabs">
+  <%= tab :return_authorizations, url: spree.admin_return_authorizations_path, match_path: '/return_authorizations' if can?(:admin, Spree::ReturnAuthorization) %>
+  <%= tab :customer_returns, url: spree.admin_customer_returns_path, match_path: '/customer_returns' if can?(:admin, Spree::CustomerReturn) %>
+</ul>

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:editing_resource, resource: Spree::ShippingCategory.model_name.human) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::ShippingCategory.model_name.human, admin_shipping_categories_path) %>
+<% end %>
+
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_category } %>
 
 <%= form_for [:admin, @shipping_category] do |f| %>

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:new_shipping_category) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::ShippingCategory.model_name.human, admin_shipping_categories_path) %>
+<% end %>
+
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_category } %>
 
 <%= form_for [:admin, @shipping_category] do |f| %>

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

@@ -26,9 +26,9 @@
             <%= link_to state_change.user.login, spree.admin_user_path(state_change.user) if state_change.user %>
           </td>
           <td>
-            <%= l(state_change.created_at) %>
+            <%= pretty_time(state_change.created_at) %>
             <% if state_change.created_at != state_change.updated_at %>
-              <small><%= Spree::StateChange.human_attribute_name(:updated)%>: <%= l(state_change.updated_at) %></small>
+              <small><%= Spree::StateChange.human_attribute_name(:updated) %>: <%= pretty_time(state_change.updated_at) %></small>
             <% end %>
           </td>
         </tr>

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:editing_resource, resource: Spree::State.model_name.human) %> / <%= @state.name %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::State.model_name.human, admin_country_states_path(@country)) %>
+<% end %>
+
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @state } %>
 
 <%= form_for [:admin, @country, @state] do |f| %>

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

@@ -4,6 +4,10 @@
   <%= Spree.t(:new_state) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::State.model_name.human, admin_country_states_path(@country)) %>
+<% end %>
+
 <%= form_for [:admin, @country, @state] do |f| %>
   <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>

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

@@ -4,7 +4,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::StockLocation.model_name.human), admin_stock_locations_path, class: 'btn btn-default' %>
+  <%= back_to_list_button(Spree::StockLocation.model_name.human, admin_stock_locations_path) %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @stock_location } %>

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

@@ -1,12 +1,12 @@
 <div data-hook="admin_stock_movements_form_fields">
   <%= f.field_container :quantity, class: ['form-group'] do %>
     <%= f.label :quantity, Spree.t(:quantity) %>
-    <%= f.text_field :quantity %>
+    <%= f.text_field :quantity, class: 'form-control' %>
   <% end %>
   <%= f.field_container :stock_item_id, class: ['form-group'] do %>
     <%= f.label :stock_item_id, Spree.t(:stock_item_id) %>
-    <%= f.text_field 'stock_item_id', :class => 'form-control', :'data-stock-location-id' => params[:stock_location_id] %>
+    <%= f.text_field 'stock_item_id', :'data-stock-location-id' => params[:stock_location_id] %>
   <% end %>
 </div>
 
-<%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>
+<%= render partial: "spree/admin/variants/autocomplete", formats: :js %>

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

@@ -3,7 +3,8 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::StockMovement.model_name.human), admin_stock_location_stock_movements_path(stock_location), class: 'btn btn-default' %>
+  <%= back_to_list_button(Spree::StockMovement.model_name.human,
+    admin_stock_location_stock_movements_path(stock_location)) %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_movement } %>

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

@@ -3,8 +3,8 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'plus', id: 'admin_new_stock_movement_link' %>
-  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::StockLocation.model_name.human), admin_stock_locations_path, class: 'btn btn-default' %>
+  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'add', class: 'btn-success', id: 'admin_new_stock_movement_link' %>
+  <%= back_to_list_button(Spree::StockLocation.model_name.human, admin_stock_locations_path) %>
 <% end %>
 
 <% if @stock_movements.any? %>

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

@@ -3,14 +3,14 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_movements_list), admin_stock_location_stock_movements_path(stock_location), :class => 'btn btn-default' %></li>
+  <%= back_to_list_button(Spree::StockMovement.model_name.human, admin_stock_location_stock_movements_path(stock_location)) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @stock_movement } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_movement } %>
 
 <%= form_for [:admin, stock_location, @stock_movement] do |f| %>
   <fieldset>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links', locals: { collection_url: admin_stock_location_stock_movements_path(stock_location) } %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: admin_stock_location_stock_movements_path(stock_location) } %>
   </fieldset>
 <% end %>

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

@@ -0,0 +1,8 @@
+<div data-hook="admin_store_credit_category_form_fields">
+  <div data-hook="store_credit_category_name" class="form-group">
+    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+    <%= f.text_field :name, class: 'form-control' %>
+  </div>
+
+  <div data-hook="additional_store_credit_category_fields"></div>
+</div>

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

@@ -0,0 +1,10 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::StoreCreditCategory.model_name.human) %>
+<% end %>
+
+<%= form_for [:admin, @store_credit_category] do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,34 @@
+<% content_for :page_title do %>
+  <%= plural_resource_name(Spree::StoreCreditCategory) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_store_credit_category_link' %>
+<% end if can? :create, Spree::StoreCreditCategory %>
+
+<% if @store_credit_categories.any? %>
+  <table class="table">
+    <thead>
+      <tr data-hook="admin_store_credit_categories_index_headers">
+        <th><%= Spree.t(:name) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @store_credit_categories.each do |store_credit_category| %>
+        <tr id="<%= spree_dom_id store_credit_category %>" data-hook="admin_store_credit_categories_index_rows">
+          <td><%= store_credit_category.name %></td>
+          <td class="actions text-right">
+            <%= link_to_edit(store_credit_category, no_text: true) if can? :edit, store_credit_category %>
+            <%= link_to_delete(store_credit_category, no_text: true) if can? :destroy, store_credit_category %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-warning">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCreditCategory)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::StoreCreditCategory %>!
+  </div>
+<% end %>

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

@@ -0,0 +1,10 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:new_store_credit_category) %>
+<% end %>
+
+<%= form_for [:admin, @store_credit_category] do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,18 @@
+<div data-hook="admin_store_credit_form_fields">
+  <%= f.field_container :amount, class: ['form-group'] do %>
+    <%= f.label :amount, raw(Spree.t(:amount) + content_tag(:span, " *", class: "required")) %>
+    <%= f.text_field :amount, class: 'form-control' %>
+    <%= f.error_message_on :amount %>
+  <% end %>
+  <%= f.field_container :category, class: ['form-group'] do %>
+    <%= f.label :category, raw(Spree.t(:category) + content_tag(:span, " *", class: "required")) %>
+    <%= f.select :category_id, options_from_collection_for_select(@credit_categories, :id, :name, f.object.category.try(:id)),
+        { include_blank: true }, { class: 'select2 fullwidth', placeholder: Spree.t(:select_a_store_credit_reason) } %>
+    <%= f.error_message_on :category %>
+  <% end %>
+  <%= f.field_container :memo, class: ['form-group'] do %>
+    <%= f.label :memo, Spree.t(:memo) %>
+    <%= f.text_area :memo, class: 'form-control' %>
+    <%= f.error_message_on :memo %>
+  <% end %>
+</div>

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

@@ -0,0 +1,12 @@
+<% content_for :page_title do %>
+  <%= link_to "#{@user.email}", spree.edit_admin_user_url(@user) %> / <%= Spree.t(:editing_resource, resource: Spree::StoreCredit.model_name.human) %>
+<% end %>
+
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :store_credits } %>
+
+<%= form_for @store_credit, url: spree.admin_user_store_credit_path(@user, @store_credit) do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: spree.admin_user_store_credits_path(@user) } %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,46 @@
+<% content_for :page_title do %>
+  <%= link_to "#{@user.email}", spree.edit_admin_user_url(@user) %> / <%= Spree.t(:"admin.user.store_credits") %>
+<% end %>
+
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :store_credits } %>
+
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree.user_class.model_name.human, spree.admin_users_path) %>
+  <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add' %>
+<% end %>
+
+<% if @store_credits.any? %>
+  <table class="table">
+    <thead>
+      <th><%= Spree.t(:credited) %></th>
+      <th><%= Spree.t(:used) %></th>
+      <th><%= Spree.t(:category) %></th>
+      <th><%= Spree.t(:created_by) %></th>
+      <th><%= Spree.t(:issued_on) %></th>
+      <th data-hook="admin_store_credits_index_header_actions" class="actions"></th>
+    <thead>
+    <tbody>
+      <% @store_credits.each do |store_credit| %>
+        <tr>
+          <td><%= store_credit.display_amount.to_html %></td>
+          <td><%= store_credit.display_amount_used.to_html %></td>
+          <td><%= store_credit.category_name %></td>
+          <td><%= store_credit.created_by_email %></td>
+          <td><%= l store_credit.created_at.to_date %></td>
+          <td class="actions actions-2 text-center" data-hook="admin_store_credits_index_row_actions">
+            <% if store_credit.amount_used.zero? %>
+              <%= link_to_edit_url spree.edit_admin_user_store_credit_path(@user, store_credit), no_text: true if can?(:edit, store_credit) %>
+              <%= link_to_delete store_credit, no_text: true, url: spree.admin_user_store_credit_path(@user, store_credit) if can?(:destroy, store_credit) %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCredit)) %>
+  </div>
+<% end %>
+
+<%= render 'spree/admin/users/lifetime_stats' %>

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

@@ -0,0 +1,12 @@
+<% content_for :page_title do %>
+  <%= link_to "#{@user.email}", spree.edit_admin_user_url(@user) %> / <%= Spree.t(:new_store_credit) %>
+<% end %>
+
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :store_credits } %>
+
+<%= form_for @store_credit, url: spree.admin_user_store_credits_path(@user, @store_credit) do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: spree.admin_user_store_credits_path(@user) } %>
+  </fieldset>
+<% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::TaxCategory.model_name.human), admin_tax_categories_path, class: 'btn btn-primary' %>
+  <%= back_to_list_button(Spree::TaxCategory.model_name.human, admin_tax_categories_path) %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_category } %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::TaxCategory.model_name.human), admin_tax_categories_path, class: 'btn btn-default' %>
+  <%= back_to_list_button(Spree::TaxCategory.model_name.human, admin_tax_categories_path) %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_category } %>

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:editing_resource, resource: Spree::TaxRate.model_name.human) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::TaxRate.model_name.human, admin_tax_rates_path) %>
+<% end %>
+
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_rate } %>
 
 <%= form_for [:admin, @tax_rate] do |f| %>