From a343d5eb9a192780ba6ce27c3d980d75f89cf1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20S=C3=A1nchez?= <joan@verdnatura.es>
Date: Wed, 26 Aug 2020 11:27:36 +0200
Subject: [PATCH 1/2] 2394 - Removed call to order_total()

---
 modules/order/back/methods/order/filter.js | 39 ++++------------------
 modules/order/back/models/order.json       |  3 ++
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js
index bfa64c4dd..66b4244d0 100644
--- a/modules/order/back/methods/order/filter.js
+++ b/modules/order/back/methods/order/filter.js
@@ -136,14 +136,10 @@ module.exports = Self => {
         let stmts = [];
         let stmt;
 
-        stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.filter');
-
         stmt = new ParameterizedSQL(
-            `CREATE TEMPORARY TABLE tmp.filter
-                (INDEX (id))
-                ENGINE = MEMORY
-                SELECT
+            `SELECT
                     o.id,
+                    o.total,
                     o.date_send landed,
                     o.date_make created,
                     o.customer_id clientFk,
@@ -178,36 +174,13 @@ module.exports = Self => {
         }
 
         stmt.merge(conn.makeWhere(filter.where));
-        stmt.merge({
-            sql: `GROUP BY o.id`
-        });
+        stmt.merge(`GROUP BY o.id`);
         stmt.merge(conn.makePagination(filter));
         stmts.push(stmt);
 
-        stmts.push(`
-            CREATE TEMPORARY TABLE tmp.order
-                (INDEX (orderFk))
-                ENGINE = MEMORY
-                    SELECT id AS orderFk
-                    FROM tmp.filter`);
+        const sql = ParameterizedSQL.join(stmts, ';');
+        const result = await conn.executeStmt(sql);
 
-        stmts.push('CALL hedera.order_getTotal()');
-
-        stmt = new ParameterizedSQL(
-            `SELECT f.*, ot.*
-                FROM tmp.filter f
-                    LEFT JOIN tmp.orderTotal ot ON ot.orderFk = f.id`);
-        const orderIndex = stmts.push(stmt) - 1;
-
-        stmts.push(`
-            DROP TEMPORARY TABLE 
-                tmp.order, 
-                tmp.orderTotal,
-                tmp.filter`);
-
-        let sql = ParameterizedSQL.join(stmts, ';');
-        let result = await conn.executeStmt(sql);
-
-        return result[orderIndex];
+        return result;
     };
 };
diff --git a/modules/order/back/models/order.json b/modules/order/back/models/order.json
index ab10ad194..38755c2a5 100644
--- a/modules/order/back/models/order.json
+++ b/modules/order/back/models/order.json
@@ -79,6 +79,9 @@
             "mysql": {
                 "columnName": "confirm_date"
             }
+        },
+        "total": {
+            "type": "Number"
         }
     },
     "relations": {
-- 
2.40.1


From 95601f5d55dcf38a2fc51bada4c643edfa223825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20S=C3=A1nchez?= <joan@verdnatura.es>
Date: Mon, 31 Aug 2020 10:15:02 +0200
Subject: [PATCH 2/2] Updated translations

---
 modules/order/front/locale/es.yml              | 3 ++-
 modules/order/front/search-panel/locale/es.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/order/front/locale/es.yml b/modules/order/front/locale/es.yml
index fbc384f21..c35898378 100644
--- a/modules/order/front/locale/es.yml
+++ b/modules/order/front/locale/es.yml
@@ -23,4 +23,5 @@ Created from: Creado desde
 Search order by id: Buscar el pedido por identificador
 order: pedido
 Confirm lines: Confirmar las lineas
-Confirm: Confirmar
\ No newline at end of file
+Confirm: Confirmar
+Real hour: Hora real
\ No newline at end of file
diff --git a/modules/order/front/search-panel/locale/es.yml b/modules/order/front/search-panel/locale/es.yml
index 949f9b202..9546c7f74 100644
--- a/modules/order/front/search-panel/locale/es.yml
+++ b/modules/order/front/search-panel/locale/es.yml
@@ -7,4 +7,5 @@ Agency: Agencia
 Application: Aplicación
 SalesPerson: Comercial
 Order confirmed: Pedido confirmado
-Show empty: Mostrar vacías
\ No newline at end of file
+Show empty: Mostrar vacías
+Search orders by id: Buscar pedido por id
\ No newline at end of file
-- 
2.40.1