spree_zaez_cielo 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74317f9fef3be962b0cdf836a217cf798046d18c
-  data.tar.gz: 356da3dd659544563dfa2d4d3b9a6230bb713120
+  metadata.gz: 0e29af900cc55139f21ad1986fe85666d732ad2b
+  data.tar.gz: 667976b4851817c46e6bbcefbab2ed47b4818610
 SHA512:
-  metadata.gz: 28c37b24361658bf3661cb31e62775669e90cd988c1e2eb5206bbe5e21f8794e6138557c6dd82081effde2f17e5b1ac78e3b21f90b1faba979dd361de60aed4d
-  data.tar.gz: b8523d37c7b8a8a86df31a00b63ec7bf8eec4fa1d8fff4a30f5d82c628c80593d860df240b6182a0de68b83aeb9efec286ae73727326e7d541b18b4fd1e5301d
+  metadata.gz: 676e7a99747ed60657beeae88e77241539daf39b92f28f9328977f29cf35bcf201a5fb2815157015329366fba7a697cce2c0ec0e5416b9902bb5216815a9760e
+  data.tar.gz: 79a8ec780ef94caf7eaa70237f7d68028c2140dfe98727ce5b4dc60a2924cedda854cace3c8e458045787e3a5718718032d1f7ea1ac14fd656109a4442215641

data/app/models/spree/payment_method/cielo_credit.rb

@@ -11,13 +11,17 @@ module Spree
     #
     # @return [ActiveMerchant::Billing::Response]
     #
-    def purchase(amount, source, gateway_options)
+    def purchase(_amount, source, gateway_options)
       if gateway_options[:portions].nil?
         return ActiveMerchant::Billing::Response.new(false, Spree.t('cielo.messages.invalid_portions'), {}, {})
       end
 
-      total_value = update_payment_amount amount, gateway_options
+      order_number = gateway_options[:order_id].split('-').first
+      order = Spree::Order.friendly.find order_number
+      portion_value = Spree::CieloConfig.calculate_portion_value order, gateway_options[:portions]
+      total_value = sprintf('%0.2f', portion_value * gateway_options[:portions])
       total_value.delete!('.')
+
       default_params = {
           parcelas: gateway_options[:portions],
           capturar: 'true'
@@ -50,6 +54,9 @@ module Spree
           storage_token source, response[:transacao]
         end
 
+        # Salva o valor do pagamento (e pedido) com o juros (se houver)
+        update_payment_amount gateway_options
+
         ActiveMerchant::Billing::Response.new(true, Spree.t('cielo.messages.purchase_success'), {}, authorization: response[:transacao][:tid])
       else
         ActiveMerchant::Billing::Response.new(false, Spree.t('cielo.messages.purchase_fail'), {}, authorization: response[:transacao][:tid])
@@ -64,13 +71,17 @@ module Spree
     #
     # @return [ActiveMerchant::Billing::Response]
     #
-    def authorize(amount, source, gateway_options)
+    def authorize(_amount, source, gateway_options)
       if gateway_options[:portions].nil?
         return ActiveMerchant::Billing::Response.new(false, Spree.t('cielo.messages.invalid_portions'), {}, {})
       end
 
-      total_value = update_payment_amount amount, gateway_options
+      order_number = gateway_options[:order_id].split('-').first
+      order = Spree::Order.friendly.find order_number
+      portion_value = Spree::CieloConfig.calculate_portion_value order, gateway_options[:portions]
+      total_value = sprintf('%0.2f', portion_value * gateway_options[:portions])
       total_value.delete!('.')
+
       default_params = {
           parcelas: gateway_options[:portions],
           capturar: 'false'
@@ -103,6 +114,9 @@ module Spree
           storage_token source, response[:transacao]
         end
 
+        # Salva o valor do pagamento (e pedido) com o juros (se houver)
+        update_payment_amount gateway_options
+
         ActiveMerchant::Billing::Response.new(true, Spree.t('cielo.messages.authorize_success'), {}, authorization: response[:transacao][:tid])
       else
         ActiveMerchant::Billing::Response.new(false, Spree.t('cielo.messages.authorize_fail'), {}, authorization: response[:transacao][:tid])
@@ -240,24 +254,26 @@ module Spree
     #
     # @author Isabella Santos
     #
-    # @param amount [Integer]
     # @param gateway_options [Hash]
     #
     # @return [Integer]
     #
-    def update_payment_amount(amount, gateway_options)
-      if gateway_options[:portions] > 1
-        order_number, payment_number = gateway_options[:order_id].split('-')
-        order = Spree::Order.friendly.find order_number
-        portion_value = Spree::CieloConfig.calculate_portion_value order, gateway_options[:portions]
-        total_value = sprintf('%0.2f', portion_value * gateway_options[:portions])
+    def update_payment_amount(gateway_options)
+      order_number, payment_number = gateway_options[:order_id].split('-')
+      order = Spree::Order.friendly.find order_number
+      total = Spree::CieloConfig.calculate_portion_value(order, gateway_options[:portions]) * gateway_options[:portions]
+
+      if total > order.total
+        Spree::Adjustment.create(adjustable: order,
+                                 amount: (total - order.total),
+                                 label: Spree.t(:cielo_adjustment_tax),
+                                 eligible: true,
+                                 order: order)
+        order.updater.update
 
         payment = Spree::Payment.friendly.find payment_number
-        payment.update_attributes(amount: total_value)
+        payment.update_attributes(amount: order.total)
 
-        total_value
-      else
-        amount.to_s
       end
     end
 

data/config/locales/en.yml

@@ -59,6 +59,7 @@ en:
       cielo_card_fail: "The card is not supported. The available cards are:"
       cielo_unavailable_credit_card: "The credit card is not supported."
       invalid_guest_token: "The guest token passed is invalid!"
+    cielo_adjustment_tax: Credit Card Tax
   activerecord:
     attributes:
       spree/payment:

data/config/locales/pt-br.yml

@@ -59,6 +59,7 @@ pt-BR:
       cielo_card_fail: "O cartão digitado não é suportado. Os tipos de cartões disponíveis são:"
       cielo_unavailable_credit_card: "O cartão informado não é suportado."
       invalid_guest_token: "O token informado é inválido!"
+    cielo_adjustment_tax: "Juros Cartão de Crédito"
   activerecord:
     attributes:
       spree/credit_card:

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
 require 'database_cleaner'
 require 'ffaker'
+
 require 'capybara/poltergeist'
 Capybara.javascript_driver = :poltergeist
 

data/spree_zaez_cielo.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zaez_cielo'
-  s.version     = '3.0.9'
+  s.version     = '3.0.10'
   s.summary     = 'Adds Cielo as a Payment Method to Spree Commerce'
   s.description = s.summary
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_zaez_cielo
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Zaez Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core