From edf35aa5ce709a7a918545072bb00041bd4e7ec3 Mon Sep 17 00:00:00 2001
From: El Mau <publico@cuates.net>
Date: Tue, 1 Feb 2022 21:31:06 -0600
Subject: [PATCH] Error al cancelar con Finkok

---
 CHANGELOG.md                    |  1 +
 source/app/controllers/utils.py | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9d865d..caba239 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 v 1.46.2 [31-Ene-2022]
 ----------------------
     - Error: Al generar Carta Porte sin remolque.
+    - Error: Al cancelar con Finkok.
 
 
 v 1.46.1 [29-Ene-2022]
diff --git a/source/app/controllers/utils.py b/source/app/controllers/utils.py
index 2fee82f..6df126f 100644
--- a/source/app/controllers/utils.py
+++ b/source/app/controllers/utils.py
@@ -768,9 +768,18 @@ def get_pac_by_rfc(cfdi):
 def _cancel_with_cert(invoice, args, auth, certificado):
     cert = SATCertificate(certificado.cer, certificado.key_enc.encode())
     pac = PACS[auth['pac']]()
-    # ~ info = {'cer': cert.cer_pem, 'key': cert.key_pem, 'pass': '', 'args': args}
+    contra = ''
+    try:
+        contra = decrypt(bytes(certificado.p12).decode(), certificado.serie)
+    except Exception as e:
+        log.error(e)
+        if auth['pac'] == 'comercio':
+            msg = 'Es necesario subir de nuevo los certificados de sello'
+            data = {'ok': False, 'msg': msg, 'row': {}}
+            return data
+
     info = {'cer': cert.cer_pem, 'key': cert.key_pem, 'cer_ori': cert.cer,
-        'key_enc': certificado.key, 'pass': decrypt(bytes(certificado.p12).decode(), certificado.serie), 'args': args}
+        'key_enc': certificado.key, 'pass': contra, 'args': args}
 
     result = pac.cancel(invoice.xml, info, auth)
     if pac.error: