killbill-stripe 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95a37dc632a4cc4d0475724df6e99b0d088afed9
-  data.tar.gz: 00b54366237adb4380ed95185ecf6607e9676a1a
+  metadata.gz: bbeb71a7aae52e4c3a9fe698f6155e177629cf03
+  data.tar.gz: 49a41004e15684354aad2a4bf2ca48afb582a4af
 SHA512:
-  metadata.gz: cc870672434794fd52ee821785fa86fe90d16854dc7cf6e1ca83a38308f5ae0a3412114839675e577c1238f262f3ab7585b648800d902762e558036cd2a4d272
-  data.tar.gz: a7b60c26c76ae61b91f75011e3d06a3d4e2117a7ae5bf6bea824a755d5253629757db63b666aa4cb654b06a1c56fd301b176da3b4a65ff482bd43350f2fe7b5e
+  metadata.gz: 2c3ce1d90ad13747342d5ca72efd2edb06bd547ea50a576552863cb4ff32176a6c7b64db7125a68b553cc9bd6092f1e3f581599b2c06073130376dbdfb900527
+  data.tar.gz: 3568addf8c662046a1cb0d65a286f1d35c4125c70c1ac8c824b495deb802df1309dce80cc1fa7ba7a72c3d91ffa65f73a3cbee6359259a1505acfc3ff7876faa

data/lib/stripe/api.rb

@@ -26,7 +26,7 @@ module Killbill #:nodoc:
         pm = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id)
 
         options = {}
-        populate_defaults(pm, amount, properties, context, options)
+        populate_defaults(pm, amount, currency, properties, context, 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)
@@ -44,7 +44,7 @@ module Killbill #:nodoc:
         pm = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id)
 
         options = {}
-        populate_defaults(pm, amount, properties, context, options)
+        populate_defaults(pm, amount, currency, properties, context, 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)
@@ -237,10 +237,10 @@ module Killbill #:nodoc:
         end
       end
 
-      def populate_defaults(pm, amount, properties, context, options)
+      def populate_defaults(pm, amount, currency, properties, context, options)
         options[:customer] ||= pm.stripe_customer_id
         options[:destination] ||= get_destination(properties, context)
-        options[:application_fee] ||= get_application_fee(amount, properties) unless options[:destination].nil?
+        options[:application_fee] ||= get_application_fee(amount, currency, properties) unless options[:destination].nil?
       end
 
       def get_destination(properties, context)
@@ -255,14 +255,16 @@ module Killbill #:nodoc:
         end
       end
 
-      def get_application_fee(amount, properties)
+      def get_application_fee(amount, currency, properties)
         fees_amount = find_value_from_properties(properties, :fees_amount)
         return fees_amount unless fees_amount.nil?
 
+        amount_in_cents = ::Monetize.from_numeric(amount, currency).cents.to_i
+
         fees_percent = find_value_from_properties(properties, :fees_percent)
-        return (fees_percent * amount * 100).to_i unless fees_percent.nil?
+        return (fees_percent * amount_in_cents).to_i unless fees_percent.nil?
 
-        config(context.tenant_id)[:stripe][:fees_amount] || (config(context.tenant_id)[:stripe][:fees_percent].to_f * amount * 100)
+        config(context.tenant_id)[:stripe][:fees_amount] || (config(context.tenant_id)[:stripe][:fees_percent].to_f * amount_in_cents)
       end
 
       def is_bank_account?(properties)

data/lib/stripe/ext/active_merchant/active_merchant.rb

@@ -42,6 +42,13 @@ module ActiveMerchant
         headers
       end
 
+      # Ignore the call to localized_amount upstream (money is already cents here)
+      def add_amount(post, money, options, include_currency = false)
+        currency = options[:currency] || currency(money)
+        post[:amount] = money
+        post[:currency] = currency.downcase if include_currency
+      end
+
       # To create a charge on a card or a token, call
       #
       #   purchase(money, card_hash_or_token, { ... })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-stripe
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement