spree_backend 2.3.13 → 2.4.0.rc1

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -1,11 +1,9 @@
 <tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value" class="<%= cycle('odd', 'even')%>">
-  <% if f.object.persisted? %>
-    <td class="no-border">
-      <span class="handle"></span>
-      <%= f.hidden_field :id %>
-    </td>
-  <% end %>
-  <td colspan="<%= f.object.persisted? ? '' : '2' %>" class="name"><%= f.text_field :name %></td>
+  <td class="no-border">
+    <span class="handle"></span>
+    <%= f.hidden_field :id %>
+  </td>
+  <td class="name"><%= f.text_field :name %></td>
   <td class="presentation"><%= f.text_field :presentation %></td>
   <td class="actions"><%= link_to_remove_fields Spree.t(:remove), f, :no_text => true %></td>
 </tr>

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

@@ -32,8 +32,15 @@
         </tr>
       </thead>
       <tbody id="option_values">
-        <%= f.fields_for :option_values, @option_values do |option_value_form| %>
-          <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
+        <% if @option_type.option_values.empty? %>
+          <tr id="none" data-hook="option_none" class="<%= cycle('odd', 'even')%>">
+            <td colspan="2"><%= Spree.t(:none) %></td>
+            <td class="actions"></td>
+          </tr>
+        <% else %>
+          <%= f.fields_for :option_values do |option_value_form| %>
+            <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
+          <% end %>
         <% end %>
       </tbody>
     </table>

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

@@ -0,0 +1,18 @@
+<%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>
+
+<%= render :partial => "spree/admin/variants/autocomplete_line_items_stock", :formats => :js %>
+
+
+<div id="add-line-item" data-hook>
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:add_product) %></legend>
+
+    <div data-hook="add_product_name" class="field twelve columns alpha">
+      <%= label_tag :add_line_item_variant_id, Spree.t(:name_or_sku) %>
+      <%= hidden_field_tag :add_line_item_variant_id, "", :class => "variant_autocomplete fullwidth" %>
+    </div>
+
+  </fieldset>
+
+  <div id="stock_details"></div>
+</div>

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

@@ -3,24 +3,23 @@
     <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
   <% end %>
 
-  <% if Spree::Order.checkout_step_names.include?(:delivery) && !%w(cart address).include?(@order.state) %>
-    <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } %>
+  <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+    <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments.order(:created_at), :locals => { :order => order } %>
   <% else %>
     <%= render :partial => "spree/admin/orders/line_items", :locals => { :order => order } %>
   <% end %>
-
   <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.line_item_adjustments,
+        :adjustments => @order.line_item_adjustments, 
         :order => order,
         :title => Spree.t(:line_item_adjustments)
    } %>
   <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.shipment_adjustments,
+        :adjustments => @order.shipment_adjustments, 
         :order => order,
         :title => Spree.t(:shipment_adjustments)
    } %>
   <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.adjustments,
+        :adjustments => @order.adjustments, 
         :order => order,
         :title => Spree.t(:order_adjustments)
    } %>
@@ -37,8 +36,9 @@
     var shipments = [];
 
     <% @order.shipments.each do |shipment| %>
-            shipments.push(<%== shipment.as_json(:root => false, :only => [:id, :tracking, :number, :state, :stock_location_id], :include => [:inventory_units, :stock_location]).to_json %>);
+      shipments.push(<%== shipment.to_json(:root => false, :include => [:inventory_units, :stock_location]) %>);
     <% end %>
+
     <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>
   <% end -%>
 </div>

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

@@ -0,0 +1,40 @@
+<div data-hook="admin_order_form_fields">
+  <% if @line_item.try(:errors).present? %>
+      <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
+  <% end %>
+
+  <%= render :partial => "spree/admin/orders/line_items", :locals => { :order => order } %>
+  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
+          :adjustments => @order.line_item_adjustments,
+          :order => order,
+          :title => Spree.t(:line_item_adjustments)
+  } %>
+  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
+          :adjustments => @order.shipment_adjustments,
+          :order => order,
+          :title => Spree.t(:shipment_adjustments)
+  } %>
+  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
+          :adjustments => @order.adjustments,
+          :order => order,
+          :title => Spree.t(:order_adjustments)
+  } %>
+
+  <% if order.line_items.exists? %>
+      <fieldset class="no-border-bottom" id="order-total" data-hook="order_details_total">
+        <legend><%= Spree.t(:order_total) %></legend>
+        <span class="order-total"><%= order.display_total %></span>
+      </fieldset>
+  <% end %>
+
+  <%= javascript_tag do -%>
+      var order_number = '<%= @order.number %>';
+      var shipments = [];
+
+      <% @order.shipments.each do |shipment| %>
+          shipments.push(<%== shipment.to_json(:root => false, :include => [:inventory_units, :stock_location]) %>);
+      <% end %>
+
+      <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>
+  <% end -%>
+</div>

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

@@ -100,7 +100,7 @@
       <tr class="show-tracking total">
         <td colspan="5" class="tracking-value">
           <% if shipment.tracking.present? %>
-            <strong><%= Spree.t(:tracking) %>:</strong> <%= shipment.tracking %>
+            <strong><%= Spree.t(:tracking) %>:</strong> <%= link_to_tracking(shipment, target: '_blank') %>
           <% else %>
             <%= Spree.t(:no_tracking_present) %>
           <% end %>

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

@@ -23,12 +23,13 @@
     <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
     <% unless shipment.shipped? %>
       <td class="cart-item-delete actions" data-hook="cart_item_delete">
-        <% if can?(:update, item.line_item) %>
+        <% if can? :update, item %>
           <%= link_to '', '#', :class => 'save-item fa fa-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
           <%= link_to '', '#', :class => 'cancel-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
-          <%= link_to '', '#', :class => 'edit-item fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
-          <%= link_to '', '#', :class => 'split-item icon_link fa fa-arrows-h no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
-          <%= link_to '', '#', :class => 'delete-item fa fa-trash no-text with-tip', :data => { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('delete') %>
+          <% if shipment.order.shipped_shipments.count == 0 %>
+            <%= link_to '', '#', :class => 'split-item icon_link fa fa-arrows-h no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
+            <%= link_to '', '#', :class => 'delete-item fa fa-trash no-text with-tip', :data => { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('delete') %>
+          <% end %>
         <% end %>
       </td>
     <% end %>

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

@@ -0,0 +1,39 @@
+<% content_for :page_actions do %>
+    <% if can?(:fire, @order) %>
+        <li><%= event_links %></li>
+    <% end %>
+    <% if can?(:resend, @order) %>
+        <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'email' %></li>
+    <% end %>
+    <% if can?(:admin, Spree::Order) %>
+        <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
+    <% end %>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Cart' } %>
+
+<div data-hook="admin_order_edit_header">
+  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+</div>
+
+<% if @order.payments.exists? && @order.considered_risky? %>
+    <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
+<% end %>
+
+<%= render :partial => 'add_line_item' if can?(:update, @order) %>
+
+<% if @order.line_items.empty? %>
+    <div class="no-objects-found">
+      <%= Spree.t(:your_order_is_empty_add_product)%>
+    </div>
+<% end %>
+
+<div data-hook="admin_order_edit_form">
+  <div id="order-form-wrapper">
+    <%= render :partial => 'line_items_edit_form', :locals => { :order => @order } %>
+  </div>
+</div>
+
+<% content_for :head do %>
+    <%= javascript_tag 'var expand_variants = true;' %>
+<% end %>

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

@@ -51,7 +51,7 @@
       <%= f.fields_for :ship_address do |sa_form| %>
         <div class="field" style="position: absolute;margin-top: -15px;right: 0;">
           <span data-hook="use_billing">
-            <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
+            <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
             <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
           </span>
         </div>

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

@@ -10,14 +10,14 @@
   <% end %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Order Details' } %>
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Shipments' } %>
 
 <div data-hook="admin_order_edit_header">
   <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 </div>
 
 <% if @order.payments.exists? && @order.considered_risky? %>
-  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.last %>
+  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
 <% end %>
 
 <%= render partial: 'add_product' if @order.shipment_state != 'shipped' && can?(:update, @order) %>

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

@@ -17,7 +17,7 @@
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="field-block alpha four columns">
         <div class="date-range-filter field">
-          <%= label_tag nil, Spree.t(:date_range) %>
+          <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
           <div class="date-range-fields">
             <%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => params[:q][:created_at_gt], :placeholder => Spree.t(:start) %>
 
@@ -30,34 +30,34 @@
         </div>
 
         <div class="field">
-          <%= label_tag nil, Spree.t(:status) %>
+          <%= label_tag :q_state_eq, Spree.t(:status) %>
           <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>
         </div>
 
         <div class="field">
-          <%= label_tag nil, Spree.t(:promotion) %>
+          <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
           <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), {:include_blank => true}, :class => 'select2' %>
         </div>
       </div>
 
       <div class="four columns">
         <div class="field">
-          <%= label_tag nil, Spree.t(:order_number, :number => '') %>
+          <%= label_tag :q_number_cont, Spree.t(:order_number, :number => '') %>
           <%= f.text_field :number_cont %>
         </div>
         <div class="field">
-          <%= label_tag nil, Spree.t(:email) %>
+          <%= label_tag :q_email_cont, Spree.t(:email) %>
           <%= f.text_field :email_cont %>
         </div>
       </div>
 
       <div class="four columns">
         <div class="field">
-          <%= label_tag nil, Spree.t(:first_name_begins_with) %>
+          <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
           <%= f.text_field :bill_address_firstname_start, :size => 25 %>
         </div>
         <div class="field">
-          <%= label_tag nil, Spree.t(:last_name_begins_with) %>
+          <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
           <%= f.text_field :bill_address_lastname_start, :size => 25%>
         </div>
       </div>
@@ -132,13 +132,7 @@
           <% 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>
-          <% if order.user %>
-            <%= link_to order.email, edit_admin_user_path(order.user) %>
-          <% else %>
-            <%= mail_to order.email %>
-          <% end %>
-        </td>
+        <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">
           <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}", :no_text => true %>

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

@@ -16,15 +16,15 @@
         <% end %>
       </div>
       <div data-hook="environment" class="field">
-        <%= label_tag nil, Spree.t(:environment) %>
+        <%= label_tag :payment_method_environment, Spree.t(:environment) %>
         <%= collection_select(:payment_method, :environment, rails_environments, :to_s, :titleize, {}, {:id => 'gtwy-env', :class => 'select2 fullwidth'}) %>
       </div>
       <div data-hook="display" class="field">
-        <%= label_tag nil, Spree.t(:display) %>
+        <%= 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 fullwidth'}) %>
       </div>
       <div data-hook="auto_capture" class="field">
-        <%= label_tag nil, Spree.t(:auto_capture) %>
+        <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
         <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {:class => 'select2 fullwidth'}) %>
       </div>
       <div data-hook="active" class="field">
@@ -32,11 +32,11 @@
         <ul>
           <li>
             <%= radio_button :payment_method, :active, true %>
-            <%= label_tag nil, Spree.t(:say_yes) %>
+            <%= label_tag :payment_method_active_true, Spree.t(:say_yes) %>
           </li>
           <li>
             <%= radio_button :payment_method, :active, false %>
-            <%= label_tag nil, Spree.t(:say_no) %>
+            <%= label_tag :payment_method_active_false, Spree.t(:say_no) %>
           </li>
         </ul>
       </div>
@@ -44,11 +44,11 @@
 
     <div class="omega eight columns">
       <div data-hook="name" class="field">
-        <%= label_tag nil, Spree.t(:name) %>
+        <%= label_tag :payment_method_name, Spree.t(:name) %>
         <%= text_field :payment_method, :name, :class => 'fullwidth' %>
       </div>
       <div data-hook="description" class="field">
-        <%= label_tag nil, Spree.t(:description) %>
+        <%= label_tag :payment_method_description, Spree.t(:description) %>
         <%= text_area :payment_method, :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} %>
       </div>
     </div>

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

@@ -1,23 +1,31 @@
 <table class="index" id='payments' data-order-id='<%= @order.number %>'>
   <thead>
     <tr data-hook="payments_header">
+      <th><%= Spree.t(:identifier) %></th>
       <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
       <th><%= Spree.t(:amount) %></th>
       <th><%= Spree.t(:payment_method) %></th>
+      <th><%= Spree.t(:transaction_id) %></th>
       <th><%= Spree.t(:payment_state) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% payments.each do |payment| %>
