solidus_backend 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 167281f642dc52cabba45304f1ec89744ea6583885fc53783303a88d949d83e6
-  data.tar.gz: 1a49a77a9e9c3dedbe2fedbfb5877a61c5fade7e435df5a28b88755bcf8cb6ed
+  metadata.gz: a8bfc5033e09dc3332e9851c3b6e2e1b3744ab88caa25a9bc6bb17491826f8e5
+  data.tar.gz: 133c9020003cfb7608879df10ae659232397be9625071f8ee4dd5e4ab38d2d4f
 SHA512:
-  metadata.gz: 4715eaba5c97daa199678e78498cb606bf1ce3cfaffe9b209c0dd388175454d91f9c46666c5143dff8244342fc1aa1061dbe18b202482c1e1a8e9531263fbb21
-  data.tar.gz: 5f9bd79cd6ce2c349bbe553889d00ba0fdf0dc3fd06961e8f72cc9ff208db8a427eaac33d038b774d840d074cd34300faef41f46558f101b7179fd354014a0df
+  metadata.gz: 8b43fe61f409ed7243b52a3f1e6d2a3268a4c255e542179b82408dcc1855105ec6afc2a87e0c95da1b079c97579c90a971b3c0a9cc8e7751502c380098146751
+  data.tar.gz: 2edd986c1cf4fb91f3cd2feef82d9a84f9b8b8171297d8f9b45f3de9a47fd48231e625137cf1e05bae34c85cfd7b1fb85e589aee0008b7a02191d57f56d631c7

data/app/assets/javascripts/spree/backend/datepicker.js

@@ -11,7 +11,8 @@ Spree.ready(function(){
   });
 
   $('.datepicker').flatpickr({
-    allowInput: true
+    allowInput: true,
+    dateFormat: Spree.t('date_picker.js_format')
   });
 
   // Handle range dates

data/app/assets/javascripts/spree/backend/navigation.js

@@ -3,11 +3,21 @@ Spree.ready(function() {
     return $('.admin-nav-header').outerHeight() + $('.admin-nav-menu').outerHeight() + $('.admin-nav-footer').outerHeight();
   };
 
-  var checkSideBarFit = function() {
-    $('.admin-nav').toggleClass('fits', navHeight() < $(window).height());
+  var initStickyNavbar = function() {
+    $(".admin-nav-sticky, .admin-nav").stick_in_parent();
+  };
+
+  var detachStickyNavbar = function() {
+    $(".admin-nav-sticky, .admin-nav").trigger("sticky_kit:detach");
   };
 
-  $(".admin-nav-sticky, .admin-nav").stick_in_parent();
+  var checkSideBarFit = function() {
+    var fits = navHeight() < $(window).height();
+
+    $('.admin-nav').toggleClass('fits', fits);
+
+    fits ? initStickyNavbar() : detachStickyNavbar();
+  };
 
   checkSideBarFit();
   $(window).on('resize', checkSideBarFit);

data/app/assets/javascripts/spree/backend/shipments.js

@@ -53,7 +53,7 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
         json = response.responseJSON;
         message = json.error;
         for (error in json.errors) {
-          message += '<br />' + json.errors[error].join();
+          message += '<br>' + json.errors[error].join();
         }
         window.show_flash('error', message);
       }

data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs

@@ -9,7 +9,7 @@
   <td class="line-item-name">
     {{ line_item.variant.name }}<br>
     {{#if line_item.variant.options_text }}
-      {{ line_item.variant.options_text }}<br/>
+      {{ line_item.variant.options_text }}<br>
     {{/if}}
     <strong>{{ t "sku" }}:</strong> {{ line_item.variant.sku }}
   </td>

data/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs

@@ -1,8 +1,8 @@
 <fieldset>
   <table class="stock-levels" data-hook="stock-levels">
     <colgroup>
-      <col style="width: 50%;" />
-      <col style="width: 50%;" />
+      <col style="width: 50%;">
+      <col style="width: 50%;">
     </colgroup>
     <thead>
       <th>{{ t "name" }}</th>

data/app/controllers/spree/admin/orders_controller.rb

@@ -10,6 +10,10 @@ module Spree
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
       respond_to :html
 
+      def show
+        redirect_to action: :edit
+      end
+
       def index
         params[:q] ||= {}
         params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]

data/app/controllers/spree/admin/payments_controller.rb

@@ -11,6 +11,8 @@ module Spree
       before_action :load_data
       before_action :require_bill_address, only: [:index]
 
+      helper ::Spree::Admin::OrdersHelper
+
       respond_to :html
 
       def index

data/app/controllers/spree/admin/resource_controller.rb

@@ -82,7 +82,9 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       records = model_class.where(id: positions.keys).to_a
 
       positions.each do |id, index|
-        records.find { |r| r.id == id.to_i }&.set_list_position(index)
+        # To permit the use of UUID as id, we compare models id in database
+        # and in params under the string representation instead of integer
+        records.find { |r| r.id.to_s == id }&.set_list_position(index)
       end
     end
 

data/app/helpers/spree/admin/adjustments_helper.rb

@@ -27,7 +27,7 @@ module Spree
         parts << variant.product.name
         parts << "(#{variant.options_text})" if variant.options_text.present?
         parts << line_item.display_amount
-        safe_join(parts, "<br />".html_safe)
+        safe_join(parts, "<br>".html_safe)
       end
 
       def display_shipment(shipment)
@@ -35,7 +35,7 @@ module Spree
           "#{t('spree.shipment')} ##{shipment.number}",
           shipment.display_cost
         ]
-        safe_join(parts, "<br />".html_safe)
+        safe_join(parts, "<br>".html_safe)
       end
 
       def display_order(_order)

data/app/helpers/spree/admin/base_helper.rb

@@ -17,7 +17,7 @@ module Spree
         obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")
 
         if obj && obj.errors[method].present?
-          errors = safe_join(obj.errors[method], "<br />".html_safe)
+          errors = safe_join(obj.errors[method], "<br>".html_safe)
           content_tag(:span, errors, class: 'formError')
         else
           ''

data/app/helpers/spree/admin/orders_helper.rb

@@ -4,10 +4,13 @@ module Spree
   module Admin
     module OrdersHelper
       # Renders all the extension partials that may have been specified in the extensions
+      #
+      # @return [ActiveSupport::SafeBuffer] the string returned is already html-safe
       def event_links
         links = []
         @order_events.sort.each do |event|
           next unless @order.send("can_#{event}?")
+
           translated_event = t(event, scope: [:spree, :admin, :order, :events])
           links << button_to(
             translated_event,
@@ -19,10 +22,18 @@ module Spree
         safe_join(links, "&nbsp;".html_safe)
       end
 
+      # @deprecated use `Spree::LineItem#display_amount` instead
       def line_item_shipment_price(line_item, quantity)
         Spree::Money.new(line_item.price * quantity, { currency: line_item.currency })
       end
+      deprecate deprecator: Spree::Deprecation,
+        line_item_shipment_price: "use Spree::LineItem#display_amount instead"
 
+      # Addresss Verification System response code
+      #
+      # @see https://en.wikipedia.org/wiki/Address_verification_service
+      #
+      # @return [Hash] codes as keys, descriptions as values
       def avs_response_code
         {
           "A" => "Street address matches, but 5-digit and 9-digit postal code do not match.",
@@ -54,6 +65,13 @@ module Spree
         }
       end
 
+      # Addresss Verification System response code
+      #
+      # @see https://developer.visa.com/request_response_codes#card_verification2_results
+      # @see https://developer.paypal.com/api/nvp-soap/AVSResponseCodes/#cvv2-error-response-codes
+      # @see https://www.checkout.com/docs/resources/codes/cvv-response-codes
+      #
+      # @return [Hash] codes as keys, descriptions as values
       def cvv_response_code
         {
           "M" => "CVV2 Match",

data/app/helpers/spree/admin/stock_movements_helper.rb

@@ -23,7 +23,7 @@ module Spree
         variant = stock_movement.stock_item.variant
         output = [variant.name]
         output << variant.options_text unless variant.options_text.blank?
-        safe_join(output, "<br />".html_safe)
+        safe_join(output, "<br>".html_safe)
       end
     end
   end

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

@@ -17,9 +17,9 @@
 <% if @adjustment_reasons.any? %>
   <table class="index" id='listing_adjustment_reasons'>
     <colgroup>
-      <col style="width: 65%" />
-      <col style="width: 20%" />
-      <col style="width: 15%" />
+      <col style="width: 65%">
+      <col style="width: 20%">
+      <col style="width: 15%">
     </colgroup>
     <thead>
       <tr data-hook="adjustment_reasons_header">

data/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb

@@ -1,12 +1,12 @@
 <div data-hook="admin_adjustment_reason_form_fields" class="row">
   <div class="col-3">
     <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
+      <%= f.label :name, class: 'required' %><br>
       <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :code do %>
-      <%= f.label :code, class: 'required' %><br />
+      <%= f.label :code, class: 'required' %><br>
       <%= f.text_field :code, class: 'fullwidth' %>
     <% end %>
 

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

@@ -19,7 +19,7 @@
 
     <div class="col-3">
       <%= f.field_container :label do %>
-        <%= f.label :adjustment_reason_id %><br/>
+        <%= f.label :adjustment_reason_id %><br>
         <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => t('spree.select_a_reason'), class: 'custom-select fullwidth'}) %>
       <% end %>
     </div>

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

@@ -18,6 +18,6 @@
     <%= button_tag t('spree.add_coupon_code'), id: "add_coupon_code", class: 'btn btn-primary' %>
   </div>
 <% end %>
-<%= javascript_tag do -%>
+<script>
   var order_number = '<%= @order.number %>';
-<% end -%>
+</script>

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

@@ -3,7 +3,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_path(@order)) %>
 <% admin_breadcrumb(t('spree.new_adjustment')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 

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

@@ -4,12 +4,12 @@
 
 <table class="stock-contents index">
   <colgroup>
-    <col style="width: 10%;" />
-    <col style="width: 35%;" />
-    <col style="width: 10%;" />
-    <col style="width: 15%;" />
-    <col style="width: 20%;" />
-    <col style="width: 10%;" />
+    <col style="width: 10%;">
+    <col style="width: 35%;">
+    <col style="width: 10%;">
+    <col style="width: 15%;">
+    <col style="width: 20%;">
+    <col style="width: 10%;">
   </colgroup>
 
   <thead>

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

@@ -8,7 +8,7 @@
       <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
       <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:acceptance_status_errors) %></th>
       <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:reception_status) %></th>
-      <% unless return_items.all?(&:received?)%>
+      <% unless return_items.all?(&:received?) %>
         <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:item_received?) %></th>
       <% end %>
       <% if show_decision %>

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

@@ -3,7 +3,6 @@
 <% 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 %>
 

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

@@ -1,5 +1,4 @@
 <tr id="<%= spree_dom_id image %>" data-hook="images_row">
-
   <td>
     <% if can?(:update_positions, Spree::Image) %>
       <span class="handle"></span>
@@ -28,7 +27,7 @@
         <%= f.select :viewable_id, options_for_select(@variants, image.viewable_id), {}, class: 'select2 fullwidth', autocomplete: "off" %>
       <% end %>
     </td>
-  <% end # @product.has_variants? %>
+  <% end %>
 
   <td>
     <%= fields_for image do |f| %>

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

@@ -5,7 +5,6 @@
 <% 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 %>

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

@@ -2,7 +2,6 @@
 
 <% admin_breadcrumb(plural_resource_name(Spree::Image)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Image) %>
     <li>

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

@@ -1,7 +1,7 @@
 <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.label :name, class: 'required' %><br>
       <%= f.text_field :name, class: "fullwidth" %>
       <%= f.error_message_on :name %>
     <% end %>
@@ -9,7 +9,7 @@
 
   <div class="col-6">
     <%= f.field_container :presentation do %>
-      <%= f.label :presentation, class: 'required' %><br />
+      <%= f.label :presentation, class: 'required' %><br>
       <%= f.text_field :presentation, class: "fullwidth" %>
       <%= f.error_message_on :presentation %>
     <% end %>

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

@@ -1,4 +1,4 @@
-<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value">
+<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>" data-hook="option_value">
   <td>
     <% if f.object.persisted? %>
       <span class="handle"></span>

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

@@ -2,7 +2,6 @@
 <% 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>

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

@@ -1,7 +1,6 @@
 <% 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">

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

