spree_backend 3.3.6 → 3.4.0.rc1

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

@@ -12,12 +12,12 @@ module Spree
           if report_description_key.nil?
             report_description_key = "#{report_key}_description"
           end
-          @@available_reports[report_key] = {name: Spree.t(report_key), description: Spree.t(report_description_key)}
+          @@available_reports[report_key] = { name: Spree.t(report_key), description: Spree.t(report_description_key) }
         end
       end
 
       def initialize
-        super 
+        super
         ReportsController.add_available_report!(:sales_total)
       end
 
@@ -28,17 +28,25 @@ module Spree
       def sales_total
         params[:q] = {} unless params[:q]
 
-        if params[:q][:completed_at_gt].blank?
-          params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
-        else
-          params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
-        end
+        params[:q][:completed_at_gt] = if params[:q][:completed_at_gt].blank?
+                                         Time.zone.now.beginning_of_month
+                                       else
+                                         begin
+                                            Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day
+                                         rescue
+                                            Time.zone.now.beginning_of_month
+                                         end
+                                       end
 
         if params[:q] && !params[:q][:completed_at_lt].blank?
-          params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue ""
+          params[:q][:completed_at_lt] = begin
+                                           Time.zone.parse(params[:q][:completed_at_lt]).end_of_day
+                                         rescue
+                                           ''
+                                         end
         end
 
-        params[:q][:s] ||= "completed_at desc"
+        params[:q][:s] ||= 'completed_at desc'
 
         @search = Order.complete.ransack(params[:q])
         @orders = @search.result
@@ -59,7 +67,6 @@ module Spree
       end
 
       @@available_reports = {}
-
     end
   end
 end

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

@@ -11,18 +11,14 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     invoke_callbacks(:new_action, :before)
     respond_with(@object) do |format|
       format.html { render layout: !request.xhr? }
-      if request.xhr?
-        format.js   { render layout: false }
-      end
+      format.js   { render layout: false } if request.xhr?
     end
   end
 
   def edit
     respond_with(@object) do |format|
       format.html { render layout: !request.xhr? }
-      if request.xhr?
-        format.js   { render layout: false }
-      end
+      format.js   { render layout: false } if request.xhr?
     end
   end
 
@@ -117,9 +113,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def resource
     return @resource if @resource
-    if parent_data
-      parent_model_name = parent_data[:model_name]
-    end
+    parent_model_name = parent_data[:model_name] if parent_data
     @resource = Spree::Admin::Resource.new controller_path, controller_name, parent_model_name, object_name
   end
 
@@ -158,11 +152,9 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   def parent
     if parent_data.present?
       @parent ||= parent_data[:model_class].
-        # Don't use `find_by_attribute_name` to workaround globalize/globalize#423 bug
-        send(:find_by, parent_data[:find_by].to_s => params["#{resource.model_name}_id"])
+                  # Don't use `find_by_attribute_name` to workaround globalize/globalize#423 bug
+                  send(:find_by, parent_data[:find_by].to_s => params["#{resource.model_name}_id"])
       instance_variable_set("@#{resource.model_name}", @parent)
-    else
-      nil
     end
   end
 
@@ -237,8 +229,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   # This method should be overridden when object_name does not match the controller name
-  def object_name
-  end
+  def object_name; end
 
   # Allow all attributes to be updatable.
   #

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

@@ -12,22 +12,22 @@ module Spree
 
         respond_with(@object) do |format|
           format.html { redirect_to collection_url }
-          format.js  { render_js_for_destroy }
+          format.js { render_js_for_destroy }
         end
       end
 
       private
 
       def set_shipping_category
-        return true if params["shipping_method"][:shipping_categories] == ""
-        @shipping_method.shipping_categories = Spree::ShippingCategory.where(id: params["shipping_method"][:shipping_categories])
+        return true if params['shipping_method'][:shipping_categories] == ''
+        @shipping_method.shipping_categories = Spree::ShippingCategory.where(id: params['shipping_method'][:shipping_categories])
         @shipping_method.save
         params[:shipping_method].delete(:shipping_categories)
       end
 
       def set_zones
-        return true if params["shipping_method"][:zones] == ""
-        @shipping_method.zones = Spree::Zone.where(id: params["shipping_method"][:zones])
+        return true if params['shipping_method'][:zones] == ''
+        @shipping_method.zones = Spree::Zone.where(id: params['shipping_method'][:zones])
         @shipping_method.save
         params[:shipping_method].delete(:zones)
       end

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

@@ -13,17 +13,17 @@ module Spree
 
       protected
 
-        def location_after_save
-          admin_country_states_url(@country)
-        end
+      def location_after_save
+        admin_country_states_url(@country)
+      end
 
-        def collection
-          super.order(:name)
-        end
+      def collection
+        super.order(:name)
+      end
 
-        def load_data
-          @countries = Country.order(:name)
-        end
+      def load_data
+        @countries = Country.order(:name)
+      end
     end
   end
 end

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

@@ -35,17 +35,18 @@ module Spree
       end
 
       private
-        def stock_movement_params
-          params.require(:stock_movement).permit(permitted_stock_movement_attributes)
-        end
 
-        def stock_item
-          @stock_item ||= StockItem.find(params[:id])
-        end
+      def stock_movement_params
+        params.require(:stock_movement).permit(permitted_stock_movement_attributes)
+      end
 
-        def determine_backorderable
-          stock_item.backorderable = params[:stock_item].present? && params[:stock_item][:backorderable].present?
-        end
+      def stock_item
+        @stock_item ||= StockItem.find(params[:id])
+      end
+
+      def determine_backorderable
+        stock_item.backorderable = params[:stock_item].present? && params[:stock_item][:backorderable].present?
+      end
     end
   end
 end

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

@@ -6,8 +6,8 @@ module Spree
 
       def index
         @stock_movements = stock_location.stock_movements.recent.
-          includes(stock_item: { variant: :product }).
-          page(params[:page])
+                           includes(stock_item: { variant: :product }).
+                           page(params[:page])
       end
 
       def new

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

@@ -7,9 +7,9 @@ module Spree
         @q = StockTransfer.ransack(params[:q])
 
         @stock_transfers = @q.result.
-                             includes(stock_movements: { stock_item: :stock_location }).
-                             order(created_at: :desc).
-                             page(params[:page])
+                           includes(stock_movements: { stock_item: :stock_location }).
+                           order(created_at: :desc).
+                           page(params[:page])
       end
 
       def show
@@ -19,27 +19,32 @@ module Spree
       def new; end
 
       def create
-        variants = Hash.new(0)
-        params[:variant].each_with_index do |variant_id, i|
-          variants[variant_id] += params[:quantity][i].to_i
+        if params[:variant].nil?
+          flash[:error] = Spree.t('stock_transfer.errors.must_have_variant')
+          render :new
+        else
+          variants = Hash.new(0)
+          params[:variant].each_with_index do |variant_id, i|
+            variants[variant_id] += params[:quantity][i].to_i
+          end
+          stock_transfer = StockTransfer.create(reference: params[:reference])
+          stock_transfer.transfer(source_location,
+                                  destination_location,
+                                  variants)
+
+          flash[:success] = Spree.t(:stock_successfully_transferred)
+          redirect_to admin_stock_transfer_path(stock_transfer)
         end
-
-        stock_transfer = StockTransfer.create(reference: params[:reference])
-        stock_transfer.transfer(source_location,
-                                destination_location,
-                                variants)
-
-        flash[:success] = Spree.t(:stock_successfully_transferred)
-        redirect_to admin_stock_transfer_path(stock_transfer)
       end
 
       private
+
       def load_stock_locations
         @stock_locations = Spree::StockLocation.active.order_default
       end
 
       def source_location
-        @source_location ||= params.has_key?(:transfer_receive_stock) ? nil :
+        @source_location ||= params.key?(:transfer_receive_stock) ? nil :
                                StockLocation.find(params[:transfer_source_location_id])
       end
 

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

@@ -87,7 +87,7 @@ module Spree
 
       def ensure_unused_store_credit
         unless @store_credit.amount_used.zero?
-          raise StoreCreditError.new(Spree.t('store_credit.errors.cannot_change_used_store_credit'))
+          raise StoreCreditError, Spree.t('store_credit.errors.cannot_change_used_store_credit')
         end
       end
     end

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

@@ -1,14 +1,12 @@
 module Spree
   module Admin
     class TaxonsController < Spree::Admin::BaseController
-
       before_action :load_taxonomy, only: [:create, :edit, :update]
       before_action :load_taxon, only: [:edit, :update]
       before_action :set_permalink_part, only: [:edit, :update]
       respond_to :html, :js
 
-      def index
-      end
+      def index; end
 
       def create
         @taxon = @taxonomy.taxons.build(params[:taxon])
@@ -24,12 +22,10 @@ module Spree
         end
       end
 
-      def edit
-      end
+      def edit; end
 
       def update
         successful = @taxon.transaction do
-
           parent_id = params[:taxon][:parent_id]
           set_position
           set_parent(parent_id)
@@ -41,16 +37,15 @@ module Spree
 
           set_permalink_params
 
-          #check if we need to rename child taxons if parent name or permalink changes
+          # check if we need to rename child taxons if parent name or permalink changes
           @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
 
           @taxon.update_attributes(taxon_params)
-
         end
         if successful
           flash[:success] = flash_message_for(@taxon, :successfully_updated)
 
-          #rename child taxons
+          # rename child taxons
           rename_child_taxons if @update_children
 
           respond_with(@taxon) do |format|
@@ -85,21 +80,17 @@ module Spree
 
       def set_position
         new_position = params[:taxon][:position]
-        if new_position
-          @taxon.child_index = new_position.to_i
-        end
+        @taxon.child_index = new_position.to_i if new_position
       end
 
       def set_parent(parent_id)
-        if parent_id
-          @taxon.parent = Taxon.find(parent_id.to_i)
-        end
+        @taxon.parent = Taxon.find(parent_id.to_i) if parent_id
       end
 
       def set_permalink_params
-        if params.key? "permalink_part"
-          parent_permalink = @taxon.permalink.split("/")[0...-1].join("/")
-          parent_permalink += "/" unless parent_permalink.blank?
+        if params.key? 'permalink_part'
+          parent_permalink = @taxon.permalink.split('/')[0...-1].join('/')
+          parent_permalink += '/' unless parent_permalink.blank?
           params[:taxon][:permalink] = parent_permalink + params[:permalink_part]
         end
       end

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

@@ -77,12 +77,12 @@ module Spree
 
       protected
 
-        def collection
-          return @collection if @collection.present?
-          @collection = super
-          @search = @collection.ransack(params[:q])
-          @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_users_per_page])
-        end
+      def collection
+        return @collection if @collection.present?
+        @collection = super
+        @search = @collection.ransack(params[:q])
+        @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_users_per_page])
+      end
 
       private
 
@@ -96,7 +96,7 @@ module Spree
       # handling raise from Spree::Admin::ResourceController#destroy
       def user_destroy_with_orders_error
         invoke_callbacks(:destroy, :fails)
-        render status: :forbidden, text: Spree.t(:error_user_destroy_with_orders)
+        render status: :forbidden, plain: Spree.t(:error_user_destroy_with_orders)
       end
 
       def sign_in_if_change_own_password

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

@@ -38,7 +38,7 @@ module Spree
       end
 
       def collection
-        @deleted = (params.key?(:deleted) && params[:deleted] == "on") ? "checked" : ""
+        @deleted = params.key?(:deleted) && params[:deleted] == 'on' ? 'checked' : ''
 
         @collection ||=
           if @deleted.blank?

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

@@ -1,16 +1,15 @@
 module Spree
   module Admin
     class VariantsIncludingMasterController < VariantsController
-      belongs_to "spree/product", find_by: :slug
+      belongs_to 'spree/product', find_by: :slug
 
       def model_class
         Spree::Variant
       end
 
       def object_name
-        "variant"
+        'variant'
       end
-
     end
   end
 end

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

@@ -9,18 +9,18 @@ module Spree
 
       protected
 
-        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 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

@@ -1,17 +1,15 @@
 module Spree
   module Admin
     module AdjustmentsHelper
-
       def display_adjustable(adjustable)
         case adjustable
-          when Spree::LineItem
-            display_line_item(adjustable)
-          when Spree::Shipment
-            display_shipment(adjustable)
-          when Spree::Order
-            display_order(adjustable)
+        when Spree::LineItem
+          display_line_item(adjustable)
+        when Spree::Shipment
+          display_shipment(adjustable)
+        when Spree::Order
+          display_order(adjustable)
         end
-
       end
 
       private
@@ -22,14 +20,14 @@ module Spree
         parts << variant.product.name
         parts << "(#{variant.options_text})" if variant.options_text.present?
         parts << line_item.display_total
-        safe_join(parts, "<br />".html_safe)
+        safe_join(parts, '<br />'.html_safe)
       end
 
       def display_shipment(shipment)
         "#{Spree.t(:shipment)} ##{shipment.number}<br>#{shipment.display_cost}".html_safe
       end
 
-      def display_order(order)
+      def display_order(_order)
         Spree.t(:order)
       end
     end

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

@@ -1,15 +1,15 @@
 module Spree
   module Admin
     module BaseHelper
-      def flash_alert flash
+      def flash_alert(flash)
         if flash.present?
           close_button = button_tag(class: 'close', 'data-dismiss' => 'alert', 'aria-label' => Spree.t(:close)) do
             content_tag('span', '×'.html_safe, 'aria-hidden' => true)
           end
           message = flash[:error] || flash[:notice] || flash[:success]
-          flash_class = "danger" if flash[:error]
-          flash_class = "info" if flash[:notice]
-          flash_class = "success" if flash[:success]
+          flash_class = 'danger' if flash[:error]
+          flash_class = 'info' if flash[:notice]
+          flash_class = 'success' if flash[:success]
           flash_div = content_tag(:div, (close_button + message), class: "alert alert-#{flash_class} alert-auto-disappear")
           content_tag(:div, flash_div, class: 'col-xs-12')
         end
@@ -18,16 +18,14 @@ module Spree
       def field_container(model, method, options = {}, &block)
         css_classes = options[:class].to_a
         css_classes << 'field'
-        if error_message_on(model, method).present?
-          css_classes << 'withError'
-        end
+        css_classes << 'withError' if error_message_on(model, method).present?
         content_tag(
           :div, capture(&block),
           options.merge(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}")
 
@@ -42,8 +40,6 @@ module Spree
       def datepicker_field_value(date)
         unless date.blank?
           l(date, format: Spree.t('date_picker.format', default: '%Y/%m/%d'))
-        else
-          nil
         end
       end
 
@@ -53,7 +49,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
@@ -84,58 +80,56 @@ module Spree
 
       def preference_field_options(options)
         field_options = case options[:type]
-        when :integer
-          {
-            size: 10,
-            class: 'input_integer form-control'
-          }
-        when :boolean
-          {}
-        when :string
-          {
-            size: 10,
-            class: 'input_string form-control'
-          }
-        when :password
-          {
-            size: 10,
-            class: 'password_string form-control'
-          }
-        when :text
-          {
-            rows: 15,
-            cols: 85,
-            class: 'form-control'
-          }
-        else
-          {
-            size: 10,
-            class: 'input_string form-control'
-          }
+                        when :integer
+                          {
+                            size: 10,
+                            class: 'input_integer form-control'
+                          }
+                        when :boolean
+                          {}
+                        when :string
+                          {
+                            size: 10,
+                            class: 'input_string form-control'
+                          }
+                        when :password
+                          {
+                            size: 10,
+                            class: 'password_string form-control'
+                          }
+                        when :text
+                          {
+                            rows: 15,
+                            cols: 85,
+                            class: 'form-control'
+                          }
+                        else
+                          {
+                            size: 10,
+                            class: 'input_string form-control'
+                          }
         end
 
-        field_options.merge!({
-          readonly: options[:readonly],
-          disabled: options[:disabled],
-          size:     options[:size]
-        })
+        field_options.merge!(readonly: options[:readonly],
+                             disabled: options[:disabled],
+                             size:     options[:size])
       end
 
       def preference_fields(object, form)
         return unless object.respond_to?(:preferences)
-        fields = object.preferences.keys.map { |key|
+        fields = object.preferences.keys.map do |key|
           if object.has_preference?(key)
-            form.label("preferred_#{key}", Spree.t(key) + ": ") +
+            form.label("preferred_#{key}", Spree.t(key) + ': ') +
               preference_field_for(form, "preferred_#{key}", type: object.preference_type(key))
           end
-        }
+        end
         safe_join(fields, '<br />'.html_safe)
       end
 
       # renders hidden field and link to remove record using nested_attributes
       def link_to_icon_remove_fields(f)
         url = f.object.persisted? ? [:admin, f.object] : '#'
-        link_to_with_icon('delete', '', url, class: "spree_remove_fields btn btn-sm btn-danger", data: {action: 'remove'}, title: Spree.t(:remove)) + f.hidden_field(:_destroy)
+        link_to_with_icon('delete', '', url, class: 'spree_remove_fields btn btn-sm btn-danger', data: { action: 'remove' }, title: Spree.t(:remove)) + f.hidden_field(:_destroy)
       end
 
       def spree_dom_id(record)
@@ -148,7 +142,7 @@ module Spree
       end
 
       def order_time(time)
-        [I18n.l(time.to_date), time.strftime("%l:%M %p").strip].join(' ')
+        [I18n.l(time.to_date), time.strftime('%l:%M %p').strip].join(' ')
       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
-