spree_backend 2.1.3 → 2.1.4

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

@@ -10,15 +10,13 @@
   <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
 <% end %>
 
-<% if @order.cart? %>
-  <div id="select-customer" data-hook>
-    <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:customer_search) %></legend>
-      <%= hidden_field_tag :customer_search,  nil, :class => 'fullwidth title' %>
-      <%= render :partial => "spree/admin/orders/customer_details/autocomplete", :formats => :js %>
-    </fieldset>
-  </div>
-<% end %>
+<div id="select-customer" data-hook>
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:customer_search) %></legend>
+    <%= hidden_field_tag :customer_search,  nil, :class => 'fullwidth title' %>
+    <%= render :partial => "spree/admin/orders/customer_details/autocomplete", :formats => :js %>
+  </fieldset>
+</div>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
 

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

@@ -37,7 +37,7 @@
 
       <div class="four columns">
         <div class="field">
-          <%= label_tag nil, Spree.t(:order_number) %>
+          <%= label_tag nil, Spree.t(:order_number, :number => '') %>
           <%= f.text_field :number_cont %>
         </div>
         <div class="field">
@@ -60,7 +60,7 @@
       <div class="omega four columns">
         <div class="field checkbox">
           <label>
-            <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '' %>
+            <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
             <%= Spree.t(:show_only_complete_orders) %>
           </label>
         </div>
@@ -87,7 +87,9 @@
        <col style="width: 10%;">
        <col style="width: 10%;">
        <col style="width: 12%;">
-       <col style="width: 12%;">
+       <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+         <col style="width: 12%;">
+       <% end %>
        <col style="width: 25%;">
        <col style="width: 10%;">
        <col style="width: 8%;">
