br_nfe 2.2.0 → 2.3.0

data/lib/br_nfe/product/response/build/nfe_status_servico.rb

@@ -4,6 +4,10 @@ module BrNfe
 			module Build
 				class NfeStatusServico < Base
 
+					def paths
+						operation.gateway_settings[:xml_paths][:status_servico][:return_paths]
+					end
+
 					# Responsável por definir qual classe será instânciada para
 					# setar os valores de retorno referentes a cada operação.
 					#
@@ -22,20 +26,19 @@ module BrNfe
 					#
 					def specific_attributes
 						{
-							environment:              body_xml.xpath('//ret:nfeStatusServicoNF2Result/nf:retConsStatServ/nf:tpAmb',    nf: nf_xmlns, ret: url_xmlns_retorno).text,
-							app_version:              body_xml.xpath('//ret:nfeStatusServicoNF2Result/nf:retConsStatServ/nf:verAplic', nf: nf_xmlns, ret: url_xmlns_retorno).text,
-							processed_at:             body_xml.xpath('//ret:nfeStatusServicoNF2Result/nf:retConsStatServ/nf:dhRecbto', nf: nf_xmlns, ret: url_xmlns_retorno).text,
 							
-							processing_status_code:   body_xml.xpath('//ret:nfeStatusServicoNF2Result/nf:retConsStatServ/nf:cStat',    nf: nf_xmlns, ret: url_xmlns_retorno).text,
-							processing_status_motive: body_xml.xpath('//ret:nfeStatusServicoNF2Result/nf:retConsStatServ/nf:xMotivo',  nf: nf_xmlns, ret: url_xmlns_retorno).text,
+							environment:              body_xml.xpath( paths[:environment],  paths[:namespaces]).text,
+							app_version:              body_xml.xpath( paths[:app_version],  paths[:namespaces]).text,
+							processed_at:             body_xml.xpath( paths[:processed_at], paths[:namespaces]).text,
+							uf:                       body_xml.xpath( paths[:uf],           paths[:namespaces]).text,
+							average_time:             body_xml.xpath( paths[:average_time],  paths[:namespaces]).text.to_i,
+							observation:              body_xml.xpath( paths[:observation],  paths[:namespaces]).text,
+							return_prevision:         body_xml.xpath( paths[:return_prevision],   paths[:namespaces]).text,
+							processing_status_code:   body_xml.xpath( paths[:processing_status_code],   paths[:namespaces]).text,
+							processing_status_motive: body_xml.xpath( paths[:processing_status_motive], paths[:namespaces]).text,
 							
-							uf:               body_xml.xpath('//ret:nfeStatusServicoNF2Result/nf:retConsStatServ/nf:cUF',  nf: nf_xmlns, ret: url_xmlns_retorno).text,
-							average_time:     body_xml.xpath('//ret:nfeStatusServicoNF2Result/nf:retConsStatServ/nf:tMed',  nf: nf_xmlns, ret: url_xmlns_retorno).text.to_i,
-							observation:      body_xml.xpath('//ret:nfeStatusServicoNF2Result/nf:retConsStatServ/nf:xObs',  nf: nf_xmlns, ret: url_xmlns_retorno).text,
-							return_prevision: body_xml.xpath('//ret:nfeStatusServicoNF2Result/nf:retConsStatServ/nf:dhRetorno',  nf: nf_xmlns, ret: url_xmlns_retorno).text,
 						}
 					end
-
 				end
 			end
 		end

data/lib/br_nfe/product/response/event.rb

@@ -22,7 +22,7 @@ module BrNfe
 				# CÓDIGO DO EVENTO
 				# Código do Tipo do Evento.
 				#   110111: Cancelamento
-				#   110110: CCe
+				#   110110: CCe - Carta de Correcao
 				#   110140: EPEC
 				# Eventos de manifestação do destinatário
 				#   210200: Confirmação da Operação
@@ -65,8 +65,8 @@ module BrNfe
 				alias_attribute :evento_nProt, :event_protocol
 
 				# NÚMERO DO PROTOCOLO DE AUTORIZAÇÃO DO EVENTO
-				attr_accessor :ret_event_protocol
-				alias_attribute :retEvento_nProt, :ret_event_protocol
+				attr_accessor :authorization_protocol
+				alias_attribute :retEvento_nProt, :authorization_protocol
 
 				# DESCRIÇÃO DO EVENTO
 				attr_accessor :description
@@ -83,6 +83,27 @@ module BrNfe
 
 				# XML DO EVENTO
 				attr_accessor :xml
+
+				def success?
+					"#{status_code}".strip.in? BrNfe::Constants::NFE_STATUS_SUCCESS
+				end
+
+				def status
+					success? ? :success : :error
+				end
+
+				def event_type
+					case code
+					when '110111'
+						:cancellation
+					when '110110'
+						:correction
+					when '110140'
+						:epec
+					else
+						:recipient_manifestation
+					end
+				end
 			end
 		end
 	end

data/lib/br_nfe/product/response/nfe_autorizacao.rb

@@ -4,8 +4,9 @@ module BrNfe
 			class NfeAutorizacao < Base
 				has_many :notas_fiscais, 'BrNfe.nota_fiscal_product_class'
 
-				attr_accessor :tempo_medio
-				alias_attribute :tMed, :tempo_medio
+				attr_accessor :average_time
+				alias_attribute :tempo_medio, :average_time
+				alias_attribute :tMed, :average_time
 			end
 		end
 	end

data/lib/br_nfe/product/response/nfe_consulta_protocolo.rb

@@ -7,6 +7,7 @@ module BrNfe
 				has_many :events, 'BrNfe::Product::Response::Event'
 
 				has_one :main_event, 'BrNfe::Product::Response::Event'
+				attr_accessor :vers
 			end
 		end
 	end

data/lib/br_nfe/product/response/nfe_recepcao_evento.rb

@@ -0,0 +1,20 @@
+module BrNfe
+	module Product
+		module Response
+			class NfeRecepcaoEvento < Base
+				# Atributos presentes na classe Base
+				#  - environment  [tpAmb]
+				#  - app_version  [verAplic]
+				#  - processed_at [dhRecbto]
+				#  - protocol     [nRec]
+
+				attr_accessor :codigo_orgao
+				alias_attribute :cOrgao, :codigo_orgao
+
+				attr_accessor :xml
+
+				has_many :events, 'BrNfe::Product::Response::Event'
+			end
+		end
+	end
+end

data/lib/br_nfe/product/xml/soap_env.xml.slim

@@ -1,4 +1,4 @@
-soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+soap:Envelope xmlns:soap="#{xmlns_soap}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	soap:Header
 		nfeCabecMsg xmlns="#{url_xmlns}"
 			cUF = ibge_code_of_issuer_uf

data/lib/br_nfe/product/xml/v3_10/infNFe/_tc_dest.xml.slim

@@ -12,7 +12,7 @@ enderDest
 - indicador_ie = nf_xml_value_indicador_IE( destinatario.indicador_ie, nfe )
 indIEDest = indicador_ie
 
-- if indicador_ie == '1'
+- if indicador_ie.to_i == 1
 	IE = nf_xml_value_IE( destinatario.inscricao_estadual )
 
 - if destinatario.inscricao_suframa.present?

data/lib/br_nfe/service/betha/v1/cancela_nfse.rb

@@ -9,7 +9,7 @@ module BrNfe
 						true
 					end
 
-					def wsdl
+					def url_wsdl
 						"http://e-gov.betha.com.br/e-nota-contribuinte-#{'test-' if env == :test}ws/cancelarNfse?wsdl"
 					end
 					

data/lib/br_nfe/service/betha/v1/consulta_lote_rps.rb

@@ -8,7 +8,7 @@ module BrNfe
 
 					validates :protocolo, presence: true
 
-					def wsdl
+					def url_wsdl
 						"http://e-gov.betha.com.br/e-nota-contribuinte-#{'test-' if env == :test}ws/consultarLoteRps?wsdl"
 					end
 

data/lib/br_nfe/service/betha/v1/consulta_nfs_por_rps.rb

@@ -5,7 +5,7 @@ module BrNfe
 				class ConsultaNfsPorRps < BrNfe::Service::Betha::V1::Gateway
 					include BrNfe::Service::Concerns::Rules::ConsultaNfsPorRps
 					
-					def wsdl
+					def url_wsdl
 						"http://e-gov.betha.com.br/e-nota-contribuinte-#{'test-' if env == :test}ws/consultarNfsePorRps?wsdl"
 					end
 

data/lib/br_nfe/service/betha/v1/consulta_nfse.rb

@@ -5,7 +5,7 @@ module BrNfe
 				class ConsultaNfse < BrNfe::Service::Betha::V1::Gateway
 					include BrNfe::Service::Concerns::Rules::ConsultaNfse
 					
-					def wsdl
+					def url_wsdl
 						"http://e-gov.betha.com.br/e-nota-contribuinte-#{'test-' if env == :test}ws/consultarNfse?wsdl"
 					end
 

data/lib/br_nfe/service/betha/v1/consulta_situacao_lote_rps.rb

@@ -3,7 +3,7 @@ module BrNfe
 		module Betha
 			module V1
 				class ConsultaSituacaoLoteRps < BrNfe::Service::Betha::V1::ConsultaLoteRps
-					def wsdl
+					def url_wsdl
 						"http://e-gov.betha.com.br/e-nota-contribuinte-#{'test-' if env == :test}ws/consultarSituacaoLoteRps?wsdl"
 					end
 

data/lib/br_nfe/service/betha/v1/recepcao_lote_rps.rb

@@ -9,7 +9,7 @@ module BrNfe
 						true
 					end
 
-					def wsdl
+					def url_wsdl
 						"http://e-gov.betha.com.br/e-nota-contribuinte-#{'test-' if env == :test}ws/recepcionarLoteRps?wsdl"
 					end
 					def method_wsdl