solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class CancellationsController < Spree::Admin::BaseController
-      before_filter :load_order, :only => [:index, :short_ship]
+      before_filter :load_order, only: [:index, :short_ship]
 
       def index
         @inventory_units = @order.inventory_units.cancelable

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

@@ -1,11 +1,9 @@
 module Spree
   module Admin
     class CountriesController < ResourceController
-
         def collection
           super.order(:name)
         end
-
     end
   end
 end

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

@@ -63,7 +63,7 @@ module Spree
           return_item = item_params[:id] ? Spree::ReturnItem.find(item_params[:id]) : Spree::ReturnItem.new
           return_item.assign_attributes(item_params)
           if item_params[:reception_status_event].blank?
-            redirect_to(new_object_url, flash: { error: 'Reception status choice required' }) and return
+            return redirect_to(new_object_url, flash: { error: 'Reception status choice required' })
           end
           return_item
         end.compact

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

@@ -9,15 +9,12 @@ module Spree
       end
 
       def update
-        params.each do |name, value|
-          next unless Spree::Config.has_preference? name
-          Spree::Config[name] = value
+        if @store.update_attributes(store_params)
+          flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
+          redirect_to edit_admin_general_settings_path
+        else
+          render :edit
         end
-
-        current_store.update_attributes store_params
-
-        flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
-        redirect_to edit_admin_general_settings_path
       end
 
       def clear_cache
@@ -27,6 +24,7 @@ module Spree
       end
 
       private
+
       def store_params
         params.require(:store).permit(permitted_params)
       end

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

@@ -8,27 +8,26 @@ module Spree
 
       private
 
-        def location_after_destroy
-          admin_product_images_url(@product)
-        end
-
-        def location_after_save
-          admin_product_images_url(@product)
-        end
+      def location_after_destroy
+        admin_product_images_url(@product)
+      end
 
-        def load_data
-          @product = Product.friendly.find(params[:product_id])
-          @variants = @product.variants.collect do |variant|
-            [variant.sku_and_options_text, variant.id]
-          end
-          @variants.insert(0, [Spree.t(:all), @product.master.id])
-        end
+      def location_after_save
+        admin_product_images_url(@product)
+      end
 
-        def set_viewable
-          @image.viewable_type = 'Spree::Variant'
-          @image.viewable_id = params[:image][:viewable_id]
+      def load_data
+        @product = Product.friendly.find(params[:product_id])
+        @variants = @product.variants.collect do |variant|
+          [variant.sku_and_options_text, variant.id]
         end
+        @variants.insert(0, [Spree.t(:all), @product.master.id])
+      end
 
+      def set_viewable
+        @image.viewable_type = 'Spree::Variant'
+        @image.viewable_id = params[:image][:viewable_id]
+      end
     end
   end
 end

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

@@ -7,11 +7,10 @@ module Spree
         @log_entries = @payment.log_entries
       end
 
-
       private
 
       def find_order_and_payment
-        @order = Spree::Order.where(:number => params[:order_id]).first!
+        @order = Spree::Order.where(number: params[:order_id]).first!
         @payment = @order.payments.find(params[:payment_id])
       end
     end

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

@@ -5,40 +5,36 @@ module Spree
 
       def update_values_positions
         params[:positions].each do |id, index|
-          OptionValue.where(:id => id).update_all(:position => index)
+          OptionValue.where(id: id).update_all(position: index)
         end
 
         respond_to do |format|
           format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js  { render :text => 'Ok' }
+          format.js { render text: 'Ok' }
         end
       end
 
       private
 
-        def location_after_save
-          if @option_type.created_at == @option_type.updated_at
-            edit_admin_option_type_url(@option_type)
-          else
-            admin_option_types_url
-          end
-        end
+      def location_after_save
+        edit_admin_option_type_url(@option_type)
+      end
 
-        def load_product
-          @product = Product.find_by_param!(params[:product_id])
-        end
+      def load_product
+        @product = Product.find_by_param!(params[:product_id])
+      end
 
-        def setup_new_option_value
-          @option_type.option_values.build if @option_type.option_values.empty?
-        end
+      def setup_new_option_value
+        @option_type.option_values.build if @option_type.option_values.empty?
+      end
 
-        def set_available_option_types
-          @available_option_types = if @product.option_type_ids.any?
-            OptionType.where('id NOT IN (?)', @product.option_type_ids)
-          else
-            OptionType.all
-          end
+      def set_available_option_types
+        @available_option_types = if @product.option_type_ids.any?
+          OptionType.where('id NOT IN (?)', @product.option_type_ids)
+        else
+          OptionType.all
         end
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Spree
       def destroy
         option_value = Spree::OptionValue.find(params[:id])
         option_value.destroy
-        render :text => nil
+        render text: nil
       end
     end
   end

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -10,8 +10,8 @@ module Spree
 
         def edit
           country_id = Country.default.id
-          @order.build_bill_address(:country_id => country_id) if @order.bill_address.nil?
-          @order.build_ship_address(:country_id => country_id) if @order.ship_address.nil?
+          @order.build_bill_address(country_id: country_id) if @order.bill_address.nil?
+          @order.build_ship_address(country_id: country_id) if @order.ship_address.nil?
 
           @order.bill_address.country_id = country_id if @order.bill_address.country.nil?
           @order.ship_address.country_id = country_id if @order.ship_address.country.nil?
@@ -22,7 +22,7 @@ module Spree
 
             if should_associate_user?
               requested_user = Spree.user_class.find(params[:user_id])
-              @order.associate_user!(Spree.user_class.find(params[:user_id]), @order.email.blank?)
+              @order.associate_user!(requested_user, @order.email.blank?)
             end
 
             unless @order.completed?
@@ -33,33 +33,32 @@ module Spree
             flash[:success] = Spree.t('customer_details_updated')
             redirect_to edit_admin_order_url(@order)
           else
-            render :action => :edit
+            render action: :edit
           end
-
         end
 
         private
-          def order_params
-            params.require(:order).permit(
-              :email,
-              :use_billing,
-              :bill_address_attributes => permitted_address_attributes,
-              :ship_address_attributes => permitted_address_attributes
-            )
-          end
 
-          def load_order
-            @order = Order.includes(:adjustments).find_by_number!(params[:order_id])
-          end
+        def order_params
+          params.require(:order).permit(
+            :email,
+            :use_billing,
+            bill_address_attributes: permitted_address_attributes,
+            ship_address_attributes: permitted_address_attributes
+          )
+        end
 
-          def model_class
-            Spree::Order
-          end
+        def load_order
+          @order = Order.includes(:adjustments).find_by_number!(params[:order_id])
+        end
 
-          def should_associate_user?
-            params[:guest_checkout] == "false" && params[:user_id] && params[:user_id].to_i != @order.user_id
-          end
+        def model_class
+          Spree::Order
+        end
 
+        def should_associate_user?
+          params[:guest_checkout] == "false" && params[:user_id] && params[:user_id].to_i != @order.user_id
+        end
       end
     end
   end

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

@@ -3,7 +3,7 @@ module Spree
     class OrdersController < Spree::Admin::BaseController
       before_action :initialize_order_events
       before_action :load_order, only: [:edit, :update, :complete, :advance, :cancel, :resume, :approve, :resend, :unfinalize_adjustments, :finalize_adjustments, :cart, :confirm]
-      around_filter :lock_order, :only => [:update, :advance, :complete, :confirm, :cancel, :resume, :approve, :resend]
+      around_filter :lock_order, only: [:update, :advance, :complete, :confirm, :cancel, :resume, :approve, :resend]
 
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
 
@@ -15,6 +15,7 @@ module Spree
         params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
         @show_only_completed = params[:q][:completed_at_not_null] == '1'
         params[:q][:s] ||= @show_only_completed ? 'completed_at desc' : 'created_at desc'
+        params[:q][:completed_at_not_null] = '' unless @show_only_completed
 
         # As date params are deleted if @show_only_completed, store
         # the original date so we can restore them into the params
@@ -25,11 +26,19 @@ module Spree
         params[:q].delete(:inventory_units_shipment_id_null) if params[:q][:inventory_units_shipment_id_null] == "0"
 
         if params[:q][:created_at_gt].present?
-          params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue ""
+          params[:q][:created_at_gt] = begin
+                                         Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day
+                                       rescue
+                                         ""
+                                       end
         end
 
         if params[:q][:created_at_lt].present?
-          params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
+          params[:q][:created_at_lt] = begin
+                                         Time.zone.parse(params[:q][:created_at_lt]).end_of_day
+                                       rescue
+                                         ""
+                                       end
         end
 
         if @show_only_completed
@@ -80,16 +89,6 @@ module Spree
         end
       end
 
-      def update
-        @order.contents.update_cart(params[:order])
-        @order.errors.add(:line_items, Spree.t('errors.messages.blank')) if @order.line_items.empty?
-        if @order.completed?
-          render :action => :edit
-        else
-          redirect_to admin_order_customer_path(@order)
-        end
-      end
-
       def advance
         if @order.completed?
           flash[:notice] = Spree.t('order_already_completed')
@@ -99,11 +98,10 @@ module Spree
 
           if @order.confirm?
             flash[:success] = Spree.t('order_ready_for_confirm')
-            redirect_to confirm_admin_order_url(@order)
           else
             flash[:error] = @order.errors.full_messages
-            redirect_to confirm_admin_order_url(@order)
           end
+          redirect_to confirm_admin_order_url(@order)
         end
       end
 
@@ -168,39 +166,40 @@ module Spree
       end
 
       private
-        def order_params
-          {
-            created_by_id: try_spree_current_user.try(:id),
-            frontend_viewable: false,
-            store_id: current_store.try(:id)
-          }.with_indifferent_access
-        end
 
-        def load_order
-          @order = Order.includes(:adjustments).find_by_number!(params[:id])
-          authorize! action, @order
-        end
+      def order_params
+        {
+          created_by_id: try_spree_current_user.try(:id),
+          frontend_viewable: false,
+          store_id: current_store.try(:id)
+        }.with_indifferent_access
+      end
 
-        # Used for extensions which need to provide their own custom event links on the order details view.
-        def initialize_order_events
-          @order_events = %w{approve cancel resume}
-        end
+      def load_order
+        @order = Order.includes(:adjustments).find_by_number!(params[:id])
+        authorize! action, @order
+      end
 
-        def model_class
-          Spree::Order
-        end
+      # Used for extensions which need to provide their own custom event links on the order details view.
+      def initialize_order_events
+        @order_events = %w{approve cancel resume}
+      end
 
-        def insufficient_stock_error
-          flash[:error] = Spree.t(:insufficient_stock_for_order)
-          redirect_to cart_admin_order_url(@order)
-        end
+      def model_class
+        Spree::Order
+      end
 
-        def require_ship_address
-          if @order.ship_address.nil?
-            flash[:notice] = Spree.t(:fill_in_customer_info)
-            redirect_to edit_admin_order_customer_url(@order)
-          end
+      def insufficient_stock_error
+        flash[:error] = Spree.t(:insufficient_stock_for_order)
+        redirect_to cart_admin_order_url(@order)
+      end
+
+      def require_ship_address
+        if @order.ship_address.nil?
+          flash[:notice] = Spree.t(:fill_in_customer_info)
+          redirect_to edit_admin_order_customer_url(@order)
         end
+      end
     end
   end
 end

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

@@ -2,18 +2,18 @@ module Spree
   module Admin
     class PaymentMethodsController < ResourceController
       skip_before_action :load_resource, only: :create
-      before_action :load_data
-      before_action :validate_payment_method_provider, only: :create
+      before_action :load_providers
+      before_action :validate_payment_method_provider, only: [:create, :update]
 
       respond_to :html
 
       def create
-        @payment_method = params[:payment_method].delete(:type).constantize.new(payment_method_params)
+        @payment_method = @payment_method_type.new(payment_method_params)
         @object = @payment_method
         invoke_callbacks(:create, :before)
         if @payment_method.save
           invoke_callbacks(:create, :after)
-          flash[:success] = Spree.t(:successfully_created, :resource => Spree.t(:payment_method))
+          flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:payment_method))
           redirect_to edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:create, :fails)
@@ -22,19 +22,12 @@ module Spree
       end
 
       def update
+        @payment_method = @payment_method.becomes(@payment_method_type)
         invoke_callbacks(:update, :before)
-        payment_method_type = params[:payment_method].delete(:type)
-        if @payment_method['type'].to_s != payment_method_type
-          @payment_method.update_columns(
-            type: payment_method_type,
-            updated_at: Time.current,
-          )
-          @payment_method = PaymentMethod.find(params[:id])
-        end
 
         update_params = params[ActiveModel::Naming.param_key(@payment_method)] || {}
         attributes = payment_method_params.merge(update_params)
-        attributes.each do |k,v|
+        attributes.each do |k, _v|
           if k.include?("password") && attributes[k].blank?
             attributes.delete(k)
           end
@@ -42,7 +35,7 @@ module Spree
 
         if @payment_method.update_attributes(attributes)
           invoke_callbacks(:update, :after)
-          flash[:success] = Spree.t(:successfully_updated, :resource => Spree.t(:payment_method))
+          flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payment_method))
           redirect_to edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:update, :fails)
@@ -52,13 +45,20 @@ module Spree
 
       private
 
-      def load_data
-        @providers = Gateway.providers.sort{|p1, p2| p1.name <=> p2.name }
+      def collection
+        super.ordered_by_position
+      end
+
+      def load_providers
+        @providers = PaymentMethod.providers.sort_by(&:name)
       end
 
       def validate_payment_method_provider
-        valid_payment_methods = Rails.application.config.spree.payment_methods.map(&:to_s)
-        if !valid_payment_methods.include?(params[:payment_method][:type])
+        requested_type = params[:payment_method].delete(:type)
+        @payment_method_type = @providers.detect do |klass|
+          klass.name == requested_type
+        end
+        if !@payment_method_type
           flash[:error] = Spree.t(:invalid_payment_provider)
           redirect_to new_admin_payment_method_path
         end