catarse_pagarme 1.5.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ba46bca94f1ff4f9461ea5ee5b99798e1e80f7
-  data.tar.gz: 082fc8e59856c856bf6f3dab97c710027f935fe9
+  metadata.gz: ea2622f55d3204092b95029e30222ee11d53ef09
+  data.tar.gz: db723fbfa732d4415e27ac35f277aebc5bfe8435
 SHA512:
-  metadata.gz: dc5e1858379c685bceb097b3737db4f8cbaa35ee202165f2f65aa416db7d157fbc3233101c936a61db78256317f9847b92204bcebd12b09d6fb5076fcf3826e2
-  data.tar.gz: 236f314db22fb50785f5fe70ff5ef01fc35785ae7112d1de196bd4233f20f6340fe8dc34f5b56e78181868b1f523d27016300949190abe8ba2ca428f2eb64ac2
+  metadata.gz: 959cc0e8544a66213446bf515ab834087d1ac24750aa8eb8ed400db618261e7406fb20eaf55ab2bf31a9e9c4b2a58536d8516f11c9d19698fc0880aca35b8f8b
+  data.tar.gz: 53922520a96378bc0387cfdccbadbba0e00e6bc68c00cf79f25d6972850d13216dcb53e06e9035963868ee43cf8254002dbe04db7b3241e2307514040eead0ff

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    catarse_pagarme (1.5.2)
-      pagarme (~> 1.9.9)
+    catarse_pagarme (2.0.0)
+      pagarme (~> 1.9.5)
       rails (~> 4.0)
 
 GEM
@@ -52,8 +52,8 @@ GEM
     mime-types (1.25.1)
     minitest (5.4.0)
     multi_json (1.10.1)
-    netrc (0.10.2)
-    pagarme (1.9.9)
+    netrc (0.7.7)
+    pagarme (1.9.6)
       multi_json
       rest-client
     pg (0.17.1)
@@ -92,15 +92,15 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    sprockets (2.12.3)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.1.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+      sprockets (~> 2.8)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)

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

