catarse_pagarme 2.6.12 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b8b4145eb190e806a130b688731201004c7c1ba
-  data.tar.gz: f98eb985ecdde23602180d5f4ddbea91f16e5ef9
+  metadata.gz: 2a7691442df6379211a0252d3dcc8202f1aefbe0
+  data.tar.gz: 4a028f6662ae40be7fa81384179aa2ed110b7597
 SHA512:
-  metadata.gz: c45303222582dda5a00f965619629610317d545aeb2a4213361def824701813c2465450d35fd00364119792f415fa794bbe1d31df8a727187ecf6f7386da91c2
-  data.tar.gz: a94b9062e5f740af2f6e469cfc7650d5e2c2f4a8ae1d513dcc5ce4ed77898ab80571fcae18c1c4dd48f021d5219f9620407a480c006e4b55d99d87b039d90514
+  metadata.gz: 98ea1073b18d52d380b5d344be6601906e38747c932cccc9abb09945b817f23bd7348f79ff8099b21c27024596fb5dedf47f729e3469a2f242c135c527a30812
+  data.tar.gz: 6dedb4d53784d8538bd8540ce2707c550ef89c6122e2d835db46ecd6bf784f9b4222e604144749823b12b9df49f0c33341519c7a26a9fadd78e5873b17def90b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    catarse_pagarme (2.6.12)
+    catarse_pagarme (2.7.0)
       pagarme (= 1.10.0)
       rails (~> 4.0)
       weekdays (>= 1.0.2)
@@ -106,7 +106,7 @@ GEM
     slop (3.6.0)
     sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.1)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

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