@@ -3,8 +3,8 @@
   <table>
     <thead>
       <tr>
-        <th><%= Spree::Adjustment.human_attribute_name(:name)%></th>
-        <th><%= Spree::Adjustment.human_attribute_name(:amount)%></th>
+        <th><%= Spree::Adjustment.human_attribute_name(:name) %></th>
+        <th><%= Spree::Adjustment.human_attribute_name(:amount) %></th>
       </tr>
     </thead>
     <tbody data-hook="order_details_adjustments">

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

@@ -12,11 +12,11 @@
 
   <table class="stock-contents carton index" data-hook="stock-contents">
     <colgroup>
-      <col style="width: 10%;" />
-      <col style="width: 45%;" />
-      <col style="width: 15%;" />
-      <col style="width: 15%;" />
-      <col style="width: 15%;" />
+      <col style="width: 10%;">
+      <col style="width: 45%;">
+      <col style="width: 15%;">
+      <col style="width: 15%;">
+      <col style="width: 15%;">
     </colgroup>
 
     <thead>

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

@@ -18,6 +18,6 @@
           <%= count %> x <%= t(state, scope: 'spree.inventory_states') %>
         <% end %>
     </td>
-    <td class="item-total"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
+    <td class="item-total"><%= item.line_item.display_amount %></td>
   </tr>
 <% end %>

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

@@ -8,12 +8,12 @@
 
   <%= render "spree/admin/orders/order_details", { order: order } %>
 
-  <%= javascript_tag do -%>
+  <script>
     var order_number = '<%= @order.number %>';
     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 %>);
     <% end %>
-  <% end -%>
+  </script>
 </div>

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

@@ -1,11 +1,11 @@
 <table class="line-items index" data-hook="line-items">
   <colgroup>
-    <col style="width: 10%;" />
-    <col style="width: 45%;" />
-    <col style="width: 10%;" />
-    <col style="width: 10%;" />
-    <col style="width: 10%;" />
-    <col style="width: 15%;" />
+    <col style="width: 10%;">
+    <col style="width: 45%;">
+    <col style="width: 10%;">
+    <col style="width: 10%;">
+    <col style="width: 10%;">
+    <col style="width: 15%;">
   </colgroup>
 
   <thead>

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

@@ -1,50 +1,26 @@
-<fieldset class="no-border-bottom" id="risk_analysis">
-  <legend><%= "#{t('spree.risk_analysis')}: #{t('spree.not') unless @order.is_risky?} #{t('spree.risky')}" %></legend>
+<details id="risk_analysis">
+  <summary><%= t('spree.risk_analysis') %>: <%= t('spree.risky') %></summary>
+
   <table>
     <thead>
-      <th><%= t('spree.risk')%></th>
-      <th><%= t('spree.status')%></th>
+      <th><%= t('spree.payment') %></th>
+      <th><%= t('spree.risk') %></th>
+      <th><%= t('spree.status') %></th>
     </thead>
     <tbody id="risk-analysis" data-hook="order_details_adjustments"  class="with-border">
-      <tr class="">
-        <td><strong>
-          <%= t('spree.failed_payment_attempts') %>:
-        </strong></td>
-        <td>
-          <span class="pill pill-<%= @order.payments.failed.count > 0 ? 'warning' : 'complete' %>">
-            <%= t(
-              'spree.payments_failed_count',
-              count: @order.payments.failed.count
-            ) %>
-          </span>
-        </td>
-      </tr>
-
-      <tr>
-        <td><strong><%= t('spree.avs_response') %>:</strong></td>
-        <td>
-          <span class="pill pill-<%= latest_payment.is_avs_risky? ? 'warning' : 'complete' %>">
-            <% if latest_payment.is_avs_risky? %>
-              <%= avs_response_code[latest_payment.avs_response] %>
-            <% else %>
-              <%= t('spree.success') %>
-            <% end %>
-          </span>
-        </td>
-      </tr>
-
-      <tr>
-        <td><strong><%= t('spree.cvv_response') %>:</strong></td>
-        <td>
-          <span class="pill pill-<%= latest_payment.is_cvv_risky? ? 'warning' : 'complete' %>">
-            <% if latest_payment.is_cvv_risky? %>
-              <%= cvv_response_code[latest_payment.cvv_response_code] %>
-            <% else %>
-              <%= t('spree.success') %>
-            <% end %>
-          </span>
-        </td>
-      </tr>
+      <% order.payments.risky.each do |payment| %>
+        <tr class="">
+          <td><%= link_to payment.number, admin_order_payment_path(order, payment) %></td>
+          <td>
+            <span class="pill pill-warning"><%= t('spree.risky') %></span>
+          </td>
+          <td>
+            <span class="pill pill-<%= payment.state %>">
+              <%= t(payment.state, scope: 'spree.payment_states') %>
+            </span>
+          </td>
+        </tr>
+      <% end %>
     </tbody>
   </table>
-</fieldset>
+</details>

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

@@ -27,12 +27,12 @@
 
   <table class="stock-contents shipment index" data-hook="stock-contents">
     <colgroup>
-      <col style="width: 17.5%;" />
-      <col style="width: 30%;" />
-      <col style="width: 12.5%;" />
-      <col style="width: 15%;" />
-      <col style="width: 15%;" />
-      <col style="width: 10%;" />
+      <col style="width: 17.5%;">
+      <col style="width: 30%;">
+      <col style="width: 12.5%;">
+      <col style="width: 15%;">
+      <col style="width: 15%;">
+      <col style="width: 10%;">
     </colgroup>
 
     <thead>

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

@@ -20,7 +20,7 @@
           <%= count %> x <%= t(state, scope: 'spree.inventory_states') %>
         <% end %>
     </td>
-    <td class="item-total"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
+    <td class="item-total"><%= item.line_item.display_amount %></td>
 
     <td class="cart-item-delete actions" data-hook="cart_item_delete">
       <% if can? :update, item %>

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

@@ -11,13 +11,12 @@
 
 <% admin_breadcrumb(t('spree.cart')) %>
 
-
 <div data-hook="admin_order_edit_header">
   <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 </div>
 
-<% if @order.payments.exists? && @order.is_risky? %>
-    <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.reorder("created_at DESC").first %>
+<% if @order.is_risky? %>
+  <%= render 'spree/admin/orders/risk_analysis', order: @order %>
 <% end %>
 
 <div data-hook="admin_order_edit_form">

data/app/views/spree/admin/orders/confirm/_customer_details.html.erb

@@ -1,6 +1,6 @@
 <fieldset class="no-border-bottom" data-hook="customer_details_total">
   <legend><%= t('spree.customer') %></legend>
-  <div class="customer"><%= order.user.try(:email) %></div><br/>
+  <div class="customer"><%= order.user.try(:email) %></div><br>
 </fieldset>
 
 <fieldset class="no-border-bottom no-border-top">

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

@@ -25,7 +25,7 @@
             <%= item.quantity %>
           </td>
           <td class="line-item-total">
-            <%= line_item_shipment_price(item, item.quantity) %>
+            <%= item.display_amount %>
           </td>
         </tr>
       <% end %>

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

@@ -17,6 +17,6 @@
           <%= count %> x <%= t(state, scope: 'spree.inventory_states') %>
         <% end %>
     </td>
-    <td class="item-total"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
+    <td class="item-total"><%= item.line_item.display_amount %></td>
   </tr>
 <% end %>

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

@@ -2,7 +2,6 @@
 
 <% admin_breadcrumb(t('spree.confirm_order')) %>
 
-
 <%= render partial: 'spree/admin/orders/confirm/customer_details', locals: {order: @order} %>
 
 <% if Spree::Order.checkout_step_names.include?(:delivery) %>

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

@@ -2,9 +2,8 @@
 
 <% admin_breadcrumb(t('spree.confirm_order')) %>
 
-
 <div class="form-buttons filter-actions actions" data-hook="complete-order-button">
-  <div><%= t('spree.order_please_refresh') %></div><br/>
+  <div><%= t('spree.order_please_refresh') %></div><br>
   <%= button_to [:advance, :admin, @order], { class: 'button', method: 'put' } do %>
     <%= t('spree.order_refresh_totals') %>
   <% end %>

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

@@ -2,7 +2,6 @@
 
 <% admin_breadcrumb(t('spree.customer_details')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>