stripe_invoice 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da990157c574276a7b2227200aa58429d99612b4
-  data.tar.gz: 337dc79ce73255c73ebdcb6bf09616bf5843be70
+  metadata.gz: eaffd686fa6c9c5dd2cb4e11cde6b468a55b4e88
+  data.tar.gz: ecc0615876caf9309adcf1f886313201795c3f0a
 SHA512:
-  metadata.gz: 86cffdeb3f473395a9c0a36c338a62d672970304dfcc8b948f81704976252d770e89405f75df308ddaffe11929872d85ef72f23d6f38b335423eb099c88aa5d4
-  data.tar.gz: 27bca204901a23d12251aa5337da4496618ff118d7ebf7ea642c214ca86599e1c1160fa9446f336bc8baae64acc0ad14b061c9033bf640bdf81dcab5f54941b6
+  metadata.gz: 8d5495ebba9a0baba0193803890623ff0889bfabfb6bc88255df318d62e1975eef20acff5eb2352b46739096e2c0758e39f812e6c4a3fe629f880b125434d4e3
+  data.tar.gz: f06c4a011698ca01c8d3aba3cebe0032359399e6d61966089ca5681612613ee8d3ee18d469bc547b7e33eea64ee753881c1558b16d049dc775675d46b5ef302a

data/app/delayed_jobs/stripe_invoice/dj_tax_report.rb

@@ -16,14 +16,17 @@ module StripeInvoice
       puts "[DJTaxReport] number of charges in year: #{sicharges.size}"
       arr_data = []
       sicharges.each do |charge|
-        owner = Koudoku.owner_class.find(charge.owner_id)
+        owner = charge.owner
         
         next unless owner # skip if we don't have an owner
         
         data = {
           charge: charge,
+          country: charge.country,
+          tax_number: charge.tax_number,
+          billing_address: charge.billing_address,
           bt: Stripe::BalanceTransaction.retrieve(charge.indifferent_json[:balance_transaction]),
-          owner: owner
+          owner: owner,
         }
         puts "[DJTaxReport] aggregating data #{charge.stripe_id}"
         if charge.indifferent_json[:refunds].count > 0
@@ -76,14 +79,14 @@ module StripeInvoice
       
       sicharges.each do |hash_ch| 
         # get value or 0 if not present
-        value = result.fetch(hash_ch[:owner].country) { 0 }
+        value = result.fetch(hash_ch[:country]) { 0 }
         
         if hash_ch[:refunds]
           hash_ch[:refunds].each do |refund|
             value -= refund[:bt][:amount]
           end
         end # deduct refunds
-        result[hash_ch[:owner].country] = value + hash_ch[:bt][:amount]
+        result[hash_ch[:country]] = value + hash_ch[:bt][:amount]
       end
       
       result.each do |key, value|

data/app/helpers/stripe_invoice/tax_report_helper.rb

@@ -7,10 +7,5 @@ module StripeInvoice
       number_to_currency(obj[attr_sym].to_f / 100, unit: "#{obj[:currency].upcase} ")
     end
     
-    
-    def format_billing_address(owner)
-      raise "You need to implement #billing_address on your subscription owner class" unless owner.respond_to? :billing_address
-      owner.billing_address
-    end
   end
 end

data/app/models/stripe_invoice/charge.rb

@@ -20,6 +20,19 @@ module StripeInvoice
       @owner ||= Koudoku.owner_class.find(owner_id)
     end
     
+    def billing_address
+      indifferent_json[:metadata][:billing_address] || owner.try(:billing_address)
+    end
+    
+    def tax_number
+      indifferent_json[:metadata][:tax_number] || owner.try(:tax_number)
+    end
+    
+    
+    def country
+      indifferent_json[:metadata][:country] || owner.try(:country)
+    end
+    
     def refunds
       indifferent_json[:refunds]
     end
@@ -31,12 +44,14 @@ module StripeInvoice
     # 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)
-      charge = Charge.find_by_stripe_id(stripe_charge[:id])
       
       unless stripe_charge.paid
         puts "ignoring unpaid charges"
         return
-      end 
+      end
+       
+      charge = Charge.find_by_stripe_id(stripe_charge[:id])
+      
       # for existing invoices just update and be done
       if charge.present?
         charge.update_attribute(:json, stripe_charge)
@@ -75,8 +90,21 @@ module StripeInvoice
     def self.get_subscription_owner(stripe_charge)
       # ::Subscription is generated by Koudoku, but lives in main_app
       subscription = ::Subscription.find_by_stripe_id(stripe_charge.customer)
-      return nil if subscription.nil?
-      owner = subscription.subscription_owner 
+      
+      # we found them directly, go for it. 
+      unless subscription.nil?
+        return subscription.subscription_owner
+      end 
+      
+      # koudoku does have a nasty feature/bug in that it deletes the subscription
+      # from the database when it is cancelled. This makes it impossible to 
+      # match past charges to customers based solely on the subscription's stripe_id
+      # instead we also try to match the email address/owner_id that was send to stripe 
+      # when the account was created
+      stripe_customer = Stripe::Customer.retrieve stripe_charge.customer
+      owner_id = stripe_customer.description.to_i
+      Koudoku.owner_class.find(owner_id)
+      
     end
   end
 end

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

@@ -33,8 +33,8 @@ prawn_document(:page_layout => :portrait) do |pdf|
                 
         pdf.text "Charged: #{format_stripe_currency(hash_ch[:charge], :total)}"
         pdf.text "Transaction: #{format_stripe_currency(hash_ch[:bt])} (Fee: #{format_stripe_currency(hash_ch[:bt],:fee)})"
-        pdf.text "Billed to: #{format_billing_address hash_ch[:owner]}"
-        pdf.text "Customer tax number: #{hash_ch[:owner].tax_number}" unless hash_ch[:owner].tax_number.blank?
+        pdf.text "Billed to: #{hash_ch[:billing_address]}"
+        pdf.text "Customer tax number: #{hash_ch[:tax_number]}" unless hash_ch[:tax_number].blank?
         if hash_ch[:refunds]
             ref_text = "<b>Refunds:</b>\n"
             hash_ch[:refunds].each do |hash_refund|

data/lib/stripe_invoice/version.rb

@@ -1,3 +1,3 @@
 module StripeInvoice
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe_invoice
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Christoph Engelhardt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails