spree_backend 4.1.15 → 4.2.0.beta

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

@@ -4,38 +4,40 @@
 
 <% 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 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 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/_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/_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>

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

@@ -43,8 +43,8 @@
             </td>
             <td class="actions text-center">
               <% if can? :update, shipment %>
-                <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
-                <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+                <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-outline-secondary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+                <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
               <% end %>
             </td>
           </tr>
@@ -64,7 +64,7 @@
 
             <td class="actions text-center">
               <% if( (can? :update, shipment) and !shipment.shipped?) %>
-                <%= link_to_with_icon 'edit', Spree.t('edit'), "javascript:;", class: 'edit-method with-tip btn btn-sm btn-primary', data: {action: 'edit'}, no_text: true %>
+                <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "javascript:;", class: 'edit-method with-tip btn btn-sm btn-outline-secondary', data: {action: 'edit'}, no_text: true %>
               <% end %>
             </td>
           </tr>
@@ -77,8 +77,8 @@
           </td>
           <td class="actions text-center">
             <% if can? :update, shipment %>
-              <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
-              <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+              <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-outline-secondary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+              <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
             <% end %>
           </td>
         </tr>
@@ -101,7 +101,7 @@
           </td>
           <td class="actions text-center">
             <% if can? :update, shipment %>
-              <%= link_to_with_icon 'edit', Spree.t('edit'), "#", class: 'edit-tracking btn btn-primary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
+              <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "#", class: 'edit-tracking btn btn-outline-secondary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
             <% end %>
           </td>
         </tr>

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

@@ -33,11 +33,11 @@
 
     <td class="cart-item-delete actions actions-3 text-center" data-hook="cart_item_delete">
       <% if((!shipment.shipped?) && can?(:update, item.line_item)) %>
-        <%= link_to_with_icon 'pencil', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-outline-secondary btn-sm', title: Spree.t('actions.edit'), no_text: true %>
-        <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-item  btn btn-primary btn-sm', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
-        <%= link_to_with_icon 'ok', Spree.t('actions.save'), "#", class: 'save-item btn btn-success btn-sm', data: {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none', no_text: true %>
-        <%= link_to_with_icon 'split', Spree.t('split'), "#", class: 'split-item btn btn-primary btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>
-        <%= link_to_with_icon 'delete', Spree.t('delete'), "#", class: 'delete-item btn btn-danger btn-sm', data: { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
+        <%= link_to_with_icon 'edit.svg', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-outline-secondary btn-sm', title: Spree.t('actions.edit'), no_text: true %>
+        <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-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-item btn btn-success btn-sm', data: {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none', no_text: true %>
+        <%= link_to_with_icon 'split.svg', Spree.t('split'), "#", class: 'split-item btn btn-outline-secondary btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>
+        <%= link_to_with_icon 'delete.svg', Spree.t('delete'), "#", class: 'delete-item btn btn-danger btn-sm', data: { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
       <% end %>
     </td>
   </tr>

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

@@ -9,10 +9,10 @@
       <% 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) }..." }} %>
+      <%= button Spree.t('actions.update'), 'recycle.svg', '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' %>
+      <%= button_link_to Spree.t('actions.cancel'), edit_admin_order_url(order), icon: 'cancel.svg' %>
     </div>
     <fieldset>
   <% end %>
-</div>
+</div>

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

@@ -100,7 +100,7 @@
 
   <% if can? :edit, @order.user %>
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'save' %>
+      <%= button Spree.t('actions.update'), 'save.svg' %>
     </div>
   <% end %>
 </div>