catarse_pagarme 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf98d419de56f7a1adfa64592a5d329dc303785d
-  data.tar.gz: 4f0515130277c1bd3cfad9a597a104994e5037a6
+  metadata.gz: e4ba46bca94f1ff4f9461ea5ee5b99798e1e80f7
+  data.tar.gz: 082fc8e59856c856bf6f3dab97c710027f935fe9
 SHA512:
-  metadata.gz: 231ba1581b502e9095993cac7285b9e56c17698330a8258c9da95beeb3ce35a15fca1acdb699610d0914912bb84c78abb90ee92b0aa87ee6f1eadccb849e5869
-  data.tar.gz: 53d94d2c2bc7853e96a3e20887c0f999ad8165fec6a25a1fb6e85af516d3ae008ba8eac31ab6146382a4b863a3a1f74475910975b450ae50882f52e27155b3a8
+  metadata.gz: dc5e1858379c685bceb097b3737db4f8cbaa35ee202165f2f65aa416db7d157fbc3233101c936a61db78256317f9847b92204bcebd12b09d6fb5076fcf3826e2
+  data.tar.gz: 236f314db22fb50785f5fe70ff5ef01fc35785ae7112d1de196bd4233f20f6340fe8dc34f5b56e78181868b1f523d27016300949190abe8ba2ca428f2eb64ac2

data/app/models/catarse_pagarme/fee_calculator_concern.rb

@@ -12,10 +12,10 @@ module CatarsePagarme::FeeCalculatorConcern
         else
           if self.transaction.card_brand == 'amex'
             self.contribution.installments > 1 ? tax_calc_for_installment(cielo_installment_amex_tax) : tax_calc(cielo_installment_not_amex_tax)
+          else
+            current_tax = self.transaction.card_brand == 'diners' ? installment_diners_tax : installment_not_diners_tax
+            self.contribution.installments > 1 ? tax_calc_for_installment(current_tax) : tax_calc(cielo_tax)
           end
-
-          current_tax = self.transaction.card_brand == 'diners' ? installment_diners_tax : installment_not_diners_tax
-          self.contribution.installments > 1 ? tax_calc_for_installment(current_tax) : tax_calc(cielo_tax)
         end
       end
     end

data/lib/catarse_pagarme/configuration.rb

@@ -21,6 +21,8 @@ module CatarsePagarme
       self.cielo_tax = 0.038
       self.cielo_installment_diners_tax = 0.048
       self.cielo_installment_not_diners_tax = 0.0455
+      self.cielo_installment_amex_tax = 0.058
+      self.cielo_installment_not_amex_tax = 0.048
     end
   end
 end

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails