docdata 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: badfb82c6e3355001e9dd1dcb11dc3c30ce04d45
-  data.tar.gz: 8efef93668be088abb0ffaffc347b5376892c5e5
+  metadata.gz: 747dd96a09532d085cf48ee29e156dd5784251a7
+  data.tar.gz: 4572f54bbab9226edd09caa51e0eef9a70048144
 SHA512:
-  metadata.gz: 13681d573d5e88e6e7b09d8a53db6b4c7eaf6648604573d4dcac239a2b6ed8040609c6d438bd61f4e2aa62f28a80f780be9107f47fe2406dac7017e681a3bcfd
-  data.tar.gz: 119ce034481911bc7ad2881e5be1448ee258db29f8e3419bf8fa15095c52702eae0bec939bfb0e9b70e3a36ac19a27b87496d49b23db93d0312077abfe2d36b2
+  metadata.gz: 08c8f2ea6390f2ac8d885422fef582e4b4cb3ffd5afb4765056a4976bf31af74464936075f149740fd2b16b15b2390e0e59940ad9674ca0b9b5583df62495669
+  data.tar.gz: 0ea23b6929003eb5563806b78c0717bbeac42ecd346969cf19bcf108eb8a29cf4753a5b5bc692393b505fb904566999f01d9a71a33c7a12ecd5606d342f84697

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.2.3
+* Fixed amount calculation in case of multiple payments in one transaction (giftcard+ideal for example)
+
 ## v0.2.2
 * Minor bugfixes (dependency issues)
 

data/lib/docdata/response.rb

@@ -58,10 +58,25 @@ module Docdata
       end
     end
 
+
+    # [Integer] the amount to set, calculated from the multiple payment nodes
+    def amount_to_set
+      #  if (report && Response.payment_node(report) && Response.payment_node(report)[:authorization] && Response.payment_node(report)[:authorization][:amount].present?)
+      if (report && Response.payment_node(report) && Response.payment_node(report)[:authorization] && Response.payment_node(report)[:authorization][:amount].present?)
+        if canceled
+          return Response.payment_node(report)[:authorization][:amount].to_i
+        else
+          return total_acquirer_pending + total_acquirer_approved
+        end
+      else
+        return false
+      end
+    end
+
     # Set the attributes based on the API response
     def set_attributes
       self.paid     = is_paid?
-      self.amount   = Response.payment_node(report)[:authorization][:amount].to_i if (report && Response.payment_node(report) && Response.payment_node(report)[:authorization] && Response.payment_node(report)[:authorization][:amount].present?)
+      self.amount   = amount_to_set if amount_to_set
       self.status   = capture_status if capture_status
       self.currency = currency_to_set
     end
@@ -103,7 +118,7 @@ module Docdata
       return body, xml
     end
 
-    methods = [:total_registered, :total_shopper_pending, :total_acquier_pending, :total_acquirer_approved, :total_captured, :total_refunded, :total_chargedback]
+    methods = [:total_registered, :total_shopper_pending, :total_acquirer_pending, :total_acquirer_approved, :total_captured, :total_refunded, :total_chargedback]
     methods.each do |method|
       define_method method do
         report[:approximate_totals][method].to_i

data/lib/docdata/version.rb

@@ -1,3 +1,3 @@
 module Docdata
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/response_spec.rb

@@ -79,6 +79,27 @@ describe Docdata::Response do
   end
 
 
+  describe "response with multiple payment nodes (partial payments)" do
+    before(:each) do
+      file = "#{File.dirname(__FILE__)}/xml/status-multiple-paid.xml"
+      @xml = open(file)
+      @response = Docdata::Response.parse(:status, @xml)
+    end    
+
+    it "returs a response object" do
+      expect(@response).to be_kind_of(Docdata::Response)
+    end
+
+    it "is paid" do
+      expect(@response.paid).to eq(true)
+    end
+
+    it "is for 300 cents" do
+      expect(@response.amount).to eq(300)
+    end
+  end
+
+
   describe "different payment methods" do
     context ":status, paid iDeal" do
       before(:each) do

data/spec/xml/status-multiple-paid.xml

@@ -0,0 +1,46 @@
+<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/">
+   <S:Body>
+      <statusResponse xmlns="http://www.docdatapayments.com/services/paymentservice/1_1/">
+         <statusSuccess>
+            <success code="SUCCESS">Operation successful.</success>
+            <report>
+               <approximateTotals exchangedTo="EUR" exchangeRateDate="2015-04-29 14:48:58">
+                  <totalRegistered>300</totalRegistered>
+                  <totalShopperPending>0</totalShopperPending>
+                  <totalAcquirerPending>216</totalAcquirerPending>
+                  <totalAcquirerApproved>84</totalAcquirerApproved>
+                  <totalCaptured>300</totalCaptured>
+                  <totalRefunded>0</totalRefunded>
+                  <totalChargedback>0</totalChargedback>
+               </approximateTotals>
+               <payment>
+                  <id>2570795670</id>
+                  <paymentMethod>IDEAL</paymentMethod>
+                  <authorization>
+                     <status>AUTHORIZED</status>
+                     <amount currency="EUR">84</amount>
+                     <confidenceLevel>ACQUIRER_APPROVED</confidenceLevel>
+                     <capture>
+                        <status>CAPTURED</status>
+                        <amount currency="EUR">84</amount>
+                     </capture>
+                  </authorization>
+               </payment>
+               <payment>
+                  <id>2570795160</id>
+                  <paymentMethod>PODIUM_GIFTCARD</paymentMethod>
+                  <authorization>
+                     <status>AUTHORIZED</status>
+                     <amount currency="EUR">216</amount>
+                     <confidenceLevel>ACQUIRER_PENDING</confidenceLevel>
+                     <capture>
+                        <status>CAPTURED</status>
+                        <amount currency="EUR">216</amount>
+                     </capture>
+                  </authorization>
+               </payment>
+            </report>
+         </statusSuccess>
+      </statusResponse>
+   </S:Body>
+</S:Envelope>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docdata
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Henk Meijer
@@ -288,6 +288,7 @@ files:
 - spec/xml/refund_success.xml
 - spec/xml/status-canceled-creditcard.xml
 - spec/xml/status-canceled-ideal.xml
+- spec/xml/status-multiple-paid.xml
 - spec/xml/status-new.xml
 - spec/xml/status-paid-canceled-ideal-multiple.xml
 - spec/xml/status-paid-creditcard.xml
@@ -335,6 +336,7 @@ test_files:
 - spec/xml/refund_success.xml
 - spec/xml/status-canceled-creditcard.xml
 - spec/xml/status-canceled-ideal.xml
+- spec/xml/status-multiple-paid.xml
 - spec/xml/status-new.xml
 - spec/xml/status-paid-canceled-ideal-multiple.xml
 - spec/xml/status-paid-creditcard.xml