spree_backend 3.3.6 → 3.4.0.rc1

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

@@ -19,53 +19,49 @@ module Spree
         options = { label: args.first.to_s }
 
         # Return if resource is found and user is not allowed to :admin
-        return '' if klass = klass_for(options[:label]) and cannot?(:admin, klass)
+        return '' if (klass = klass_for(options[:label])) && cannot?(:admin, klass)
 
-        if args.last.is_a?(Hash)
-          options = options.merge(args.pop)
-        end
-        options[:route] ||=  "admin_#{args.first}"
+        options = options.merge(args.pop) if args.last.is_a?(Hash)
+        options[:route] ||= "admin_#{args.first}"
 
         destination_url = options[:url] || spree.send("#{options[:route]}_path")
         titleized_label = Spree.t(options[:label], default: options[:label], scope: [:admin, :tab]).titleize
 
         css_classes = ['sidebar-menu-item']
 
-        if options[:icon]
-          link = link_to_with_icon(options[:icon], titleized_label, destination_url)
-        else
-          link = link_to(titleized_label, destination_url)
-        end
+        link = if options[:icon]
+                 link_to_with_icon(options[:icon], titleized_label, destination_url)
+               else
+                 link_to(titleized_label, destination_url)
+               end
 
         selected = if options[:match_path].is_a? Regexp
-          request.fullpath =~ options[:match_path]
-        elsif options[:match_path]
-          request.fullpath.starts_with?("#{spree.admin_path}#{options[:match_path]}")
-        else
-          args.include?(controller.controller_name.to_sym)
+                     request.fullpath =~ options[:match_path]
+                   elsif options[:match_path]
+                     request.fullpath.starts_with?("#{spree.admin_path}#{options[:match_path]}")
+                   else
+                     args.include?(controller.controller_name.to_sym)
         end
         css_classes << 'selected' if selected
 
-        if options[:css_class]
-          css_classes << options[:css_class]
-        end
+        css_classes << options[:css_class] if options[:css_class]
         content_tag('li', link, class: css_classes.join(' '))
       end
 
       # Single main menu item
-      def main_menu_item text, url: nil, icon: nil
-        link_to url, :'data-toggle' => "collapse", :'data-parent' => '#sidebar' do
+      def main_menu_item(text, url: nil, icon: nil)
+        link_to url, 'data-toggle': 'collapse', 'data-parent': '#sidebar' do
           content_tag(:span, nil, class: "icon icon-#{icon}") +
-          content_tag(:span, " #{text}", class: 'text') +
-          content_tag(:span, nil, class: "icon icon-chevron-left pull-right")
+            content_tag(:span, " #{text}", class: 'text') +
+            content_tag(:span, nil, class: 'icon icon-chevron-left pull-right')
         end
       end
 
       # Main menu tree menu
-      def main_menu_tree text, icon: nil, sub_menu: nil, url: '#'
+      def main_menu_tree(text, icon: nil, sub_menu: nil, url: '#')
         content_tag :li, class: 'sidebar-menu-item' do
           main_menu_item(text, url: url, icon: icon) +
-          render(partial: "spree/admin/shared/sub_menu/#{sub_menu}")
+            render(partial: "spree/admin/shared/sub_menu/#{sub_menu}")
         end
       end
 
@@ -110,36 +106,34 @@ module Spree
       def klass_for(name)
         model_name = name.to_s
 
-        ["Spree::#{model_name.classify}", model_name.classify, model_name.gsub('_', '/').classify].find do |t|
-          t.safe_constantize
-        end.try(:safe_constantize)
+        ["Spree::#{model_name.classify}", model_name.classify, model_name.tr('_', '/').classify].find(&:safe_constantize).try(:safe_constantize)
       end
 
-      def link_to_clone(resource, options={})
-        options[:data] = { action: 'clone', :'original-title' => Spree.t(:clone) }
-        options[:class] = "btn btn-primary btn-sm with-tip"
+      def link_to_clone(resource, options = {})
+        options[:data] = { action: 'clone', 'original-title': Spree.t(:clone) }
+        options[:class] = 'btn btn-primary btn-sm with-tip'
         options[:method] = :post
         options[:icon] = :clone
         button_link_to '', clone_object_url(resource), options
       end
 
-      def link_to_edit(resource, options={})
+      def link_to_edit(resource, options = {})
         url = options[:url] || edit_object_url(resource)
         options[:data] = { action: 'edit' }
-        options[:class] = "btn btn-primary btn-sm"
+        options[:class] = 'btn btn-primary btn-sm'
         link_to_with_icon('edit', Spree.t(:edit), url, options)
       end
 
-      def link_to_edit_url(url, options={})
+      def link_to_edit_url(url, options = {})
         options[:data] = { action: 'edit' }
-        options[:class] = "btn btn-primary btn-sm"
+        options[:class] = 'btn btn-primary btn-sm'
         link_to_with_icon('edit', Spree.t(:edit), url, options)
       end
 
-      def link_to_delete(resource, options={})
+      def link_to_delete(resource, options = {})
         url = options[:url] || object_url(resource)
         name = options[:name] || Spree.t(:delete)
-        options[:class] = "btn btn-danger btn-sm delete-resource"
+        options[:class] = 'btn btn-danger btn-sm delete-resource'
         options[:data] = { confirm: Spree.t(:are_you_sure), action: 'remove' }
         link_to_with_icon 'delete', name, url, options
       end
@@ -161,19 +155,19 @@ module Spree
         icon_name ? content_tag(:i, '', class: icon_name) : ''
       end
 
-      #Override: Add disable_with option to prevent multiple request on consecutive clicks
-      def button(text, icon_name = nil, button_type = 'submit', options={})
+      # Override: Add disable_with option to prevent multiple request on consecutive clicks
+      def button(text, icon_name = nil, button_type = 'submit', options = {})
         if icon_name
           icon = content_tag(:span, '', class: "icon icon-#{icon_name}")
           text.insert(0, icon + ' ')
         end
-        button_tag(text.html_safe, options.merge(type: button_type, class: "btn btn-primary #{options[:class]}", 'data-disable-with' => "#{ Spree.t(:saving) }..."))
+        button_tag(text.html_safe, options.merge(type: button_type, class: "btn btn-primary #{options[:class]}", 'data-disable-with' => "#{Spree.t(:saving)}..."))
       end
 
       def button_link_to(text, url, html_options = {})
-        if (html_options[:method] &&
-            html_options[:method].to_s.downcase != 'get' &&
-            !html_options[:remote])
+        if html_options[:method] &&
+            !html_options[:method].to_s.casecmp('get').zero? &&
+            !html_options[:remote]
           form_tag(url, method: html_options.delete(:method), class: 'display-inline') do
             button(text, html_options.delete(:icon), nil, html_options)
           end
@@ -185,7 +179,7 @@ module Spree
 
           html_options.delete('data-update') unless html_options['data-update']
 
-          html_options[:class]  = html_options[:class] ? "btn #{html_options[:class]}" : "btn btn-default"
+          html_options[:class] = html_options[:class] ? "btn #{html_options[:class]}" : 'btn btn-default'
 
           if html_options[:icon]
             icon = content_tag(:span, '', class: "icon icon-#{html_options[:icon]}")
@@ -198,8 +192,8 @@ module Spree
 
       def configurations_sidebar_menu_item(link_text, url, options = {})
         is_selected = url.ends_with?(controller.controller_name) ||
-                      url.ends_with?("#{controller.controller_name}/edit") ||
-                      url.ends_with?("#{controller.controller_name.singularize}/edit")
+          url.ends_with?("#{controller.controller_name}/edit") ||
+          url.ends_with?("#{controller.controller_name.singularize}/edit")
 
         options[:class] = 'sidebar-menu-item'
         options[:class] << ' selected' if is_selected

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

@@ -5,63 +5,62 @@ module Spree
       def event_links(order, events)
         links = []
         events.sort.each do |event|
-          if order.send("can_#{event}?")
-            label = Spree.t(event, scope: 'admin.order.events', default: Spree.t(event))
-            links << button_link_to(
-              label.capitalize,
-              [event, :admin, order],
-              method: :put,
-              icon: "#{event}",
-              data: { confirm: Spree.t(:order_sure_want_to, event: label) }
-            )
-          end
+          next unless order.send("can_#{event}?")
+          label = Spree.t(event, scope: 'admin.order.events', default: Spree.t(event))
+          links << button_link_to(
+            label.capitalize,
+            [event, :admin, order],
+            method: :put,
+            icon: event.to_s,
+            data: { confirm: Spree.t(:order_sure_want_to, event: label) }
+          )
         end
         safe_join(links, '&nbsp;'.html_safe)
       end
 
       def line_item_shipment_price(line_item, quantity)
-        Spree::Money.new(line_item.price * quantity, { currency: line_item.currency })
+        Spree::Money.new(line_item.price * quantity, currency: line_item.currency)
       end
 
       def avs_response_code
         {
-          "A" => "Street address matches, but 5-digit and 9-digit postal code do not match.",
-          "B" => "Street address matches, but postal code not verified.",
-          "C" => "Street address and postal code do not match.",
-          "D" => "Street address and postal code match. ",
-          "E" => "AVS data is invalid or AVS is not allowed for this card type.",
-          "F" => "Card member's name does not match, but billing postal code matches.",
-          "G" => "Non-U.S. issuing bank does not support AVS.",
-          "H" => "Card member's name does not match. Street address and postal code match.",
-          "I" => "Address not verified.",
-          "J" => "Card member's name, billing address, and postal code match.",
-          "K" => "Card member's name matches but billing address and billing postal code do not match.",
-          "L" => "Card member's name and billing postal code match, but billing address does not match.",
-          "M" => "Street address and postal code match. ",
-          "N" => "Street address and postal code do not match.",
-          "O" => "Card member's name and billing address match, but billing postal code does not match.",
-          "P" => "Postal code matches, but street address not verified.",
-          "Q" => "Card member's name, billing address, and postal code match.",
-          "R" => "System unavailable.",
-          "S" => "Bank does not support AVS.",
-          "T" => "Card member's name does not match, but street address matches.",
-          "U" => "Address information unavailable. Returned if the U.S. bank does not support non-U.S. AVS or if the AVS in a U.S. bank is not functioning properly.",
-          "V" => "Card member's name, billing address, and billing postal code match.",
-          "W" => "Street address does not match, but 9-digit postal code matches.",
-          "X" => "Street address and 9-digit postal code match.",
-          "Y" => "Street address and 5-digit postal code match.",
-          "Z" => "Street address does not match, but 5-digit postal code matches."
+          'A' => 'Street address matches, but 5-digit and 9-digit postal code do not match.',
+          'B' => 'Street address matches, but postal code not verified.',
+          'C' => 'Street address and postal code do not match.',
+          'D' => 'Street address and postal code match. ',
+          'E' => 'AVS data is invalid or AVS is not allowed for this card type.',
+          'F' => "Card member's name does not match, but billing postal code matches.",
+          'G' => 'Non-U.S. issuing bank does not support AVS.',
+          'H' => "Card member's name does not match. Street address and postal code match.",
+          'I' => 'Address not verified.',
+          'J' => "Card member's name, billing address, and postal code match.",
+          'K' => "Card member's name matches but billing address and billing postal code do not match.",
+          'L' => "Card member's name and billing postal code match, but billing address does not match.",
+          'M' => 'Street address and postal code match. ',
+          'N' => 'Street address and postal code do not match.',
+          'O' => "Card member's name and billing address match, but billing postal code does not match.",
+          'P' => 'Postal code matches, but street address not verified.',
+          'Q' => "Card member's name, billing address, and postal code match.",
+          'R' => 'System unavailable.',
+          'S' => 'Bank does not support AVS.',
+          'T' => "Card member's name does not match, but street address matches.",
+          'U' => 'Address information unavailable. Returned if the U.S. bank does not support non-U.S. AVS or if the AVS in a U.S. bank is not functioning properly.',
+          'V' => "Card member's name, billing address, and billing postal code match.",
+          'W' => 'Street address does not match, but 9-digit postal code matches.',
+          'X' => 'Street address and 9-digit postal code match.',
+          'Y' => 'Street address and 5-digit postal code match.',
+          'Z' => 'Street address does not match, but 5-digit postal code matches.'
         }
       end
 
       def cvv_response_code
         {
-          "M" => "CVV2 Match",
-          "N" => "CVV2 No Match",
-          "P" => "Not Processed",
-          "S" => "Issuer indicates that CVV2 data should be present on the card, but the merchant has indicated data is not present on the card",
-          "U" => "Issuer has not certified for CVV2 or Issuer has not provided Visa with the CVV2 encryption keys",
-          ""  => "Transaction failed because wrong CVV2 number was entered or no CVV2 number was entered"
+          'M' => 'CVV2 Match',
+          'N' => 'CVV2 No Match',
+          'P' => 'Not Processed',
+          'S' => 'Issuer indicates that CVV2 data should be present on the card, but the merchant has indicated data is not present on the card',
+          'U' => 'Issuer has not certified for CVV2 or Issuer has not provided Visa with the CVV2 encryption keys',
+          ''  => 'Transaction failed because wrong CVV2 number was entered or no CVV2 number was entered'
         }
       end
     end

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

@@ -2,7 +2,7 @@ module Spree
   module Admin
     module PaymentsHelper
       def payment_method_name(payment)
-        # hack to allow us to retrieve the name of a "deleted" payment method
+        # HACK: to allow us to retrieve the name of a "deleted" payment method
         id = payment.payment_method_id
         Spree::PaymentMethod.find_with_destroyed(id).name
       end

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

@@ -3,8 +3,8 @@ module Spree
     module PromotionRulesHelper
       def options_for_promotion_rule_types(promotion)
         existing = promotion.rules.map { |rule| rule.class.name }
-        rule_names = Rails.application.config.spree.promotions.rules.map(&:name).reject{ |r| existing.include? r }
-        options = rule_names.map { |name| [ Spree.t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] }
+        rule_names = Rails.application.config.spree.promotions.rules.map(&:name).reject { |r| existing.include? r }
+        options = rule_names.map { |name| [Spree.t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] }
         options_for_select(options)
       end
     end

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

@@ -12,4 +12,4 @@ module Spree
       end
     end
   end
-end
+end

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

@@ -9,7 +9,7 @@ module Spree
             stock_movement.originator.number
           end
         else
-          ""
+          ''
         end
       end
 

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

@@ -2,7 +2,7 @@ module Spree
   module Admin
     module TaxonsHelper
       def taxon_path(taxon)
-        taxon.ancestors.reverse.collect { |ancestor| ancestor.name }.join( " >> ")
+        taxon.ancestors.reverse.collect(&:name).join(' >> ')
       end
     end
   end

data/app/models/spree/admin/resource.rb

@@ -13,21 +13,21 @@ module Spree
       end
 
       def model_class
-        sub_namespace = sub_namespace_parts.map { |s| s.capitalize }.join('::')
-        sub_namespace = "#{sub_namespace}::" if sub_namespace.length > 0
+        sub_namespace = sub_namespace_parts.map(&:capitalize).join('::')
+        sub_namespace = "#{sub_namespace}::" unless sub_namespace.empty?
         "Spree::#{sub_namespace}#{@controller_name.classify}".constantize
       end
 
       def model_name
         sub_namespace = sub_namespace_parts.join('/')
-        sub_namespace = "#{sub_namespace}/" if sub_namespace.length > 0
+        sub_namespace = "#{sub_namespace}/" unless sub_namespace.empty?
         @parent_model.gsub("spree/#{sub_namespace}", '')
       end
 
       def object_name
         return @object_name if @object_name
         sub_namespace = sub_namespace_parts.join('_')
-        sub_namespace = "#{sub_namespace}_" if sub_namespace.length > 0
+        sub_namespace = "#{sub_namespace}_" unless sub_namespace.empty?
         "#{sub_namespace}#{@controller_name.singularize}"
       end
     end

data/app/views/spree/admin/products/_autocomplete.js.erb

@@ -6,7 +6,7 @@
         <span class="caret"></span>
       </button>
       <ul class="dropdown-menu" role="menu" data-hook="taxon_product_dropdown">
-        <li><a href="javascript:;" class="edit-product js-edit-product"><%= Spree.t(:edit) %></a></li>
+        <li><a href="{{ edit_product_url product.id }}" class="edit-product js-edit-product"><%= Spree.t(:edit) %></a></li>
         <li><a href="javascript:;" class="delete-product js-delete-product"><%= Spree.t(:delete_from_taxon) %></a></li>
       </ul>
     </div>

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

@@ -44,7 +44,7 @@
           </td>
           <td>
             <% if editable %>
-              <%= item_fields.number_field :return_quantity, { class: 'refund-quantity-input form-control' } %>
+              <%= item_fields.number_field :return_quantity, { class: 'refund-quantity-input form-control', min: 0, max: return_item.return_quantity } %>
             <% else %>
               <%= return_item.return_quantity %>
             <% end %>

data/app/views/spree/admin/shared/_account_nav.html.erb

@@ -0,0 +1,59 @@
+<% if try_spree_current_user %>
+  <ul class="nav navbar-nav">
+    <li class="dropdown user user-menu">
+      <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+        <i class="glyphicon glyphicon-user"></i>
+        <span><%= try_spree_current_user.email %> <i class="caret"></i></span>
+      </a>
+      <ul class="dropdown-menu">
+        <% if spree.respond_to? :root_path %>
+          <li>
+            <%= link_to spree.root_path, target: :blank do %>
+              <i class="glyphicon glyphicon-new-window"></i>
+              &nbsp;
+              <%= Spree.t(:back_to_store) %>
+            <% end %>
+          </li>
+        <% end %>
+        <li>
+          <%= link_to spree.edit_admin_user_path(try_spree_current_user) do %>
+            <i class="glyphicon glyphicon-user"></i>
+            &nbsp;
+            <%= Spree.t(:account) %>
+          <% end %>
+        </li>
+        <% if spree.respond_to? :admin_logout_path %>
+          <li>
+            <%= link_to spree.admin_logout_path do %>
+              <i class="glyphicon glyphicon-log-out"></i>
+              &nbsp;
+              <%= Spree.t(:logout) %>
+            <% end %>
+          </li>
+        <% end %>
+        <hr />
+        <li>
+          <%= link_to 'http://guides.spreecommerce.org', target: :blank do %>
+            <i class="glyphicon glyphicon-info-sign"></i>
+            &nbsp;
+            <%= Spree.t(:help_center) %>
+          <% end %>
+        </li>
+        <li>
+          <%= link_to 'http://slack.spreecommerce.org', target: :blank do %>
+            <i class="glyphicon glyphicon-comment"></i>
+            &nbsp;
+            <%= Spree.t(:join_slack) %>
+          <% end %>
+        </li>
+        <li>
+          <%= link_to 'https://github.com/spree-contrib', target: :blank do %>
+            <i class="glyphicon glyphicon-download"></i>
+            &nbsp;
+            <%= Spree.t(:extensions_directory) %>
+          <% end %>
+        </li>
+      </ul>
+    </li>
+  </ul>
+<% end %>

data/app/views/spree/admin/shared/_header.html.erb

@@ -16,7 +16,9 @@
             </span>
         </div>
         <div class="col-xs-9 col-md-10">
-          <div class="navbar-right" data-hook="admin_login_navigation_bar"></div>
+          <div class="navbar-right">
+            <%= render partial: 'spree/admin/shared/account_nav' %>
+          </div>
         </div>
       </div>
     </div>

data/app/views/spree/admin/shared/_main_menu.html.erb

@@ -39,9 +39,3 @@
     <%= main_menu_tree Spree.t(:configurations), icon: "wrench", sub_menu: "configuration", url: "#sidebar-configuration" %>
   </ul>
 <% end %>
-
-<% if can?(:admin, current_store) && Spree::Config[:admin_show_version] %>
-  <div class="spree-version hidden-xs hidden-sm">
-    <%= Spree.version %>
-  </div>
-<% end %>

data/app/views/spree/admin/shared/_version.html.erb

@@ -0,0 +1,5 @@
+<% if can?(:admin, current_store) && Spree::Config[:admin_show_version] %>
+  <div class="spree-version hidden-xs hidden-sm">
+    <%= Spree.version %>
+  </div>
+<% end %>

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

@@ -73,7 +73,7 @@
           <div class="form-group" id="stock_movement_quantity_field">
             <%= label_tag :transfer_variant_quantity, Spree.t(:quantity) %>
             <div class="input-group">
-              <%= number_field_tag :transfer_variant_quantity, 1, class: 'form-control', min: 0 %>
+              <%= number_field_tag :transfer_variant_quantity, 1, class: 'form-control', min: 1 %>
               <span class="input-group-btn">
                 <%= button Spree.t(:add), 'plus', 'submit', class: "transfer_add_variant" %>
               </span>

data/app/views/spree/admin/stock_transfers/show.html.erb

@@ -8,7 +8,7 @@
 <% end if can? :create, Spree::StockTransfer %>
 
 <fieldset>
-  <legend><%= Spree.t(:stock_transfer) %></legend>
+  <legend><%= Spree.t(:stock_transfer_name) %></legend>
 
   <table class="table table-bordered">
     <tr>

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

@@ -66,7 +66,7 @@
   </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::User)) %>,
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree.user_class)) %>,
     <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

data/app/views/spree/layouts/admin.html.erb

@@ -32,6 +32,8 @@
         <%#-------------------------------------------------%>
         <div class="<%= main_sidebar_classes %>" id="main-sidebar" data-hook="admin_tabs">
           <%= render partial: 'spree/admin/shared/main_menu' %>
+
+          <%= render partial: 'spree/admin/shared/version' %>
         </div>
 
         <%#-------------------------------------------------%>

data/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w( admin/* credit_cards/credit_card.gif )
+Rails.application.config.assets.precompile += %w(admin/* credit_cards/credit_card.gif)

data/config/initializers/form_builder.rb

@@ -3,7 +3,7 @@
 #
 class ActionView::Helpers::FormBuilder
   def field_container(method, options = {}, &block)
-    @template.field_container(@object_name,method,options,&block)
+    @template.field_container(@object_name, method, options, &block)
   end
 
   def error_message_on(method, options = {})
@@ -11,5 +11,4 @@ class ActionView::Helpers::FormBuilder
   end
 end
 
-ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }
-
+ActionView::Base.field_error_proc = proc { |html_tag, _instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }

data/config/routes.rb

@@ -45,7 +45,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    delete '/option_values/:id', to: "option_values#destroy", as: :option_value
+    delete '/option_values/:id', to: 'option_values#destroy', as: :option_value
 
     resources :properties do
       collection do
@@ -53,7 +53,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    delete '/product_properties/:id', to: "product_properties#destroy", as: :product_property
+    delete '/product_properties/:id', to: 'product_properties#destroy', as: :product_property
 
     resources :prototypes do
       member do
@@ -78,7 +78,7 @@ Spree::Core::Engine.add_routes do
 
       resources :state_changes, only: [:index]
 
-      resource :customer, controller: "orders/customer_details"
+      resource :customer, controller: 'orders/customer_details'
       resources :customer_returns, only: [:index, :new, :edit, :create, :update] do
         member do
           put :refund
@@ -107,8 +107,8 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    get '/return_authorizations', to: "return_index#return_authorizations", as: :return_authorizations
-    get '/customer_returns', to: "return_index#customer_returns", as: :customer_returns
+    get '/return_authorizations', to: 'return_index#return_authorizations', as: :return_authorizations
+    get '/customer_returns', to: 'return_index#customer_returns', as: :customer_returns
 
     resource :general_settings do
       collection do

data/lib/spree/backend/action_callbacks.rb

@@ -21,6 +21,5 @@ module Spree
     def fails(method)
       @fails_methods << method
     end
-
   end
 end

data/lib/spree/backend/callbacks.rb

@@ -4,7 +4,6 @@ module Spree
       extend ActiveSupport::Concern
 
       module ClassMethods
-
         attr_accessor :callbacks
 
         protected
@@ -37,12 +36,11 @@ module Spree
         callbacks = self.class.callbacks || {}
         return if callbacks[action].nil?
         case callback_type.to_sym
-          when :before then callbacks[action].before_methods.each {|method| send method }
-          when :after  then callbacks[action].after_methods.each  {|method| send method }
-          when :fails  then callbacks[action].fails_methods.each  {|method| send method }
+        when :before then callbacks[action].before_methods.each { |method| send method }
+        when :after  then callbacks[action].after_methods.each  { |method| send method }
+        when :fails  then callbacks[action].fails_methods.each  { |method| send method }
         end
       end
-
     end
   end
 end

data/lib/spree/backend/engine.rb

@@ -1,19 +1,19 @@
 module Spree
   module Backend
     class Engine < ::Rails::Engine
-      config.middleware.use "Spree::Backend::Middleware::SeoAssist"
+      config.middleware.use 'Spree::Backend::Middleware::SeoAssist'
 
-      initializer "spree.backend.environment", before: :load_config_initializers do |app|
+      initializer 'spree.backend.environment', before: :load_config_initializers do |_app|
         Spree::Backend::Config = Spree::BackendConfiguration.new
       end
 
       # filter sensitive information during logging
-      initializer "spree.params.filter" do |app|
+      initializer 'spree.params.filter' do |app|
         app.config.filter_parameters += [:password, :password_confirmation, :number]
       end
 
       # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
-      initializer "spree.assets.precompile", group: :all do |app|
+      initializer 'spree.assets.precompile', group: :all do |app|
         app.config.assets.paths << "#{Rails.root}/app/assets/fonts"
         app.config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/