solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,10 +1,9 @@
 module Spree
   module Admin
     class VariantsController < ResourceController
-      belongs_to 'spree/product', :find_by => :slug
+      belongs_to 'spree/product', find_by: :slug
       new_action.before :new_before
       before_action :load_data, only: [:new, :create, :edit, :update]
-      before_action :load_option_types_values, only: [:index]
 
       # override the destroy method to set deleted_at value
       # instead of actually deleting the product.
@@ -18,49 +17,37 @@ module Spree
 
         respond_with(@variant) do |format|
           format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js  { render_js_for_destroy }
+          format.js { render_js_for_destroy }
         end
       end
 
       private
 
-        def new_before
-          @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
-                                                                        'sku', 'is_master')
-          # Shallow Clone of the default price to populate the price field.
-          @object.default_price = @object.product.master.default_price.clone
-        end
-
-        def collection
-          @deleted = (params.key?(:deleted) && params[:deleted] == "on") ? "checked" : ""
-
-          if @deleted.blank?
-            @collection ||= super
-          else
-            @collection ||= Variant.only_deleted.where(:product_id => parent.id)
-          end
-
-          params[:q] ||= {}
-
-          # @search needs to be defined as this is passed to search_form_for
-          @search = @collection.ransack(params[:q])
-          @collection = @search.result.includes(variant_includes).page(params[:page]).per(Spree::Config[:admin_variants_per_page])
-        end
+      def new_before
+        @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
+                                                                      'sku', 'is_master')
+        # Shallow Clone of the default price to populate the price field.
+        @object.default_price = @object.product.master.default_price.clone
+      end
 
-        def load_option_types_values
-          @option_types = parent.option_types.includes(:option_values)
-          @option_values = @option_types.flat_map(&:option_values).uniq(&:presentation)
+      def collection
+        if params[:deleted] == "on"
+          base_variant_scope ||= super.with_deleted
+        else
+          base_variant_scope ||= super
         end
 
+        search = Spree::Config.variant_search_class.new(params[:variant_search_term], scope: base_variant_scope)
+        @collection = search.results.includes(variant_includes).page(params[:page]).per(Spree::Config[:admin_variants_per_page])
+      end
 
-      private
-        def load_data
-          @tax_categories = TaxCategory.order(:name)
-        end
+      def load_data
+        @tax_categories = TaxCategory.order(:name)
+      end
 
-        def variant_includes
-          [{ option_values: :option_type }, :default_price, :stock_items]
-        end
+      def variant_includes
+        [{ option_values: :option_type }, :default_price]
+      end
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Spree
   module Admin
     class VariantsIncludingMasterController < VariantsController
-
       def model_class
         Spree::Variant
       end
@@ -9,7 +8,6 @@ module Spree
       def object_name
         "variant"
       end
-
     end
   end
 end

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

@@ -9,18 +9,18 @@ module Spree
 
       private
 
-        def collection
-          params[:q] ||= {}
-          params[:q][:s] ||= "ascend_by_name"
-          @search = super.ransack(params[:q])
-          @zones = @search.result.page(params[:page]).per(params[:per_page])
-        end
+      def collection
+        params[:q] ||= {}
+        params[:q][:s] ||= "name asc"
+        @search = super.ransack(params[:q])
+        @zones = @search.result.page(params[:page]).per(params[:per_page])
+      end
 
-        def load_data
-          @countries = Country.order(:name)
-          @states = State.order(:name)
-          @zones = Zone.order(:name)
-        end
+      def load_data
+        @countries = Country.order(:name)
+        @states = State.order(:name)
+        @zones = Zone.order(:name)
+      end
     end
   end
 end

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

@@ -8,14 +8,13 @@ module Spree
 
       def display_adjustable(adjustable)
         case adjustable
-          when Spree::LineItem
+        when Spree::LineItem
             display_line_item(adjustable)
-          when Spree::Shipment
+        when Spree::Shipment
             display_shipment(adjustable)
-          when Spree::Order
+        when Spree::Order
             display_order(adjustable)
         end
-
       end
 
       private
@@ -37,7 +36,7 @@ module Spree
         safe_join(parts, "<br />".html_safe)
       end
 
-      def display_order(order)
+      def display_order(_order)
         Spree.t(:order)
       end
     end

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

@@ -7,10 +7,10 @@ module Spree
         if error_message_on(model, method).present?
           css_classes << 'withError'
         end
-        content_tag(:div, capture(&block), :class => css_classes.join(' '), :id => "#{model}_#{method}_field")
+        content_tag(:div, capture(&block), class: css_classes.join(' '), id: "#{model}_#{method}_field")
       end
 
-      def error_message_on(object, method, options = {})
+      def error_message_on(object, method, _options = {})
         object = convert_to_model(object)
         obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")
 
@@ -24,9 +24,7 @@ module Spree
 
       def datepicker_field_value(date)
         unless date.blank?
-          l(date, :format => Spree.t('date_picker.format', default: '%Y/%m/%d'))
-        else
-          nil
+          l(date, format: Spree.t('date_picker.format', default: '%Y/%m/%d'))
         end
       end
 
@@ -49,10 +47,9 @@ module Spree
         options[:partial] ||= method.to_s.singularize
         options[:form_builder_local] ||= :f
 
-        form_builder.fields_for(method, options[:object], :child_index => 'NEW_RECORD') do |f|
-          render(:partial => options[:partial], :locals => { options[:form_builder_local] => f })
+        form_builder.fields_for(method, options[:object], child_index: 'NEW_RECORD') do |f|
+          render(partial: options[:partial], locals: { options[:form_builder_local] => f })
         end
-
       end
 
       def generate_template(form_builder, method, options = {})
@@ -62,7 +59,7 @@ module Spree
       def remove_nested(fields)
         out = ''
         out << fields.hidden_field(:_destroy) unless fields.object.new_record?
-        out << (link_to icon('remove'), "#", :class => 'remove')
+        out << (link_to icon('remove'), "#", class: 'remove')
         out.html_safe
       end
 
@@ -72,7 +69,7 @@ module Spree
           text_field_tag(name, value, preference_field_options(options))
         when :boolean
           hidden_field_tag(name, 0, id: "#{name}_hidden") +
-          check_box_tag(name, 1, value, preference_field_options(options))
+            check_box_tag(name, 1, value, preference_field_options(options))
         when :string
           text_field_tag(name, value, preference_field_options(options))
         when :password
@@ -103,30 +100,30 @@ module Spree
 
       def preference_field_options(options)
         field_options = case options[:type]
-        when :integer
-          { :size => 10,
-            :class => 'input_integer' }
-        when :boolean
+                        when :integer
+          { size: 10,
+            class: 'input_integer' }
+                        when :boolean
           {}
-        when :string
-          { :size => 10,
-            :class => 'input_string fullwidth' }
-        when :password
-          { :size => 10,
-            :class => 'password_string fullwidth' }
-        when :text
-          { :rows => 15,
-            :cols => 85,
-            :class => 'fullwidth' }
+                        when :string
+          { size: 10,
+            class: 'input_string fullwidth' }
+                        when :password
+          { size: 10,
+            class: 'password_string fullwidth' }
+                        when :text
+          { rows: 15,
+            cols: 85,
+            class: 'fullwidth' }
         else
-          { :size => 10,
-            :class => 'input_string fullwidth' }
+          { size: 10,
+            class: 'input_string fullwidth' }
         end
 
         field_options.merge!({
-          :readonly => options[:readonly],
-          :disabled => options[:disabled],
-          :size     => options[:size]
+          readonly: options[:readonly],
+          disabled: options[:disabled],
+          size: options[:size]
         })
       end
 
@@ -142,7 +139,7 @@ module Spree
       def link_to_add_fields(name, target, options = {})
         name = '' if options[:no_text]
         css_classes = options[:class] ? options[:class] + " spree_add_fields" : "spree_add_fields"
-        link_to_with_icon('plus', name, 'javascript:', :data => { :target => target }, :class => css_classes)
+        link_to_with_icon('plus', name, 'javascript:', data: { target: target }, class: css_classes)
       end
 
       # renders hidden field and link to remove record using nested_attributes
@@ -151,7 +148,7 @@ module Spree
         options[:class] = '' unless options[:class]
         options[:class] += 'no-text with-tip' if options[:no_text]
         url = f.object.persisted? ? [:admin, f.object] : '#'
-        link_to_with_icon('trash', name, url, :class => "spree_remove_fields #{options[:class]}", :data => {:action => 'remove'}, :title => Spree.t(:remove)) + f.hidden_field(:_destroy)
+        link_to_with_icon('trash', name, url, class: "spree_remove_fields #{options[:class]}", data: { action: 'remove' }, title: Spree.t('actions.remove')) + f.hidden_field(:_destroy)
       end
 
       def spree_dom_id(record)
@@ -159,9 +156,10 @@ module Spree
       end
 
       private
-        def attribute_name_for(field_name)
-          field_name.gsub(' ', '_').downcase
-        end
+
+      def attribute_name_for(field_name)
+        field_name.tr(' ', '_').downcase
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Spree
   module Admin
     module GeneralSettingsHelper
       def currency_options
-        currencies = ::Money::Currency.table.map do |code, details|
+        currencies = ::Money::Currency.table.map do |_code, details|
           iso = details[:iso_code]
           [iso, "#{details[:name]} (#{iso})"]
         end

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

@@ -15,4 +15,3 @@ module Spree
     end
   end
 end
-

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

@@ -6,24 +6,24 @@ module Spree
       #   * :label to override link text, otherwise based on the first resource name (translated)
       #   * :route to override automatically determining the default route
       #   * :match_path as an alternative way to control when the tab is active, /products would match /admin/products, /admin/products/5/variants etc.
-      def tab(*args, &block)
-        options = {:label => args.first.to_s}
+      def tab(*args, &_block)
+        options = { label: args.first.to_s }
 
         if args.last.is_a?(Hash)
           options = options.merge(args.pop)
         end
-        options[:route] ||=  "admin_#{args.first}"
+        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
+        label = Spree.t(options[:label], scope: [:admin, :tab])
 
         css_classes = []
 
         if options[:icon]
-          link = link_to_with_icon(options[:icon], titleized_label, destination_url)
+          link = link_to_with_icon(options[:icon], label, destination_url)
           css_classes << 'tab-with-icon'
         else
-          link = link_to(titleized_label, destination_url)
+          link = link_to(label, destination_url)
         end
 
         selected = if options[:match_path].is_a? Regexp
@@ -31,7 +31,8 @@ module Spree
         elsif options[:match_path]
           request.fullpath.starts_with?("#{admin_path}#{options[:match_path]}")
         else
-          args.include?(controller.controller_name.to_sym)
+          request.fullpath.starts_with?(destination_url) ||
+            args.include?(controller.controller_name.to_sym)
         end
         css_classes << 'selected' if selected
 
@@ -41,32 +42,32 @@ module Spree
         content_tag('li', link + (yield if block_given?), class: css_classes.join(' ') )
       end
 
-      def link_to_clone(resource, options={})
-        options[:data] = {:action => 'clone'}
+      def link_to_clone(resource, options = {})
+        options[:data] = { action: 'clone' }
         link_to_with_icon('copy', Spree.t(:clone), clone_object_url(resource), options)
       end
 
       def link_to_new(resource)
-        options[:data] = {:action => 'new'}
+        options[:data] = { action: 'new' }
         link_to_with_icon('plus', Spree.t(:new), edit_object_url(resource))
       end
 
-      def link_to_edit(resource, options={})
+      def link_to_edit(resource, options = {})
         url = options[:url] || edit_object_url(resource)
-        options[:data] = {:action => 'edit'}
-        link_to_with_icon('edit', Spree.t(:edit), url, options)
+        options[:data] = { action: 'edit' }
+        link_to_with_icon('edit', Spree.t('actions.edit'), url, options)
       end
 
-      def link_to_edit_url(url, options={})
-        options[:data] = {:action => 'edit'}
-        link_to_with_icon('edit', Spree.t(:edit), url, options)
+      def link_to_edit_url(url, options = {})
+        options[:data] = { action: 'edit' }
+        link_to_with_icon('edit', Spree.t('actions.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)
+        name = options[:name] || Spree.t('actions.delete')
         options[:class] = "delete-resource"
-        options[:data] = { :confirm => Spree.t(:are_you_sure), :action => 'remove' }
+        options[:data] = { confirm: Spree.t(:are_you_sure), action: 'remove' }
         link_to_with_icon 'trash', name, url, options
       end
 
@@ -80,29 +81,22 @@ module Spree
       end
 
       def icon(icon_name)
-        icon_name ? content_tag(:i, '', :class => icon_name) : ''
+        icon_name ? content_tag(:i, '', class: icon_name) : ''
       end
 
-      def button(text, icon_name = nil, button_type = 'submit', options={})
-        button_tag(text, options.merge(:type => button_type, :class => "fa fa-#{icon_name} button"))
+      def button(text, icon_name = nil, button_type = 'submit', options = {})
+        button_tag(text, options.merge(type: button_type, class: "fa fa-#{icon_name} button"))
       end
 
       def button_link_to(text, url, html_options = {})
-        html_options = {class: ''}.merge(html_options)
-        if (html_options[:method] &&
-            html_options[:method].to_s.downcase != 'get' &&
-            !html_options[:remote])
-          form_tag(url, :method => html_options.delete(:method)) do
+        html_options = { class: '' }.merge(html_options)
+        if html_options[:method] &&
+           html_options[:method].to_s.downcase != 'get' &&
+           !html_options[:remote]
+          form_tag(url, method: html_options.delete(:method)) do
             button(text, html_options.delete(:icon), nil, html_options)
           end
         else
-          if html_options['data-update'].nil? && html_options[:remote]
-            object_name, action = url.split('/')[-2..-1]
-            html_options['data-update'] = [action, object_name.singularize].join('_')
-          end
-
-          html_options.delete('data-update') unless html_options['data-update']
-
           html_options[:class] += ' button'
 
           if html_options[:icon]
@@ -124,7 +118,19 @@ module Spree
         is_active = url.ends_with?(controller.controller_name) ||
                     url.ends_with?("#{controller.controller_name}/edit") ||
                     url.ends_with?("#{controller.controller_name.singularize}/edit")
-        options.merge!(:class => is_active ? 'active' : nil)
+        options[:class] = is_active ? 'active' : nil
+        content_tag(:li, options) do
+          link_to(link_text, url)
+        end
+      end
+
+      def settings_tab_item(link_text, url, options = {})
+        is_active = url.ends_with?(controller.controller_name) ||
+                    url.ends_with?("#{controller.controller_name}/edit") ||
+                    url.ends_with?("#{controller.controller_name.singularize}/edit")
+        options[:class] = 'fa'
+        options[:class] += ' active' if is_active
+        options[:datahook] = "admin_settings_#{link_text.downcase.tr(' ', '_')}"
         content_tag(:li, options) do
           link_to(link_text, url)
         end