spree_zaez_cielo 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44b86666a7498bb608fea3a1e4ca0a7a2720a262
-  data.tar.gz: 5610340416beb53e46b2f436ffd27e1147065d29
+  metadata.gz: ac2388adf429e3428e2155259c53a03b4f539928
+  data.tar.gz: a35ee56108197d854a6b6855ba3d356a4c4bd34c
 SHA512:
-  metadata.gz: 448b339bb12e77116e2bdaa4c26aba16c73055725bfcde27e3cad046ba0a3a698745e89b9efa8fef6529d0a9ba9cd07dc836dd5f2aeca087a98e3cbc25b8a50f
-  data.tar.gz: 0f937b6166815fc6e87223ae17d5d5b98dc9abc003679dbcc0e7e3f9209b527e768fcc1e12994de4ad874d96fd384978b7f4b61e11ddd0b9ee6f8eb45c573ebb
+  metadata.gz: a50afaf3307b3d3d364d299c02d34dffafb64b9a7f47a9e6a3b52c2259d5c84203e40a5f30a215f44bc2cad6f95a3a48c5e415b408de9d45f2e9cf57e91168ff
+  data.tar.gz: bd6cf0a60c66161257012ccfce3c22cc533eaaead676cff8d5f00cbb9c80e171856cc096c9bd640fada009b585546765fefb0e6471b01ee7b06ca4994db073bf

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

@@ -23,19 +23,8 @@ module Spree
           capturar: 'true'
       }
 
-      if source.gateway_customer_profile_id.present?
+      if source.gateway_customer_profile_id?
         params = { token: CGI.escape(source.gateway_customer_profile_id) }
-      elsif Spree::CieloConfig.generate_token
-        params = generate_token source
-
-        if params[:token].nil?
-          params = {
-              cartao_numero: source.number,
-              cartao_validade: "#{source.year}#{source.month}",
-              cartao_seguranca: source.verification_value,
-              cartao_portador: source.name
-          }
-        end
       else
         params = {
             cartao_numero: source.number,
@@ -43,19 +32,28 @@ module Spree
             cartao_seguranca: source.verification_value,
             cartao_portador: source.name
         }
+
+        if Spree::CieloConfig.generate_token
+          params[:'gerar-token'] = 'true'
+        end
       end
+
       transaction_params = mount_params(total_value, source, params.merge!(default_params))
 
       transaction = Cielo::Transaction.new
-      ret = transaction.create!(transaction_params, :store)
+      response = transaction.create!(transaction_params, :store)
 
-      if ret[:transacao][:status] == '6'
-        ActiveMerchant::Billing::Response.new(true, Spree.t('cielo.messages.purchase_success'), {}, authorization: ret[:transacao][:tid])
+      if response[:transacao][:status] == '6'
+        if Spree::CieloConfig.generate_token
+          storage_token source, response[:transacao]
+        end
+
+        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: ret[:transacao][:tid])
+        ActiveMerchant::Billing::Response.new(false, Spree.t('cielo.messages.purchase_fail'), {}, authorization: response[:transacao][:tid])
       end
     rescue
-      verify_error 'purchase', ret
+      verify_error 'purchase', response
     end
 
     # Authorizes the payment to Cielo
@@ -76,19 +74,8 @@ module Spree
           capturar: 'false'
       }
 
-      if source.gateway_customer_profile_id.present?
+      if source.gateway_customer_profile_id?
         params = { token: CGI.escape(source.gateway_customer_profile_id) }
-      elsif Spree::CieloConfig.generate_token
-        params = generate_token source
-
-        if params[:token].nil?
-          params = {
-              cartao_numero: source.number,
-              cartao_validade: "#{source.year}#{source.month}",
-              cartao_seguranca: source.verification_value,
-              cartao_portador: source.name
-          }
-        end
       else
         params = {
             cartao_numero: source.number,
@@ -96,19 +83,28 @@ module Spree
             cartao_seguranca: source.verification_value,
             cartao_portador: source.name
         }
+
+        if Spree::CieloConfig.generate_token
+          params[:'gerar-token'] = 'true'
+        end
       end
+
       transaction_params = mount_params(total_value, source, params.merge!(default_params))
 
       transaction = Cielo::Transaction.new
-      ret = transaction.create!(transaction_params, :store)
+      response = transaction.create!(transaction_params, :store)
+
+      if response[:transacao][:status] == '4'
+        if Spree::CieloConfig.generate_token
+          storage_token source, response[:transacao]
+        end
 
-      if ret[:transacao][:status] == '4'
-        ActiveMerchant::Billing::Response.new(true, Spree.t('cielo.messages.authorize_success'), {}, authorization: ret[:transacao][:tid])
+        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: ret[:transacao][:tid])
+        ActiveMerchant::Billing::Response.new(false, Spree.t('cielo.messages.authorize_fail'), {}, authorization: response[:transacao][:tid])
       end
     rescue
-      verify_error 'authorize', ret
+      verify_error 'authorize', response
     end
 
     # Captures the payment
@@ -160,30 +156,20 @@ module Spree
       cc_type
     end
 
-    # Generate and storage the token in the source object
+    # Storage the token generated in request
     #
     # @author Isabella Santos
     #
     # @param credit_card [Spree::CreditCard]
+    # @param response [Hash]
     #
-    # @return [Hash]
-    #
-    def generate_token credit_card
-      token_request = Cielo::Token.new
-      token_parameters = {
-          cartao_numero: credit_card.number,
-          cartao_validade: "#{credit_card.year}#{credit_card.month}",
-          cartao_portador: credit_card.name
-      }
-      response = token_request.create! token_parameters, :store
-
-      if response[:'retorno-token'][:token][:'dados-token'][:'codigo-token']
-        token = response[:'retorno-token'][:token][:'dados-token'][:'codigo-token']
+    def storage_token credit_card, response
+      if response[:token][:'dados-token'][:status] == '1' and response[:token][:'dados-token'][:'codigo-token']
+        token = response[:token][:'dados-token'][:'codigo-token']
         credit_card.update_attributes(gateway_customer_profile_id: token)
-        return { token: token }
       end
     rescue
-      {}
+      false
     end
 
     # Returns the params to Cielo::Transaction

data/spec/features/checkout_with_cielo_credit_spec.rb

@@ -42,9 +42,7 @@ describe 'Checkout with Cielo Credit Payment Method', type: :feature do
     it 'should create a token and use in next transactions', js: true do
       Spree::CieloConfig.generate_token = true
 
-      response = JSON.parse File.read('spec/fixtures/cielo_returns/token_success.json'), symbolize_names: true
-      allow_any_instance_of(Cielo::Token).to receive(:create!).and_return(response)
-      stub_cielo_request
+      stub_cielo_request 'authorize_token_success'
 
       navigate_to_payment
       fill_credit_card_data

data/spec/fixtures/cielo_returns/authorize_token_success.json

@@ -0,0 +1 @@
+{"transacao":{"tid":"100699306930C9392002","pan":"9HihX8E+Hzyu2Ol+kdeOh0oUa/GvzRoyW8Q3I3An9KE=","dados-pedido":{"numero":"123","valor":"1000","moeda":"986","data-hora":"2015-07-09T11:21:00.821-03:00","idioma":"PT","taxa-embarque":"0"},"forma-pagamento":{"bandeira":"mastercard","produto":"2","parcelas":"2"},"status":"4","autenticacao":{"codigo":"4","mensagem":"Transacao sem autenticacao","data-hora":"2015-07-09T11:21:00.857-03:00","valor":"1000","eci":"0"},"autorizacao":{"codigo":"4","mensagem":"Transação autorizada","data-hora":"2015-07-09T11:21:00.873-03:00","valor":"1000","lr":"00","arp":"123456","nsu":"197241"},"token":{"dados-token":{"codigo-token":"2ta/YqYaeyolf2NHkBWO8grPqZE44j3PvRAQxVQQGgE=","status":"1","numero-cartao":"411111******1111"}}}}

data/spec/fixtures/cielo_returns/purchase_token_success.json

@@ -0,0 +1 @@
+{"transacao":{"tid":"100699306930CC6B2002","pan":"9HihX8E+Hzyu2Ol+kdeOh0oUa/GvzRoyW8Q3I3An9KE=","dados-pedido":{"numero":"123","valor":"1000","moeda":"986","data-hora":"2015-07-09T14:47:49.820-03:00","idioma":"PT","taxa-embarque":"0"},"forma-pagamento":{"bandeira":"mastercard","produto":"2","parcelas":"2"},"status":"6","autenticacao":{"codigo":"6","mensagem":"Transacao sem autenticacao","data-hora":"2015-07-09T14:47:49.827-03:00","valor":"1000","eci":"0"},"autorizacao":{"codigo":"6","mensagem":"Transação autorizada","data-hora":"2015-07-09T14:47:49.831-03:00","valor":"1000","lr":"00","arp":"123456","nsu":"198059"},"captura":{"codigo":"6","mensagem":"Transacao capturada com sucesso","data-hora":"2015-07-09T14:47:49.856-03:00","valor":"1000"},"token":{"dados-token":{"codigo-token":"2ta/YqYaeyolf2NHkBWO8grPqZE44j3PvRAQxVQQGgE=","status":"1","numero-cartao":"411111******1111"}}}}

data/spec/models/spree/payment_method/cielo_credit_spec.rb

@@ -37,9 +37,7 @@ describe Spree::PaymentMethod::CieloCredit do
 
       it 'should create the token and save on credit card when the setting is enable' do
         Spree::CieloConfig.generate_token = true
-        token_response = JSON.parse File.read('spec/fixtures/cielo_returns/token_success.json'), symbolize_names: true
-        allow_any_instance_of(Cielo::Token).to receive(:create!).and_return(token_response)
-        stub_cielo_request :create!, 'authorize_success'
+        stub_cielo_request :create!, 'authorize_token_success'
 
         response = cielo.authorize(1000, credit_card, gateway_options)
         expect(response.success?).to be true
@@ -47,15 +45,11 @@ describe Spree::PaymentMethod::CieloCredit do
         expect(credit_card.gateway_customer_profile_id).to eq '2ta/YqYaeyolf2NHkBWO8grPqZE44j3PvRAQxVQQGgE='
       end
 
-      it 'should not storage the token if the request fail' do
+      it 'should not storage the token if the request is unauthorized' do
         Spree::CieloConfig.generate_token = true
-        token_response = JSON.parse File.read('spec/fixtures/cielo_returns/capture_error.json'), symbolize_names: true
-        allow_any_instance_of(Cielo::Token).to receive(:create!).and_return(token_response)
-        stub_cielo_request :create!, 'authorize_success'
+        stub_cielo_request :create!, 'authorize_error'
 
-        response = cielo.authorize(1000, credit_card, gateway_options)
-        expect(response.success?).to be true
-        expect(response.message).to eq 'Cielo: transaction authorized successfully'
+        cielo.authorize(1000, credit_card, gateway_options)
         expect(credit_card.gateway_customer_profile_id).to be_nil
       end
     end
@@ -77,7 +71,7 @@ describe Spree::PaymentMethod::CieloCredit do
         expect(response.message).to eq 'Cielo: The message is invalid. Verify the information and try again.'
       end
 
-      it 'should rturn an invalid response when occurs an error on authorization' do
+      it 'should return an invalid response when occurs an error on authorization' do
         allow_any_instance_of(Cielo::Transaction).to receive(:create!).and_return(nil)
 
         response = cielo.authorize(1000, credit_card, gateway_options)
@@ -114,9 +108,7 @@ describe Spree::PaymentMethod::CieloCredit do
 
       it 'should create the token and save on credit card when the setting is enable' do
         Spree::CieloConfig.generate_token = true