@@ -18,15 +18,6 @@ App.views.Pagarme.addChild('PaymentSlip', _.extend({
     this.$('#user_bank_account_attributes_name').brbanks();
   },
 
-  validateName: function(field) {
-    if(field.val().length < 5 || field.val().length > 30){
-      $(field).trigger('invalid');
-      return false;
-    }
-
-    return true;
-  },
-
   onContentClick: function() {
     var thank_you = $('#project_review').data('thank-you-path');
 
@@ -51,21 +42,7 @@ App.views.Pagarme.addChild('PaymentSlip', _.extend({
     this.$('#payment-slip-instructions').slideUp('slow');
     that.parent.loader.show();
 
-    var bankAccountAttributes = {
-      user: {
-        bank_account_attributes: {
-          bank_id: that.$('select#user_bank_account_attributes_bank_id').val(),
-          agency: that.$('input#user_bank_account_attributes_agency').val(),
-          agency_digit: that.$('input#user_bank_account_attributes_agency_digit').val(),
-          account: that.$('input#user_bank_account_attributes_account').val(),
-          account_digit: that.$('input#user_bank_account_attributes_account_digit').val(),
-          owner_name: that.$('input#user_bank_account_attributes_owner_name').val(),
-          owner_document: that.$('input#user_bank_account_attributes_owner_document').val()
-        }
-      }
-    };
-
-    $.post('/payment/pagarme/'+that.parent.contributionId+'/pay_slip.json', bankAccountAttributes, null, 'json').success(function(response){
+    $.post('/payment/pagarme/'+that.parent.contributionId+'/pay_slip.json',null, 'json').success(function(response){
       parent.loader.hide();
       if(response.payment_status == 'failed'){
         that.message.find('.message-text').html(response.message);

data/app/controllers/catarse_pagarme/slip_controller.rb

@@ -4,7 +4,7 @@ module CatarsePagarme
   class SlipController < CatarsePagarme::ApplicationController
 
     def create
-      transaction = SlipTransaction.new(permitted_attributes, payment).charge!
+      transaction = SlipTransaction.new(slip_attributes, payment).charge!
 
       render json: { boleto_url: transaction.boleto_url, payment_status: transaction.status }
     rescue PagarMe::PagarMeError => e
@@ -12,7 +12,7 @@ module CatarsePagarme
     end
 
     def update
-      transaction = SlipTransaction.new(permitted_attributes, payment).charge!
+      transaction = SlipTransaction.new(slip_attributes, payment).charge!
       render text: transaction.boleto_url
     end
 
@@ -32,19 +32,7 @@ module CatarsePagarme
           name: payment.user.name
         },
         metadata: metadata_attributes
-      }.update({ user: params[:user] })
+      }
     end
-
-    def permitted_attributes
-      attrs = ActionController::Parameters.new(slip_attributes)
-      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,
-            :agency_digit, :owner_name, :owner_document
-          ]
-        ])
-    end
-
   end
 end

data/app/models/catarse_pagarme/credit_card_transaction.rb

@@ -6,7 +6,8 @@ module CatarsePagarme
 
       self.transaction = PagarMe::Transaction.new(self.attributes)
 
-      payment.update_attributes(gateway: 'Pagarme', payment_method: 'CartaoDeCredito')
+      payment.update_attributes({
+        gateway: 'Pagarme', payment_method: payment_method})
       payment.save
 
       self.transaction.charge

data/app/models/catarse_pagarme/slip_transaction.rb

@@ -1,40 +1,15 @@
 module CatarsePagarme
   class SlipTransaction < TransactionBase
-    def initialize(attributes, payment)
-      super
-      build_default_bank_account
-    end
-
     def charge!
-      update_user_bank_account
-
       self.transaction = PagarMe::Transaction.new(self.attributes)
-
       self.transaction.charge
 
       change_payment_state
-
       self.transaction
     end
 
     def payment_method
       PaymentType::SLIP
     end
-
-    protected
-
-    def update_user_bank_account
-      if self.attributes.include?(:user)
-        self.user.update_attributes(self.attributes.delete(:user))
-      end
-
-      if self.user.errors.present?
-        raise ::PagarMe::PagarMeError.new(self.user.errors.full_messages.to_sentence)
-      end
-    end
-
-    def build_default_bank_account
-      self.user.build_bank_account unless self.user.bank_account
-    end
   end
 end

data/app/views/catarse_pagarme/pagarme/review.html.slim

@@ -93,21 +93,6 @@
 
   #payment_type_slip_section.payment_section.w-hidden
     = simple_form_for current_user, url: 'javascript:void(0)' do |f|
-      .card.card-message.u-radius.zindex-10.fontsize-small.u-marginbottom-30
-        = t('projects.contributions.edit.payment_slip_disclaimer')
-      .formwrapper
-        .bank_accounts
-          = f.simple_fields_for :bank_account do |bank_form|
-            .w-row
-              = bank_form.input :bank_id, as: :select, collection: Bank.order(:code, :name).to_collection, wrapper_html: {class: 'w-col w-col-12'}, input_html: {required: true}, validation_text: true 
-            .w-row
-              = bank_form.input :agency, as: :tel, wrapper_html: {class: 'w-col w-sub-col-middle w-col-4 w-col-small-8 w-col-tiny-8'}, input_html: {required: true}, validation_text: true 
-              = bank_form.input :agency_digit, as: :tel, wrapper_html: {class: 'w-col w-sub-col-middle w-sub-col w-col-2 w-col-small-4 w-col-tiny-4'}
-              = bank_form.input :account, as: :tel, wrapper_html: {class: 'w-col w-sub-col-middle w-col-4 w-col-small-8 w-col-tiny-8'}, input_html: {required: true}, validation_text: true 
-              = bank_form.input :account_digit, as: :tel, wrapper_html: {class: 'w-col w-col-2 w-col-small-4 w-col-tiny-4'}, input_html: {required: true}, validation_text: true 
-            .w-row
-              = bank_form.input :owner_name, as: :string, input_html: { required: true, value: bank_form.object.owner_name || current_user.name }, wrapper_html: {class: 'w-col w-sub-col w-col-6'}, validation_text: true 
-              = bank_form.input :owner_document, as: :tel, input_html: { required: true, data: { :'validate-cpf-cnpj' => true }, value: (bank_form.object.owner_document || current_user.cpf) }, wrapper_html: {class: 'w-col w-col-6'}, validation_text: true 
       .w-row
         .w-col.w-col-12
           .payment-error-message.card.card-error.u-radius.zindex-10.u-marginbottom-30.w-hidden
@@ -117,9 +102,16 @@
         .w-col.w-col-12
           #payment-slip-link.card.card-message.fontsize-small.u-radius.u-marginbottom-30.zindex-10.w-hidden
             .link_content.fontsize-small
-            .fontsize-small Você também receberá um email com esse boleto.
+            .fontsize-small= t('projects.contributions.edit.review_slip_email')
       .w-row
-        .w-col.w-col-push-3.w-col-6
-          #card-loading.loader.u-text-center.w-col.w-col-12.u-marginbottom-30 = image_tag "catarse_bootstrap/loader.gif"
-          = submit_tag t('projects.contributions.review.form.labels.build_boleto'), :class => 'btn btn-large u-marginbottom-20', :id => "build_boleto"
-          = render partial: 'terms'
+        .w-col.w-col-12
+          .u-margintop-30.u-marginbottom-60.u-radius.card-big.card
+            - expiration_date = (CatarsePagarme.configuration.slip_week_day_interval || 2).weekdays_from_now
+            .fontsize-small.u-marginbottom-20= t('projects.contributions.edit.slip_expiration', date: l(expiration_date.to_date))
+            .fontsize-small.u-marginbottom-40= t('projects.contributions.edit.slip_message')
+
+            .w-row
+              .w-col.w-col-8.w-col-offset-2
+                #card-loading.loader.u-text-center.w-col.w-col-12.u-marginbottom-30 = image_tag "catarse_bootstrap/loader.gif"
+                = submit_tag t('projects.contributions.review.form.labels.build_boleto'), :class => 'btn btn-large u-marginbottom-20', :id => "build_boleto"
+                = render partial: 'terms'

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "2.6.12"
+  VERSION = "2.7.0"
 end

data/spec/controllers/catarse_pagarme/slip_controller_spec.rb

@@ -12,13 +12,23 @@ describe CatarsePagarme::SlipController do
   let(:credit_card) { create(:credit_card, subscription_id: '1542')}
 
   describe 'PATCH update' do
-    let(:user) { payment.user }
+    context  'without an user' do
+      let(:user) { nil }
 
-    before do
-      patch :update, locale: :pt, id: contribution.id, use_route: 'catarse_pagarme'
+      it 'should raise a error' do
+        expect {
+          patch :update, locale: :pt, id: contribution.id, use_route: 'catarse_pagarme'
+        }.to raise_error('invalid user')
+      end
     end
 
-    context 'with valid bank account data' do
+    context 'with an user' do
+      let(:user) { payment.user }
+
+      before do
+        patch :update, locale: :pt, id: contribution.id, use_route: 'catarse_pagarme'
+      end
+
       it 'boleto_url should be filled' do
         expect(response.body).to be_present
       end
@@ -39,42 +49,20 @@ describe CatarsePagarme::SlipController do
     context 'with an user' do
       let(:user) { payment.user }
 
-      context 'with valid bank account data' do
-        before do
-          post :create, {
-            locale: :pt, id: contribution.id, use_route: 'catarse_pagarme',
-            user: { bank_account_attributes: {
-              bank_id: Bank.first.id, agency: '1', agency_digit: '1', account: '1', account_digit: '1', owner_name: 'foo', owner_document: '1'
-            } } }
-        end
-
-        it 'boleto_url should be filled' do
-          expect(ActiveSupport::JSON.decode(response.body)['boleto_url']).not_to be_nil
-        end
-
-        it 'payment_status should be waiting_payment' do
-          expect(ActiveSupport::JSON.decode(response.body)['payment_status']).to eq 'waiting_payment'
-        end
+      before do
+        post :create, {
+          locale: :pt, id: contribution.id, use_route: 'catarse_pagarme',
+          user: { bank_account_attributes: {
+            bank_id: Bank.first.id, agency: '1', agency_digit: '1', account: '1', account_digit: '1', owner_name: 'foo', owner_document: '1'
+          } } }
       end
 
-      context 'with invalid bank account data' do
-        let(:user) { payment.user }
-
-        before do
-          post :create, { locale: :pt, id: contribution.id, use_route: 'catarse_pagarme', user: { bank_account_attributes: { owner_name: '' } } }
-        end
-
-        it 'boleto_url should be nil' do
-          expect(ActiveSupport::JSON.decode(response.body)['boleto_url']).to be_nil
-        end
-
-        it 'payment_status should be failed' do
-          expect(ActiveSupport::JSON.decode(response.body)['payment_status']).to eq 'failed'
-        end
+      it 'boleto_url should be filled' do
+        expect(ActiveSupport::JSON.decode(response.body)['boleto_url']).not_to be_nil
+      end
 
-        it 'message should be filled' do
-          expect(ActiveSupport::JSON.decode(response.body)['message']).not_to be_nil
-        end
+      it 'payment_status should be waiting_payment' do
+        expect(ActiveSupport::JSON.decode(response.body)['payment_status']).to eq 'waiting_payment'
       end
     end
   end

data/spec/models/catarse_pagarme/bank_account_concern_spec.rb

@@ -8,7 +8,7 @@ describe FakeBankAccount do
   let(:bank) { create(:bank) }
 
   let(:valid_attr) do
-    vb = build(:bank_account, bank: bank)
+    vb = build(:bank_account, bank: bank, owner_name: 'fo')
     vb.attributes
   end
 

data/spec/models/catarse_pagarme/slip_transaction_spec.rb

@@ -25,12 +25,6 @@ describe CatarsePagarme::SlipTransaction do
         payment_method: 'boleto',
         amount: payment.pagarme_delegator.value_for_transaction,
         postback_url: 'http://test.foo'
-      }, user: {
-        bank_account_attributes: {
-          bank_id: 1, agency: '1', agency_digit: '1',
-          account: '1', account_digit: '1', owner_name: 'foo',
-          owner_document: 'bar'
-        }
       }
     }
   end
@@ -39,12 +33,8 @@ describe CatarsePagarme::SlipTransaction do
     {
       slip_payment: {
         payment_method: 'boleto',
-        amount: payment.pagarme_delegator.value_for_transaction,
+        amount: nil,
         postback_url: 'http://test.foo'
-      }, user: {
-        bank_account_attributes: {
-          owner_name: ''
-        }
       }
     }
   end
@@ -76,8 +66,6 @@ describe CatarsePagarme::SlipTransaction do
 
     context "with valid attributes" do
       before do
-        slip_transaction.should_receive(:update_user_bank_account).and_call_original
-        slip_transaction.user.should_receive(:update_attributes).and_return(true)
         payment.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::PaymentDelegator.any_instance.should_receive(:change_status_by_transaction).with('paid')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 2.6.12
+  version: 2.7.0
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails