solidus_backend_devise_token_auth 2.8.0.alpha.2

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

@@ -0,0 +1,63 @@
+<table class="index return-items-table">
+  <thead>
+    <tr>
+      <th>
+        <%= check_box_tag 'select-all' %>
+      </th>
+      <th><%= Spree::Product.model_name.human %></th>
+      <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:inventory_unit_state) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:resellable) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:reception_status) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:return_reason) %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <%= f.fields_for :return_items, return_items do |item_fields| %>
+      <% return_item = item_fields.object %>
+
+      <tr>
+        <td class="inventory-unit-checkbox">
+          <div style="display:none">
+            <%= item_fields.hidden_field :inventory_unit_id %>
+            <%= item_fields.hidden_field :return_authorization_id %>
+            <%= item_fields.hidden_field :amount %>
+          </div>
+          <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.amount}, '1', '0' %>
+        </td>
+        <td>
+          <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+          <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
+        </td>
+        <td>
+          <%= return_item.inventory_unit.variant.sku %>
+        </td>
+        <td>
+          <%= return_item.display_amount %>
+        </td>
+        <td>
+          <span class="pill pill-<%= return_item.inventory_unit.state %>">
+            <%= t(
+              return_item.inventory_unit.state,
+              scope: 'spree.inventory_states'
+            ) %>
+          </span>
+        </td>
+        <td>
+          <%= return_item.exchange_variant.try(:exchange_name) %>
+        </td>
+        <td>
+          <%= item_fields.check_box :resellable, { checked: return_item.resellable } %>
+        </td>
+        <td>
+          <%= item_fields.select :reception_status_event, return_item.potential_reception_transitions, {include_blank: true}, {class: 'add-item custom-select fullwidth'} %>
+        </td>
+        <td>
+          <%= item_fields.select :return_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'custom-select fullwidth'} %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,63 @@
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Returns' } %>
+
+<% admin_breadcrumb(link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order)) %>
+<% admin_breadcrumb(@customer_return.number) %>
+
+<% content_for :page_actions do %>
+<% end %>
+
+<% if @manual_intervention_return_items.any? %>
+  <fieldset data-hook="manual_intervention_return_items" class="no-border-bottom">
+    <legend align="center"><%= t('spree.manual_intervention_required') %></legend>
+    <%= render partial: 'return_item_decision', locals: {return_items: @manual_intervention_return_items, show_decision: true} %>
+  </fieldset>
+<% end %>
+
+<% if @pending_return_items.any? %>
+  <fieldset data-hook="pending_return_items" class="no-border-bottom">
+    <legend align="center"><%= t('spree.pending') %></legend>
+    <%= render partial: 'return_item_decision', locals: {return_items: @pending_return_items, show_decision: true} %>
+  </fieldset>
+<% end %>
+
+<% if @accepted_return_items.any? %>
+  <fieldset data-hook="accepted_return_items" class="no-border-bottom">
+    <legend align="center"><%= t('spree.accepted') %></legend>
+    <%= render partial: 'return_item_decision', locals: {return_items: @accepted_return_items, show_decision: false} %>
+  </fieldset>
+<% end %>
+
+<% if @rejected_return_items.any? %>
+  <fieldset data-hook="rejected_return_items" class="no-border-bottom">
+    <legend align="center"><%= t('spree.rejected') %></legend>
+    <%= render partial: 'return_item_decision', locals: {return_items: @rejected_return_items, show_decision: false} %>
+  </fieldset>
+<% end %>
+
+<% if !@customer_return.fully_reimbursed? && @pending_reimbursements.empty? %>
+  <fieldset data-hook="reimbursements" class="no-border-bottom no-border-top align-center">
+    <% if @customer_return.completely_decided? %>
+      <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
+        <%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %>
+        <%= f.button class: 'button' do %>
+          <%= t('spree.create_reimbursement') %>
+        <% end %>
+      <% end %>
+    <% else %>
+      <div class="no-objects-found">
+        <%= t('spree.unable_to_create_reimbursements') %>
+      </div>
+    <% end %>
+  </fieldset>
+<% end %>
+
+<fieldset data-hook="reimbursements" class="no-border-bottom">
+  <legend align="center"><%= plural_resource_name(Spree::Reimbursement) %></legend>
+  <% if @customer_return.reimbursements.any? %>
+    <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>
+  <% else %>
+    <div class="no-objects-found">
+      <%= t('spree.none') %>
+    </div>
+  <% end %>
+</fieldset>

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

