From 7bcf6d6e3cad1e1e8f207eeaae7061f16db3bd46 Mon Sep 17 00:00:00 2001
From: El Mau <publico@cuates.net>
Date: Sat, 22 Jan 2022 20:17:42 -0600
Subject: [PATCH] =?UTF-8?q?Agregar=20columna=20m=C3=A9todo=20de=20pago=20a?=
 =?UTF-8?q?l=20listado=20de=20facturas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/app/models/main.py       |  1 +
 source/app/settings.py          | 70 ++++++++++++++++-----------------
 source/static/js/ui/invoices.js |  2 +
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/source/app/models/main.py b/source/app/models/main.py
index 3c5c2fb..f9932cb 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -4518,6 +4518,7 @@ class Facturas(BaseModel):
                     (True, 'Si'),
                     (False, 'No'),
                 )).alias('paid'),
+                Facturas.metodo_pago,
                 Facturas.total,
                 Facturas.moneda.alias('currency'),
                 Facturas.total_mn,
diff --git a/source/app/settings.py b/source/app/settings.py
index d717108..a209e41 100644
--- a/source/app/settings.py
+++ b/source/app/settings.py
@@ -256,38 +256,38 @@ DEFAULT_GLOBAL = {
     'clave_sat': '01010101',
 }
 
-# ~ TEMPLATE_CANCEL = """<Cancelacion xmlns="http://cancelacfd.sat.gob.mx" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}">
-  # ~ <Folios>
-    # ~ <Folio UUID="{uuid}" Motivo="{motivo}"{folio}/>
-  # ~ </Folios>
-  # ~ <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-    # ~ <SignedInfo>
-      # ~ <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
-      # ~ <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-      # ~ <Reference URI="">
-        # ~ <Transforms>
-          # ~ <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
-        # ~ </Transforms>
-        # ~ <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        # ~ <DigestValue/>
-      # ~ </Reference>
-    # ~ </SignedInfo>
-    # ~ <SignatureValue/>
-    # ~ <KeyInfo>
-      # ~ <X509Data>
-        # ~ <X509IssuerSerial>
-          # ~ <X509IssuerName/>
-          # ~ <X509SerialNumber/>
-        # ~ </X509IssuerSerial>
-        # ~ <X509Certificate/>
-      # ~ </X509Data>
-      # ~ <KeyValue>
-        # ~ <RSAKeyValue>
-          # ~ <Modulus/>
-          # ~ <Exponent/>
-        # ~ </RSAKeyValue>
-      # ~ </KeyValue>
-    # ~ </KeyInfo>
-  # ~ </Signature>
-# ~ </Cancelacion>"""
-TEMPLATE_CANCEL = """<Cancelacion xmlns="http://cancelacfd.sat.gob.mx" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}"><Folios><Folio UUID="{uuid}" Motivo="{motivo}"{folio}/></Folios><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue/></Reference></SignedInfo><SignatureValue/><KeyInfo><X509Data><X509IssuerSerial><X509IssuerName/><X509SerialNumber/></X509IssuerSerial><X509Certificate/></X509Data><KeyValue><RSAKeyValue><Modulus/><Exponent/></RSAKeyValue></KeyValue></KeyInfo></Signature></Cancelacion>"""
+TEMPLATE_CANCEL = """<Cancelacion xmlns="http://cancelacfd.sat.gob.mx" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}">
+  <Folios>
+    <Folio UUID="{uuid}" Motivo="{motivo}"{folio}/>
+  </Folios>
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+      <Reference URI="">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+        <DigestValue/>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue/>
+    <KeyInfo>
+      <X509Data>
+        <X509IssuerSerial>
+          <X509IssuerName/>
+          <X509SerialNumber/>
+        </X509IssuerSerial>
+        <X509Certificate/>
+      </X509Data>
+      <KeyValue>
+        <RSAKeyValue>
+          <Modulus/>
+          <Exponent/>
+        </RSAKeyValue>
+      </KeyValue>
+    </KeyInfo>
+  </Signature>
+</Cancelacion>"""
+# ~ TEMPLATE_CANCEL = """<Cancelacion xmlns="http://cancelacfd.sat.gob.mx" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}"><Folios><Folio UUID="{uuid}" Motivo="{motivo}"{folio}/></Folios><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue/></Reference></SignedInfo><SignatureValue/><KeyInfo><X509Data><X509IssuerSerial><X509IssuerName/><X509SerialNumber/></X509IssuerSerial><X509Certificate/></X509Data><KeyValue><RSAKeyValue><Modulus/><Exponent/></RSAKeyValue></KeyValue></KeyInfo></Signature></Cancelacion>"""
diff --git a/source/static/js/ui/invoices.js b/source/static/js/ui/invoices.js
index a897c6b..6a05e3c 100644
--- a/source/static/js/ui/invoices.js
+++ b/source/static/js/ui/invoices.js
@@ -258,6 +258,8 @@ var grid_invoices_cols = [
         adjust: "data", sort:"string"},
     {id: "paid", header: ["Pagada", {content: "selectFilter"}],
         adjust: "data", sort:"string"},
+    {id: 'metodo_pago', header: ['Método de Pago', {content: 'selectFilter'}],
+        adjust: 'data', hidden: true},
     {id: 'total', header: ['Total', {content: 'numberFilter'}],
         width: 125, sort: 'int', format: webix.i18n.priceFormat, css: 'right',
         hidden: true},