From 4bcb948affefb4e8376e9b411327496e403f3bb9 Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Fri, 12 Feb 2021 16:41:29 +0100 Subject: [PATCH] Updated code for better read --- .../back/methods/client/lastActiveTickets.js | 6 +++--- modules/ticket/front/sale/index.html | 21 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/modules/client/back/methods/client/lastActiveTickets.js b/modules/client/back/methods/client/lastActiveTickets.js index 0a9236850..7444dff45 100644 --- a/modules/client/back/methods/client/lastActiveTickets.js +++ b/modules/client/back/methods/client/lastActiveTickets.js @@ -42,9 +42,9 @@ module.exports = Self => { JOIN vn.warehouse w ON t.warehouseFk = w.id JOIN vn.address ad ON t.addressFk = ad.id JOIN vn.province pr ON ad.provinceFk = pr.id - WHERE t.shipped >= CURDATE() AND t.clientFk = ? AND ts.alertLevel = 0 - AND t.id <> ? AND t.warehouseFk = ? - ORDER BY t.shipped + WHERE t.shipped >= CURDATE() AND t.clientFk = ? AND ts.alertLevel = 0 + AND t.id <> ? AND t.warehouseFk = ? + ORDER BY t.shipped LIMIT 10`; return Self.rawSql(query, [id, ticketId, ticket.warehouseFk]); diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index 7c6b77d4e..585feb063 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -344,27 +344,26 @@ {{::ticket.shipped | date: 'dd/MM/yyyy'}} {{::ticket.agencyName}} {{::ticket.address}} - - {{::ticket.nickname}} - {{::ticket.name}} - {{::ticket.street}} - {{::ticket.postalCode}} - {{::ticket.city}} + {{::ticket.nickname}} + {{::ticket.name}} + {{::ticket.street}} + {{::ticket.postalCode}} + {{::ticket.city}} + ng-if="!$ctrl.transfer.lastActiveTickets.length" + class="empty-rows" + colspan="4" + translate> No results