catarse_pagarme 2.8.8 → 2.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ea6ec12b1dabcaa055aaa99e9253858e00f0300
-  data.tar.gz: f2c5cf359952348edb0d01cc9fc03e122caf6830
+  metadata.gz: c2443b9ba729f2a1407ef3a274edba6082c76614
+  data.tar.gz: 833a7473cef82549a012993fbbac76a9e1ec666a
 SHA512:
-  metadata.gz: 03a3a3dcb793054b7ddf0ccd9d5206902adc7f0dff1899fe3ab3fbd4b810eedb6589d7688749d55f7a433ef237bf32fdc1039e14de50f00f376e0b8498678532
-  data.tar.gz: 9b04f03cf05df54269d993297043b6b31e2d82e7386909e3d4ef8f7a04b17ace92a114aeb34e0ea0d54f245ec3291de55aea47530e82cf531294fadbf880dec4
+  metadata.gz: eb7398738c1f43e71e9204a1cb581d44ee5824d6d78ea271512d96f93e1f1005aab5eb20efcc5b0e060880abde98375c5f016c93d9b2821f76f043aee90b5226
+  data.tar.gz: 734e501e94fc9a0917fa8f841aedcdfa043208b04f16e3e7f993c8b14d68cd18c7e9de45c8f573ae0ef3142b36a3f1240fceac1009c33a7853f51fb2dc159f17

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    catarse_pagarme (2.8.8)
+    catarse_pagarme (2.8.9)
       pagarme (= 1.10.0)
       rails (~> 4.0)
       sidekiq
@@ -68,8 +68,8 @@ GEM
     json (1.8.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (2.99.1)
     mini_portile (0.6.2)

data/app/assets/javascripts/catarse_pagarme/credit_card.js

@@ -118,38 +118,64 @@ App.views.Pagarme.addChild('PaymentCard', _.extend({
     return creditCard;
   },
 
-  requestPayment: function(data){
-    var that = this;
-
-    $.ajax({
-      type: 'POST',
-      url: '/payment/pagarme/'+that.parent.contributionId+'/pay_credit_card',
-      data: data,
-      success: function(response){
-        that.parent.loader.hide();
-
-        if(response.payment_status == 'failed'){
-          that.message.find('.message-text').html(response.message);
-          that.message.slideDown('slow');
-
-          $("#credit_card_submit").show();
-        } else {
-          var thank_you = $('#project_review').data('thank-you-path');
-
-          if(thank_you){
-            location.href = thank_you;
-          } else {
-            location.href = '/';
-          }
-        }
-      }
+  reUpdateContributionData: function(callback) {
+    var contribution_data = {
+        anonymous: $('#review_form #contribution_anonymous').is(':checked'),
+        country_id: $('#review_form #contribution_country_id').val(),
+        payer_name: $('#review_form #contribution_payer_name').val(),
+        payer_email: $('#review_form #contribution_payer_email').val(),
+        payer_document: $('#review_form #contribution_payer_document').val(),
+        address_street: $('#review_form #contribution_address_street').val(),
+        address_number: $('#review_form #contribution_address_number').val(),
+        address_complement: $('#review_form #contribution_address_complement').val(),
+        address_neighbourhood: $('#review_form #contribution_address_neighbourhood').val(),
+        address_zip_code: $('#review_form #contribution_address_zip_code').val(),
+        address_city: $('#review_form #contribution_address_city').val(),
+        address_state: $('#review_form #contribution_address_state').val(),
+        address_phone_number: $('#review_form #contribution_address_phone_number').val()
+    };
+    $.post($('#review_form').data('update-info-path'), {
+        _method: 'put',
+        contribution: contribution_data
+    }).always(function(data) {
+        callback();
     });
+  },
 
+  requestPayment: function(data){
+      var that = this,
+          doCreditCardAjax = function() {
+              $.ajax({
+                  type: 'POST',
+                  url: '/payment/pagarme/'+that.parent.contributionId+'/pay_credit_card',
+                  data: data,
+                  success: function(response){
+                      that.parent.loader.hide();
+
+                      if(response.payment_status == 'failed'){
+                          that.message.find('.message-text').html(response.message);
+                          that.message.slideDown('slow');
+
+                          $("#credit_card_submit").show();
+                      } else {
+                          var thank_you = $('#project_review').data('thank-you-path');
+
+                          if(thank_you){
+                              location.href = thank_you;
+                          } else {
+                              location.href = '/';
+                          }
+                      }
+                  }
+              });
+          };
+
+      this.reUpdateContributionData(doCreditCardAjax);
   },
 
   onKeyupPaymentCardNumber: function(e){
     var number = $(e.currentTarget).val();
-    this.$('#payment_card_flag').html(this.getCardFlag(number))
+    this.$('#payment_card_flag').html(this.getCardFlag(number));
   },
 
   getCardFlag: function(number) {

data/app/controllers/catarse_pagarme/credit_cards_controller.rb

@@ -7,6 +7,8 @@ module CatarsePagarme
 
       render json: { payment_status: transaction.status }
     rescue PagarMe::PagarMeError => e
+      payment.destroy if payment.persisted? && !payment.gateway_id.present?
+
       render json: { payment_status: 'failed', message: e.message }
     end
 

data/app/helpers/catarse_pagarme/application_helper.rb

@@ -3,10 +3,11 @@ module CatarsePagarme
 
     def installments_for_select(payment)
       installments = payment.pagarme_delegator.get_installments['installments']
+      project = payment.project
 
       collection = installments.map do |installment|
         installment_number = installment[0].to_i
-        if installment_number <= CatarsePagarme.configuration.max_installments.to_i
+        if installment_number <= (project.try(:total_installments) || CatarsePagarme.configuration.max_installments.to_i)
           amount = installment[1]['installment_amount'] / 100.0
 
           optional_text = nil

data/app/models/catarse_pagarme/balance_transfer_concern.rb

@@ -0,0 +1,9 @@
+module CatarsePagarme::BalanceTransferConcern
+  extend ActiveSupport::Concern
+
+  included do
+    def pagarme_delegator
+      CatarsePagarme::BalanceTransferDelegator.new(self)
+    end
+  end
+end

data/app/models/catarse_pagarme/balance_transfer_delegator.rb

@@ -0,0 +1,55 @@
+module CatarsePagarme
+  class BalanceTransferDelegator
+    attr_accessor :balance_transfer, :transfer
+
+    def initialize(balance_transfer)
+      configure_pagarme
+      self.balance_transfer = balance_transfer
+    end
+
+    def transfer_funds
+      ActiveRecord::Base.transaction do
+        raise "unable to create transfer, need to be authorized" if !balance_transfer.authorized?
+
+        bank_account = PagarMe::BankAccount.new(bank_account_attributes.delete(:bank_account))
+        bank_account.create
+        raise "unable to create an bank account" unless bank_account.id.present?
+
+        transfer = PagarMe::Transfer.new({
+          bank_account_id: bank_account.id,
+          amount: value_for_transaction
+        })
+        transfer.create
+        raise "unable to create a transfer" unless transfer.id.present?
+
+        balance_transfer.update_attribute(:transfer_id, transfer.id)
+        balance_transfer.transition_to(:processing, transfer_data: transfer.to_hash)
+        balance_transfer
+      end
+    end
+
+    def bank_account_attributes
+      account = balance_transfer.project.account
+
+      {
+        bank_account: {
+          bank_code: (account.bank.code || account.bank.name),
+          agencia: account.agency,
+          agencia_dv: account.agency_digit,
+          conta: account.account,
+          conta_dv: account.account_digit,
+          legal_name: account.owner_name,
+          document_number: account.owner_document
+        }
+      }
+    end
+
+    def configure_pagarme
+      ::PagarMe.api_key = CatarsePagarme.configuration.api_key
+    end
+
+    def value_for_transaction
+      (self.balance_transfer.amount * 100).to_i
+    end
+  end
+end

data/app/models/catarse_pagarme/credit_card_transaction.rb

@@ -12,10 +12,10 @@ module CatarsePagarme
       })
       payment.save!
 
-      VerifyPagarmeWorker.perform_in(5.minutes, payment.key)
-
       self.transaction.charge
 
+      VerifyPagarmeWorker.perform_in(5.minutes, payment.key)
+
       change_payment_state
 
       if self.transaction.status == 'refused'

data/lib/catarse_pagarme/engine.rb

@@ -4,6 +4,7 @@ module CatarsePagarme
 
     config.to_prepare do
       ::Payment.send(:include, CatarsePagarme::PaymentConcern)
+      ::BalanceTransfer.send(:include, CatarsePagarme::BalanceTransferConcern)
     end
   end
 end

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "2.8.8"
+  VERSION = "2.8.9"
 end

data/spec/controllers/catarse_pagarme/credit_cards_controller_spec.rb

@@ -8,7 +8,12 @@ describe CatarsePagarme::CreditCardsController, type: :controller do
 
   let(:project) { create(:project, goal: 10_000, state: 'online') }
   let(:contribution) { create(:contribution, value: 10, project: project) }
-  let(:payment) { contribution.payments.first }
+  let(:payment) do
+    contribution.reload
+    p = contribution.payments.first
+    #p.update_attributes({ state: 'pending', gateway_id: nil })
+    p
+  end
 
   describe 'pay with credit card' do
     context  'without an user' do
@@ -22,9 +27,11 @@ describe CatarsePagarme::CreditCardsController, type: :controller do
     end
 
     context 'with an user' do
-      let(:user) { payment.user }
+      let(:user) { contribution.user }
+
       context "with valid card data" do
         before do
+          contribution.payments.destroy_all
           allow(CatarsePagarme::CreditCardTransaction).to receive(:new).and_call_original
           post :create, {
             locale: :pt, id: contribution.id,
@@ -38,10 +45,16 @@ describe CatarsePagarme::CreditCardsController, type: :controller do
         it 'and payment_status is not failed' do
           expect(ActiveSupport::JSON.decode(response.body)['payment_status']).not_to eq('failed')
         end
+
+        it 'should persist payment record with references' do
+          expect(payment.persisted?).to eq(true)
+          expect(payment.gateway_id).not_to be_nil
+        end
       end
 
       context 'with invalid card data' do
         before do
+          contribution.payments.destroy_all
           post :create, {
             locale: :pt, id: contribution.id, card_hash: "abcd" }
         end
@@ -49,22 +62,27 @@ describe CatarsePagarme::CreditCardsController, type: :controller do
         it 'payment_status should be failed' do
           expect(ActiveSupport::JSON.decode(response.body)['payment_status']).to eq('failed')
         end
+
+        it 'destroy payment record when not created insied gateway' do
+          contribution.reload
+          expect(contribution.payments.size).to eq(0)
+          #expect(contribution.payments.first.persisted?).to eq(false)
+        end
       end
 
       context "when charges fails" do
         before do
+          contribution.payments.destroy_all
           allow_any_instance_of(PagarMe::Transaction).to receive(:charge).and_raise(PagarMe::PagarMeError)
           post :create, {
             locale: :pt, id: contribution.id,
             card_hash: sample_card_hash }
         end
 
-        it "should have created a payment" do
-          expect(contribution.payments.size).to eq(2)
-        end
-
-        it "should update the payment key on the local database" do
-          expect(contribution.payments.last.key).to_not be_nil
+        it 'destroy payment record when not created insied gateway' do
+          contribution.reload
+          expect(contribution.payments.size).to eq(0)
+          #expect(contribution.payments.first.persisted?).to eq(false)
         end
       end
     end

data/spec/dummy/app/models/balance_transfer.rb

@@ -0,0 +1,4 @@
+class BalanceTransfer < ActiveRecord::Base
+  belongs_to :project
+  belongs_to :user
+end

data/spec/dummy/app/models/payment.rb

@@ -10,7 +10,7 @@ class Payment < ActiveRecord::Base
   before_validation do
     generate_key
     self.value ||= self.contribution.try(:value)
-    self.state = 'pending' # mock initial state for here we do not include the stat machine
+    self.state ||= 'pending' # mock initial state for here we do not include the stat machine
   end
 
   def slip_expiration_date

data/spec/models/catarse_pagarme/balance_transfer_delegator_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe CatarsePagarme::BalanceTransferDelegator do
+  let(:project) { create(:project, state: 'successful') }
+  let(:project_acc) { create(:project_account, project: project) }
+  let(:balance_transfer) { create(:balance_transfer, amount: 10, user: project.user, project: project)}
+  let(:delegator) { balance_transfer.pagarme_delegator }
+
+  before do
+    allow(CatarsePagarme).to receive(:configuration).and_return(double('fake config', {
+      slip_tax: 2.00,
+      credit_card_tax: 0.01,
+      pagarme_tax: 0.0063,
+      cielo_tax: 0.038,
+      stone_tax: 0.0307,
+      stone_installment_tax: 0.0307,
+      credit_card_cents_fee: 0.39,
+      api_key: '',
+      interest_rate: 0
+    }))
+  end
+
+  describe "instance of CatarsePagarme::BalanceTransferDelegator" do
+    it { expect(delegator).to be_a CatarsePagarme::BalanceTransferDelegator}
+  end
+
+  describe "#value_for_transaction" do
+    subject { delegator.value_for_transaction }
+
+    it "should convert balance value to pagarme value format" do
+      expect(subject).to eq(1000)
+    end
+  end
+
+  describe "#transfer_funds" do
+    let(:transfer_mock) { double(create: true, id: "123", foo: false, to_hash: {id: '123'}, to_json: {id: '123'}.to_json) }
+    let(:bank_acc_mock) { double(create: true, id: "1234")}
+    before do
+      allow(PagarMe::BankAccount).to receive(:new).and_return(bank_acc_mock)
+      allow(PagarMe::Transfer).to receive(:new).and_return(transfer_mock)
+    end
+
+    context "when transfer is not authorized?" do
+      before do
+        allow(balance_transfer).to receive(:authorized?).and_return(false)
+      end
+
+      it do
+        expect { delegator.transfer_funds }.to raise_error('unable to create transfer, need to be authorized')
+      end
+    end
+
+    context "when transfer is authorized?" do
+      before do
+        allow(balance_transfer).to receive(:authorized?).and_return(true)
+        allow(balance_transfer).to receive(:transition_to).and_return(true)
+        expect(balance_transfer).to receive(:transition_to).with(:processing, transfer_data: transfer_mock.to_hash)
+      end
+
+      it do
+        transfer = delegator.transfer_funds
+
+        expect(transfer.transfer_id).to eq(transfer_mock.id)
+      end
+    end
+  end
+end

data/spec/models/catarse_pagarme/payment_delegator_spec.rb

@@ -143,7 +143,7 @@ describe CatarsePagarme::PaymentDelegator do
     let(:transfer_mock) { double(create: true, id: "123", to_json: {id: '123'}.to_json) }
     before do
       allow(PagarMe::Transfer).to receive(:new).and_return(transfer_mock)
-      create(:bank_account, user: payment.user)
+      create(:bank_account, user: payment.user, bank: create(:bank, code: '237'))
     end
 
     it do

data/spec/support/factories.rb

@@ -40,6 +40,19 @@ FactoryGirl.define do
     f.code { generate(:serial) }
   end
 
+  factory :balance_transfer do |f| 
+    f.association :user
+    f.association :project
+    f.amount 100
+  end
+
+  factory :balance_transaction do |f| 
+    f.association :user
+    f.association :project
+    f.amount 100
+    f.event_name 'foo'
+  end
+
   factory :bank_account do |f|
     f.association :bank
     f.account '25334'
@@ -85,7 +98,7 @@ FactoryGirl.define do
     end
     after :build do |project|
       project.account = build(:project_account, project: nil)
-      project.rewards.build(deliver_at: Time.now, minimum_value: 10, description: 'test')
+      project.rewards.build(deliver_at: 1.year.from_now, minimum_value: 10, description: 'test')
     end
   end
 
@@ -118,6 +131,12 @@ FactoryGirl.define do
   factory :project_account do |f|
     f.association :project
     f.association :bank
+    f.account '25334'
+    f.account_digit '2'
+    f.agency '1432'
+    f.agency_digit '2'
+    f.owner_name 'Lorem amenori'
+    f.owner_document '11111111111'
     f.email "foo@bar.com"
     f.address_zip_code "foo"
     f.address_neighbourhood "foo"
@@ -126,12 +145,6 @@ FactoryGirl.define do
     f.address_number "foo"
     f.address_street "foo"
     f.phone_number "1234"
-    f.agency "fooo"
-    f.agency_digit "foo"
-    f.owner_document "foo"
-    f.owner_name "foo"
-    f.account "1"
-    f.account_digit "1000"
     f.account_type "foo"
   end
 
@@ -155,13 +168,13 @@ FactoryGirl.define do
 
   factory :payment do |f|
     f.association :contribution
-    f.gateway 'pagarme'
+    f.gateway 'Pagarme'
     f.value 10.00
     f.state 'paid'
     f.installment_value nil
     f.payment_method "CartaoDeCredito"
     after :build do |payment|
-      payment.gateway = 'pagarme'
+      payment.gateway = 'Pagarme'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 2.8.8
+  version: 2.8.9
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,6 +150,8 @@ files:
 - app/controllers/catarse_pagarme/pagarme_controller.rb
 - app/controllers/catarse_pagarme/slip_controller.rb
 - app/helpers/catarse_pagarme/application_helper.rb
+- app/models/catarse_pagarme/balance_transfer_concern.rb
+- app/models/catarse_pagarme/balance_transfer_delegator.rb
 - app/models/catarse_pagarme/bank_account_concern.rb
 - app/models/catarse_pagarme/credit_card_transaction.rb
 - app/models/catarse_pagarme/fee_calculator_concern.rb
@@ -186,6 +188,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
+- spec/dummy/app/models/balance_transfer.rb
 - spec/dummy/app/models/bank.rb
 - spec/dummy/app/models/bank_account.rb
 - spec/dummy/app/models/category.rb
@@ -237,6 +240,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/spec/support/testimg.png
 - spec/helpers/catarse_pagarme/application_helper_spec.rb
+- spec/models/catarse_pagarme/balance_transfer_delegator_spec.rb
 - spec/models/catarse_pagarme/bank_account_concern_spec.rb
 - spec/models/catarse_pagarme/credit_card_transaction_spec.rb
 - spec/models/catarse_pagarme/payment_delegator_spec.rb
@@ -282,6 +286,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
+- spec/dummy/app/models/balance_transfer.rb
 - spec/dummy/app/models/bank.rb
 - spec/dummy/app/models/bank_account.rb
 - spec/dummy/app/models/category.rb
@@ -333,6 +338,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/spec/support/testimg.png
 - spec/helpers/catarse_pagarme/application_helper_spec.rb
+- spec/models/catarse_pagarme/balance_transfer_delegator_spec.rb
 - spec/models/catarse_pagarme/bank_account_concern_spec.rb
 - spec/models/catarse_pagarme/credit_card_transaction_spec.rb
 - spec/models/catarse_pagarme/payment_delegator_spec.rb