IN-392 Changes sf services and spree services to build returns too

lib/SF_services/return.rb

@@ -14,7 +14,7 @@ def find_order(id)
       results.any? ? results.first['Id'] : nil
     end
 
-    def upsert!(payment_attr = {}, order_code, email)
+    def upsert!(payment_attr = {}, order_code)
       order_id = find_order(order_code)
 
       payment_attr = payment_attr.merge( { 'ParentId' => order_id } ) if order_id.present?

lib/integrations/base.rb

@@ -32,5 +32,9 @@ def line_item_service
     def payment_service
       @payment_service ||= SFService::Payment.new(config)
     end
+
+    def return_service
+      @return_service ||= SFService::Return.new(config)
+    end
   end
 end

lib/integrations/return.rb

@@ -10,33 +10,21 @@ def initialize(config, object)
 
     def handle_all!
       @object.each { |_return| handle _return }
-      @object.each { |_return| handle_payment _return }
     end
 
     def handle _return
       returned_items = _return["inventory_units"].map{|item| item["variant"]["sku"]}
       returned_counts = returned_items.inject(Hash.new(0)) { |total, item| total[item] += 1; total }
       result = "Returned items: "
       returned_counts.each { |item_name, count| result += "#{item_name}: (#{count}) " }
-      order_service.update!(order_params(_return).merge({"Notes__c" => result}))
-    end
-
-    def handle_payment _return
-      payment_service.upsert!(payment_params(_return), _return["order_id"], order(_return)["Email__c"])
+      #.merge({"extra" => result})
+      return_service.upsert!(return_params(_return), _return['order_id'])
     end
 
     private
 
-    def order _return
-      @order ||= order_service.find(_return["order_id"])
-    end
-
-    def order_params _return
-      Integration::Builder::OrderFromSf.new(order(_return)).build
-    end
-
-    def payment_params _return
-      Integration::Builder::PaymentFromReturn.new(_return).build
+    def return_params _return
+      Integration::Builder::Return.new(_return).build
     end
   end
 end

lib/salesforce_integration.rb

@@ -25,6 +25,7 @@
 require 'integrations/builders/payment'
 require 'integrations/builders/payment_from_return'
 require 'integrations/builders/order_product'
+require 'integrations/builders/return'
 
 require 'SF_services/base'
 require 'SF_services/account'