-        token_response = JSON.parse File.read('spec/fixtures/cielo_returns/token_success.json'), symbolize_names: true
-        allow_any_instance_of(Cielo::Token).to receive(:create!).and_return(token_response)
-        stub_cielo_request :create!, 'purchase_success'
+        stub_cielo_request :create!, 'purchase_token_success'
 
         response = cielo.purchase(1000, credit_card, gateway_options)
         expect(response.success?).to be true
@@ -124,15 +116,11 @@ describe Spree::PaymentMethod::CieloCredit do
         expect(credit_card.gateway_customer_profile_id).to eq '2ta/YqYaeyolf2NHkBWO8grPqZE44j3PvRAQxVQQGgE='
       end
 
-      it 'should not storage the token if the request fail' do
+      it 'should not storage the token if the request is unauthorized' do
         Spree::CieloConfig.generate_token = true
-        token_response = JSON.parse File.read('spec/fixtures/cielo_returns/capture_error.json'), symbolize_names: true
-        allow_any_instance_of(Cielo::Token).to receive(:create!).and_return(token_response)
-        stub_cielo_request :create!, 'purchase_success'
+        stub_cielo_request :create!, 'authorize_error'
 
-        response = cielo.purchase(1000, credit_card, gateway_options)
-        expect(response.success?).to be true
-        expect(response.message).to eq 'Cielo: transaction purchased successfully'
+        cielo.purchase(1000, credit_card, gateway_options)
         expect(credit_card.gateway_customer_profile_id).to be_nil
       end
     end

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.4'
+  s.version     = '3.0.5'
   s.summary     = 'Adds Cielo as a Payment Method to Spree Commerce'
   s.description = s.summary
   s.required_ruby_version = '>= 2.0.0'
@@ -35,4 +35,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'guard-bundler'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'guard-shell'
+  s.add_development_dependency 'http_logger'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_zaez_cielo
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Zaez Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -262,6 +262,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: http_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds Cielo as a Payment Method to Spree Commerce
 email: contato@zaez.net
 executables: []
@@ -325,12 +339,14 @@ files:
 - spec/features/checkout_with_cielo_debt_spec.rb
 - spec/fixtures/cielo_returns/authorize_error.json
 - spec/fixtures/cielo_returns/authorize_success.json
+- spec/fixtures/cielo_returns/authorize_token_success.json
 - spec/fixtures/cielo_returns/capture_error.json
 - spec/fixtures/cielo_returns/capture_success.json
 - spec/fixtures/cielo_returns/create_error.json
 - spec/fixtures/cielo_returns/create_success.json
 - spec/fixtures/cielo_returns/error_001.json
 - spec/fixtures/cielo_returns/purchase_success.json
+- spec/fixtures/cielo_returns/purchase_token_success.json
 - spec/fixtures/cielo_returns/token_success.json
 - spec/fixtures/cielo_returns/void_error.json
 - spec/fixtures/cielo_returns/void_success.json
@@ -379,12 +395,14 @@ test_files:
 - spec/features/checkout_with_cielo_debt_spec.rb
 - spec/fixtures/cielo_returns/authorize_error.json
 - spec/fixtures/cielo_returns/authorize_success.json
+- spec/fixtures/cielo_returns/authorize_token_success.json
 - spec/fixtures/cielo_returns/capture_error.json
 - spec/fixtures/cielo_returns/capture_success.json
 - spec/fixtures/cielo_returns/create_error.json
 - spec/fixtures/cielo_returns/create_success.json
 - spec/fixtures/cielo_returns/error_001.json
 - spec/fixtures/cielo_returns/purchase_success.json
+- spec/fixtures/cielo_returns/purchase_token_success.json
 - spec/fixtures/cielo_returns/token_success.json
 - spec/fixtures/cielo_returns/void_error.json
 - spec/fixtures/cielo_returns/void_success.json