-      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="<%= cycle('odd', 'even')%>">
-        <td><%= link_to pretty_time(payment.created_at), spree.admin_order_payment_path(@order, payment) %></td>
+      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="<%= cycle('odd', 'even', name: 'payment_table_cycle')%>">
+        <td><%= link_to payment.identifier, spree.admin_order_payment_path(@order, payment) %></td>
+        <td><%= pretty_time(payment.created_at) %></td>
         <td class="align-center amount"><%= payment.display_amount.to_html %></td>
         <td class="align-center"><%= payment_method_name(payment) %></td>
+        <td class="align-center"><%= payment.transaction_id %></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| %>
-            <%= link_to_with_icon action, Spree.t(action), fire_admin_order_payment_path(@order, payment, :e => action), :method => :put, :no_text => true, :data => {:action => action} %>
+            <% if action == 'credit' %>
+              <%= link_to_with_icon 'reply', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
+            <% else %>
+              <%= link_to_with_icon action, Spree.t(action), fire_admin_order_payment_path(@order, payment, :e => action), :method => :put, :no_text => true, :data => {:action => action} %>
+            <% end %>
           <% end %>
         </td>
       </tr>

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

@@ -18,7 +18,19 @@
 <% end %>
 
 <% if @payments.any? %>
-  <%= render :partial => 'list', :locals => { :payments => @payments } %>
+
+  <fieldset data-hook="payment_list" class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:payments) %></legend>
+    <%= render :partial => 'list', :locals => { :payments => @payments } %>
+  </fieldset>
+
+  <% if @refunds.any? %>
+    <fieldset data-hook="payment_list" class="no-border-bottom">
+      <legend align="center"><%= Spree.t(:refunds) %></legend>
+      <%= render :partial => 'spree/admin/shared/refunds', :locals => { :refunds => @refunds, show_actions: true } %>
+    </fieldset>
+  <% end %>
+
 <% else %>
   <div class="alpha twelve columns no-objects-found"><%= Spree.t(:order_has_no_payments) %></div>
 <% end %>

data/app/views/spree/admin/product_properties/_product_property_fields.html.erb

@@ -1,19 +1,17 @@
 <tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
   <td class="no-border">
-    <% if f.object.persisted? %>
-      <span class="handle"></span>
-      <%= f.hidden_field :id %>
-    <% end %>
+    <span class="handle"></span>
+    <%= f.hidden_field :id %>
   </td>
   <td class='property_name'>
-    <%= f.text_field :property_name, class: 'autocomplete' %>
+    <%= f.text_field :property_name, :class => 'autocomplete' %>
   </td>
   <td class='value'>
     <%= f.text_field :value %>
   </td>
   <td class="actions">
     <% if f.object.persisted? %>
-      <%= link_to_delete f.object, no_text: true %>
+      <%= link_to_delete f.object, :no_text => true %>
     <% end %>
   </td>
 </tr>

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

@@ -4,7 +4,7 @@
     <div data-hook="admin_product_form_name">
       <%= f.field_container :name do %>
         <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
-        <%= f.text_field :name, :class => 'fullwidth title', :required => true %>
+        <%= f.text_field :name, :class => 'fullwidth title' %>
         <%= f.error_message_on :name %>
       <% end %>
     </div>
@@ -12,7 +12,7 @@
     <div data-hook="admin_product_form_slug">
       <%= f.field_container :slug do %>
         <%= f.label :slug, raw(Spree.t(:slug) + content_tag(:span, ' *',  :class => "required")) %>
-        <%= f.text_field :slug, :class => 'fullwidth title', :required => true %>
+        <%= f.text_field :slug, :class => 'fullwidth title' %>
         <%= f.error_message_on :slug %>
       <% end %>
     </div>
@@ -20,7 +20,7 @@
     <div data-hook="admin_product_form_description">
       <%= f.field_container :description do %>
         <%= f.label :description, Spree.t(:description) %>
-        <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '20' else '13' end}", :class => 'fullwidth'} %>
+        <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '22' else '15' end}", :class => 'fullwidth'} %>
         <%= f.error_message_on :description %>
       <% end %>
     </div>
@@ -30,7 +30,7 @@
     <div data-hook="admin_product_form_price">
     <%= f.field_container :price do %>
       <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', :class => "required")) %>
-      <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :required => true %>
+      <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
       <%= f.error_message_on :price %>
     <% end %>
     </div>
@@ -42,7 +42,6 @@
         <%= f.error_message_on :cost_price %>
       <% end %>
     </div>
