catarse_pagarme 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca5f1843f383ba1b039078824668b3ae1f76355d
-  data.tar.gz: d1490d6301640a4c5c07c874aeb435a4948475e6
+  metadata.gz: 7dc8ae441730dda9e80feffa57915394a1b7d00f
+  data.tar.gz: 889da7140baeb1bbdc7b43d712c77186eab8a5e7
 SHA512:
-  metadata.gz: 45bafd1a218639dae2940a9e37066fec3c28b17c3ded75a58738d13c5f7863cf837e9d5c81e9b2fe00fe46a06a8127f1064fcf534e3e3131c74ac09eabcee003
-  data.tar.gz: 64d599f47e98fe0d17c81258e788d4fa278a0a615314d95b893ce0f0eec76e34a22a8137d4ad77b51b17199ec3d5f90458c11d72e6278e56e82765df6c0e2375
+  metadata.gz: 2adc8c464fdcc70ad0b5d480a86130c23d78f96a73b53ac9fb641c6f6825ebbb027b0e894545b8db278c4c3a5fd31fa0753c62811168256ff2f3a8a5cd61e163
+  data.tar.gz: 49a57fee3431a84a4fe913327232f47213b8bd9e8f96e2e1bd88dfa19cac78831c49783404c56b5a697498a182141e0ca524ebdecb3eaa8e06f0c2732014e6e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    catarse_pagarme (2.5.1)
+    catarse_pagarme (2.6.0)
       pagarme (~> 1.9.8)
       rails (~> 4.0)
 
@@ -111,262 +111,6 @@ GEM
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
       polyglot (>= 0.3.1)
     tzinfo (1.2.1)
       thread_safe (~> 0.1)

data/app/controllers/catarse_pagarme/application_controller.rb

@@ -34,17 +34,16 @@ module CatarsePagarme
     end
 
     def contribution
-      conditions = {id: params[:id] }
-
-      unless params[:controller] == 'catarse_pagarme/notifications'
-        conditions.merge!({user_id: current_user.id}) unless current_user.admin
-      end
+      @contribution ||= PaymentEngines.find_contribution(params[:id])
+    end
 
-      @contribution ||= PaymentEngines.find_payment(conditions)
+    def payment
+      attributes = {contribution: contribution, value: contribution.value}
+      @payment ||= PaymentEngines.new_payment(attributes)
     end
 
     def delegator
-      contribution.pagarme_delegator
+      payment.pagarme_delegator
     end
   end
 end

data/app/controllers/catarse_pagarme/credit_cards_controller.rb

@@ -2,7 +2,7 @@ module CatarsePagarme
   class CreditCardsController < CatarsePagarme::ApplicationController
 
     def create
-      transaction = CreditCardTransaction.new(credit_card_attributes, contribution).charge!
+      transaction = CreditCardTransaction.new(credit_card_attributes, payment).charge!
 
       render json: { payment_status: transaction.status }
     rescue Exception => e
@@ -20,11 +20,11 @@ module CatarsePagarme
                                             protocol: CatarsePagarme.configuration.protocol),
         installments: get_installment,
         customer: {
-          email: contribution.user.email,
-          name: contribution.user.name
+          email: payment.user.email,
+          name: payment.user.name
         },
         metadata: {
-          key: contribution.key
+          key: payment.generate_key
         }
       }
 
@@ -42,7 +42,7 @@ module CatarsePagarme
     end
 
     def get_installment
-      if contribution.value.to_f < CatarsePagarme.configuration.minimum_value_for_installment.to_f
+      if payment.value.to_f < CatarsePagarme.configuration.minimum_value_for_installment.to_f
         1
       elsif params[:payment_card_installments].to_i > 0
         params[:payment_card_installments].to_i

data/app/controllers/catarse_pagarme/notifications_controller.rb

@@ -3,13 +3,13 @@ module CatarsePagarme
     skip_before_filter :authenticate_user!
 
     def create
-      if contribution
-        contribution.payment_notifications.create(extra_data: params.to_json)
+      if payment
+        payment.payment_notifications.create(contribution: payment.contribution, extra_data: params.to_json)
 
-        if PagarMe::validate_fingerprint(contribution.try(:payment_id), params[:fingerprint])
+        if PagarMe::validate_fingerprint(payment.try(:gateway_id), params[:fingerprint])
 
           if params[:current_status] == 'paid' && params[:desired_status] == 'refunded'
-            contribution.try(:invalid_refund)
+            payment.try(:invalid_refund)
           else
             delegator.change_status_by_transaction(params[:current_status])
             delegator.update_fee
@@ -24,8 +24,8 @@ module CatarsePagarme
 
     protected
 
-    def contribution
-      @contribution ||=  PaymentEngines.find_payment({ payment_id: params[:id] })
+    def payment
+      @payment ||=  PaymentEngines.find_payment({ gateway_id: params[:id] })
     end
   end
 end

