spree_backend 3.0.10 → 3.1.0.rc1

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

@@ -99,8 +99,8 @@
 
         <div class="col-md-4">
           <div class="form-group">
-            <%= label_tag :q_line_items_variant_id_in, Spree.t(:sku) %>
-            <%= f.select :line_items_variant_id_in, Spree::Variant.having_orders.order(:sku).pluck(:sku, :id), {:include_blank => true}, :class => 'select2' %>
+            <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
+            <%= f.text_field :line_items_variant_sku_eq, class: 'form-control' %>
           </div>
         </div>
 
@@ -145,7 +145,7 @@
 
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/index_table_options', :locals => { :collection => @orders } %>
+<%= render 'spree/admin/shared/index_table_options', collection: @orders %>
 
 <% if @orders.any? %>
   <table class="table" id="listing_orders" data-hook>
@@ -171,7 +171,9 @@
     <tbody>
     <% @orders.each do |order| %>
       <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
-        <td><%= l (@show_only_completed ? order.completed_at : order.created_at).try(&:to_date) %></td>
+        <td>
+          <%= order_time(@show_only_completed ? order.completed_at : order.created_at) %>
+        </td>
         <td><%= link_to order.number, edit_admin_order_path(order) %></td>
         <td>
           <span class="label label-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>">
@@ -221,4 +223,4 @@
   </div>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/index_table_options', :locals => { :collection => @orders, :simple => true } %>
+<%= render 'spree/admin/shared/index_table_options', collection: @orders, simple: true %>

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

@@ -17,7 +17,7 @@
       </div>
       <div data-hook="display" class="form-group">
         <%= label_tag :payment_method_display_on, Spree.t(:display) %>
-        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2'}) %>
+        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {:class => 'select2'}) %>
       </div>
       <div data-hook="auto_capture" class="form-group">
         <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:editing_resource, resource: Spree::PaymentMethod.model_name.human) %> / <%= @payment_method.name %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::PaymentMethod.model_name.human, admin_payment_methods_path) %>
+<% end %>
+
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
 
 <%= form_for @payment_method, url: admin_payment_method_path(@payment_method) do |f| %>

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

@@ -7,9 +7,10 @@
 <% end if can? :create, Spree::PaymentMethod %>
 
 <% if @payment_methods.any? %>
-  <table class="table" id='listing_payment_methods'>
+  <table class="table sortable" id='listing_payment_methods' data-hook data-sortable-link="<%= update_positions_admin_payment_methods_url %>">
     <thead>
       <tr data-hook="admin_payment_methods_index_headers">
+        <th></th>
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:provider) %></th>
         <th class="text-center"><%= Spree.t(:display) %></th>
@@ -20,9 +21,14 @@
     <tbody>
       <% @payment_methods.each do |method|%>
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
+          <td class="move-handle text-center">
+            <% if can?(:edit, method) %>
+              <span class="icon icon-move handle"></span>
+            <% end %>
+          </td>
           <td><%= method.name %></td>
           <td><%= method.type %></td>
-          <td class="text-center"><%= method.display_on.blank? ? Spree.t(:both) : Spree.t(method.display_on) %></td>
+          <td class="text-center"><%= Spree.t(method.display_on) %></td>
           <td class="text-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions actions-2 text-right">
             <%= link_to_edit(method, :no_text => true) if can? :edit, method %>

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:new_payment_method) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::PaymentMethod.model_name.human, admin_payment_methods_path) %>
+<% end %>
+
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
 
 <%= form_for @payment_method, url: collection_url do |f| %>

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

@@ -20,7 +20,7 @@
 
 <% if @payments.any? %>
 
-  <div data-hook="payment_list" class="panel panel-default no-border-bottom">
+  <div data-hook="payment_list" class="panel panel-default no-border-bottom table-wrapper">
     <%= render partial: 'list', locals: { payments: @payments } %>
   </div>
 

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

@@ -0,0 +1,9 @@
+<% if @order.could_use_store_credit? %>
+  <div class="alert alert-info text-center" data-hook="admin_payment_store_credit_available">
+    <h4><%= Spree.t('admin.user.available_store_credit', amount: @order.display_total_available_store_credit) %></h4>
+  </div>
+<% else %>
+  <div class="alert alert-danger text-center" data-hook="admin_payment_no_store_credit">
+    <h4><strong><%= Spree.t('admin.user.no_store_credit') %></strong></h4>
+  </div>
+<% end %>

data/app/views/spree/admin/payments/source_views/_storecredit.html.erb

@@ -0,0 +1,29 @@
+<fieldset data-hook="store_credit">
+  <legend><%= Spree.t(:store_credit_name) %></legend>
+  <table class="table table-condensed table-bordered">
+    <tr>
+      <th width="20%"><%= Spree.t(:used) %>:</th>
+      <td><%= payment.source.display_amount_used %></td>
+    </tr>
+    <tr>
+      <th><%= Spree.t(:amount) %>:</th>
+      <td><%= payment.source.display_amount %></td>
+    </tr>
+    <tr>
+      <th><%= Spree.t(:memo) %>:</th>
+      <td><%= payment.source.memo %></td>
+    </tr>
+    <tr>
+      <th><%= Spree.t(:type) %>:</th>
+      <td><%= payment.source.category_name %></td>
+    </tr>
+    <tr>
+      <th><%= Spree.t(:created_by) %>:</th>
+      <td><%= payment.source.created_by_email %></td>
+    </tr>
+    <tr>
+      <th><%= Spree.t(:issued_on) %>:</th>
+      <td><%= pretty_time(payment.source.created_at) %></td>
+    </tr>
+  </table>
+</fieldset>

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

@@ -1,3 +1,4 @@
+
 <div data-hook="admin_product_form_fields">
 
   <div class="row">
@@ -60,19 +61,27 @@
         <% end %>
       </div>
 
+      <div data-hook="admin_product_form_discontinue_on">
+        <%= f.field_container :discontinue_on, class: ['form-group'] do %>
+          <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
+          <%= f.error_message_on :discontinue_on %>
+          <%= f.text_field :discontinue_on, value: datepicker_field_value(@product.discontinue_on), class: 'datepicker form-control' %>
+        <% end %>
+      </div>
+
       <% if @product.has_variants? %>
         <div data-hook="admin_product_form_multiple_variants" class="well">
           <%= f.label :skus, Spree.t(:sku).pluralize %>
           <div class="info marginb">
-            <%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.count) %>
+            <%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.size) %>
             <ul class="text_list">
               <% @product.variants.first(5).each do |variant| %>
                 <li><%= variant.sku %></li>
               <% end %>
             </ul>
-            <% if @product.variants.count > 5 %>
+            <% if @product.variants.size > 5 %>
               <em>
-                <%= Spree.t(:info_number_of_skus_not_shown, count: @product.variants.count - 5) %>
+                <%= Spree.t(:info_number_of_skus_not_shown, count: @product.variants.size - 5) %>
               </em>
             <% end %>
           </div>

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

@@ -2,6 +2,7 @@
   <% if can?(:create, Spree::Product) %>
     <%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_product' } %>
   <% end %>
+  <%= back_to_list_button(Spree::Product.model_name.human, admin_products_path) %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/product_tabs', locals: {current: :details} %>

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

@@ -31,6 +31,13 @@
               <%= Spree.t(:show_deleted) %>
             </label>
           </div>
+
+          <div class="field checkbox">
+            <label>
+              <%= f.check_box :discontinue_on_null, {:checked => params[:q][:discontinue_on_null] == '0'}, '0', '1' %>
+              <%= Spree.t(:show_discontinued ) %>
+            </label>
+          </div>
         </div>
       </div>
       <div data-hook="admin_products_index_search_buttons" class="form-actions">
@@ -48,6 +55,8 @@
     <thead>
       <tr data-hook="admin_products_index_headers">
         <th><%= Spree.t(:sku) %></th>
+        <th><%= Spree.t(:status) %></th>
+
         <th colspan="2"><%= sort_link @search,:name, Spree.t(:name), { default_order: "desc" }, {title: 'admin_products_listing_name_title'} %></th>
         <th class="text-center">
           <%= sort_link @search, :master_default_price_amount, Spree.t(:master_price), {}, {title: 'admin_products_listing_price_title'} %>
@@ -59,6 +68,7 @@
       <% @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="sku"><%= product.sku rescue '' %></td>
+            <td class="status"><%= available_status(product) %> </td>
             <td class="image"><%= mini_image product %></td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
             <td class="text-center"><%= product.display_price.to_html rescue '' %></td>

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

@@ -4,6 +4,10 @@
   <%= Spree.t(:new_product) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::Product.model_name.human, admin_products_path) %>
+<% end %>
+
 <%= form_for [:admin, @product], :html => { :multipart => true } do |f| %>
   <fieldset data-hook="new_product">
     <%= f.field_container :name, :class => ['form-group'] do %>

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:editing_resource, resource: Spree::PromotionCategory.model_name.human) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::PromotionCategory.model_name.human, admin_promotion_categories_path) %>
+<% end %>
+
 <%= form_for @promotion_category, :url => object_url, :method => :put do |f| %>
   <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:new_promotion_category) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::PromotionCategory.model_name.human, admin_promotion_categories_path) %>
+<% end %>
+
 <%= form_for :promotion_category, :url => collection_url do |f| %>
   <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:editing_resource, resource: Spree::Promotion.model_name.human) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::Promotion.model_name.human, admin_promotions_path) %>
+<% end %>
+
 <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
   <div class="row">
     <div class="col-md-12">

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

@@ -2,6 +2,10 @@
   <%= Spree.t(:new_promotion) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::Promotion.model_name.human, admin_promotions_path) %>
+<% end %>
+
 <%= form_for :promotion, :url => collection_url do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <div class="text-center">

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

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

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

@@ -4,6 +4,10 @@
   <%= Spree.t(:new_property) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::Property.model_name.human, admin_properties_path) %>
+<% end %>
+
 <%= form_for [:admin, @property] do |f| %>
   <fieldset data-hook="new_property">
     <%= render partial: 'form', locals: { f: f } %>

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

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

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

@@ -4,6 +4,10 @@
   <%= Spree.t(:new_prototype) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= back_to_list_button(Spree::Prototype.model_name.human, admin_prototypes_path) %>
+<% end %>
+
 <%= form_for [:admin, @prototype] do |f| %>
   <fieldset data-hook="new_prototype">
     <%= render :partial => 'form', :locals => { :f => f } %>

data/app/views/spree/admin/refund_reasons/destroy.js.erb

@@ -0,0 +1 @@
+<%= render partial: 'spree/admin/shared/destroy' %>

data/app/views/spree/admin/reports/sales_total.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.t(:report)), spree.admin_reports_url, class: 'btn btn-default' %>
+  <%= back_to_list_button(Spree.t(:report), admin_reports_path) %>
 <% end %>
 
 <div class="well">

data/app/views/spree/admin/return_authorization_reasons/destroy.js.erb

@@ -0,0 +1 @@
+<%= render partial: 'spree/admin/shared/destroy' %>

data/app/views/spree/admin/return_index/customer_returns.html.erb

@@ -0,0 +1,64 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:customer_returns) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_return_authorisations_index_filters">
+    <%= search_form_for [:admin, @search], url: spree.admin_customer_returns_path do |f| %>
+      <div class="row">
+        <div class="col-md-12">
+          <div class="form-group">
+            <%= f.label :number_cont, Spree.t(:number) %>
+            <%= f.text_field :number_cont, class: "form-control js-quick-search-target" %>
+          </div>
+        </div>
+      </div>
+      <div data-hook="admin_return_authorisations_index_filters_buttons" class="form-actions">
+        <%= button Spree.t(:search), 'search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection, per_page_action: :customer_returns } %>
+
+<% if @collection.any? %>
+  <table class="table">
+    <thead>
+      <tr data-hook="rate_header">
+        <th><%= Spree.t(:created_at) %></th>
+        <th><%= Spree.t(:number) %></th>
+        <th><%= Spree.t(:order) %></th>
+        <th><%= Spree.t(:reimbursement_status) %></th>
+        <th><%= Spree.t(:pre_tax_total) %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @collection.each do |customer_return| %>
+        <tr id="<%= spree_dom_id customer_return %>" data-hook="customer_return_row">
+          <td><%= customer_return.created_at.to_date %></td>
+          <td><%= link_to customer_return.number, spree.edit_admin_order_customer_return_path(customer_return.order, customer_return) %></td>
+          <td><%= link_to customer_return.order.number, spree.edit_admin_order_path(customer_return.order) %></td>
+          <td>
+            <% if customer_return.fully_reimbursed? %>
+              <span class="label label-success"><%= Spree.t(:reimbursed) %></span>
+            <% else %>
+              <span class="label label-info"><%= Spree.t(:incomplete) %></span>
+            <% end %>
+          </td>
+          <td><%= customer_return.display_pre_tax_total.to_html %></td>
+          <td class="actions actions-1 text-right">
+            <%= link_to_edit_url spree.edit_admin_order_customer_return_path(customer_return.order, customer_return), no_text: true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::CustomerReturn.model_name.human(count: :many)) %>.
+  </div>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection, per_page_action: :customer_returns } %>

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

@@ -0,0 +1,76 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:return_authorizations) %>
+<% end %>
+
+<% content_for :page_tabs do %>
+  <li class="<%= "active" if params[:q][:state_eq].blank? %>">
+    <%= link_to Spree.t(:all), spree.admin_return_authorizations_path %>
+  </li>
+  <li class="<%= "active" if params[:q][:state_eq] == "authorized" %>">
+    <%= link_to Spree.t(:authorized), params.merge({q: {state_eq: :authorized}}) %>
+  </li>
+  <li class="<%= "active" if params[:q][:state_eq] == "canceled" %>">
+    <%= link_to Spree.t(:canceled), params.merge({q: {state_eq: :canceled}}) %>
+  </li>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_return_authorisations_index_filters">
+    <%= search_form_for [:admin, @search], url: spree.admin_return_authorizations_path do |f| %>
+      <div class="row">
+        <div class="col-md-6">
+          <div class="form-group">
+            <%= f.label :number_cont, Spree.t(:number) %>
+            <%= f.text_field :number_cont, class: "form-control js-quick-search-target" %>
+          </div>
+        </div>
+        <div class="col-md-6">
+          <div class="form-group">
+            <%= label_tag :q_state_eq, Spree.t(:status) %>
+            <%= f.select :state_eq, Spree::ReturnAuthorization.state_machines[:state].states.collect {|s| [Spree.t("return_authorization_states.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2' %>
+          </div>
+        </div>
+      </div>
+      <div data-hook="admin_return_authorisations_index_filters_buttons" class="form-actions">
+        <%= button Spree.t(:search), 'search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection, per_page_action: :return_authorizations } %>
+
+<% if @collection.any? %>
+  <table class="table">
+    <thead>
+      <tr data-hook="rate_header">
+        <th><%= Spree.t(:created_at) %></th>
+        <th><%= Spree.t(:number) %></th>
+        <th><%= Spree.t(:order) %></th>
+        <th><%= Spree.t(:state) %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @collection.each do |return_authorization| %>
+        <tr id="<%= spree_dom_id return_authorization %>" data-hook="return_authorization_row">
+          <td><%= return_authorization.created_at.to_date %></td>
+          <td><%= link_to return_authorization.number, spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization) %></td>
+          <td><%= link_to return_authorization.order.number, spree.edit_admin_order_path(return_authorization.order) %></td>
+          <td>
+            <span class="label label-<%= return_authorization.state %>"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
+          </td>
+          <td class="actions actions-1 text-right">
+            <%= link_to_edit return_authorization, url: spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization), no_text: true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::ReturnAuthorization.model_name.human(count: :many)) %>.
+  </div>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection, per_page_action: :return_authorizations } %>