-
     <div data-hook="admin_product_form_cost_currency" class="omega two columns">
       <%= f.field_container :cost_currency do %>
         <%= f.label :cost_currency, Spree.t(:cost_currency) %>
@@ -61,6 +60,14 @@
       <% end %>
     </div>
 
+    <div data-hook="admin_product_form_promotionable">
+      <%= f.field_container :promotionable do %>
+        <%= f.label :promotionable do %>
+          <%= f.check_box :promotionable %> <%= Spree.t(:promotionable) %>
+        <% end %>
+      <% end %>
+    </div>
+
     <% if @product.has_variants? %>
       <div data-hook="admin_product_form_multiple_variants">
         <%= f.label :skus, Spree.t(:skus) %>
@@ -77,7 +84,7 @@
         </span>
         <div class="info-actions">
           <% if can?(:admin, Spree::Variant) %>
-            <%= link_to_with_icon 'th-large', Spree.t(:manage_variants),  admin_product_variants_url(@product) %>
+            <%= link_to_with_icon 'th-large', Spree.t(:manage_variants), admin_product_variants_url(@product) %>
           <% end %>
         </div>
       </div>
@@ -143,6 +150,13 @@
   </div>
 
   <div data-hook="admin_product_form_meta" class="alpha omega twelve columns">
+    <div data-hook="admin_product_form_meta_title">
+      <%= f.field_container :meta_title do %>
+        <%= f.label :meta_title, Spree.t(:meta_title) %>
+        <%= f.text_field :meta_title, :class => 'fullwidth' %>
+      <% end %>
+    </div>
+
     <div data-hook="admin_product_form_meta_keywords">
       <%= f.field_container :meta_keywords do %>
         <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>

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

@@ -10,7 +10,7 @@
 
     <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-      <%= f.text_field :name, :class => 'fullwidth title', :required => true %>
+      <%= f.text_field :name, :class => 'fullwidth title' %>
       <%= f.error_message_on :name %>
     <% end %>
 
@@ -35,7 +35,7 @@
       <div data-hook="new_product_price" class="four columns">
         <%= f.field_container :price do %>
           <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span><br />
-          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth', :required => true %>
+          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth' %>
           <%= f.error_message_on :price %>
         <% end %>
       </div>
@@ -54,7 +54,7 @@
       <div data-hook="new_product_shipping_category" class="alpha four columns">
         <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span><br />
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth', :required => true }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>

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

@@ -37,7 +37,7 @@
             <%= 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) %>
+                <%= label_tag :track_inventory, Spree.t(:track_inventory) %>
                 <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
                     class: 'variant_track_inventory',
                     id: "variant_track_inventory_#{variant.id}" %>

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

@@ -0,0 +1,10 @@
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @promotion } %>
+
+<div class='row'>
+  <div class='alpha six columns'>
+    <%= f.field_container :name do %>
+      <%= f.label :name %>
+      <%= f.text_field :name, :class => 'fullwidth' %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,17 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_promotion_category) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:back_to_promotion_categories_list), spree.admin_promotion_categories_path, :icon => 'arrow-left' %>
+  </li>
+<% end %>
+
+<%= form_for @promotion_category, :url => object_url, :method => :put do |f| %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>
+

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

@@ -0,0 +1,34 @@
+<% content_for :page_title do %>
+  <%= Spree::PromotionCategory.model_name.human(count: :many) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path, :icon => 'plus' %>
+  </li>
+  <li>
+    <%= button_link_to Spree.t(:back_to_promotions_list), spree.admin_promotions_path, :icon => 'arrow-left' %>
+  </li>
+<% end %>
+
+<table>
+  <colgroup>
+    <col style="width: 85%">
+    <col style="width: 15%">
+  </colgroup>
+  <thead>
+    <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
+    <th class='actions'></th>
+  </thead>
+  <tbody>
+    <% @promotion_categories.each do |promotion_category| %>
+      <tr>
+        <td><%= promotion_category.name %></td>
+        <td class="actions">
+          <%= link_to_edit promotion_category, :no_text => true %>
+          <%= link_to_delete promotion_category, :no_text => true %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,16 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:new_promotion_category) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:back_to_promotion_categories_list), spree.admin_promotion_categories_path, :icon => 'arrow-left' %>
+  </li>
+<% end %>
+
+<%= form_for :promotion_category, :url => collection_url do |f| %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>