stripe_invoice 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df644f3ed96fa4252f80eed1698a5d5281cc484a
-  data.tar.gz: 90a0dd31292726cd2c018fcd893f8a418fd0af17
+  metadata.gz: d6c62d186f30b26ee3f6f9c5e0741a8f5e855924
+  data.tar.gz: cc3d701733f07968d2fdf9ba1d9af4eb7c5f953a
 SHA512:
-  metadata.gz: 75e3bc64405cf840b164b385a4cad26ebd2164c7120d42e65862960a4af6d00d302b97103c64e846802d24db17437f80e12013c0453f857ba939b995d69d04cf
-  data.tar.gz: cde4bd6bf66f8490b7f9048e1e124524de4f2f729a4191548c0f3e0eaf059902ac54c56c6f169a293cc9d766c7ebd5c34ea03f031330dd19ffe01e966036c9d7
+  metadata.gz: 2f43f460652eef6aa0204be986a70a2239384f3557c6d7c3ede0a05ae38ca5b65dcb04d3787366dfca6adb50bca27681b28ef2553ac328d22df8e6f13f763a77
+  data.tar.gz: 0914d73f343604a061f854d02d394f1fcb4bd40ec8a42abb77143d1c5abb27d55b53ecd56b1ef7414182ae167c8dabbf84496434bf1b9b31315f9d77e7e8d45e

data/app/delayed_jobs/stripe_invoice/dj_tax_report.rb

@@ -28,7 +28,7 @@ module StripeInvoice
           country: country,
           tax_number: charge.tax_number,
           billing_address: charge.billing_address,
-          bt: Stripe::BalanceTransaction.retrieve(charge.indifferent_json[:balance_transaction]),
+          bt: charge.balance_transaction_object,
           owner: owner,
         }
         puts "[#{self.class.name}##{__method__.to_s}] aggregating data #{charge.stripe_id}"
@@ -82,11 +82,13 @@ module StripeInvoice
       result = []
       charges.each_key do |key|
         next if key.blank?
-        
+
         result <<  {
-          amount: charges[key].sum{|char| char[:charge].total_less_refunds},
-          currency: charges[key].first[:charge].currency,
-          tax_number: key 
+          amount: (charges[key].sum {|charge| charge[:charge].balance_transaction_total_less_refunds}),
+          currency: charges[key].first[:bt][:currency],
+          tax_number: key,
+          country: (charges[key].first[:charge].owner.country ? charges[key].first[:charge].owner.country : 
+             "CC: #{charges[key].first[:charge].source_country}")
           }
       end
       

data/app/models/stripe_invoice/charge.rb

@@ -41,10 +41,46 @@ module StripeInvoice
       refunds.inject(0){ |total,refund| total + refund[:amount]}
     end
     
+    def total_refund_transaction
+      refunds.inject(0) do |total, refund|
+        bt = Stripe::BalanceTransaction.retrieve(refund[:balance_transaction])
+        total + bt[:amount]
+      end
+    end
+    
     def total_less_refunds
       total - total_refund
     end
     
+    def balance_transaction_object
+      @btobj ||= Stripe::BalanceTransaction.retrieve balance_transaction_sid
+    end
+    
+    def balance_transaction_sid
+      self.indifferent_json[:balance_transaction]
+    end
+    
+    def balance_transaction_currency
+      self.balance_transaction_object[:currency]
+    end
+    
+    def balance_transaction_total_less_refunds
+      result = (balance_transaction_object[:amount] - self.total_refund_transaction)
+      puts "[#{self.class.name}##{__method__.to_s}] result for #{id}-#{tax_number}: #{result}"
+      
+      result
+    end
+    
+    # the country the source is registered in 
+    def source_country
+      # source can only be accessed via Customer
+      cus = Stripe::Customer.retrieve self.indifferent_json[:customer]
+      # TODO this is wrong, because there might be multiple sources and I 
+      # just randomly select the first one - also some source types might NOT even
+      # have a country information
+      cus.sources.data[0].country
+    end
+    
     # builds the invoice from the stripe CHARGE object
     # OR updates the existing invoice if an invoice for that id exists
     def self.create_from_stripe(stripe_charge)

data/app/views/stripe_invoice/invoices/tax_report.pdf.prawn

@@ -29,7 +29,7 @@ prawn_document(:page_layout => :portrait) do |pdf|
     pdf.start_new_page
     pdf.font_size(17.5) { pdf.text "Volume per tax ID", :style => :bold }
     volume_per_tax_number.each do |vptn_hash|
-        pdf.text "#{vptn_hash[:tax_number]}: #{format_stripe_currency(vptn_hash,:amount)}" 
+        pdf.text "#{vptn_hash[:tax_number]}(#{vptn_hash[:country]}): #{format_stripe_currency(vptn_hash,:amount)}" 
     end
     
     pdf.start_new_page

data/lib/stripe_invoice/version.rb

@@ -1,3 +1,3 @@
 module StripeInvoice
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe_invoice
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Christoph Engelhardt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails