killbill-orbital 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f5bba84dbe74251ec5904356f3d8fa11a6153bd
-  data.tar.gz: fc986e9dcfc179e1e4691a20e332a924fb52fdda
+  metadata.gz: 79c94a1e5cf3ddacf63444b693a0b576353b3c7b
+  data.tar.gz: ccf210b4dd5e6e76047552eccfc00898ac27bc82
 SHA512:
-  metadata.gz: 0f505cb644e0bd9a2c6ca06b29bdd66b1b427e0ec993cb827e9337904d87827c33ae09450b555c32980ad648b334ccaba548f6b0aba3642ae3fde679e44e93ba
-  data.tar.gz: d447fec891c98d7c7a10c0b777b0f5f1236083d1685ac69be71d472d66aed9a4997f037fcd58eb0b70aab50d3a79dc818be410600a09e2633ab6df7bb1dfeba0
+  metadata.gz: 0bfef0b4ec28065a2b8dba0acd47a8c2e8491cb85b2920dcb602c4c2e3d3356ed64a7f9a964aebeb04277a97569f3950ad6c3904d5ae68fd13c5fea0592dc823
+  data.tar.gz: 754d60b264e0d33e0dc58abcc4f76e8c316c3ce43bdcd602e709f1877a034983e12a78876e311e46b624e3f9c2468ce27ccbdab679d3a8b4abd9686d6f328650

data/lib/orbital/api.rb

@@ -35,10 +35,16 @@ module Killbill #:nodoc:
 
       def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
         # Pass extra parameters for the gateway here
-        options = {}
-
-        properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        options = properties_to_hash properties
+        if options[:force_capture]
+          last_auth_response = @response_model.send('auth_responses_from_kb_payment_id', kb_payment_id, context.tenant_id).last
+          raise "Unable to retrieve last authorization for operation=capture, kb_payment_id=#{kb_payment_id}, kb_payment_transaction_id=#{kb_payment_transaction_id}, kb_payment_method_id=#{kb_payment_method_id}" if last_auth_response.nil?
+          options[:payment_processor_account_id] = last_auth_response.payment_processor_account_id
+          options[:prior_auth_id] = last_auth_response.params_auth_code
+          purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, hash_to_properties(options), context)
+        else
+          super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        end
       end
 
       def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)

data/lib/orbital/ext/active_merchant/active_merchant.rb

@@ -86,6 +86,7 @@ module ActiveMerchant
 
             yield xml if block_given?
 
+            xml.tag! :PriorAuthID, parameters[:prior_auth_id] if parameters[:prior_auth_id]
             xml.tag! :OrderID, format_order_id(parameters[:order_id])
             xml.tag! :Amount, amount(money)
             xml.tag! :Comments, parameters[:comments] if parameters[:comments]
@@ -113,42 +114,41 @@ module ActiveMerchant
 
       # A – Authorization request
       def authorize(money, creditcard, options = {})
-        order = build_new_order_xml(AUTH_ONLY, money, options.merge(:creditcard=>creditcard)) do |xml|
-          add_creditcard(xml, creditcard, options)
-          add_address(xml, creditcard, options)
-          if @options[:customer_profiles]
-            add_customer_data(xml, creditcard, options)
-            add_managed_billing(xml, options)
-          end
-          add_network_tokenization(xml, creditcard)
-        end
+        order = build_new_order_xml_with_cc(AUTH_ONLY, money, creditcard, options)
         commit(order, :authorize, options[:trace_number])
       end
 
-      # AC – Authorization and Capture
+      # AC – Authorization and Capture or Force Capture
       def purchase(money, creditcard, options = {})
-        order = build_new_order_xml(AUTH_AND_CAPTURE, money, options.merge(:creditcard=>creditcard)) do |xml|
-          add_creditcard(xml, creditcard, options)
-          add_address(xml, creditcard, options)
-          if @options[:customer_profiles]
-            add_customer_data(xml, creditcard, options)
-            add_managed_billing(xml, options)
-          end
-          add_network_tokenization(xml, creditcard)
+        if options[:force_capture]
+          order = build_new_order_xml_with_cc(FORCE_AUTH_AND_CAPTURE, money, creditcard, options)
+          commit(order, :purchase, options[:trace_number])
+        else
+          order = build_new_order_xml_with_cc(AUTH_AND_CAPTURE, money, creditcard, options)
+          commit(order, :purchase, options[:trace_number])
         end
-        commit(order, :purchase, options[:trace_number])
+      end
+
+      # MFC - Mark For Capture or Force capture
+      def capture(money, authorization, options = {})
+        commit(build_mark_for_capture_xml(money, authorization, options), :capture)
       end
 
       def credit(money, creditcard, options= {})
-        order = build_new_order_xml(REFUND, money, options) do |xml|
+        order = build_new_order_xml_with_cc(REFUND, money, creditcard, options)
+        commit(order, :credit, options[:trace_number])
+      end
+
+      def build_new_order_xml_with_cc(operation, money, creditcard, options)
+        build_new_order_xml(operation, money, options.merge(:creditcard=>creditcard)) do |xml|
           add_creditcard(xml, creditcard, options)
           add_address(xml, creditcard, options)
           if @options[:customer_profiles]
             add_customer_data(xml, creditcard, options)
             add_managed_billing(xml, options)
           end
+          add_network_tokenization(xml, creditcard)
         end
-        commit(order, :credit, options[:trace_number])
       end
 
       def add_creditcard(xml, creditcard, options = {})

data/lib/orbital/models/response.rb

@@ -88,6 +88,10 @@ module Killbill #:nodoc:
         params_order_id
       end
 
+      def self.auth_responses_from_kb_payment_id(kb_payment_id, kb_tenant_id)
+        where(:kb_payment_id => kb_payment_id, :kb_tenant_id => kb_tenant_id, :api_call => 'authorize').order(:created_at)
+      end
+
       def gateway_error_code
         params_resp_code
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-orbital
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement