lib/finapps/rest/transactions.rb in finapps-1.0.3 vs lib/finapps/rest/transactions.rb in finapps-1.0.4

@@ -11,51 +11,35 @@
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
         path = end_point.sub ':transaction_id', ERB::Util.url_encode(transaction_id)
         logger.debug "##{__method__.to_s} => path: #{path}"
 
-<<<<<<< HEAD
-        transaction, error_messages = @client.send(path, :get)
-=======
-        transaction, error_messages =  @client.send_request(path, :get)
-
-        logger.debug "##{__method__.to_s} => Completed"
->>>>>>> develop
+        transaction, error_messages = client.send_request(path, :get)
         return transaction, error_messages
       end
 
       # @param [Hash] params
       # @return [Array<Hash>, Array<String>]
       def search(params={})
-        path = Defaults::END_POINTS[:transactions_list]
+        end_point = Defaults::END_POINTS[:transactions_list]
+
+        path = end_point
         logger.debug "##{__method__.to_s} => path: #{path}"
 
-<<<<<<< HEAD
-        transactions, error_messages = @client.send(path, :post, params.compact)
-=======
-        transactions, error_messages = @client.send_request(path, :post, params.compact)
-
-        logger.debug "##{__method__.to_s} => Completed"
->>>>>>> develop
+        transactions, error_messages = client.send_request(path, :post, params.compact)
         return transactions, error_messages
       end
 
       # @param [Hash] params
       # @return [Array<Hash>, Array<String>]
       def update(params={})
         path = Defaults::END_POINTS[:transactions_update]
         logger.debug "##{__method__.to_s} => path: #{path}"
 
-<<<<<<< HEAD
-        _, error_messages = @client.send(path, :put, params.compact)
-=======
-        _, error_messages = @client.send_request(path, :put, params.compact)
-
-        logger.debug "##{__method__.to_s} => Completed"
->>>>>>> develop
+        _, error_messages = client.send_request(path, :put, params.compact)
         error_messages
       end
 
     end
 
   end
-end
+end
\ No newline at end of file