catarse_pagarme 2.3.10 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18c70a97dc75f3a4393f18ffbd3556b608c38aba
-  data.tar.gz: ab7d9147e8269bf844398bf7d7fbb2f4002734be
+  metadata.gz: 415da7334098845435424c47e308397ebbcf1250
+  data.tar.gz: 0801a8de19aae2c980fd9b44407c3975120883a6
 SHA512:
-  metadata.gz: b26e1eff2c24abe6cc908bc18f92a67f86deffd54fcd97ca991e4530a7539edb44aebe9481d53cbdfdd1dc4e7f6f7e2f55e9d4b3bbb9837add666039d4801ee2
-  data.tar.gz: 648ed04c24df704b038dbf9bda2556f747b4a59ef8172e5dbb86421c1747714a027df8fb1c030919872f719780d29a1da01ce7152d235bf27beafaa58269eaea
+  metadata.gz: 56a44204b6cd1feb1edf0546859e16681a49b8dae1a8d6741e87e0093189e751fae2d4229a689348dd7899714986d9eb8f0215e45f80be2c7389f99a539ea85f
+  data.tar.gz: 7fe2f172eac029cc469ea9651e3b23c891b874b11fbb2c1d911117076c208b455d7f23a206132f492c227f97a3062d33464cc6bf916b43ba1c0fd20aeafc6051

data/app/models/catarse_pagarme/contribution_delegator.rb

@@ -1,6 +1,7 @@
 module CatarsePagarme
   class ContributionDelegator
     attr_accessor :contribution, :transaction
+    include FeeCalculatorConcern
 
     def initialize(contribution)
       configure_pagarme
@@ -74,34 +75,6 @@ module CatarsePagarme
       })
     end
 
-    def get_fee(payment_method, acquirer_name = nil)
-      value = self.contribution.value
-      installment_value = self.contribution.installment_value
-      installments = self.contribution.installments
-      cents_fee = CatarsePagarme.configuration.credit_card_cents_fee.to_f
-      pagarme_tax = CatarsePagarme.configuration.pagarme_tax.to_f
-      cielo_tax = CatarsePagarme.configuration.cielo_tax.to_f
-      stone_tax = CatarsePagarme.configuration.stone_tax.to_f
-
-      if payment_method == PaymentType::SLIP
-        CatarsePagarme.configuration.slip_tax.to_f
-      else
-        if acquirer_name == 'stone'
-          if installments > 1
-            (((installment_value * installments) * pagarme_tax) + cents_fee).round(2) + ((installment_value * stone_tax).round(2) * installments)
-          else
-            ((value * pagarme_tax) + cents_fee).round(2) + (value * stone_tax).round(2)
-          end
-        else
-          if installments > 1
-            (((installment_value * installments) * pagarme_tax) + cents_fee).round(2) + ((installment_value * cielo_tax).round(2) * installments)
-          else
-            ((value * pagarme_tax) + cents_fee).round(2) + (value * cielo_tax).round(2)
-          end
-        end
-      end
-    end
-
     protected
 
     def bank_account_attributes

data/app/models/catarse_pagarme/fee_calculator_concern.rb

@@ -0,0 +1,54 @@
+module CatarsePagarme::FeeCalculatorConcern
+  extend ActiveSupport::Concern
+
+  included do
+
+    def get_fee(payment_method, acquirer_name = nil)
+      if payment_method == ::CatarsePagarme::PaymentType::SLIP
+        CatarsePagarme.configuration.slip_tax.to_f
+      else
+        if acquirer_name == 'stone'
+          self.contribution.installments > 1 ? tax_calc_for_installment(stone_tax) : tax_calc(stone_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
+      end
+    end
+
+    protected
+
+    def tax_calc acquirer_tax
+      ((self.contribution.value * pagarme_tax) + cents_fee).round(2) + (self.contribution.value * acquirer_tax).round(2)
+    end
+
+    def tax_calc_for_installment acquirer_tax
+      (((self.contribution.installment_value * self.contribution.installments) * pagarme_tax) + cents_fee).round(2) + ((self.contribution.installment_value * acquirer_tax).round(2) * self.contribution.installments)
+    end
+
+    def cents_fee
+      CatarsePagarme.configuration.credit_card_cents_fee.to_f
+    end
+
+    def pagarme_tax
+      CatarsePagarme.configuration.pagarme_tax.to_f
+    end
+
+    def cielo_tax
+      CatarsePagarme.configuration.cielo_tax.to_f
+    end
+
+    def stone_tax
+      CatarsePagarme.configuration.stone_tax.to_f
+    end
+
+    def installment_diners_tax
+      CatarsePagarme.configuration.cielo_installment_diners_tax.to_f
+    end
+
+    def installment_not_diners_tax
+      CatarsePagarme.configuration.cielo_installment_not_diners_tax.to_f
+    end
+
+  end
+end

data/app/models/catarse_pagarme/transaction_base.rb

@@ -11,6 +11,7 @@ module CatarsePagarme
 
     def change_contribution_state
       self.contribution.update_attributes(attributes_to_contribution)
+      update_fee
       self.contribution.payment_notifications.create(extra_data: self.transaction.to_json)
       delegator.change_status_by_transaction(self.transaction.status)
     end
@@ -22,7 +23,6 @@ module CatarsePagarme
     def attributes_to_contribution
       {
         payment_choice: payment_method,
-        payment_service_fee: delegator.get_fee(payment_method, self.transaction.acquirer_name),
         payment_id: self.transaction.id,
         payment_method: 'Pagarme',
         slip_url: self.transaction.boleto_url,
@@ -33,6 +33,12 @@ module CatarsePagarme
       }
     end
 
+    def update_fee
+      self.contribution.update_attributes({
+        payment_service_fee: delegator.get_fee(payment_method, self.transaction.acquirer_name),
+      })
+    end
+
     def delegator
       self.contribution.pagarme_delegator
     end

data/lib/catarse_pagarme/configuration.rb

@@ -1,7 +1,8 @@
 module CatarsePagarme
   class Configuration
     attr_accessor :api_key, :slip_tax, :credit_card_tax, :interest_rate, :host, :subdomain, :protocol,
-      :max_installments, :minimum_value_for_installment, :credit_card_cents_fee, :pagarme_tax, :stone_tax, :cielo_tax
+      :max_installments, :minimum_value_for_installment, :credit_card_cents_fee, :pagarme_tax, :stone_tax,
+      :cielo_tax, :cielo_installment_diners_tax, :cielo_installment_not_diners_tax
 
     def initialize
       self.api_key = ''
@@ -17,6 +18,8 @@ module CatarsePagarme
       self.pagarme_tax = 0.0063
       self.stone_tax = 0.0307
       self.cielo_tax = 0.038
+      self.cielo_installment_diners_tax = 0.048
+      self.cielo_installment_not_diners_tax = 0.0455
     end
   end
 end

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "2.3.10"
+  VERSION = "2.4.0"
 end

data/spec/controllers/catarse_pagarme/credit_cards_controller_spec.rb

@@ -27,12 +27,12 @@ describe CatarsePagarme::CreditCardsController do
         before do
           post :create, {
             locale: :pt, project_id: project.id, contribution_id: contribution.id, use_route: 'catarse_pagarme',
-            payment_card_date: '10/17', payment_card_number: '4901720080344448', payment_card_name: 'Foo bar',
-            payment_card_source: '143', payment_card_installments: '1' }
+            payment_card_date: '10/17', payment_card_number: '4012888888881881', payment_card_name: 'Foo bar',
+            payment_card_source: '574', payment_card_installments: '1' }
 
         end
 
-        it 'payment_status should be filled and not failed' do
+        it 'payment_status should be filled' do
           expect(ActiveSupport::JSON.decode(response.body)['payment_status']).not_to be_nil
         end
 

data/spec/controllers/catarse_pagarme/notifications_controller_spec.rb

@@ -1,8 +1,16 @@
 require 'spec_helper'
 
 describe CatarsePagarme::NotificationsController do
+  let(:fake_transaction) {
+    t = double
+    t.stub(:card_brand).and_return('visa')
+    t.stub(:acquirer_name).and_return('stone')
+    t.stub(:tid).and_return('404040404')
+    t
+  }
   before do
     PagarMe.stub(:validate_fingerprint).and_return(true)
+    PagarMe::Transaction.stub(:find_by_id).and_return(fake_transaction)
   end
 
   let(:project) { create(:project, goal: 10_000, state: 'online') }

data/spec/models/catarse_pagarme/contribution_delegator_spec.rb

@@ -30,12 +30,22 @@ describe CatarsePagarme::ContributionDelegator do
   end
 
   context "#get_fee" do
+    let(:fake_transaction) {
+      t = double
+      t.stub(:card_brand).and_return('visa')
+      t.stub(:acquirer_name).and_return('stone')
+      t.stub(:acquirer_tid).and_return('404040404')
+      t
+    }
+
     before do
       CatarsePagarme.configuration.stub(:slip_tax).and_return(2.00)
       CatarsePagarme.configuration.stub(:credit_card_tax).and_return(0.01)
       CatarsePagarme.configuration.stub(:pagarme_tax).and_return(0.0063)
       CatarsePagarme.configuration.stub(:cielo_tax).and_return(0.038)
       CatarsePagarme.configuration.stub(:stone_tax).and_return(0.0307)
+
+      delegator.stub(:transaction).and_return(fake_transaction)
     end
 
     context 'when choice is slip' do

data/spec/models/catarse_pagarme/credit_card_transaction_spec.rb

@@ -40,7 +40,7 @@ describe CatarsePagarme::CreditCardTransaction do
   describe '#charge!' do
     describe 'with valid attributes' do
       before do
-        contribution.should_receive(:update_attributes).and_call_original
+        contribution.should_receive(:update_attributes).at_least(1).and_call_original
         CatarsePagarme::ContributionDelegator.any_instance.should_receive(:change_status_by_transaction).with('paid')
 
         card_transaction.charge!
@@ -52,7 +52,7 @@ describe CatarsePagarme::CreditCardTransaction do
       end
 
       it "should update contribution payment_service_fee" do
-        expect(contribution.payment_service_fee.to_f).to eq(1.39)
+        expect(contribution.payment_service_fee.to_f).to eq(4.08)
       end
 
       it "should update contribution payment_method" do

data/spec/models/catarse_pagarme/slip_transaction_spec.rb

@@ -8,7 +8,7 @@ describe CatarsePagarme::SlipTransaction do
     transaction.stub(:charge).and_return(true)
     transaction.stub(:status).and_return('paid')
     transaction.stub(:boleto_url).and_return('boleto url')
-    transaction.stub(:installments).and_return(nil)
+    transaction.stub(:installments).and_return(1)
     transaction.stub(:acquirer_name).and_return('pagarme')
     transaction.stub(:tid).and_return('123123')
     transaction
@@ -72,7 +72,7 @@ describe CatarsePagarme::SlipTransaction do
       before do
         slip_transaction.should_receive(:update_user_bank_account).and_call_original
         slip_transaction.user.should_receive(:update_attributes).and_return(true)
-        contribution.should_receive(:update_attributes).and_call_original
+        contribution.should_receive(:update_attributes).at_least(1).and_call_original
         CatarsePagarme::ContributionDelegator.any_instance.should_receive(:change_status_by_transaction).with('paid')
 
         slip_transaction.charge!

data/spec/spec_helper.rb

@@ -30,7 +30,7 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    PagarMe.stub(:api_key).and_return('ak_test_Rw4JR98FmYST2ngEHtMvVf5QJW7Eoo')
+    PagarMe.stub(:api_key).and_return('ak_test_XLoo19QDn9kg5JFGU70x12IA4NqbAv')
     PaymentEngines.stub(:configuration).and_return({})
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 2.3.10
+  version: 2.4.0
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,6 +116,7 @@ files:
 - app/models/catarse_pagarme/credit_card_concern.rb
 - app/models/catarse_pagarme/credit_card_delegator.rb
 - app/models/catarse_pagarme/credit_card_transaction.rb
+- app/models/catarse_pagarme/fee_calculator_concern.rb
 - app/models/catarse_pagarme/payment_type.rb
 - app/models/catarse_pagarme/save_credit_card_transaction.rb
 - app/models/catarse_pagarme/slip_transaction.rb