From 1d9243af190cfff109db22d468cd0be59f017b33 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 24 Sep 2018 16:58:43 +0100
Subject: [PATCH] DRY and clarify serializer and service

---
 app/serializers/api/admin/order_serializer.rb | 18 ++++++++++++------
 app/services/pending_payments.rb              |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/serializers/api/admin/order_serializer.rb b/app/serializers/api/admin/order_serializer.rb
index 7b7c5018c1..2a579b2910 100644
--- a/app/serializers/api/admin/order_serializer.rb
+++ b/app/serializers/api/admin/order_serializer.rb
@@ -17,32 +17,32 @@ class Api::Admin::OrderSerializer < ActiveModel::Serializer
 
   def show_path
     return '' unless object.id
-    Spree::Core::Engine.routes_url_helpers.admin_order_path(object)
+    spree_routes_helper.admin_order_path(object)
   end
 
   def edit_path
     return '' unless object.id
-    Spree::Core::Engine.routes_url_helpers.edit_admin_order_path(object)
+    spree_routes_helper.edit_admin_order_path(object)
   end
 
   def payments_path
     return '' unless object.payment_state
-    Spree::Core::Engine.routes_url_helpers.admin_order_payments_path(object)
+    spree_routes_helper.admin_order_payments_path(object)
   end
 
   def shipments_path
     return '' unless object.shipment_state
-    Spree::Core::Engine.routes_url_helpers.admin_order_shipments_path(object)
+    spree_routes_helper.admin_order_shipments_path(object)
   end
 
   def ship_path
-    Spree::Core::Engine.routes_url_helpers.fire_admin_order_path(object, e: 'ship')
+    spree_routes_helper.fire_admin_order_path(object, e: 'ship')
   end
 
   def capture_path
     payment_due = PendingPayments.new(object)
     return '' unless object.payment_required? && payment_due.payment_object
-    Spree::Core::Engine.routes_url_helpers.fire_admin_order_payment_path(object, payment_due.payment_object.id, e: 'capture')
+    spree_routes_helper.fire_admin_order_payment_path(object, payment_due.payment_object.id, e: 'capture')
   end
 
   def ready_to_ship
@@ -68,4 +68,10 @@ class Api::Admin::OrderSerializer < ActiveModel::Serializer
   def completed_at
     object.completed_at.blank? ? "" : I18n.l(object.completed_at, format: '%B %d, %Y')
   end
+
+  private
+
+  def spree_routes_helper
+    Spree::Core::Engine.routes_url_helpers
+  end
 end
diff --git a/app/services/pending_payments.rb b/app/services/pending_payments.rb
index 729af49e47..8a0d660c2d 100644
--- a/app/services/pending_payments.rb
+++ b/app/services/pending_payments.rb
@@ -6,7 +6,7 @@ class PendingPayments
   end
 
   def payment_object
-    @order.payments.select{ |p| p if p.state == 'checkout' }.first
+    @order.payments.select{ |payment| payment if payment.state == 'checkout' }.first
   end
 
   def can_be_captured?