@@ -0,0 +1,52 @@
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Returns' } %>
+
+<% content_for :page_actions do %>
+  <% if can? :create, Spree::CustomerReturn %>
+    <li>
+      <%= link_to t('spree.new_customer_return'), spree.new_admin_order_customer_return_path(@order), class: 'btn btn-primary' %>
+    </li>
+  <% end %>
+<% end %>
+
+<% admin_breadcrumb(plural_resource_name(Spree::CustomerReturn)) %>
+
+<% if @customer_returns.any? %>
+  <table class="index">
+    <thead data-hook="customer_return_header">
+      <tr>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:number) %></th>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:total_excluding_vat) %></th>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:total) %></th>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:created_at) %></th>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:reimbursement_status) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @customer_returns.each do |customer_return| %>
+        <tr id="<%= spree_dom_id(customer_return) %>" data-hook="customer_return_row">
+          <td><%= link_to customer_return.number, edit_admin_order_customer_return_path(@order, customer_return) %></td>
+          <td><%= customer_return.display_total_excluding_vat.to_html %></td>
+          <td><%= customer_return.display_total.to_html %></td>
+          <td><%= pretty_time(customer_return.created_at) %></td>
+          <td>
+            <% if customer_return.fully_reimbursed? %>
+              <span class="pill pill-complete"><%= t('spree.reimbursed') %></span>
+            <% else %>
+              <span class="pill pill-pending"><%= t('spree.incomplete') %></span>
+            <% end %>
+          </td>
+          <td class='actions align-center' data-hook="admin_orders_customer_returns_index_row_actions">
+            <%= link_to_edit_url edit_admin_order_customer_return_path(@order, customer_return), title: "admin_edit_#{dom_id(customer_return)}", no_text: true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="no-objects-found">
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::CustomerReturn,
+                 new_resource_url: new_object_url %>
+  </div>
+<% end %>

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

@@ -0,0 +1,56 @@
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Returns' } %>
+
+<% admin_breadcrumb(link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order)) %>
+<% admin_breadcrumb(t('spree.new_customer_return')) %>
+
+
+<% content_for :page_actions do %>
+<% end %>
+
+<% if @rma_return_items.any? || @new_return_items.any? %>
+
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @customer_return } %>
+  <%= form_for [:admin, @order, @customer_return] do |f| %>
+    <fieldset class="no-border-top">
+      <div data-hook="admin_customer_return_form_fields">
+        <fieldset class='no-border-bottom'>
+          <legend align='center'><%= t('spree.items_in_rmas') %></legend>
+          <% if @rma_return_items.any? %>
+            <%= render partial: 'return_item_selection', locals: {f: f, return_items: @rma_return_items} %>
+          <% else %>
+            <div class="no-objects-found"><%= t('spree.none') %></div>
+          <% end %>
+        </fieldset>
+
+        <fieldset class='no-border-bottom'>
+          <legend align='center'><%= t('spree.other_items_in_other') %></legend>
+          <% if @new_return_items.any? %>
+            <%= render partial: 'return_item_selection', locals: {f: f, return_items: @new_return_items} %>
+          <% else %>
+            <div class="no-objects-found"><%= t('spree.none') %></div>
+          <% end %>
+        </fieldset>
+
+        <%= f.field_container :stock_location do %>
+          <%= f.label :stock_location_id, Spree::StockLocation.model_name.human %>
+          <%= f.select :stock_location_id, Spree::StockLocation.order_default.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'custom-select fullwidth', "data-placeholder" => t('spree.select_a_stock_location')} %>
+          <%= f.error_message_on :stock_location_id %>
+        <% end %>
+
+      </div>
+
+      <div class="form-buttons filter-actions actions" data-hook="buttons">
+        <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+        <%= link_to t('spree.actions.cancel'), admin_order_customer_returns_url(@order), class: 'btn btn-primary' %>
+      </div>
+    </fieldset>
+  <% end %>
+
+<% else %>
+
+  <div class="no-objects-found">
+    <%= t('spree.all_items_have_been_returned') %>,
+    <%= link_to t('spree.back_to_customer_return_list'), spree.admin_order_customer_returns_path(@order) %>.
+  </div>
+
+<% end %>

data/app/views/spree/admin/dashboards/home.html.erb

@@ -0,0 +1 @@
+<%# Placeholder view for a home dashboard %>

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

@@ -0,0 +1,20 @@
+<div data-hook="admin_image_form_fields">
+  <div class="row">
+    <div class="col-3">
+      <div data-hook="file" class="field">
+        <%= f.label :attachment %><br>
+        <%= f.file_field :attachment %>
+      </div>
+      <div data-hook="variant" class="field">
+        <%= f.label :viewable_id, Spree::Variant.model_name.human %><br>
+        <%= f.select :viewable_id, @variants, {}, { class: 'custom-select fullwidth' } %>
+      </div>
+    </div>
+    <div data-hook="alt_text" class="field col-4">
+      <%= f.label :alt %><br>
+      <%= f.text_area :alt, rows: 4, class: 'fullwidth' %>
+    </div>
+  </div>
+</div>
+
+<div class="clear"></div>

data/app/views/spree/admin/images/_image_row.html.erb

@@ -0,0 +1,52 @@
+<tr id="<%= spree_dom_id image %>" data-hook="images_row">
+
+  <td>
+    <% if can?(:update_positions, Spree::Image) %>
+      <span class="handle"></span>
+    <% end %>
+  </td>
+
+  <td>
+    <span class="modal-image-trigger" data-toggle="modal" data-target="#modal-image-<%= image.id %>">
+      <%= render 'spree/admin/shared/image', image: image, size: :mini %>
+    </span>
+    <%= render(
+      "spree/admin/shared/modal",
+      target: "modal-image-#{image.id}",
+      title: image.alt,
+      content: %{
+        <div class='align-center'>
+          #{image_tag(image.url(:large))}
+        </div>
+      }.html_safe
+    ) %>
+  </td>
+
+  <% if @product.has_variants? %>
+    <td>
+      <%= fields_for image do |f| %>
+        <%= f.select :viewable_id, options_for_select(@variants, image.viewable_id), {}, class: 'select2 fullwidth', autocomplete: "off" %>
+      <% end %>
+    </td>
+  <% end # @product.has_variants? %>
+
+  <td>
+    <%= fields_for image do |f| %>
+      <%= f.text_field :alt %>
+    <% end %>
+  </td>
+
+  <td class="actions">
+    <% if can?(:update, image) %>
+      <%= link_to_with_icon 'check', t('spree.actions.save'), api_product_image_path(@product, image), no_text: true, data: {action: 'save'} %>
+
+      <%= link_to_with_icon 'cancel', t('spree.actions.cancel'), nil, no_text: true, data: {action: 'cancel'} %>
+
+      <%= link_to_with_icon 'edit', t('spree.actions.edit'), edit_admin_product_image_path(@product, image), no_text: true, data: {action: 'edit'} %>
+    <% end %>
+
+    <% if can?(:destroy, image) %>
+      <%= link_to_delete image, { url: admin_product_image_url(@product, image), no_text: true } %>
+    <% end %>
+  </td>
+</tr>

data/app/views/spree/admin/images/_new.html.erb

@@ -0,0 +1,12 @@
+<%= form_for [:admin, product, image], html: { multipart: true } do |f| %>
+  <fieldset data-hook="new_image">
+    <legend align="center"><%= t('spree.new_image') %></legend>
+
+      <%= render partial: 'form', locals: { f: f } %>
+
+      <div class="form-buttons filter-actions actions" data-hook="buttons">
+        <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
+        <%= link_to t('spree.actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button' %>
+      </div>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/images/create.js.erb

@@ -0,0 +1,12 @@
+var $uploadEl = $('[data-upload-id="<%= params[:upload_id] %>"]');
+
+<% if @image.persisted? %>
+
+  $uploadEl.trigger('clear');
+  Spree.Views.Tables.EditableTable.append('<%= j render "image_row", image: @image %>');
+
+<% else %>
+
+  $uploadEl.find('error').removeClass('hidden').html('<%= j @image.errors.full_messages.join("<br>").html_safe %>');
+
+<% end %>

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

@@ -0,0 +1,33 @@
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Images' } %>
+
+<%= render partial: 'spree/shared/error_messages', locals: { target: @image } %>
+
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Image), admin_product_images_path(@product)) %>
+<% admin_breadcrumb(@image.filename) %>
+
+
+<% content_for :page_actions do %>
+  <li><%= link_to t('spree.back_to_images_list'), admin_product_images_url(@product), class: 'btn btn-primary' %></li>
+<% end %>
+
+<%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
+  <fieldset data-hook="edit_image">
+    <legend align="center"><%= @image.filename %></legend>
+
+    <div class="row">
+      <div data-hook="thumbnail" class="field col-2 align-center">
+        <%= f.label t('spree.thumbnail') %><br>
+        <%= link_to image_tag(@image.url(:small)), @image.url(:product) %>
+      </div>
+      <div class="col-10">
+        <%= render partial: 'form', locals: { f: f } %>
+      </div>
+      <div class="clear"></div>
+    </div>
+
+    <div class="form-buttons filter-actions actions" data-hook="buttons">
+      <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button' %>
+    </div>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,74 @@
+<%= render partial: 'spree/admin/shared/product_tabs', locals: {current: 'Images'} %>
+
+<% admin_breadcrumb(plural_resource_name(Spree::Image)) %>
+
+
+<% content_for :page_actions do %>
+  <% if can?(:create, Spree::Image) %>
+    <li><%= link_to_with_icon('plus', t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'button') %></li>
+  <% end %>
+<% end %>
+
+<div id="new_image" class="hidden">
+  <%= render 'new', product: @product, image: Spree::Image.new(viewable: @product) %>
+</div>
+
+<fieldset class="no-border-bottom">
+  <legend align="center"><%= t(".upload_images") %></legend>
+
+  <div id="upload-zone">
+    <%= form_for [:admin, @product, Spree::Image.new],
+        html: { multipart: true, id: 'upload-form' } do |f| %>
+      <label class="upload">
+        <i class="fa fa-5x fa-cloud-upload"></i>
+        <p>
+          <span class="button"><%= t(".choose_files") %></span>
+        </p>
+        <p>
+          <%= t(".drag_and_drop") %>
+        </p>
+
+        <%= f.file_field :attachment, multiple: '', class: 'hidden' %>
+        <%= f.hidden_field :viewable_id, value: @product.master.id %>
+      </label>
+    <% end %>
+  </div>
+
+  <div id="progress-zone" class="row"></div>
+</fieldset>
+
+<% no_images = @product.gallery.images.empty? %>
+
+<table class="index sortable inline-editable-table <%= 'hidden' if no_images %>" id="images-table" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
+  <colgroup>
+    <col style="width: 5%">
+    <col style="width: 10%">
+    <% if @product.has_variants? %>
+      <col style="width: 40%">
+    <% end %>
+    <col style="width: 30%">
+    <col style="width: 15%">
+  </colgroup>
+
+  <thead>
+    <tr data-hook="images_header">
+      <th></th>
+      <th><%= t('spree.thumbnail') %></th>
+      <% if @product.has_variants? %>
+        <th><%= Spree::Variant.model_name.human %></th>
+      <% end %>
+      <th><%= Spree::Image.human_attribute_name(:alt) %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <%= render partial: 'image_row', collection: @product.gallery.images, as: :image %>
+  </tbody>
+</table>
+
+<% if no_images %>
+  <div class="no-objects-found">
+    <%= t('spree.no_images_found') %>.
+  </div>
+<% end %>

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

@@ -0,0 +1 @@
+<%= render 'new', product: @product, image: @image %>

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

@@ -0,0 +1,29 @@
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }%>
+
+<% admin_breadcrumb(Spree::Payment.model_name.human) %>
+<% admin_breadcrumb(plural_resource_name(Spree::LogEntry)) %>
+
+<% content_for :page_actions do %>
+  <li><%= link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment), class: 'btn btn-primary' %></li>
+  <li><%= link_to t('spree.back_to_payment'), spree.admin_order_payment_url(@order, @payment), class: 'btn btn-primary' %></li>
+<% end %>
+
+<table class='index' id='listing_log_entries'>
+  <% @log_entries.each do |entry| %>
+      <thead>
+        <tr class="log_entry <%= entry.parsed_details.success? ? 'success' : 'fail' %>">
+          <td colspan='2'>
+            <h4><i class='fa fa-<%= entry.parsed_details.success? ? 'ok-circle' : 'remove-sign' %>'></i> <%= pretty_time(entry.created_at) %></h4>
+          </td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>Message</td>
+          <td>
+            <pre><%= entry.parsed_details.message %></pre>
+          </td>
+        </tr>
+      </tbody>
+  <% end %>
+</table>

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

@@ -0,0 +1,17 @@
+<div data-hook="admin_option_type_form_fields" class="align-center row">
+  <div class="col-6">
+    <%= f.field_container :name do %>
+      <%= f.label :name, class: 'required' %><br />
+      <%= f.text_field :name, class: "fullwidth" %>
+      <%= f.error_message_on :name %>
+    <% end %>
+  </div>
+
+  <div class="col-6">
+    <%= f.field_container :presentation do %>
+      <%= f.label :presentation, class: 'required' %><br />
+      <%= f.text_field :presentation, class: "fullwidth" %>
+      <%= f.error_message_on :presentation %>
+    <% end %>
+  </div>
+</div>

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

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

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

@@ -0,0 +1,42 @@
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::OptionType), spree.admin_option_types_path) %>
+<% admin_breadcrumb(@option_type.name) %>
+
+
+<% content_for :page_actions do %>
+  <li>
+    <span id="new_add_option_value" data-hook>
+      <%= link_to_add_fields t('spree.add_option_value'), "tbody#option_values", class: 'button' %>
+    </span>
+  </li>
+  <% end %>
+
+<%= render partial: 'spree/shared/error_messages', locals: { target: @option_type } %>
+
+<%= form_for [:admin, @option_type] do |f| %>
+
+  <fieldset class="no-border-bottom">
+    <legend><%= Spree::OptionType.model_name.human %></legend>
+    <%= render partial: 'form', locals: { f: f } %>
+  </fieldset>
+
+  <fieldset>
+    <legend><%= plural_resource_name(Spree::OptionValue) %></legend>
+    <table class="index sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
+      <thead data-hook="option_header">
+        <tr>
+          <th></th>
+          <th><%= Spree::OptionValue.human_attribute_name(:name) %></th>
+          <th><%= Spree::OptionValue.human_attribute_name(:presentation) %></th>
+          <th class="actions"></th>
+        </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 } %>
+        <% end %>
+      </tbody>
+    </table>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,55 @@
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb(plural_resource_name(Spree::OptionType)) %>
+
+
+<% content_for :page_actions do %>
+  <% if can?(:create, Spree::OptionType) %>
+    <li id="new_ot_link">
+      <%= link_to t('spree.new_option_type'), new_admin_option_type_url, remote: true, id: 'new_option_type_link', class: 'btn btn-primary' %>
+    </li>
+  <% end %>
+<% end %>
+
+<div id="new_option_type"></div>
+
+<% if @option_types.any? %>
+<table class="index sortable" id="listing_option_types" data-hook data-sortable-link="<%= update_positions_admin_option_types_url %>">
+  <colgroup>
+    <col style="width: 10%">
+    <col style="width: 35%">
+    <col style="width: 40%">
+    <col style="width: 15%">
+  </colgroup>
+  <thead>
+    <tr data-hook="option_header">
+      <th></th>
+      <th><%= Spree::OptionType.human_attribute_name(:name) %></th>
+      <th><%= Spree::OptionType.human_attribute_name(:presentation) %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @option_types.each do |option_type| %>
+      <tr class="spree_option_type" id="<%= spree_dom_id option_type %>" data-hook="option_row">
+        <td><span class="handle"></span></td>
+        <td><%= option_type.name %></td>
+        <td class="presentation"><%= option_type.presentation %></td>
+        <td class="actions">
+          <% if can?(:update, option_type) %>
+            <%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) %>
+          <% end %>
+          <% if can?(:destroy, option_type) %>
+            <%= link_to_delete(option_type, no_text: true) %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+<% else %>
+  <div class="no-objects-found">
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::OptionType,
+                 new_resource_url: new_object_url %>
+  </div>
+<% end %>

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

@@ -0,0 +1,9 @@
+<%= render partial: 'spree/shared/error_messages', locals: { target: @option_type } %>
+
+<%= form_for [:admin, @option_type] do |f| %>
+  <fieldset>
+    <legend align="center"><%= t('spree.new_option_type') %></legend>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/option_types/new.js.erb

@@ -0,0 +1,2 @@
+$("#new_option_type").html('<%= escape_javascript(render template: "spree/admin/option_types/new", formats: [:html], handlers: [:erb]) %>');
+$("#new_option_type_link").parent().hide();

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

@@ -0,0 +1,12 @@
+<div id="add-line-item" class="js-shipment-add-variant" data-hook>
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= t('spree.add_product') %></legend>
+
+    <div data-hook="add_product_name" class="field">
+      <%= label_tag :add_variant_id, t('spree.name_or_sku') %>
+      <%= text_field_tag :add_variant_id, "", class: "variant_autocomplete fullwidth" %>
+    </div>
+  </fieldset>
+
+  <div id="stock_details"></div>
+</div>