catarse_pagarme 2.14.12 → 2.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c52bfe0429ba2976126325031d6c5372a549e0e054e7b210d0771be827f6322a
-  data.tar.gz: 72f750266694d8661a6b807c9331f0ac1263679c743b0bb01b99ca9bbebf453b
+  metadata.gz: 280c47fbcd1f68b9b8388c7a668578c88c6256da12248c9c7094460db5a9bc46
+  data.tar.gz: de3c7200fd94ef8d836ebde417fb005d5da3338b84ee4519d85c180199b5fbef
 SHA512:
-  metadata.gz: 914fcfc46b1cb2a8a78ca6875552d6ef8de296449ef36033a0312661ec3dabf60028d20e42d75dc2112d3149964e368afa26f0e2b62be2a1cb56b961a689c3f7
-  data.tar.gz: 979286b6207d4af8d9cf93a4ee14099bc79a03361e02f8bf1825387e97c28d9a6380d7a0f0ead484b649f7676f5a147c6f36f9b714f319805bab483f0249a373
+  metadata.gz: 89bad0499c9b211cd2d0ca91f2a34709a75b128a98ec93e9fe6718a942fa26bd0483c78a4b1d3a5c8370089732a08d5a4fab32c40aad551a04c9cdf54a0da772
+  data.tar.gz: a4e5a09162bf1d373aeae3c8f3e0b3319e57521e42f78910b2a0c41a589ade9372075921e3bca2f9e6973e6bc2f64ea1b2e8c49693a01f1d16b604390515d0c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    catarse_pagarme (2.14.12)
+    catarse_pagarme (2.16.1)
       countries (= 3.0.0)
       konduto-ruby (= 2.1.0)
       pagarme (= 2.1.4)

data/app/controllers/catarse_pagarme/application_controller.rb

@@ -19,20 +19,24 @@ module CatarsePagarme
           payment_method: payment.payment_method
         }
       )
-      ::Raven.capture_exception(exception)
+      ::Raven.capture_exception(exception, level: 'fatal')
       ::Raven.user_context({})
     end
 
     def metadata_attributes
       {
         key: payment.generate_key,
-        contribution_id: payment.contribution.id,
+        contribution_id: payment.contribution.id.to_s,
+        project_id: payment.project.id.to_s,
         project_name: payment.project.name,
         permalink: payment.project.permalink,
         project_online: payment.project.online_at,
         project_expires: payment.project.expires_at,
         user_total_contributions: payment.user.contributions.was_confirmed.count,
-        user_id: payment.user.id
+        user_id: payment.user.id,
+        common_user_id: payment.user.common_id.to_s,
+        user_name: payment.user.name,
+        user_email: payment.user.email
       }
     end
 

data/app/controllers/catarse_pagarme/credit_cards_controller.rb

@@ -83,11 +83,7 @@ module CatarsePagarme
     end
 
     def document_number
-      user_document = contribution.user.cpf.try(:gsub, /[-.\/_\s]/, '')
-      card_owner_document = contribution.card_owner_document.try(:gsub, /[-.\/_\s]/, '')
-      fallback_document = '00000000000'
-
-      user_document || card_owner_document || fallback_document
+      contribution.user.cpf.try(:gsub, /[-.\/_\s]/, '')
     end
 
     def phone_matches
@@ -137,7 +133,7 @@ module CatarsePagarme
 
     def address_hash
       {
-        country: contribution.country.try(:name),
+        country_code: contribution.country.try(:code),
         state: contribution.address_state,
         city: contribution.address_city,
         zipcode: contribution.address_zip_code.try(:gsub, /[-.\/_\s]/, ''),

data/app/controllers/catarse_pagarme/slip_controller.rb

@@ -46,7 +46,7 @@ module CatarsePagarme
             number: document_number
           }],
         },
-        metadata: metadata_attributes
+        metadata: metadata_attributes.merge({ second_slip: payment.generating_second_slip.to_s })
       }
     end
 

data/app/models/catarse_pagarme/antifraud_order_wrapper.rb

@@ -71,14 +71,15 @@ module CatarsePagarme
 
     def customer_attributes
       customer = self.attributes.dig(:customer)
+      tax_id = customer[:document_number].present? ? { tax_id: customer[:document_number] } : {}
+
       {
         id: customer[:id].to_s,
-        tax_id: customer[:document_number],
         name: customer[:name],
         email: customer[:email],
         phone1: customer[:phone].to_h.values.join,
         created_at: self.attributes.dig(:antifraud_metadata, :register, :registered_at)
-      }
+      }.merge(tax_id)
     end
 
     def payment_attributes
@@ -99,7 +100,8 @@ module CatarsePagarme
         city: billing_data.dig(:address, :city),
         state: billing_data.dig(:address, :state),
         zip: billing_data.dig(:address, :zipcode),
-      }.merge(card_country_code)
+        country: billing_data.dig(:address, :country_code),
+      }
     end
 
     def shipping_address_attributes
@@ -139,10 +141,5 @@ module CatarsePagarme
       expiration_date = self.transaction.card.expiration_date
       "#{expiration_date[0..1]}20#{expiration_date[2..3]}"
     end
-
-    def card_country_code
-      country = ::ISO3166::Country.find_country_by_name(self.transaction.card.country)
-      country.present? ? { country: country.try(:alpha2) } : {}
-    end
   end
 end

data/app/models/catarse_pagarme/credit_card_transaction.rb

@@ -8,6 +8,8 @@ module CatarsePagarme
         else
           antifraud_outcome = process_antifraud
 
+          self.payment.create_antifraud_analysis!(cost: CatarsePagarme.configuration.antifraud_tax)
+
           if antifraud_outcome.recommendation == :APPROVE
             self.transaction.capture
           elsif antifraud_outcome.recommendation == :DECLINE
@@ -33,7 +35,8 @@ module CatarsePagarme
           async: false,
           postback_url: self.attributes[:postback_url],
           installments: self.attributes[:installments],
-          soft_descriptor: self.attributes[:soft_descriptor]
+          soft_descriptor: self.attributes[:soft_descriptor],
+          metadata: self.attributes[:metadata]
         }.merge(credit_card_identifier)
       )
 

data/app/models/catarse_pagarme/fee_calculator_concern.rb

@@ -5,102 +5,17 @@ module CatarsePagarme::FeeCalculatorConcern
 
     def get_fee
       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
-      end
-    end
-
-    protected
-    def get_slip_fee
-      CatarsePagarme.configuration.slip_tax.to_f
-    end
-
-    def get_card_fee
-      return nil if self.payment.gateway_data["acquirer_name"].blank? # Here we depend on the acquirer name
-      fee = if %w(stone pagarme).include? self.payment.gateway_data["acquirer_name"]
-        get_stone_fee
-      else
-        get_cielo_fee
-      end
-
-      fee + payment_cost
-    end
 
-    def payment_cost
-      self.payment.gateway_data["cost"] / 100.0
-    end
-
-    def get_stone_fee
-      self.payment.installments > 1 ? tax_calc_for_installment(stone_installment_tax) : tax_calc(stone_tax)
-    end
+      transaction = PagarMe::Transaction.find(self.payment.gateway_id)
+      payables = transaction.payables
+      cost = transaction.cost.to_f / 100.00
+      payables_fee = payables.to_a.sum(&:fee).to_f / 100.00
 
-    def get_cielo_fee
-      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
+      if self.payment.payment_method == ::CatarsePagarme::PaymentType::SLIP
+        payables_fee == 0 ? cost : payables_fee
       else
-        get_cielo_fee_for_non_amex
+        cost + payables_fee
       end
     end
-
-    def get_cielo_fee_for_amex
-      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.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.payment.value * pagarme_tax) + cents_fee).round(2) + (self.payment.value * acquirer_tax).round(2)
-    end
-
-    def tax_calc_for_installment acquirer_tax
-      (((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 antifraud_tax
-      CatarsePagarme.configuration.antifraud_tax.to_f
-    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 stone_installment_tax
-      CatarsePagarme.configuration.stone_installment_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
-
-    def cielo_installment_amex_tax
-      CatarsePagarme.configuration.cielo_installment_amex_tax.to_f
-    end
-
-    def cielo_installment_not_amex_tax
-      CatarsePagarme.configuration.cielo_installment_not_amex_tax.to_f
-    end
-
   end
 end

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "2.14.12"
+  VERSION = "2.16.1"
 end

data/spec/models/catarse_pagarme/antifraud_order_wrapper_spec.rb

@@ -245,14 +245,15 @@ describe CatarsePagarme::AntifraudOrderWrapper do
               street: 'R. A',
               city: 'New City',
               state: 'NC',
-              zipcode: '1245'
+              zipcode: '1245',
+              country_code: 'BR'
             }
           }
         }
       }
     end
 
-    let(:transaction) { double(card: double(country: 'BRAZIL', holder_name: 'holder name')) }
+    let(:transaction) { double(card: double(holder_name: 'holder name')) }
 
     before do
       subject.attributes = attributes
@@ -267,7 +268,7 @@ describe CatarsePagarme::AntifraudOrderWrapper do
       expect(billing_address_attributes[:city]).to eq 'New City'
       expect(billing_address_attributes[:state]).to eq 'NC'
       expect(billing_address_attributes[:zip]).to eq '1245'
-      expect(billing_address_attributes[:country]).to eq 'BR'
+      expect(billing_address_attributes[:country_code]).to eq 'BR'
     end
   end
 
@@ -290,7 +291,7 @@ describe CatarsePagarme::AntifraudOrderWrapper do
       }
     end
 
-    let(:transaction) { double(card: double(country: 'BRAZIL')) }
+    let(:transaction) { double(card: double) }
 
     before do
       subject.attributes = attributes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 2.14.12
+  version: 2.16.1
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries