From 74226fbdf80420b0102075e48bfe6e4a6c9c1e24 Mon Sep 17 00:00:00 2001
From: luisramos0 <luisramos0@gmail.com>
Date: Sat, 14 Dec 2019 12:41:07 +0000
Subject: [PATCH] Fix one rubocop issue and update rubocop todo manual for the
 new controller

---
 .rubocop_manual_todo.yml                         |  8 +++-----
 .../spree/admin/payments_controller.rb           | 16 ++++++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index f2a0f1d7f9..e8ef371ca2 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -43,7 +43,6 @@ Layout/LineLength:
   - app/controllers/checkout_controller.rb
   - app/controllers/spree/admin/adjustments_controller_decorator.rb
   - app/controllers/spree/admin/orders_controller_decorator.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
   - app/controllers/spree/credit_cards_controller.rb
   - app/controllers/spree/paypal_controller_decorator.rb
   - app/controllers/stripe/callbacks_controller.rb
@@ -366,7 +365,8 @@ Metrics/AbcSize:
   - app/controllers/spree/admin/orders_controller_decorator.rb
   - app/controllers/spree/admin/overview_controller.rb
   - app/controllers/spree/admin/payment_methods_controller.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
+  - app/controllers/spree/admin/payments_controller.rb
+  - app/controllers/spree/admin/products_controller_decorator.rb
   - app/controllers/spree/admin/reports_controller.rb
   - app/controllers/spree/admin/resource_controller.rb
   - app/controllers/spree/admin/products_controller.rb
@@ -495,7 +495,6 @@ Metrics/CyclomaticComplexity:
   - app/controllers/admin/enterprise_fees_controller.rb
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/checkout_controller.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/helpers/checkout_helper.rb
@@ -525,7 +524,6 @@ Metrics/PerceivedComplexity:
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/api/variants_controller.rb
   - app/controllers/checkout_controller.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/helpers/checkout_helper.rb
@@ -566,7 +564,7 @@ Metrics/MethodLength:
   - app/controllers/spree/admin/image_settings_controller.rb
   - app/controllers/spree/admin/orders/customer_details_controller_decorator.rb
   - app/controllers/spree/admin/payment_methods_controller.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
+  - app/controllers/spree/admin/payments_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
   - app/controllers/spree/admin/resource_controller.rb
   - app/controllers/spree/admin/products_controller.rb
diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb
index f607b49bea..8e2151f86c 100644
--- a/app/controllers/spree/admin/payments_controller.rb
+++ b/app/controllers/spree/admin/payments_controller.rb
@@ -18,12 +18,7 @@ module Spree
 
       def create
         @payment = @order.payments.build(object_params)
-        if @payment.payment_method.is_a?(Spree::Gateway) &&
-           @payment.payment_method.payment_profiles_supported? &&
-           params[:card].present? &&
-           (params[:card] != 'new')
-          @payment.source = CreditCard.find_by_id(params[:card])
-        end
+        load_payment_source
 
         begin
           unless @payment.save
@@ -71,6 +66,15 @@ module Spree
 
       private
 
+      def load_payment_source
+        if @payment.payment_method.is_a?(Spree::Gateway) &&
+           @payment.payment_method.payment_profiles_supported? &&
+           params[:card].present? &&
+           (params[:card] != 'new')
+          @payment.source = CreditCard.find_by_id(params[:card])
+        end
+      end
+
       def object_params
         if params[:payment] &&
            params[:payment_source] &&