From f7d0c372ef9c99a47489a150601ef5a9c9233f5a Mon Sep 17 00:00:00 2001
From: Junior Tada <juniortada@gmail.com>
Date: Tue, 5 Jun 2018 15:57:34 -0300
Subject: [PATCH] [REF] Corrigido url e flags mdfe

---
 pynfe/utils/flags.py       | 41 ++++++++++++++++++++++++++
 pynfe/utils/webservices.py | 73 +++++++---------------------------------------
 2 files changed, 52 insertions(+), 62 deletions(-)

diff --git a/pynfe/utils/flags.py b/pynfe/utils/flags.py
index 4390aee..aee8053 100644
--- a/pynfe/utils/flags.py
+++ b/pynfe/utils/flags.py
@@ -272,3 +272,44 @@ CODIGOS_ESTADOS = {
 NAMESPACE_MDFE = 'http://www.portalfiscal.inf.br/mdfe'
 NAMESPACE_MDFE_METODO = 'http://www.portalfiscal.inf.br/mdfe/wsdl/'
 MODELO_MDFE = '58'
+
+MDFE_VERSAO = '3.00'
+
+
+AMBIENTE_PRODUCAO = 1
+AMBIENTE_HOMOLOGACAO = 2
+
+WS_MDFE_RECEPCAO = '1'
+WS_MDFE_RET_RECEPCAO = '2'
+WS_MDFE_RECEPCAO_EVENTO = '3'
+WS_MDFE_CONSULTA = '4'
+WS_MDFE_STATUS_SERVICO = '5'
+WS_MDFE_CONSULTA_NAO_ENCERRADOS = '6'
+
+MDFE_WS_METODO = {
+    WS_MDFE_RECEPCAO: {
+        'webservice': 'MDFeRecepcao',
+        'metodo': 'mdfeRecepcaoLote',
+    },
+    WS_MDFE_RET_RECEPCAO: {
+        'webservice': 'MDFeRetRecepcao',
+        'metodo': 'mdfeRetRecepcao',
+    },
+    WS_MDFE_RECEPCAO_EVENTO: {
+        'webservice': 'MDFeRecepcaoEvento',
+        'metodo': 'mdfeRecepcaoEvento',
+    },
+    WS_MDFE_CONSULTA: {
+        'webservice': 'MDFeConsulta',
+        'metodo': 'mdfeConsultaMDF',
+    },
+    WS_MDFE_STATUS_SERVICO: {
+        'webservice': 'MDFeStatusServico',
+        'metodo': 'mdfeStatusServicoMDF',
+        'url': 'STATUS'
+    },
+    WS_MDFE_CONSULTA_NAO_ENCERRADOS: {
+        'webservice': 'MDFeConsNaoEnc',
+        'metodo': 'mdfeConsNaoEnc',
+    },
+}
\ No newline at end of file
diff --git a/pynfe/utils/webservices.py b/pynfe/utils/webservices.py
index ffd5ad8..c358db9 100644
--- a/pynfe/utils/webservices.py
+++ b/pynfe/utils/webservices.py
@@ -487,66 +487,15 @@ NFSE = {
 	}
 }
 
-AMBIENTE_PRODUCAO = 1
-AMBIENTE_HOMOLOGACAO = 2
-
-WS_MDFE_RECEPCAO = '1'
-WS_MDFE_RET_RECEPCAO = '2'
-WS_MDFE_RECEPCAO_EVENTO = '3'
-WS_MDFE_CONSULTA = '4'
-WS_MDFE_STATUS_SERVICO = '5'
-WS_MDFE_CONSULTA_NAO_ENCERRADOS = '6'
-
-MDFE_WS_METODO = {
-    WS_MDFE_RECEPCAO: {
-        'webservice': 'MDFeRecepcao',
-        'metodo': 'mdfeRecepcaoLote',
-        'versao': '3.00',
-    },
-    WS_MDFE_RET_RECEPCAO: {
-        'webservice': 'MDFeRetRecepcao',
-        'metodo': 'mdfeRetRecepcao',
-        'versao': '3.00',
-    },
-    WS_MDFE_RECEPCAO_EVENTO: {
-        'webservice': 'MDFeRecepcaoEvento',
-        'metodo': 'mdfeRecepcaoEvento',
-        'versao': '3.00',
-    },
-    WS_MDFE_CONSULTA: {
-        'webservice': 'MDFeConsulta',
-        'metodo': 'mdfeConsultaMDF',
-        'versao': '3.00',
-    },
-    WS_MDFE_STATUS_SERVICO: {
-        'webservice': 'MDFeStatusServico',
-        'metodo': 'mdfeStatusServicoMDF',
-        'versao': '3.00',
-    },
-    WS_MDFE_CONSULTA_NAO_ENCERRADOS: {
-        'webservice': 'MDFeConsNaoEnc',
-        'metodo': 'mdfeConsNaoEnc',
-        'versao': '3.00',
-    },
-}
-
-MDFE_WS_URL = {
-    AMBIENTE_PRODUCAO: {
-        'servidor': 'mdfe.svrs.rs.gov.br',
-        WS_MDFE_RECEPCAO: 'ws/MDFerecepcao/MDFeRecepcao.asmx',
-        WS_MDFE_RET_RECEPCAO: 'ws/MDFeRetRecepcao/MDFeRetRecepcao.asmx',
-        WS_MDFE_RECEPCAO_EVENTO: 'ws/MDFeRecepcaoEvento/MDFeRecepcaoEvento.asmx',
-        WS_MDFE_CONSULTA: 'ws/MDFeConsulta/MDFeConsulta.asmx',
-        WS_MDFE_STATUS_SERVICO: 'ws/MDFeStatusServico/MDFeStatusServico.asmx',
-        WS_MDFE_CONSULTA_NAO_ENCERRADOS: 'ws/MDFeConsNaoEnc/MDFeConsNaoEnc.asmx',
-    },
-    AMBIENTE_HOMOLOGACAO: {
-        'servidor': 'mdfe-homologacao.svrs.rs.gov.br',
-        WS_MDFE_RECEPCAO: 'ws/MDFerecepcao/MDFeRecepcao.asmx',
-        WS_MDFE_RET_RECEPCAO: 'ws/MDFeRetRecepcao/MDFeRetRecepcao.asmx',
-        WS_MDFE_RECEPCAO_EVENTO: 'ws/MDFeRecepcaoEvento/MDFeRecepcaoEvento.asmx',
-        WS_MDFE_CONSULTA: 'ws/MDFeConsulta/MDFeConsulta.asmx',
-        WS_MDFE_STATUS_SERVICO: 'ws/MDFeStatusServico/MDFeStatusServico.asmx',
-        WS_MDFE_CONSULTA_NAO_ENCERRADOS: 'ws/MDFeConsNaoEnc/MDFeConsNaoEnc.asmx',
-    },
+MDFE = {
+	# unico autorizador de MDF-e
+	'SVRS': {
+		'RECEPCAO': 'MDFerecepcao/MDFeRecepcao.asmx',
+		'RET_RECEPCAO': 'MDFeRetRecepcao/MDFeRetRecepcao.asmx',
+		'EVENTO': 'MDFeRecepcaoEvento/MDFeRecepcaoEvento.asmx',
+		'CONSULTA': 'MDFeConsulta/MDFeConsulta.asmx',
+		'STATUS': 'MDFeStatusServico/MDFeStatusServico.asmx',
+		'HTTPS': 'https://mdfe.svrs.rs.gov.br/ws/',
+		'HOMOLOGACAO': 'https://mdfe-homologacao.svrs.rs.gov.br/ws/'
+	}
 }