@@ -3,7 +3,7 @@ App.addChild('PagarmeForm', {
 
   activate: function() {
     this.message = this.$('.next_step_after_valid_document .alert-danger');
-    this.loader = this.$('.loader');
+    this.loader = this.$('.loader img');
 
     this.contributionId = $('input#contribution_id').val();
     this.projectId = $('input#project_id').val();

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

@@ -5,30 +5,28 @@ App.views.PagarmeForm.addChild('PaymentCard', {
     'keyup input[type="text"]' : 'creditCardInputValidator',
     'keyup #payment_card_number' : 'onKeyupPaymentCardNumber',
     'click input#credit_card_submit' : 'onSubmit',
-    'click a.use_another-card': 'showCreditCardForm'
+    'change .creditcard-records' : 'onChangeCard'
+  },
+
+  onChangeCard: function(event){
+    var $target = $(event.currentTarget);
+    $target.siblings().removeClass('selected');
+    $target.addClass('selected');
+    if($(event.target).val() == 0){
+      this.$('.type_card_data').slideDown('slow');
+    }
+    else{
+      this.$('.type_card_data').slideUp('slow');
+    }
   },
 
   activate: function(options){
     var that = this;
     this.pagarmeForm = this.parent;
-    this.message = this.$('.alert-danger');
+    this.message = this.$('.payment-error-message');
     this.$('input#payment_card_date').mask('99/99');
   },
 
-  showCreditCardForm: function(e) {
-    var that = this;
-    e.preventDefault();
-
-    that.$('ul.my_credit_cards').hide();
-    that.$('a.use_another-card ').hide();
-    that.$('.type_card_data').show();
-    that.$('.save_card').show();
-
-    $.each(that.$('.my_credit_cards input:radio[name=payment_subscription_card]'), function(i, item) {
-      $(item).prop('checked', false);
-    });
-  },
-
   getUrl: function(){
     var that = this;
     var url = '';
@@ -52,7 +50,7 @@ App.views.PagarmeForm.addChild('PaymentCard', {
   },
 
   selectedCard: function() {
-    return this.$('.my_credit_cards input:radio[name=payment_subscription_card]:checked');
+    return this.$('input:radio[data-stored][name=payment_subscription_card]:checked');
   },
 
   hasSelectedSomeCard: function() {
@@ -81,7 +79,7 @@ App.views.PagarmeForm.addChild('PaymentCard', {
 
   getInstallments: function() {
     if(this.hasSelectedSomeCard()) {
-      return this.$('.my_credit_cards select#payment_card_installments').val();
+      return this.$('.my-credit-cards .selected select#payment_card_installments').val();
     } else {
       return this.$('.type_card_data select#payment_card_installments').val();
     }
@@ -102,8 +100,8 @@ App.views.PagarmeForm.addChild('PaymentCard', {
         that.parent.loader.hide();
 
         if(response.payment_status == 'failed'){
-          that.message.find('p').html(response.message);
-          that.message.fadeIn('fast')
+          that.message.find('.message-text').html(response.message);
+          that.message.slideDown('slow')
 
           $(e.currentTarget).show();
         } else {
@@ -120,7 +118,7 @@ App.views.PagarmeForm.addChild('PaymentCard', {
   },
 
   onKeyupPaymentCardNumber: function(e){
-    this.$('input#payment_card_flag').val(this.getCardFlag($(e.currentTarget).val()))
+    this.$('#payment_card_flag').html(this.getCardFlag($(e.currentTarget).val()))
   },
 
   getCardFlag: function(number) {

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

@@ -16,7 +16,6 @@ App.views.PagarmeForm.addChild('PaymentChoice', {
 
   activate: function(){
     var that = this.parent;
-
     that.$('input#payment_type_credit_card').click();
   }
 });

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

@@ -8,7 +8,7 @@ App.views.PagarmeForm.addChild('PaymentSlip', {
 
   activate: function(options){
     this.PagarmeForm = this.parent;
-    this.message = this.$('.alert-danger');
+    this.message = this.$('.payment-error-message');
     this.$('#user_bank_account_attributes_name').brbanks();
   },
 
@@ -44,18 +44,18 @@ App.views.PagarmeForm.addChild('PaymentSlip', {
       }
     };
 
-    $.post('/payment/pagarme/'+that.PagarmeForm.contributionId+'/pay_slip.json', bankAccountAttributes, null, 'json').success(function(response){
+    $.post('/payment/pagarme/'+that.PagarmeForm.contributionId+'/pay_slip', bankAccountAttributes).success(function(response){
       parent.loader.hide();
       if(response.payment_status == 'failed'){
-        that.message.find('p').html(response.message);
-        that.message.fadeIn('fast')
+        that.message.find('.message-text').html(response.message);
+        that.message.slideDown('slow')
 
         $(e.currentTarget).show();
       } else if(response.boleto_url) {
-        var link = $('<a target="__blank">'+response.boleto_url+'</a>')
+        var link = $('<a class="alt-link" target="__blank">'+response.boleto_url+'</a>')
         link.attr('href', response.boleto_url);
         that.$('.link_content').empty().html(link);
-        that.$('.payment_section:visible .subtitle').fadeIn('fast');
+        that.$('#payment-slip-link').slideDown('slow');
       }
     });
   }

data/app/controllers/catarse_pagarme/credit_card_base_controller.rb

@@ -18,7 +18,7 @@ module CatarsePagarme
     end
 
     def get_installment
-      if contribution.value.to_f < CatarsePagarme.configuration.minimum_value_for_installment.to_f
+      if contribution.value < CatarsePagarme.configuration.minimum_value_for_installment
         1
       elsif params[:payment_card_installments].to_i > 0
         params[:payment_card_installments].to_i
@@ -36,9 +36,9 @@ module CatarsePagarme
         card_expiration_year: splited_month_and_year[1],
         card_cvv: params[:payment_card_source],
         amount: delegator.value_with_installment_tax(get_installment),
-        postback_url: ipn_pagarme_index_url(host: CatarsePagarme.configuration.host,
-                                            subdomain: CatarsePagarme.configuration.subdomain,
-                                            protocol: CatarsePagarme.configuration.protocol),
+        postback_url: ipn_pagarme_url(contribution, host: CatarsePagarme.configuration.host,
+                                      subdomain: CatarsePagarme.configuration.subdomain,
+                                      protocol: CatarsePagarme.configuration.protocol),
         installments: get_installment,
         customer: {
           email: contribution.user.email,

data/app/controllers/catarse_pagarme/notifications_controller.rb

@@ -8,25 +8,12 @@ module CatarsePagarme
         contribution.payment_notifications.create(extra_data: params.to_json)
 
         if PagarMe::validate_fingerprint(contribution.try(:payment_id), params[:fingerprint])
-
-          if params[:current_status] == 'paid' && params[:desired_status] == 'refunded'
-            contribution.try(:invalid_refund)
-          else
-            delegator.change_status_by_transaction(params[:current_status])
-            delegator.fill_acquirer_data
-          end
-
+          delegator.change_status_by_transaction(params[:current_status])
           return render nothing: true, status: 200
         end
       end
 
       render nothing: true, status: 404
     end
-
-    protected
-
-    def contribution
-      @contribution ||=  PaymentEngines.find_payment({ payment_id: params[:id] })
-    end
   end
 end

data/app/controllers/catarse_pagarme/slip_controller.rb

@@ -21,9 +21,9 @@ module CatarsePagarme
         payment_method: 'boleto',
         boleto_expiration_date: 2.days.from_now,
         amount: delegator.value_for_transaction,
-        postback_url: ipn_pagarme_index_url(host: CatarsePagarme.configuration.host,
-                                            subdomain: CatarsePagarme.configuration.subdomain,
-                                            protocol: CatarsePagarme.configuration.protocol),
+        postback_url: ipn_pagarme_url(contribution, host: CatarsePagarme.configuration.host,
+                                      subdomain: CatarsePagarme.configuration.subdomain,
+                                      protocol: CatarsePagarme.configuration.protocol),
         customer: {
           email: contribution.user.email,
           name: contribution.user.name

data/app/helpers/catarse_pagarme/application_helper.rb

@@ -6,7 +6,7 @@ module CatarsePagarme
 
       collection = installments.map do |installment|
         installment_number = installment[0].to_i
-        if installment_number <= CatarsePagarme.configuration.max_installments.to_i
+        if installment_number <= CatarsePagarme.configuration.max_installments
           amount = installment[1]['installment_amount'] / 100.0
 
           optional_text = nil

data/app/models/catarse_pagarme/contribution_delegator.rb

@@ -1,7 +1,6 @@
 module CatarsePagarme
   class ContributionDelegator
     attr_accessor :contribution, :transaction
-    include FeeCalculatorConcern
 
     def initialize(contribution)
       configure_pagarme
@@ -21,15 +20,6 @@ module CatarsePagarme
       end
     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
-        })
-      end
-    end
-
     def refund
       if contribution.is_credit_card?
         transaction.refund
@@ -52,10 +42,6 @@ module CatarsePagarme
       end
     end
 
-    def value_for_installment(installment)
-      get_installment(installment).try(:[], "installment_amount")
-    end
-
     def transaction
       @transaction ||= ::PagarMe::Transaction.find_by_id(self.contribution.payment_id)
     end
@@ -75,6 +61,16 @@ module CatarsePagarme
       })
     end
 
+    def get_fee(payment_method, acquirer_name = nil)
+      if payment_method == PaymentType::SLIP
+        CatarsePagarme.configuration.slip_tax.to_f
+      else
+        if acquirer_name != 'cielo'
+          (self.contribution.value * CatarsePagarme.configuration.credit_card_tax.to_f) + CatarsePagarme.configuration.credit_card_cents_fee.to_f
+        end
+      end
+    end
+
     protected
 
     def bank_account_attributes

data/app/models/catarse_pagarme/transaction_base.rb

@@ -11,7 +11,6 @@ module CatarsePagarme
 
     def change_contribution_state
       self.contribution.update_attributes(attributes_to_contribution)
-      update_fee
       self.contribution.payment_notifications.create(extra_data: self.transaction.to_json)
       delegator.change_status_by_transaction(self.transaction.status)
     end
@@ -23,22 +22,14 @@ module CatarsePagarme
     def attributes_to_contribution
       {
         payment_choice: payment_method,
+        payment_service_fee: delegator.get_fee(payment_method, self.transaction.acquirer_name),
         payment_id: self.transaction.id,
         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
+        installments: (self.transaction.installments || 1)
       }
     end
 
-    def update_fee
-      self.contribution.update_attributes({
-        payment_service_fee: delegator.get_fee(payment_method, self.transaction.acquirer_name),
-      })
-    end
-
     def delegator
       self.contribution.pagarme_delegator
     end

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

@@ -0,0 +1,6 @@
+.fontsize-smallest.u-text-center.u-marginbottom-30
+  | Ao apoiar, você concorda com os 
+  = link_to 'Termos de Uso', main_app.terms_of_use_path, class: 'alt-link'
+  |  e   
+  = link_to 'Política de Privacidade', main_app.privacy_policy_path, class: 'alt-link'
+

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

@@ -3,111 +3,110 @@
   = form_tag 'javascript:void(0);', :class => 'pagarme' do
 
     .next_step_after_valid_document
+      .w-row.list_payment.w-form
+        .w-col.w-col-7.w-col-small-7.back-payment-moip-options-column
+          = radio_button_tag 'payment_type', "credit_card", false, class: 'w-radio-input back-payment-radio-button'
+          = label_tag :payment_type_credit_card, nil, class: "cards w-form-label" do
+            = image_tag 'catarse_bootstrap/payment_cards.jpg'
+        .w-col.w-col-5.w-col-small-5.back-payment-moip-options-column
+          = radio_button_tag 'payment_type', "slip", false, class: 'w-radio-input back-payment-radio-button'
+          = label_tag :payment_type_slip, class: "boleto w-form-label" do
+            = image_tag 'catarse_bootstrap/payment_boleto.jpg'
 
-      .list_payment
-        .input
-          = radio_button_tag 'payment_type', "credit_card"
-          = label_tag :payment_type_credit_card, nil, :class => "cards"
-
-          = radio_button_tag 'payment_type', "slip"
-          = label_tag :payment_type_slip, 'Boleto', :class => "boleto"
-
+    .formwrapper 
       #payment_type_credit_card_section.payment_section
-        h3= t('projects.contributions.review.form.labels.payment_card')
-
-        .clearfix
-
-        .bootstrap-twitter style="float: none;"
-          .alert.alert-danger.hide
-            p.error_msg
-            .clearfix
-
-        .clearfix
-
-        .choose_card
-          ul class="my_credit_cards #{(current_user.credit_cards.present? ? '' : 'hide')}"
-            - current_user.credit_cards.each_with_index do |credit_card, i|
-              li.credit_card
-                .radio_button
-                  = radio_button_tag :payment_subscription_card, credit_card.subscription_id, { checked: (i == 0) } 
-                .select_installments
-                  - if @contribution.value.to_f >= CatarsePagarme.configuration.minimum_value_for_installment.to_f
-                    = select_tag :payment_card_installments, options_for_select(installments_for_select(@contribution))
-                .card_info
+        div[class="my-credit-cards w-form back-payment-form-creditcard formwrapper records-choice #{(current_user.credit_cards.present? ? '' : 'w-hidden')}"]
+          - current_user.credit_cards.each_with_index do |credit_card, i|
+            .w-row.creditcard-records
+              .w-col.w-col-1
+                .w-radio.w-clearfix.back-payment-credit-card-radio-field
+                  = radio_button_tag :payment_subscription_card, credit_card.subscription_id, i == 0, {"data-stored" => true}
+              .w-col.w-col-2
+                .fontsize-small.fontweight-semibold.text-success
+                  = credit_card.card_brand.upcase
+              .w-col.w-col-5
+                .fontsize-small.fontweight-semibold.u-marginbottom-20
                   = "XXXX.XXXX.XXXX.#{credit_card.last_digits}"
-                .card_brand
-                  = credit_card.card_brand
-                .clearfix
-
-          .bootstrap-twitter
-            a href='javascript:void(0)' class="btn use_another-card #{(current_user.credit_cards.present? ? '' : 'hide')}"
-              | Utilizar outro cartão
-
-          div class="type_card_data #{(current_user.credit_cards.present? ? 'hide' : '')}"
-            .div
-              .owner_outside
-                .owner
-                  ol.inputs
-                    li.name
-                      = label_tag :payment_card_name, t('projects.contributions.edit.form_labels.payment_card_name')
-                      = text_field_tag :payment_card_name, nil
-                    - if @contribution.value.to_f >= CatarsePagarme.configuration.minimum_value_for_installment.to_f
-                      li.cpf
-                        = label_tag :payment_card_installments, t('projects.contributions.edit.form_labels.payment_card_installments')
-                        = select_tag :payment_card_installments, options_for_select(installments_for_select(@contribution))
-            .div
-              .infocard_outside
-                .infocard
-                  ol.inputs
-                    li.number
-                      = label_tag :payment_card_number, t('projects.contributions.edit.form_labels.payment_card_number')
-                      = text_field_tag :payment_card_number, nil
-                    li.flag
-                      = label_tag :payment_card_flag, t('projects.contributions.edit.form_labels.payment_card_flag')
-                      = text_field_tag :payment_card_flag, nil, { disabled: true }
-                    li.source
-                      = label_tag :payment_card_source, t('projects.contributions.edit.form_labels.payment_card_source')
-                      = text_field_tag :payment_card_source, nil
-                    li.date
-                      = label_tag :payment_card_date, t('projects.contributions.edit.form_labels.payment_card_date')
-                      = text_field_tag :payment_card_date, nil
-
-        .clearfix
-        .bootstrap-twitter
-          div class="save_card #{(current_user.credit_cards.present? ? 'hide' : '')}"
-            = check_box_tag :payment_save_card, 1, false
-            = label_tag :payment_save_card, t('projects.contributions.edit.payment_save_card')
-          .loader.hide= image_tag('loading.gif')
-            .clearfix
-          = submit_tag t('projects.contributions.review.form.labels.submit'), :class => 'btn btn-primary btn-large', :id => "credit_card_submit"
-
-      #payment_type_slip_section.hide.payment_section
-        h3= t('projects.contributions.review.form.labels.payment_boleto')
-        .clearfix
-        .bootstrap-twitter style="float: none;"
-          .alert.alert-danger.hide
-            p.error_msg
-            .clearfix
-        .bootstrap-twitter
-          .bootstrap-form
-
-            .bootstrap-alert
-              .alert.credit_alert
-                = t('users.current_user_fields.bank_account_hint')
+              .w-col.w-col-4
+                = select_tag :payment_card_installments, options_for_select(installments_for_select(@contribution)), class: 'w-select text-field text-field-creditcard'
+          .w-row.creditcard-records
+            .w-col.w-col-1
+              .w-radio.w-clearfix.back-payment-credit-card-radio-field
+                = radio_button_tag :payment_subscription_card, 0
+            .w-col.w-col-11
+              .fontsize-small.fontweight-semibold.fontcolor-secondary
+                = t('projects.contributions.edit.form_labels.user_another_card')
+        div[class="w-form formwrapper type_card_data #{(current_user.credit_cards.present? ? 'w-hidden' : '')}"]
+          .w-row
+            .w-col.w-col-12
+              .field-label.fontweight-semibold
+                = label_tag :payment_card_name, t('projects.contributions.edit.form_labels.payment_card_name'), class: 'field-label fontweight-semibold'
+                = text_field_tag :payment_card_name, nil, class: 'w-input text-field'
+          .w-row
+            .w-col.w-col-6.w-sub-col
+              = label_tag :payment_card_number, t('projects.contributions.edit.form_labels.payment_card_number'), class: 'fontweight-semibold field-label'
+              .card-brand.prefix.text-field
+                #payment_card_flag.fontsize-smallest.fontcolor-secondary.u-text-center
+                  | 
+              .card-number
+                = text_field_tag :payment_card_number, nil, class: 'w-input text-field postfix'
+            .w-col.w-col-6
+              .w-row
+                .w-col.w-col-6.w-col-small-6.w-col-tiny-6.w-sub-col-middle
+                  = label_tag :payment_card_source, t('projects.contributions.edit.form_labels.payment_card_source'), class: 'field-label fontweight-semibold'
+                  = text_field_tag :payment_card_source, nil, class: 'w-input text-field'
+                .w-col.w-col-6.w-col-small-6.w-col-tiny-6
+                  = label_tag :payment_card_date, t('projects.contributions.edit.form_labels.payment_card_date'), class: 'field-label fontweight-semibold'
+                  = text_field_tag :payment_card_date, nil, class: 'w-input text-field'
+          - if @contribution.value >= CatarsePagarme.configuration.minimum_value_for_installment
+            .w-row
+              .w-col.w-col-6.w-sub-col
+                = label_tag :payment_card_installments, t('projects.contributions.edit.form_labels.payment_card_installments'), class: 'field-label fontweight-semibold'
+                = select_tag :payment_card_installments, options_for_select(installments_for_select(@contribution)), class: 'w-select text-field'
+          .w-checkbox.w-clearfix
+            = check_box_tag :payment_save_card, 1, false, class: 'w-checkbox-input'
+            = label_tag :payment_save_card, t('projects.contributions.edit.payment_save_card'), class: 'w-form-label'
+        .w-row
+          .w-col.w-col-12
+            .payment-error-message.card.card-error.u-radius.zindex-10.u-marginbottom-30.w-hidden
+              .fontsize-smaller.fontweight-bold.u-marginbottom-10= t('projects.contributions.edit.review_errors_title')
+              .message-text.fontsize-smaller = t('.review_errors')
+        .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.submit'), :class => 'btn btn-large u-marginbottom-20', :id => "credit_card_submit"
+            = render partial: 'terms'
 
-            = simple_form_for current_user, url: 'javascript:void(0)' do |f|
-              .bank_accounts
-                = f.simple_fields_for :bank_account do |bank_form|
-                  = bank_form.input :bank_id, as: :select, collection: Bank.to_collection, input_html: { style: 'width: 150px' }
-                  = bank_form.input :agency, as: :string
-                  = bank_form.input :agency_digit, as: :string
-                  = bank_form.input :account, as: :string
-                  = bank_form.input :account_digit, as: :string
-                  = bank_form.input :owner_name, as: :string, input_html: { value: bank_form.object.owner_name || current_user.full_name }
-                  = bank_form.input :owner_document, as: :string, input_html: { value: bank_form.object.owner_document || current_user.cpf }
-                  .clearfix
-          .loader.hide= image_tag('loading.gif')
-          = submit_tag t('projects.contributions.review.form.labels.build_boleto'), :class => 'btn btn-primary btn-large', :id => "build_boleto"
-        .clearfix
-        p.subtitle.hide= t('projects.contributions.review.form.labels.payment_boleto_subtitle')
-        .link_content
+      #payment_type_slip_section.payment_section.w-hidden
+        = simple_form_for current_user, url: 'javascript:void(0)' do |f|
+          .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'}
+              .w-row
+                = bank_form.input :agency, as: :string, wrapper_html: {class: 'w-col w-sub-col-middle w-col-4 w-col-small-8'}
+                = bank_form.input :agency_digit, as: :string, wrapper_html: {class: 'w-col w-sub-col-middle w-sub-col w-col-2 w-col-small-4'}
+                = bank_form.input :account, as: :string, wrapper_html: {class: 'w-col w-sub-col-middle w-col-4 w-col-small-8'}
+                = bank_form.input :account_digit, as: :string, wrapper_html: {class: 'w-col w-col-2 w-col-small-4'}
+              .w-row
+                = bank_form.input :owner_name, as: :string, input_html: { value: bank_form.object.owner_name || current_user.full_name }, wrapper_html: {class: 'w-col w-sub-col w-col-6'}
+                = bank_form.input :owner_document, as: :string, input_html: { value: bank_form.object.owner_document || current_user.cpf }, wrapper_html: {class: 'w-col w-col-6'}
+        .w-row
+          .w-col.w-col-12
+            .card.card-message.u-radius.fontsize-small.zindex-10.u-marginbottom-30
+              | Após clicar no botão abaixo, você receberá um link com o boleto para completar o pagamento.
+        .w-row
+          .w-col.w-col-12
+            .payment-error-message.card.card-error.u-radius.zindex-10.u-marginbottom-30.w-hidden
+              .fontsize-smaller.fontweight-bold.u-marginbottom-10= t('projects.contributions.edit.review_errors_title')
+              .message-text.fontsize-smaller = t('.review_errors')
+        .w-row
+          .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-smaller
+              .fontsize-smaller Você também receberá um email com esse boleto.
+        .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'

data/catarse_pagarme.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   s.add_dependency "rails", "~> 4.0"
-  s.add_dependency "pagarme", "~> 1.9.9"
+  s.add_dependency "pagarme", "~> 1.9.5"
 
   s.add_development_dependency "rspec-rails", "~> 2.14.0"
   s.add_development_dependency "factory_girl_rails"

data/config/routes.rb

@@ -4,15 +4,12 @@ CatarsePagarme::Engine.routes.draw do
     member do
       get  :review
       put :second_slip, to: 'slip#update'
+      post :ipn, to: 'notifications#create'
       post :pay_credit_card, to: 'credit_cards#create'
       post :pay_slip, to: 'slip#create'
       post :pay_with_subscription, to: 'subscriptions#create'
       put :pay_with_subscription, to: 'subscriptions#update'
     end
 
-    collection do
-      post :ipn, to: 'notifications#create'
-    end
-
   end
 end

data/lib/catarse_pagarme/configuration.rb

@@ -1,9 +1,7 @@
 module CatarsePagarme
   class Configuration
     attr_accessor :api_key, :slip_tax, :credit_card_tax, :interest_rate, :host, :subdomain, :protocol,
-      :max_installments, :minimum_value_for_installment, :credit_card_cents_fee, :pagarme_tax, :stone_tax,
-      :cielo_tax, :cielo_installment_diners_tax, :cielo_installment_not_diners_tax,
-      :cielo_installment_amex_tax, :cielo_installment_not_amex_tax
+      :max_installments, :minimum_value_for_installment, :credit_card_cents_fee
 
     def initialize
       self.api_key = ''
@@ -16,13 +14,6 @@ module CatarsePagarme
       self.host = 'catarse.me'
       self.subdomain = 'www'
       self.protocol = 'http'
-      self.pagarme_tax = 0.0063
-      self.stone_tax = 0.0307
-      self.cielo_tax = 0.038
-      self.cielo_installment_diners_tax = 0.048
-      self.cielo_installment_not_diners_tax = 0.0455
-      self.cielo_installment_amex_tax = 0.058
-      self.cielo_installment_not_amex_tax = 0.048
     end
   end
 end

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "1.5.3"
+  VERSION = "2.0.0"
 end

data/spec/controllers/catarse_pagarme/credit_cards_controller_spec.rb

@@ -27,12 +27,12 @@ describe CatarsePagarme::CreditCardsController do
         before do
           post :create, {
             locale: :pt, project_id: project.id, contribution_id: contribution.id, use_route: 'catarse_pagarme',
-            payment_card_date: '10/17', payment_card_number: '4012888888881881', payment_card_name: 'Foo bar',
-            payment_card_source: '574', payment_card_installments: '1' }
+            payment_card_date: '10/17', payment_card_number: '4901720080344448', payment_card_name: 'Foo bar',
+            payment_card_source: '143', payment_card_installments: '1' }
 
         end
 
-        it 'payment_status should be filled' do
+        it 'payment_status should be filled and not failed' do
           expect(ActiveSupport::JSON.decode(response.body)['payment_status']).not_to be_nil
         end
 

data/spec/controllers/catarse_pagarme/notifications_controller_spec.rb

@@ -1,20 +1,12 @@
 require 'spec_helper'
 
 describe CatarsePagarme::NotificationsController do
-  let(:fake_transaction) {
-    t = double
-    t.stub(:card_brand).and_return('visa')
-    t.stub(:acquirer_name).and_return('stone')
-    t.stub(:tid).and_return('404040404')
-    t
-  }
   before do
     PagarMe.stub(:validate_fingerprint).and_return(true)
-    PagarMe::Transaction.stub(:find_by_id).and_return(fake_transaction)
   end
 
   let(:project) { create(:project, goal: 10_000, state: 'online') }
-  let(:contribution) { create(:contribution, value: 10, project: project, payment_id: 'abcd') }
+  let(:contribution) { create(:contribution, value: 10, project: project) }
   let(:credit_card) { create(:credit_card, subscription_id: '1542')}
 
   describe 'CREATE' do
@@ -32,7 +24,7 @@ describe CatarsePagarme::NotificationsController do
     context "with valid contribution" do
       before do
         PaymentEngines.stub(:find_payment).and_return(contribution)
-        post :create, { locale: :pt, id: 'abcd', use_route: 'catarse_pagarme' }
+        post :create, { locale: :pt, id: contribution.id, use_route: 'catarse_pagarme' }
       end
 
       it "should save an extra_data into payment_notifications" do

data/spec/models/catarse_pagarme/contribution_delegator_spec.rb

@@ -30,22 +30,9 @@ describe CatarsePagarme::ContributionDelegator do
   end
 
   context "#get_fee" do
-    let(:fake_transaction) {
-      t = double
-      t.stub(:card_brand).and_return('visa')
-      t.stub(:acquirer_name).and_return('stone')
-      t.stub(:acquirer_tid).and_return('404040404')
-      t
-    }
-
     before do
       CatarsePagarme.configuration.stub(:slip_tax).and_return(2.00)
       CatarsePagarme.configuration.stub(:credit_card_tax).and_return(0.01)
-      CatarsePagarme.configuration.stub(:pagarme_tax).and_return(0.0063)
-      CatarsePagarme.configuration.stub(:cielo_tax).and_return(0.038)
-      CatarsePagarme.configuration.stub(:stone_tax).and_return(0.0307)
-
-      delegator.stub(:transaction).and_return(fake_transaction)
     end
 
     context 'when choice is slip' do
@@ -55,7 +42,7 @@ describe CatarsePagarme::ContributionDelegator do
 
     context 'when choice is credit card' do
       subject { delegator.get_fee(CatarsePagarme::PaymentType::CREDIT_CARD).to_f }
-      it { expect(subject).to eq(0.83) }
+      it { expect(subject).to eq(0.49) }
     end
   end
 

data/spec/models/catarse_pagarme/credit_card_transaction_spec.rb

@@ -11,7 +11,6 @@ describe CatarsePagarme::CreditCardTransaction do
     transaction.stub(:boleto_url).and_return(nil)
     transaction.stub(:installments).and_return(3)
     transaction.stub(:acquirer_name).and_return('stone')
-    transaction.stub(:tid).and_return('123123')
     transaction
   }
 
@@ -40,7 +39,7 @@ describe CatarsePagarme::CreditCardTransaction do
   describe '#charge!' do
     describe 'with valid attributes' do
       before do
-        contribution.should_receive(:update_attributes).at_least(1).and_call_original
+        contribution.should_receive(:update_attributes).and_call_original
         CatarsePagarme::ContributionDelegator.any_instance.should_receive(:change_status_by_transaction).with('paid')
 
         card_transaction.charge!
@@ -52,7 +51,7 @@ describe CatarsePagarme::CreditCardTransaction do
       end
 
       it "should update contribution payment_service_fee" do
-        expect(contribution.payment_service_fee.to_f).to eq(4.08)
+        expect(contribution.payment_service_fee.to_f).to eq(1.39)
       end
 
       it "should update contribution payment_method" do
@@ -66,18 +65,6 @@ describe CatarsePagarme::CreditCardTransaction do
       it "should update contribution payment_choice" do
         expect(contribution.payment_choice).to eq(CatarsePagarme::PaymentType::CREDIT_CARD)
       end
-
-      it "should update contribution acquirer_name" do
-        expect(contribution.acquirer_name).to eq('stone')
-      end
-
-      it "should update contribution acquirer_tid" do
-        expect(contribution.acquirer_tid).to eq('123123')
-      end
-
-      it "should update contribution installment_value" do
-        expect(contribution.installment_value).to_not be_nil
-      end
     end
   end
 

data/spec/models/catarse_pagarme/slip_transaction_spec.rb

@@ -8,9 +8,8 @@ describe CatarsePagarme::SlipTransaction do
     transaction.stub(:charge).and_return(true)
     transaction.stub(:status).and_return('paid')
     transaction.stub(:boleto_url).and_return('boleto url')
-    transaction.stub(:installments).and_return(1)
+    transaction.stub(:installments).and_return(nil)
     transaction.stub(:acquirer_name).and_return('pagarme')
-    transaction.stub(:tid).and_return('123123')
     transaction
   }
   let(:valid_attributes) do
@@ -72,7 +71,7 @@ describe CatarsePagarme::SlipTransaction do
       before 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
+        contribution.should_receive(:update_attributes).and_call_original
         CatarsePagarme::ContributionDelegator.any_instance.should_receive(:change_status_by_transaction).with('paid')
 
         slip_transaction.charge!
@@ -98,18 +97,6 @@ describe CatarsePagarme::SlipTransaction do
       it "should update contribution payment_choice" do
         expect(contribution.payment_choice).to eq(CatarsePagarme::PaymentType::SLIP)
       end
-
-      it "should update contribution acquirer_name" do
-        expect(contribution.acquirer_name).to eq('pagarme')
-      end
-
-      it "should update contribution acquirer_tid" do
-        expect(contribution.acquirer_tid).to eq('123123')
-      end
-
-      it "should update contribution installment_value" do
-        expect(contribution.installment_value).to_not be_nil
-      end
     end
   end
 

data/spec/spec_helper.rb

@@ -30,7 +30,7 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    PagarMe.stub(:api_key).and_return('ak_test_XLoo19QDn9kg5JFGU70x12IA4NqbAv')
+    PagarMe.stub(:api_key).and_return('ak_test_Rw4JR98FmYST2ngEHtMvVf5QJW7Eoo')
     PaymentEngines.stub(:configuration).and_return({})
   end
 end

data/spec/support/factories.rb

@@ -32,19 +32,14 @@ FactoryGirl.define do
     f.name_pt { generate(:name) }
   end
 
-  factory :bank do |f|
-    f.name { generate(:uid) }
-    f.code { generate(:uid) }
-  end
-
   factory :bank_account do |f|
-    f.association :bank
+    f.name 'Foo bar'
     f.account '1234'
     f.account_digit '1'
     f.agency '1'
     f.agency_digit '2'
-    f.owner_name 'fooo'
-    f.owner_document '9889'
+    f.user_name 'fooo'
+    f.user_document '9889'
   end
 
   factory :project do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.9
+        version: 1.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.9
+        version: 1.9.5
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -110,18 +110,17 @@ files:
 - app/controllers/catarse_pagarme/slip_controller.rb
 - app/controllers/catarse_pagarme/subscriptions_controller.rb
 - app/helpers/catarse_pagarme/application_helper.rb
-- app/models/catarse_pagarme/bank_account_concern.rb
 - app/models/catarse_pagarme/contribution_concern.rb
 - app/models/catarse_pagarme/contribution_delegator.rb
 - app/models/catarse_pagarme/credit_card_concern.rb
 - app/models/catarse_pagarme/credit_card_delegator.rb
 - app/models/catarse_pagarme/credit_card_transaction.rb
-- app/models/catarse_pagarme/fee_calculator_concern.rb
 - app/models/catarse_pagarme/payment_type.rb
 - app/models/catarse_pagarme/save_credit_card_transaction.rb
 - app/models/catarse_pagarme/slip_transaction.rb
 - app/models/catarse_pagarme/subscription_transaction.rb
 - app/models/catarse_pagarme/transaction_base.rb
+- app/views/catarse_pagarme/pagarme/_terms.html.slim
 - app/views/catarse_pagarme/pagarme/review.html.slim
 - app/views/layouts/catarse_pagarme/application.html.erb
 - bin/rails
@@ -191,7 +190,6 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/helpers/catarse_pagarme/application_helper_spec.rb
-- spec/models/catarse_pagarme/bank_account_concern_spec.rb
 - spec/models/catarse_pagarme/contribution_delegator_spec.rb
 - spec/models/catarse_pagarme/credit_card_transaction_spec.rb
 - spec/models/catarse_pagarme/slip_transaction_spec.rb
@@ -278,7 +276,6 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/helpers/catarse_pagarme/application_helper_spec.rb
-- spec/models/catarse_pagarme/bank_account_concern_spec.rb
 - spec/models/catarse_pagarme/contribution_delegator_spec.rb
 - spec/models/catarse_pagarme/credit_card_transaction_spec.rb
 - spec/models/catarse_pagarme/slip_transaction_spec.rb

data/app/models/catarse_pagarme/bank_account_concern.rb

@@ -1,58 +0,0 @@
-module CatarsePagarme::BankAccountConcern
-  extend ActiveSupport::Concern
-
-  included do
-
-    validate :must_be_valid_on_pagarme
-
-    def must_be_valid_on_pagarme
-      pagarme_errors.each do |p_error|
-        _attr = attributes_parsed_from_pagarme[p_error.parameter_name.to_sym]
-        errors.add(_attr, :invalid)
-      end
-    end
-
-    private
-
-    def pagarme_errors
-      configure_pagarme
-      bank_account = ::PagarMe::BankAccount.new(attributes_parsed_to_pagarme)
-
-      begin
-        bank_account.create
-
-        []
-      rescue Exception => e
-        e.errors
-      end
-    end
-
-    def attributes_parsed_to_pagarme
-      {
-        bank_code: self.bank.try(:code),
-        agencia: self.agency,
-        agencia_dv: self.agency_digit,
-        conta: self.account,
-        conta_dv: self.account_digit,
-        legal_name: self.owner_name,
-        document_number: self.owner_document
-      }
-    end
-
-    def attributes_parsed_from_pagarme
-      {
-        bank_code: :bank,
-        agencia: :agency,
-        agencia_dv: :agency_digit,
-        conta: :account,
-        conta_dv: :account_digit,
-        legal_name: :owner_name,
-        document_number: :owner_document
-      }
-    end
-
-    def configure_pagarme
-      ::PagarMe.api_key = CatarsePagarme.configuration.api_key
-    end
-  end
-end

data/app/models/catarse_pagarme/fee_calculator_concern.rb

@@ -1,66 +0,0 @@
-module CatarsePagarme::FeeCalculatorConcern
-  extend ActiveSupport::Concern
-
-  included do
-
-    def get_fee(payment_method, acquirer_name = nil)
-      if payment_method == ::CatarsePagarme::PaymentType::SLIP
-        CatarsePagarme.configuration.slip_tax.to_f
-      else
-        if acquirer_name == 'stone'
-          self.contribution.installments > 1 ? tax_calc_for_installment(stone_tax) : tax_calc(stone_tax)
-        else
-          if self.transaction.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.transaction.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
-      end
-    end
-
-    protected
-
-    def tax_calc acquirer_tax
-      ((self.contribution.value * pagarme_tax) + cents_fee).round(2) + (self.contribution.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)
-    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 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/spec/models/catarse_pagarme/bank_account_concern_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-class FakeBankAccount < BankAccount
-  include CatarsePagarme::BankAccountConcern
-end
-
-describe FakeBankAccount do
-  let(:bank) { create(:bank) }
-
-  let(:valid_attr) do
-    vb = build(:bank_account, bank: bank)
-    vb.attributes
-  end
-
-  let(:valid_attr_on_pagarme) do
-    {
-      bank_id: bank.id,
-      agency: '1732',
-      agency_dv: '8',
-      account: '25483',
-      account_dv: 'X',
-      owner_name: 'Lorem Ipsum',
-      owner_document: '111.111.111-11'
-    }
-  end
-
-  describe "validate :must_be_valid_on_pagarme" do
-    context "when bank account has invalid data on pagarme" do
-      let(:bank_account_on_pagarme) { FakeBankAccount.new(valid_attr) }
-      let(:local_bank_account) { BankAccount.new(valid_attr) }
-
-      it "local_bank_account should be valid" do
-        expect(local_bank_account.valid?).to be_true
-      end
-
-      it "bank_account_on_pagarme should be not valid with these attrs" do
-        expect(bank_account_on_pagarme.valid?).to be_false
-      end
-
-      it "bank_account_on_pagarme should be valid with another attrs" do
-        subject { FakeBankAccount.new(valid_attr_on_pagarme).valid? }
-        expect(subject).to be_true
-      end
-    end
-  end
-end