data/app/controllers/catarse_pagarme/slip_controller.rb

@@ -2,7 +2,7 @@ module CatarsePagarme
   class SlipController < CatarsePagarme::ApplicationController
 
     def create
-      transaction = SlipTransaction.new(permitted_attributes, contribution).charge!
+      transaction = SlipTransaction.new(permitted_attributes, payment).charge!
 
       render json: { boleto_url: transaction.boleto_url, payment_status: transaction.status }
     rescue PagarMe::PagarMeError => e
@@ -10,7 +10,7 @@ module CatarsePagarme
     end
 
     def update
-      transaction = SlipTransaction.new(permitted_attributes, contribution).charge!
+      transaction = SlipTransaction.new(permitted_attributes, payment).charge!
       render text: transaction.boleto_url
     end
 
@@ -25,18 +25,18 @@ module CatarsePagarme
                                             subdomain: CatarsePagarme.configuration.subdomain,
                                             protocol: CatarsePagarme.configuration.protocol),
         customer: {
-          email: contribution.user.email,
-          name: contribution.user.name
+          email: payment.user.email,
+          name: payment.user.name
         },
         metadata: {
-          key: contribution.key 
+          key: payment.generate_key 
         }
       }.update({ user: params[:user] })
     end
 
     def permitted_attributes
       attrs = ActionController::Parameters.new(slip_attributes)
-      attrs.permit(:boleto_expiration_date, :payment_method, :amount, :postback_url, customer: [:name, :email],
+      attrs.permit(:boleto_expiration_date, :payment_method, :amount, :postback_url, metadata: [:key], customer: [:name, :email],
         user: [
           bank_account_attributes: [
             :bank_id, :account, :account_digit, :agency,

data/app/helpers/catarse_pagarme/application_helper.rb

@@ -1,8 +1,8 @@
 module CatarsePagarme
   module ApplicationHelper
 
-    def installments_for_select(contribution)
-      installments = contribution.pagarme_delegator.get_installments['installments']
+    def installments_for_select(payment)
+      installments = payment.pagarme_delegator.get_installments['installments']
 
       collection = installments.map do |installment|
         installment_number = installment[0].to_i
@@ -11,7 +11,7 @@ module CatarsePagarme
 
           optional_text = nil
           if installment_number != 1
-            optional_text = I18n.t('projects.contributions.edit.installment_with_tax')
+            optional_text = I18n.t('projects.payments.edit.installment_with_tax')
           end
 
           ["#{format_instalment_text(installment_number, amount)} #{optional_text}", installment_number]

data/app/models/catarse_pagarme/credit_card_transaction.rb

@@ -7,7 +7,7 @@ module CatarsePagarme
       self.transaction = PagarMe::Transaction.new(self.attributes)
       self.transaction.charge
 
-      change_contribution_state
+      change_payment_state
 
       if self.transaction.status == 'refused'
         raise ::PagarMe::PagarMeError.new(I18n.t('projects.contributions.edit.transaction_error'))

data/app/models/catarse_pagarme/fee_calculator_concern.rb

@@ -4,8 +4,8 @@ module CatarsePagarme::FeeCalculatorConcern
   included do
 
     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
+      return nil if self.payment.payment_method.blank? # We always depend on the payment_choice
+      if self.payment.payment_method == ::CatarsePagarme::PaymentType::SLIP
         get_slip_fee
       else
         get_card_fee
@@ -18,8 +18,8 @@ module CatarsePagarme::FeeCalculatorConcern
     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'
+      return nil if self.payment.gateway_data["acquirer_name"].blank? # Here we depend on the acquirer name
+      if self.payment.gateway_data["acquirer_name"] == 'stone'
         get_stone_fee
       else
         get_cielo_fee
@@ -27,12 +27,12 @@ module CatarsePagarme::FeeCalculatorConcern
     end
 
     def get_stone_fee
-      self.contribution.installments > 1 ? tax_calc_for_installment(stone_tax) : tax_calc(stone_tax)
+      self.payment.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'
+      return nil if self.payment.gateway_data["card_brand"].blank? # Here we depend on the card_brand
+      if self.payment.gateway_data["card_brand"] == 'amex'
         get_cielo_fee_for_amex
       else
         get_cielo_fee_for_non_amex
@@ -40,20 +40,20 @@ module CatarsePagarme::FeeCalculatorConcern
     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)
+      self.payment.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)
+      current_tax = self.payment.gateway_data["card_brand"] == 'diners' ? installment_diners_tax : installment_not_diners_tax
+      self.payment.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)
+      ((self.payment.value * pagarme_tax) + cents_fee).round(2) + (self.payment.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)
+      (((self.payment.installment_value * self.payment.installments) * pagarme_tax) + cents_fee).round(2) + ((self.payment.installment_value * acquirer_tax).round(2) * self.payment.installments)
     end
 
     def cents_fee