lib/active_merchant/billing/gateways/bambora_apac.rb in activemerchant-1.104.0 vs lib/active_merchant/billing/gateways/bambora_apac.rb in activemerchant-1.105.0

@@ -28,11 +28,11 @@
 
       def purchase(money, payment, options={})
         commit('SubmitSinglePayment') do |xml|
           xml.Transaction do
             xml.CustRef options[:order_id]
-            add_amount(xml, money)
+            xml.Amount amount(money)
             xml.TrnType '1'
             add_payment(xml, payment)
             add_credentials(xml, options)
             xml.TrnSource options[:ip]
           end
@@ -41,11 +41,11 @@
 
       def authorize(money, payment, options={})
         commit('SubmitSinglePayment') do |xml|
           xml.Transaction do
             xml.CustRef options[:order_id]
-            add_amount(xml, money)
+            xml.Amount amount(money)
             xml.TrnType '2'
             add_payment(xml, payment)
             add_credentials(xml, options)
             xml.TrnSource options[:ip]
           end
@@ -54,31 +54,31 @@
 
       def capture(money, authorization, options={})
         commit('SubmitSingleCapture') do |xml|
           xml.Capture do
             xml.Receipt authorization
-            add_amount(xml, money)
+            xml.Amount amount(money)
             add_credentials(xml, options)
           end
         end
       end
 
       def refund(money, authorization, options={})
         commit('SubmitSingleRefund') do |xml|
           xml.Refund do
             xml.Receipt authorization
-            add_amount(xml, money)
+            xml.Amount amount(money)
             add_credentials(xml, options)
           end
         end
       end
 
-      def void(money, authorization, options={})
+      def void(authorization, options={})
         commit('SubmitSingleVoid') do |xml|
           xml.Void do
             xml.Receipt authorization
-            add_amount(xml, money)
+            xml.Amount amount(options[:amount])
             add_credentials(xml, options)
           end
         end
       end
 
@@ -112,13 +112,9 @@
         xml.AccountNumber options[:account_number] if options[:account_number]
         xml.Security do
           xml.UserName @options[:username]
           xml.Password @options[:password]
         end
-      end
-
-      def add_amount(xml, money)
-        xml.Amount amount(money)
       end
 
       def add_payment(xml, payment)
         if payment.is_a?(String)
           add_token(xml, payment)