diff --git a/modules/worker/front/calendar/style.scss b/modules/worker/front/calendar/style.scss index a028c8c30..70e998a4f 100644 --- a/modules/worker/front/calendar/style.scss +++ b/modules/worker/front/calendar/style.scss @@ -42,7 +42,7 @@ vn-worker-calendar { border-bottom: 1px solid rgba(0, 0, 0, 0.3); } - vn-avatar.festive, + .festive, vn-avatar.today { background-color: $color-font-dark; width: 24px; @@ -50,7 +50,7 @@ vn-worker-calendar { height: 24px } - vn-avatar.festive { + .festive { border: 2px solid $color-alert } diff --git a/modules/zone/front/calendar/style.scss b/modules/zone/front/calendar/style.scss index 14d234c1b..25b6a87d1 100644 --- a/modules/zone/front/calendar/style.scss +++ b/modules/zone/front/calendar/style.scss @@ -26,7 +26,7 @@ vn-zone-calendar { & > .vn-calendar { max-width: 288px; - .day { + #days-container .day { &.event .day-number { background-color: $color-success; } diff --git a/print/templates/email/osticket-report/sql/tickets.sql b/print/templates/email/osticket-report/sql/tickets.sql index 4056298e1..7cb35aaab 100644 --- a/print/templates/email/osticket-report/sql/tickets.sql +++ b/print/templates/email/osticket-report/sql/tickets.sql @@ -19,9 +19,9 @@ SELECT * FROM ( AND ote.type = 'M' LEFT JOIN ost_thread_entry oter ON oth.id = oter.thread_id AND oter.type = 'R' - WHERE ot.ticket_pid = NULL + WHERE ot.ticket_pid IS NULL AND ots.state = 'closed' - AND otc.closed BETWEEN ? AND ? + AND ot.closed BETWEEN ? AND ? ORDER BY oter.created DESC ) ot GROUP BY ot.ticket_id ORDER BY ot.assigned \ No newline at end of file diff --git a/print/templates/reports/invoice/invoice.js b/print/templates/reports/invoice/invoice.js index a6e37d591..3e8734306 100755 --- a/print/templates/reports/invoice/invoice.js +++ b/print/templates/reports/invoice/invoice.js @@ -19,12 +19,14 @@ module.exports = { const map = new Map(); - for (let ticket of tickets) + for (let ticket of tickets) { + ticket.sales = []; + map.set(ticket.id, ticket); + } for (let sale of sales) { const ticket = map.get(sale.ticketFk); - if (!ticket.sales) ticket.sales = []; ticket.sales.push(sale); } @@ -93,6 +95,7 @@ module.exports = { }, ticketSubtotal(ticket) { let subTotal = 0.00; + console.log(ticket.sales); for (let sale of ticket.sales) subTotal += this.saleImport(sale);