From 94f5df0723a3ffabfc33f7a89368f47be3003aed Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Sun, 10 Jan 2021 19:18:13 -0600 Subject: [PATCH] Fix get folios --- requirements.txt | 2 +- source/app/controllers/pacs/comerciodigital/comercio.py | 2 +- source/app/controllers/pacs/finkok/finkok.py | 8 +++----- source/app/controllers/utils.py | 4 ++-- source/app/models/main.py | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 389a78d..6e32811 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ psycopg2-binary cryptography xmlsec -# escpos +# python-escpos # pyusb # pyserial # qrcode diff --git a/source/app/controllers/pacs/comerciodigital/comercio.py b/source/app/controllers/pacs/comerciodigital/comercio.py index 185a7f8..694e148 100644 --- a/source/app/controllers/pacs/comerciodigital/comercio.py +++ b/source/app/controllers/pacs/comerciodigital/comercio.py @@ -327,7 +327,7 @@ class PACComercioDigital(object): return True - def client_balance(self, data): + def client_balance(self, data, rfc=''): url = self.URL['saldo'] host = url.split('/')[2] headers = { diff --git a/source/app/controllers/pacs/finkok/finkok.py b/source/app/controllers/pacs/finkok/finkok.py index 21acc9b..68b5aa2 100644 --- a/source/app/controllers/pacs/finkok/finkok.py +++ b/source/app/controllers/pacs/finkok/finkok.py @@ -412,15 +412,12 @@ class PACFinkok(object): Se pueden usar las credenciales de relleser o las credenciales del emisor Args: - rfc (str): El RFC del emisor - - Kwargs: auth (dict): Credenciales del emisor + rfc (str): El RFC del emisor Returns: int Cantidad de timbres restantes """ - if not auth: auth = AUTH['RESELLER'] @@ -432,8 +429,8 @@ class PACFinkok(object): 'reseller_password': auth['pass'], 'taxpayer_id': rfc, } - result = self._get_result(client, 'get', args) + if self.error: log.error(self.error) return '' @@ -441,6 +438,7 @@ class PACFinkok(object): success = bool(result.users) if not success: self._error = result.message or 'RFC no existe' + log.error(self.error) return 0 return result.users.ResellerUser[0].credit diff --git a/source/app/controllers/utils.py b/source/app/controllers/utils.py index 232ac37..24291fe 100644 --- a/source/app/controllers/utils.py +++ b/source/app/controllers/utils.py @@ -612,12 +612,12 @@ def xml_cancel(xml, auth, cert, name): return data, result -def get_client_balance(auth): +def get_client_balance(auth, rfc=''): if DEBUG: return '-d' pac = PACS[auth['pac']]() - balance = pac.client_balance(auth) + balance = pac.client_balance(auth, rfc) if pac.error: balance = 'p/e' diff --git a/source/app/models/main.py b/source/app/models/main.py index 9e19474..c44aa00 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -1104,7 +1104,7 @@ class Emisor(BaseModel): return 's/e' auth = Configuracion.get_({'fields': 'pac_auth'}) - result = utils.get_client_balance(auth) + result = utils.get_client_balance(auth, obj.rfc) return result @classmethod