spree_backend 4.1.12 → 4.2.0.rc3

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

@@ -20,9 +20,9 @@
         </div>
 
         <div class="form-actions" data-hook="buttons">
-          <%= button Spree.t('actions.update'), 'save' %>
+          <%= button Spree.t('actions.update'), 'save.svg' %>
           <span class="or"><%= Spree.t(:or) %></span>
-          <%= button_link_to Spree.t('actions.cancel'), spree.admin_product_images_url(@product), id: 'cancel_link', icon: 'delete' %>
+          <%= button_link_to Spree.t('actions.cancel'), spree.admin_product_images_url(@product), id: 'cancel_link', icon: 'cancel.svg' %>
         </div>
       </div>
     </div>

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

@@ -1,11 +1,9 @@
 <%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :images } %>
 
 <% content_for :page_actions do %>
-  <div class="page-actions col-6 pr-0" data-hook="toolbar">
-    <%= yield :page_actions %>
-  </div>
+  <%= yield :page_actions %>
   <%= product_preview_link(@product) %>
-  <%= button_link_to(Spree.t(:new_image), spree.new_admin_product_image_url(@product), { class: "btn-success", icon: 'add', id: 'new_image_link' }) if can? :create, Spree::Image %>
+  <%= button_link_to(Spree.t(:new_image), spree.new_admin_product_image_url(@product), { class: "btn-success", icon: 'add.svg', id: 'new_image_link' }) if can? :create, Spree::Image %>
 <% end %>
 
 <% has_variants = @product.has_variants? %>
@@ -15,6 +13,7 @@
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Image)) %>.
   </div>
 <% else %>
+<div class="table-responsive">
   <table class="table sortable" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
     <thead>
       <tr data-hook="images_header">
@@ -33,12 +32,12 @@
       </tr>
     </thead>
 
-    <tbody>
+    <tbody id="sortVert">
       <% (@product.variant_images).each do |image| %>
         <tr id="<%= spree_dom_id image %>" data-hook="images_row">
           <td class="move-handle text-center">
             <% if can? :edit, image %>
-              <span class="icon icon-move handle"></span>
+              <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
             <% end %>
           </td>
           <td class="image">
@@ -49,11 +48,12 @@
           <% end %>
           <td><%= image.alt %></td>
           <td class="actions actions-2 text-right">
-            <%= link_to_with_icon('edit', Spree.t(:edit), spree.edit_admin_product_image_url(@product, image), class: 'btn btn-primary btn-sm', no_text: true, data: { action: 'edit' }) if can? :edit, image %>
+            <%= link_to_with_icon('edit.svg', Spree.t(:edit), spree.edit_admin_product_image_url(@product, image), class: 'btn btn-primary btn-sm', no_text: true, data: { action: 'edit' }) if can? :edit, image %>
             <%= link_to_delete(image, { url: spree.admin_product_image_url(@product, image), no_text: true }) if can? :destroy, image %>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
+</div>
 <% end %>

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

@@ -11,9 +11,9 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.create'), 'save' %>
+      <%= button Spree.t('actions.create'), 'save.svg' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_product_images_url(@product), icon: 'delete', id: 'cancel_link' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_product_images_url(@product), icon: 'delete.svg', id: 'cancel_link' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -8,16 +8,16 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), icon: 'file' %>
+  <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), icon: 'file.svg' %>
 <% end %>
-
+<div class="table-responsive">
 <table class="table" id='listing_log_entries'>
   <% @log_entries.each do |entry| %>
       <thead>
         <tr class="log_entry <%= entry.parsed_details.success? ? 'success' : 'fail' %>">
           <td colspan="2">
             <h4>
-              <span class="icon icon-<%= entry.parsed_details.success? ? 'ok' : 'delete' %>"></span>
+              <i class="icon icon-<%= entry.parsed_details.success? ? 'save' : 'cancel' %>"></i>
               <%= pretty_time(entry.created_at) %>
             </h4>
           </td>
@@ -31,3 +31,4 @@
       </tbody>
   <% end %>
 </table>
+</div>

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

@@ -14,4 +14,13 @@
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>
+
+  <div class="col-12 col-md-6">
+    <%= f.field_container :filterable, class: ['form-group'] do %>
+      <%= label_tag :option_type_filterable do %>
+        <%= f.check_box :filterable %>
+        <%= Spree.t(:filterable) %>
+      <% end %>
+    <% end %>
+  </div>
 </div>

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

@@ -1,6 +1,6 @@
 <tr class="option_value fields" id="spree_<%= dom_id(f.object) %>" data-hook="option_value">
   <td class="move-handle text-center">
-    <span class="icon icon-move handle"></span>
+    <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
     <%= f.hidden_field :id %>
   </td>
   <td class="name"><%= f.text_field :name, class: "form-control" %></td>

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

@@ -5,7 +5,7 @@
 
 <% content_for :page_actions do %>
   <span id="new_add_option_value" data-hook>
-    <%= button_link_to Spree.t(:add_option_value), "javascript:;", { icon: 'add', :'data-target' => "tbody#option_values", class: 'btn-success spree_add_fields' } %>
+    <%= button_link_to Spree.t(:add_option_value), "javascript:;", { icon: 'add.svg', :'data-target' => "tbody#sortVert", class: 'btn-success spree_add_fields' } %>
   </span>
 <% end %>
 
@@ -21,27 +21,29 @@
     <div class="card-body">
       <%= render partial: 'form', locals: { f: f } %>
     </div>
-    <table class="table table-condensed table-bordered sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
-      <thead data-hook="option_header">
-        <tr>
-          <th colspan="2"><%= Spree.t(:name) %> <span class="required">*</span></th>
-          <th><%= Spree.t(:display) %> <span class="required">*</span></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody id="option_values">
-        <% if @option_type.option_values.empty? %>
-          <tr id="none" data-hook="option_none">
-            <td colspan="2"><%= Spree.t(:none) %></td>
-            <td class="actions text-center"></td>
+    <div class="table-responsive">
+      <table class="table table-condensed sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
+        <thead data-hook="option_header">
+          <tr>
+            <th colspan="2"><%= Spree.t(:name) %> <span class="required">*</span></th>
+            <th><%= Spree.t(:display) %> <span class="required">*</span></th>
+            <th class="actions"></th>
           </tr>
-        <% else %>
-          <%= f.fields_for :option_values do |option_value_form| %>
-            <%= render partial: 'option_value_fields', locals: { f: option_value_form } %>
+        </thead>
+        <tbody id="sortVert">
+          <% if @option_type.option_values.empty? %>
+            <tr id="none" data-hook="option_none">
+              <td colspan="2"><%= Spree.t(:none) %></td>
+              <td class="actions text-center"></td>
+            </tr>
+          <% else %>
+            <%= f.fields_for :option_values do |option_value_form| %>
+              <%= render partial: 'option_value_fields', locals: { f: option_value_form } %>
+            <% end %>
           <% end %>
-        <% end %>
-      </tbody>
-    </table>
+        </tbody>
+      </table>
+    </div>
     <div class="card-footer text-center">
       <%= render partial: 'spree/admin/shared/edit_resource_links' %>
     </div>

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

@@ -4,38 +4,42 @@
 
 <% content_for :page_actions do %>
   <span id="new_ot_link">
-    <%= button_link_to Spree.t(:new_option_type), new_object_url, { class: "btn-success", icon: 'add', id: 'new_option_type_link' } %>
+    <%= button_link_to Spree.t(:new_option_type), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_option_type_link' } %>
   </span>
 <% end if can?(:create, Spree::OptionType) %>
 
 <div id="new_option_type"></div>
 
 <% if @option_types.any? %>
-<table class="table sortable" id="listing_option_types" data-hook data-sortable-link="<%= update_positions_admin_option_types_url %>">
-  <thead>
-    <tr data-hook="option_header">
-      <th class="no-border"></th>
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:presentation) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @option_types.each do |option_type| %>
-      <tr class="spree_option_type <%= cycle('odd', 'even')%>" id="<%= spree_dom_id option_type %>" data-hook="option_row">
-        <td class="move-handle text-center">
-          <span class="icon icon-move handle"></span>
-        </td>
-        <td><%= option_type.name %></td>
-        <td class="presentation"><%= option_type.presentation %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) if can?(:edit, option_type) %>
-          <%= link_to_delete(option_type, no_text: true) if can?(:delete, option_type) %>
-        </td>
+<div class="table-responsive">
+  <table class="table sortable" id="listing_option_types" data-hook data-sortable-link="<%= update_positions_admin_option_types_url %>">
+    <thead>
+      <tr data-hook="option_header">
+        <th class="no-border handel-head"></th>
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:presentation) %></th>
+        <th><%= Spree.t(:filterable) %></th>
+        <th class="actions"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody id="sortVert">
+      <% @option_types.each do |option_type| %>
+        <tr class="spree_option_type <%= cycle('odd', 'even')%>" id="<%= spree_dom_id option_type %>" data-hook="option_row">
+          <td class="move-handle text-center">
+            <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
+          </td>
+          <td><%= option_type.name %></td>
+          <td class="presentation"><%= option_type.presentation %></td>
+          <td><%= active_badge(option_type.filterable) %></td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) if can?(:edit, option_type) %>
+            <%= link_to_delete(option_type, no_text: true) if can?(:delete, option_type) %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::OptionType)) %>,

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

@@ -9,7 +9,7 @@
   <div class="card-body">
     <div data-hook="add_product_name" class="form-group">
       <%= label_tag :add_line_item_variant_id, Spree.t(:name_or_sku) %>
-      <%= hidden_field_tag :add_line_item_variant_id, "", class: "variant_autocomplete d-block w-100" %>
+      <%= select_tag 'add_line_item_variant_id', nil , class: 'variant_autocomplete d-block w-100' %>
     </div>
 
     <div id="stock_details"></div>

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

@@ -10,7 +10,7 @@
   <div class="card-body">
     <div data-hook="add_product_name">
       <%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
-      <%= hidden_field_tag :add_variant_id, "", class: "variant_autocomplete d-block w-100" %>
+      <%= select_tag 'variants', nil, id: :add_variant_id, class: 'variant_autocomplete d-block w-100' %>
     </div>
 
     <div id="stock_details"></div>

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

@@ -5,32 +5,32 @@
         <%= title %>
       </h1>
     </div>
-
-    <table class="table table-bordered">
-      <thead>
-        <tr>
-          <th><%= Spree.t('name')%></th>
-          <th><%= Spree.t('amount')%></th>
-        </tr>
-      </thead>
-      <tbody id="order-charges" data-hook="order_details_adjustments">
-        <% adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
-          <tr class="total">
-            <td>
-              <strong><%= label %>:</strong>
-            </td>
-            <td class="total">
-              <span>
-                <%= Spree::Money.new(
-                  adjustments.sum(&:amount),
-                  currency: adjustments.first.order.try(:currency)
-                ) %>
-              </span>
-            </td>
+    <div class="table-responsive">
+      <table class="table table-bordered">
+        <thead>
+          <tr>
+            <th><%= Spree.t('name')%></th>
+            <th><%= Spree.t('amount')%></th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-
+        </thead>
+        <tbody id="order-charges" data-hook="order_details_adjustments">
+          <% adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
+            <tr class="total">
+              <td>
+                <strong><%= label %>:</strong>
+              </td>
+              <td class="total">
+                <span>
+                  <%= Spree::Money.new(
+                    adjustments.sum(&:amount),
+                    currency: adjustments.first.order.try(:currency)
+                  ) %>
+                </span>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
   </div>
 <% end %>

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

@@ -0,0 +1,18 @@
+<div data-hook="channel-form-container">
+  <%= form_for [:admin, order], method: :put, url: set_channel_admin_order_url do |f| %>
+    <fieldset>
+    <div data-hook="admin_order_channel_field">
+      <%= f.field_container :channel, class: %w[form-group] do %>
+        <%= f.label :channel, Spree.t(:channel) %>
+        <%= f.text_field :channel, name: 'channel', class: 'form-control' %>
+        <%= f.error_message_on :channel %>
+      <% end %>
+    </div>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t('actions.update'), 'refresh', 'submit', { class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= button_link_to Spree.t('actions.cancel'), edit_admin_order_url(order), icon: 'delete' %>
+    </div>
+    <fieldset>
+  <% end %>
+</div>

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

@@ -28,19 +28,19 @@
                 <%= "(#{item.options_text})" if item.options_text.present? %>
               </td>
               <td class="line-item-price text-center"><%= item.single_money.to_html %></td>
-              <td class="line-item-qty-show text-center">
+              <td class="line-item-qty-show text-center" style="width:120px;">
                 <%= item.quantity %>
               </td>
-              <td class="line-item-qty-edit is-hidden">
+              <td class="line-item-qty-edit is-hidden" style="width:120px;">
                 <%= number_field_tag :quantity, item.quantity, min: 0, class: "line_item_quantity form-control", size: 5 %>
               </td>
               <td class="line-item-total text-center"><%= line_item_shipment_price(item, item.quantity) %></td>
-              <td class="cart-line-item-delete actions actions-4 text-center" data-hook="cart_line_item_delete">
+              <td class="cart-line-item-delete actions actions-4 text-center no-wrap" data-hook="cart_line_item_delete">
                 <% if can? :update, item %>
-                  <%= link_to_with_icon 'arrow-left', Spree.t('actions.cancel'), "#", class: 'cancel-line-item btn btn-outline-secondary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
-                  <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-line-item btn btn-success btn-sm', no_text: true, data: { :'line-item-id' => item.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none' %>
-                  <%= link_to_with_icon 'edit', Spree.t('edit'), "#", class: 'edit-line-item btn btn-primary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
-                  <%= link_to_with_icon 'delete', Spree.t('delete'), "#", class: 'delete-line-item btn btn-danger btn-sm', data: { 'line-item-id' => item.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
+                  <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-line-item btn btn-outline-secondary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
+                  <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-line-item btn btn-success btn-sm', no_text: true, data: { :'line-item-id' => item.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none' %>
+                  <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "#", class: 'edit-line-item btn btn-outline-secondary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
+                  <%= link_to_with_icon 'delete.svg', Spree.t('delete'), "#", class: 'delete-line-item btn btn-danger btn-sm', data: { 'line-item-id' => item.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
                 <% end %>
               </td>
             </tr>

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

@@ -6,7 +6,7 @@
     <%= button_link_to Spree.t(:resend, scope: 'admin.order.events', default: Spree.t(:resend)),
           resend_admin_order_url(order),
           method: :post,
-          icon: 'envelope'
+          icon: 'envelope.svg'
     %>
   <% end %>
 <% end %>

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

@@ -1,47 +1,49 @@
 <fieldset id="risk_analysis">
   <legend><%= "#{Spree.t(:risk_analysis)}: #{Spree.t(:not) unless @order.is_risky?} #{Spree.t(:risky)}" %></legend>
-  <table class="table table-condensed table-bordered">
-    <thead>
-      <th><%= Spree.t('risk')%></th>
-      <th><%= Spree.t('status')%></th>
-    </thead>
-    <tbody id="risk-analysis" data-hook="order_details_adjustments"  class="with-border">
-      <tr class="">
-        <td>
-          <strong><%= Spree.t(:failed_payment_attempts) %>:</strong>
-        </td>
-        <td>
-          <span class="badge badge-<%= @order.payments.failed.size > 0 ? 'void' : 'complete' %>">
-            <%= link_to "#{Spree.t 'payments_count', count: @order.payments.failed.size, default: pluralize(@order.payments.failed.size, Spree.t(:payment))}", spree.admin_order_payments_path(@order) %>
-          </span>
-        </td>
-      </tr>
+  <div class="table-responsive">
+    <table class="table table-condensed table-bordered">
+      <thead>
+        <th><%= Spree.t('risk')%></th>
+        <th><%= Spree.t('status')%></th>
+      </thead>
+      <tbody id="risk-analysis" data-hook="order_details_adjustments"  class="with-border">
+        <tr class="">
+          <td>
+            <strong><%= Spree.t(:failed_payment_attempts) %>:</strong>
+          </td>
+          <td>
+            <span class="badge badge-<%= @order.payments.failed.size > 0 ? 'void' : 'complete' %>">
+              <%= link_to "#{Spree.t 'payments_count', count: @order.payments.failed.size, default: pluralize(@order.payments.failed.size, Spree.t(:payment))}", spree.admin_order_payments_path(@order) %>
+            </span>
+          </td>
+        </tr>
 
-      <tr>
-        <td><strong><%= Spree.t(:avs_response) %>:</strong></td>
-        <td>
-          <span class="badge badge-<%= latest_payment.is_avs_risky? ? 'void' : 'complete' %>">
-            <% if latest_payment.is_avs_risky? %>
-              <%= "#{Spree.t(:error)}: #{avs_response_code[latest_payment.avs_response]}" %>
-            <% else %>
-              <%= Spree.t(:success) %>
-            <% end %>
-          </span>
-        </td>
-      </tr>
+        <tr>
+          <td><strong><%= Spree.t(:avs_response) %>:</strong></td>
+          <td>
+            <span class="badge badge-<%= latest_payment.is_avs_risky? ? 'void' : 'complete' %>">
+              <% if latest_payment.is_avs_risky? %>
+                <%= "#{Spree.t(:error)}: #{avs_response_code[latest_payment.avs_response]}" %>
+              <% else %>
+                <%= Spree.t(:success) %>
+              <% end %>
+            </span>
+          </td>
+        </tr>
 
-      <tr>
-        <td><strong><%= Spree.t(:cvv_response) %>:</strong></td>
-        <td>
-          <span class="badge badge-<%= latest_payment.is_cvv_risky? ? 'void' : 'complete' %>">
-            <% if latest_payment.is_cvv_risky? %>
-              <%= "#{Spree.t(:error)}: #{cvv_response_code[latest_payment.cvv_response_code]}" %>
-            <% else %>
-              <%= Spree.t(:success) %>
-            <% end %>
-          </span>
-        </td>
-      </tr>
-    </tbody>
-  </table>
+        <tr>
+          <td><strong><%= Spree.t(:cvv_response) %>:</strong></td>
+          <td>
+            <span class="badge badge-<%= latest_payment.is_cvv_risky? ? 'void' : 'complete' %>">
+              <% if latest_payment.is_cvv_risky? %>
+                <%= "#{Spree.t(:error)}: #{cvv_response_code[latest_payment.cvv_response_code]}" %>
+              <% else %>
+                <%= Spree.t(:success) %>
+              <% end %>
+            </span>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </fieldset>