@@ -102,7 +104,9 @@
         <th><%= sort_link @search, :number,         I18n.t(:number, :scope => 'activerecord.attributes.spree/order') %></th>
         <th><%= sort_link @search, :state,          I18n.t(:state, :scope => 'activerecord.attributes.spree/order') %></th>
         <th><%= sort_link @search, :payment_state,  I18n.t(:payment_state, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+         <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+          <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+         <% end %>
         <th><%= sort_link @search, :email,          I18n.t(:email, :scope => 'activerecord.attributes.spree/order') %></th>
         <th><%= sort_link @search, :total,          I18n.t(:total, :scope => 'activerecord.attributes.spree/order') %></th>
         <th data-hook="admin_orders_index_header_actions" class="actions"></th>
@@ -115,7 +119,9 @@
         <td class="align-center"><%= link_to order.number, edit_admin_order_path(order) %></td>
         <td class="align-center"><span class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span></td>
         <td class="align-center"><span class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></span></td>
-        <td class="align-center"><span class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") if order.shipment_state %></span></td>
+          <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+            <td class="align-center"><span class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") if order.shipment_state %></span></td>
+          <% end %>
         <td><%= mail_to order.email %></td>
         <td class="align-center"><%= order.display_total.to_html %></td>
         <td class='actions align-center' data-hook="admin_orders_index_row_actions">

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

@@ -1,5 +1,3 @@
-<% # Usage of old-style form helpers in this file is INTENTIONAL
-   # For reasons, see commit 3e981c7. %>
 <div data-hook="admin_payment_method_form_fields">
 
   <div data-hook="payment_method">

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

@@ -11,9 +11,9 @@
   <tbody>
     <% payments.each do |payment| %>
       <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="<%= cycle('odd', 'even')%>">
-        <td><%= pretty_time(payment.created_at) %></td>
+        <td><%= link_to pretty_time(payment.created_at), spree.admin_order_payment_path(@order, payment) %></td>
         <td class="align-center amount"><%= 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"><%= payment_method_name(payment) %></td>
         <td class="align-center"> <span class="state <%= payment.state %>"><%= Spree.t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></span></td>
         <td class="actions">
           <% payment.actions.each do |action| %>

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

@@ -8,11 +8,12 @@
 <% end %>
 
 <% content_for :page_actions do %>
+  <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'icon-archive' %></li>
   <li><%= button_link_to Spree.t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => 'icon-arrow-left' %></li>
 <% end %>
 
 <%= render :partial => "spree/admin/payments/source_views/#{@payment.payment_method.method_type}", :locals => { :payment => @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
 
 <div data-hook="amount" class="align-center">
-  <h5><%= label_tag nil, Spree.t(:amount) %>: <span class="green"><%= @payment.amount %></span> </h5>
+  <h5><%= label_tag nil, Spree.t(:amount) %>: <span class="green"><%= @payment.display_amount.to_html %></span> </h5>
 </div>

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

@@ -20,7 +20,7 @@
       <div class="five columns omega">
         <%= f.field_container :variant_id do %>
           <%= label_tag 'variant_id', Spree.t(:variant) %>
-          <%= select_tag 'variant_id', options_from_collection_for_select(@variants, :id, :sku),
+          <%= select_tag 'variant_id', options_from_collection_for_select(@variants, :id, :sku_and_options_text),
             class: 'select2 fullwidth' %>
         <% end %>
       </div>

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

@@ -101,7 +101,6 @@
     <% end %>
   </div>
 
-  <!-- <h2><%= Spree.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, Spree.t(:meta_keywords) %>

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

@@ -28,11 +28,20 @@
       <% if variant.stock_items.present? %>
         <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows" class="<%= cycle('odd', 'even') %>">
           <td class="align-center">
-            <%= variant.sku %>
+            <%= variant.sku_and_options_text %>
             <br>
             <% if variant.images.present? %>
               <%= image_tag variant.images.first.attachment.url(:mini) %>
             <% end %>
+            <br/>
+            <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
+                <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
+                                  class: 'track_inventory_checkbox' %>
+                <%= Spree.t(:track_inventory) %>
+                <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
+                    class: 'variant_track_inventory',
+                    id: "variant_track_inventory_#{variant.id}" %>
+            <% end %>
           </td>
           <td colspan="4" class="stock_location_info">
             <table>

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

@@ -1,16 +1,7 @@
-notice_div = $('.flash.notice');
-<% notice = flash.discard(:notice)
-if notice %>
-  if (notice_div.length > 0) {
-    notice_div.html("<%= notice %>");
-    notice_div.show();
-  } else {
-    if ($("#content .toolbar").length > 0) {
-      $("#content .toolbar").before('<div class="flash notice"><%= notice %></div>');
-    } else {
-      $("#content h1").before('<div class="flash notice"><%= notice %></div>');
-    }
-  } <%
-end %>
+<% success = flash.discard(:success)
+if success %>
+  console.log(show_flash)
+  show_flash('success', "<%= success %>")
+<% end %>
 
 <%= render :partial => '/spree/admin/shared/update_order_state' if @order %>

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

@@ -3,8 +3,12 @@
 <%= csrf_meta_tags %>
 
 <title>
-  <%= "Spree #{Spree.t('administration')}: " %>
-  <%= Spree.t(controller.controller_name, :default => controller.controller_name.titleize) %>
+  <% if content_for? :title %>
+    <%= yield :title %>
+  <% else %>
+    <%= "Spree #{Spree.t('administration')}: " %>
+    <%= Spree.t(controller.controller_name, :default => controller.controller_name.titleize) %>
+  <% end %>
 </title>
 
 <!-- Get "Open Sans" font from Google -->

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

@@ -27,7 +27,7 @@
       <dt data-hook><%= Spree.t(:total) %>:</dt>
       <dd id='order_total'><%= @order.display_total.to_html %></dd>
 
-    
+
       <% if @order.completed? %>
         <dt><%= Spree.t(:shipment) %>: </dt>
         <dd id='shipment_status'><span class="state <%= @order.shipment_state %>"><%= Spree.t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %></span></dd>
@@ -52,17 +52,17 @@
           <%= link_to_with_icon 'icon-user', Spree.t(:customer_details), admin_order_customer_url(@order) %>
         </li>
       <% end %>
-      <% if can? :index, @order.adjustments %>
+      <% if can? :index, Spree::Adjustment %>
         <li<%== ' class="active"' if current == 'Adjustments' %>>
           <%= link_to_with_icon 'icon-cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
         </li>
       <% end %>
-      <% if can? :index, @order.payments && @payment_required %>
+      <% if can? :index, Spree::Payment && @payment_required %>
         <li<%== ' class="active"' if current == 'Payments' %>>
           <%= link_to_with_icon 'icon-credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
         </li>
       <% end %>
-      <% if can? :index, @order.return_authorizations %>
+      <% if can? :index, Spree::ReturnAuthorization %>
         <% if @order.completed? %>
           <li<%== ' class="active"' if current == 'Return Authorizations' %>>
             <%= link_to_with_icon 'icon-share-alt', Spree.t(:return_authorizations), admin_order_return_authorizations_url(@order) %>

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

@@ -0,0 +1 @@
+<%= @object.as_json %>

data/config/routes.rb

@@ -38,6 +38,7 @@ Spree::Core::Engine.add_routes do
           post :update_positions
         end
       end
+      resources :variants_including_master, :only => [:update]
     end
 
     get '/variants/search', :to => "variants#search", :as => :search_variants
@@ -97,6 +98,8 @@ Spree::Core::Engine.add_routes do
         member do
           put :fire
         end
+
+        resources :log_entries
       end
     end