catarse_pagarme 2.4.9 → 2.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 102545aaa90e556cf8be86f2a9029f85568d7a3e
-  data.tar.gz: 8f8c037dc1e3d78e79cce1e4e2caadfd590abb4b
+  metadata.gz: 167056c394c65f4907196b570a631367b03fe471
+  data.tar.gz: 6dedfa0adf8a6b398e5967d320851adcc21eb637
 SHA512:
-  metadata.gz: ef493484bbd2dc0372895c6e2c5f06586c3ebf621bce44bdc638d8bf1ee94e3f3b4f184ed4e823234594eacbde5e8b5accf3190008c204843b4a881c0b1ccc9b
-  data.tar.gz: 711bdd179df176ef971a82e052695cc0935c7835ab508f34f93d18d074bfe2e58055352f7d653626d67fe53695aa6010bc3d12d00aafac105c99e5ed160da0a0
+  metadata.gz: 0230b0a36302dace3afd5bdbeb2cc5e27a021260e096950b062353d5ec50479ae80eae3f74308b5e993e1ea00d8444dfa53df690d492a9f9d866ccc1965ccd58
+  data.tar.gz: f59f6667a1237763d93fc3dfec731562eb355a89f666777e677a4f1a82a1ea4735ffdc96593169f69fca1631d6645d6f29290e5d28680939ebecc5736b0f7322

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    catarse_pagarme (2.4.9)
+    catarse_pagarme (2.4.10)
       pagarme (~> 1.9.8)
       rails (~> 4.0)
 
@@ -52,7 +52,7 @@ GEM
     mime-types (1.25.1)
     minitest (5.4.0)
     multi_json (1.10.1)
-    netrc (0.10.2)
+    netrc (0.10.3)
     pagarme (1.9.9)
       multi_json
       rest-client

data/app/controllers/catarse_pagarme/notifications_controller.rb

@@ -13,7 +13,7 @@ module CatarsePagarme
             contribution.try(:invalid_refund)
           else
             delegator.change_status_by_transaction(params[:current_status])
-            delegator.fill_acquirer_data
+            delegator.update_fee
           end
 
           return render nothing: true, status: 200

data/app/models/catarse_pagarme/contribution_delegator.rb

@@ -21,11 +21,19 @@ module CatarsePagarme
       end
     end
 
+    def update_fee
+      fill_acquirer_data
+      contribution.update_attributes({
+        payment_service_fee: get_fee,
+      })
+    end
+
     def fill_acquirer_data
       if !contribution.acquirer_name.present? || !contribution.acquirer_tid.present?
         contribution.update_attributes({
           acquirer_name: transaction.acquirer_name,
-          acquirer_tid: transaction.tid
+          acquirer_tid: transaction.tid,
+          card_brand: transaction.try(:card_brand)
         })
       end
     end

data/app/models/catarse_pagarme/fee_calculator_concern.rb

@@ -6,24 +6,47 @@ module CatarsePagarme::FeeCalculatorConcern
     def get_fee
       return nil if self.contribution.payment_choice.blank? # We always depend on the payment_choice
       if self.contribution.payment_choice == ::CatarsePagarme::PaymentType::SLIP
-        CatarsePagarme.configuration.slip_tax.to_f
+        get_slip_fee
       else
-        return nil if self.contribution.acquirer_name.blank? # Here we depend on the acquirer name
-        if self.contribution.acquirer_name == 'stone'
-          self.contribution.installments > 1 ? tax_calc_for_installment(stone_tax) : tax_calc(stone_tax)
-        else
-          return nil if self.contribution.card_brand.blank? # Here we depend on the card_brand
-          if self.contribution.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.contribution.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
+        get_card_fee
       end
     end
 
     protected
+    def get_slip_fee
+      CatarsePagarme.configuration.slip_tax.to_f
+    end
+
+    def get_card_fee
+      return nil if self.contribution.acquirer_name.blank? # Here we depend on the acquirer name
+      if self.contribution.acquirer_name == 'stone'
+        get_stone_fee
+      else
+        get_cielo_fee
+      end
+    end
+
+    def get_stone_fee
+      self.contribution.installments > 1 ? tax_calc_for_installment(stone_tax) : tax_calc(stone_tax)
+    end
+
+    def get_cielo_fee
+      return nil if self.contribution.card_brand.blank? # Here we depend on the card_brand
+      if self.contribution.card_brand == 'amex'
+        get_cielo_fee_for_amex
+      else
+        get_cielo_fee_for_non_amex
+      end
+    end
+
+    def get_cielo_fee_for_amex
+      self.contribution.installments > 1 ? tax_calc_for_installment(cielo_installment_amex_tax) : tax_calc(cielo_installment_not_amex_tax)
+    end
+
+    def get_cielo_fee_for_non_amex
+      current_tax = self.contribution.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
 
     def tax_calc acquirer_tax
       ((self.contribution.value * pagarme_tax) + cents_fee).round(2) + (self.contribution.value * acquirer_tax).round(2)

data/app/models/catarse_pagarme/transaction_base.rb

@@ -11,7 +11,7 @@ module CatarsePagarme
 
     def change_contribution_state
       self.contribution.update_attributes(attributes_to_contribution)
-      update_fee
+      delegator.update_fee
       self.contribution.payment_notifications.create(extra_data: self.transaction.to_json)
       delegator.change_status_by_transaction(self.transaction.status)
     end
@@ -27,10 +27,7 @@ module CatarsePagarme
         payment_method: 'Pagarme',
         slip_url: self.transaction.boleto_url,
         installments: (self.transaction.installments || 1),
-        installment_value: (delegator.value_for_installment(self.transaction.installments || 0) / 100.0).to_f,
-        acquirer_name: self.transaction.acquirer_name,
-        acquirer_tid: self.transaction.tid,
-        card_brand: self.transaction.try(:card_brand)
+        installment_value: (delegator.value_for_installment(self.transaction.installments || 0) / 100.0).to_f
       }
     end
 
@@ -38,11 +35,5 @@ module CatarsePagarme
       self.contribution.pagarme_delegator
     end
 
-    private
-    def update_fee
-      self.contribution.update_attributes({
-        payment_service_fee: delegator.get_fee,
-      })
-    end
   end
 end

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "2.4.9"
+  VERSION = "2.4.10"
 end

data/spec/models/catarse_pagarme/credit_card_transaction_spec.rb

@@ -42,6 +42,7 @@ describe CatarsePagarme::CreditCardTransaction do
     describe 'with valid attributes' do
       before do
         contribution.should_receive(:update_attributes).at_least(1).and_call_original
+        PagarMe::Transaction.should_receive(:find_by_id).with(pagarme_transaction.id).and_return(pagarme_transaction)
         CatarsePagarme::ContributionDelegator.any_instance.should_receive(:change_status_by_transaction).with('paid')
 
         card_transaction.charge!

data/spec/models/catarse_pagarme/slip_transaction_spec.rb

@@ -74,6 +74,7 @@ describe CatarsePagarme::SlipTransaction 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).at_least(1).and_call_original
+        PagarMe::Transaction.should_receive(:find_by_id).with(pagarme_transaction.id).and_return(pagarme_transaction)
         CatarsePagarme::ContributionDelegator.any_instance.should_receive(:change_status_by_transaction).with('paid')
 
         slip_transaction.charge!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 2.4.9
+  version: 2.4.10
 platform: ruby
 authors:
 - Antônio Roberto Silva