verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2021-10-04 09:37:15 +02:00
parent 892282b182 b3a34489b0
commit 495b06b932
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/worker/front/calendar/style.scss
View File

@ -42,7 +42,7 @@ vn-worker-calendar {
border-bottom: 1px solid rgba(0, 0, 0, 0.3); border-bottom: 1px solid rgba(0, 0, 0, 0.3);
} }
vn-avatar.festive, .festive,
vn-avatar.today { vn-avatar.today {
background-color: $color-font-dark; background-color: $color-font-dark;
width: 24px; width: 24px;
@ -50,7 +50,7 @@ vn-worker-calendar {
height: 24px height: 24px
} }
vn-avatar.festive { .festive {
border: 2px solid $color-alert border: 2px solid $color-alert
} }

2
modules/zone/front/calendar/style.scss
View File

@ -26,7 +26,7 @@ vn-zone-calendar {
& > .vn-calendar { & > .vn-calendar {
max-width: 288px; max-width: 288px;
.day { #days-container .day {
&.event .day-number { &.event .day-number {
background-color: $color-success; background-color: $color-success;
} }

4
print/templates/email/osticket-report/sql/tickets.sql
View File

@ -19,9 +19,9 @@ SELECT * FROM (
AND ote.type = 'M' AND ote.type = 'M'
LEFT JOIN ost_thread_entry oter ON oth.id = oter.thread_id LEFT JOIN ost_thread_entry oter ON oth.id = oter.thread_id
AND oter.type = 'R' AND oter.type = 'R'
WHERE ot.ticket_pid = NULL WHERE ot.ticket_pid IS NULL
AND ots.state = 'closed' AND ots.state = 'closed'
AND otc.closed BETWEEN ? AND ? AND ot.closed BETWEEN ? AND ?
ORDER BY oter.created DESC ORDER BY oter.created DESC
) ot GROUP BY ot.ticket_id ) ot GROUP BY ot.ticket_id
ORDER BY ot.assigned ORDER BY ot.assigned

7
print/templates/reports/invoice/invoice.js
View File

@ -19,12 +19,14 @@ module.exports = {
const map = new Map(); const map = new Map();
for (let ticket of tickets) for (let ticket of tickets) {
ticket.sales = [];
map.set(ticket.id, ticket); map.set(ticket.id, ticket);
}
for (let sale of sales) { for (let sale of sales) {
const ticket = map.get(sale.ticketFk); const ticket = map.get(sale.ticketFk);
if (!ticket.sales) ticket.sales = [];
ticket.sales.push(sale); ticket.sales.push(sale);
} }
@ -93,6 +95,7 @@ module.exports = {
}, },
ticketSubtotal(ticket) { ticketSubtotal(ticket) {
let subTotal = 0.00; let subTotal = 0.00;
console.log(ticket.sales);
for (let sale of ticket.sales) for (let sale of ticket.sales)
subTotal += this.saleImport(sale); subTotal += this.saleImport(sale);