From 498a496cd9387c4c450f42cac993922012236aca Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Wed, 6 Dec 2017 00:21:22 -0600 Subject: [PATCH 1/3] Fix - Buscar por clave --- source/app/models/main.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/source/app/models/main.py b/source/app/models/main.py index 16be3a9..8faaeb7 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -1710,8 +1710,9 @@ class Productos(BaseModel): @classmethod def get_by(cls, values): - id = int(values.get('id', 0)) - if id: + # ~ id = int(values.get('id', 0)) + clave = values.get('id', '') + if clave: row = (Productos .select( Productos.id, @@ -1722,8 +1723,9 @@ class Productos(BaseModel): Productos.valor_unitario, Productos.descuento) .join(SATUnidades).switch(Productos) - .where(Productos.id==id).dicts()) + .where(Productos.clave==clave).dicts()) if len(row): + id = row[0]['id'] model_pt = Productos.impuestos.get_through_model() taxes = tuple(model_pt .select( @@ -1731,6 +1733,8 @@ class Productos(BaseModel): model_pt.satimpuestos_id.alias('tax')) .where(model_pt.productos_id==id).dicts()) return {'ok': True, 'row': row[0], 'taxes': taxes} + + return {'ok': False} name = values.get('name', '') @@ -1745,7 +1749,8 @@ class Productos(BaseModel): Productos.valor_unitario) .join(SATUnidades) .switch(Productos) - .where(Productos.descripcion.contains(name)) + .where((Productos.descripcion.contains(name)) | + (Productos.clave.contains(name))) .dicts() ) return tuple(rows) From d4af8c77719e468ed84444808a7fcf8c54bb225d Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Wed, 6 Dec 2017 00:24:13 -0600 Subject: [PATCH 2/3] Fix - Buscar por clave --- source/static/js/ui/invoices.js | 2 +- source/static/js/ui/products.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/static/js/ui/invoices.js b/source/static/js/ui/invoices.js index 6ffc93d..97cce8b 100644 --- a/source/static/js/ui/invoices.js +++ b/source/static/js/ui/invoices.js @@ -437,7 +437,7 @@ var controls_generate = [ labelPosition:'top', maxWidth:200, placeholder:'Captura la clave'}, {view: "search", id: "search_product_name", - name: "search_product_name", label: "por Descripción", + name: "search_product_name", label: "por Descripción o Clave", labelPosition:'top', suggest: suggest_products, placeholder:'Captura al menos tres letras'}, ]}, diff --git a/source/static/js/ui/products.js b/source/static/js/ui/products.js index e2bbdaf..d5d87d4 100644 --- a/source/static/js/ui/products.js +++ b/source/static/js/ui/products.js @@ -11,7 +11,7 @@ var toolbar_products = [ var grid_products_cols = [ - { id: "id", header: "ID", width: 75}, + { id: "id", header: "ID", width: 75, hidden: true}, { id: "clave", header: ["Clave", {content: "textFilter"}], width: 100, sort: 'string', footer: {content: 'rowCount', css: 'right'}}, { id: "descripcion", header: ["Descripción", {content: "textFilter"}], From 85de4e5d90da364506e2bf0289c66b431b930c4e Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Wed, 6 Dec 2017 00:30:30 -0600 Subject: [PATCH 3/3] Cambiar leyenda al buscar producto por clave --- source/static/js/ui/invoices.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/static/js/ui/invoices.js b/source/static/js/ui/invoices.js index 97cce8b..edda18f 100644 --- a/source/static/js/ui/invoices.js +++ b/source/static/js/ui/invoices.js @@ -435,7 +435,7 @@ var controls_generate = [ {view: "search", id: "search_product_id", name: "search_product_id", label: "por Clave", labelPosition:'top', maxWidth:200, - placeholder:'Captura la clave'}, + placeholder:'Presiona ENTER para buscar'}, {view: "search", id: "search_product_name", name: "search_product_name", label: "por Descripción o Clave", labelPosition:'top', suggest: suggest_products,