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

Merge branch 'dev' into 2162-print_pdf_puppeteer
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2020-07-09 06:30:37 +00:00
parent 11ae95daba 1fa2bd1e1d
commit 65dd591cf4
7 changed files with 2215 additions and 939 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
db/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

2953
db/dump/structure.sql
View File

File diff suppressed because it is too large Load Diff

2
modules/ticket/back/methods/ticket-weekly/filter.js
View File

@ -51,7 +51,7 @@ module.exports = Self => {
stmt = new ParameterizedSQL( stmt = new ParameterizedSQL(
`SELECT t.id AS ticketFk, c.id AS clientFk, c.name AS clientName, tw.weekDay, `SELECT t.id AS ticketFk, c.id AS clientFk, c.name AS clientName, tw.weekDay,
wh.name AS warehouseName, u.id AS workerFk, u.nickName, tw.agencyModeFk wh.name AS warehouseName, u.id AS workerFk, u.name AS userName, u.nickName, tw.agencyModeFk
FROM ticketWeekly tw FROM ticketWeekly tw
JOIN ticket t ON t.id = tw.ticketFk JOIN ticket t ON t.id = tw.ticketFk
JOIN client c ON c.id = t.clientFk JOIN client c ON c.id = t.clientFk

2
modules/ticket/back/methods/ticket/specs/getTaxes.spec.js
View File

@ -4,6 +4,6 @@ describe('ticket getTaxes()', () => {
it('should return the tax of a given ticket', async() => { it('should return the tax of a given ticket', async() => {
let result = await app.models.Ticket.getTaxes(1); let result = await app.models.Ticket.getTaxes(1);
expect(result[0].tax).toEqual(77.54); expect(result[0].tax).toEqual(7.1);
}); });
}); });

16
modules/ticket/front/routes.json
View File

@ -189,28 +189,26 @@
"state": "ticket.weekly.index", "state": "ticket.weekly.index",
"component": "vn-ticket-weekly-index", "component": "vn-ticket-weekly-index",
"description": "Weekly tickets" "description": "Weekly tickets"
}, {
"url": "/request",
"state": "ticket.card.request",
"abstract": true,
"component": "ui-view"
}, { }, {
"url": "/service", "url": "/service",
"state": "ticket.card.service", "state": "ticket.card.service",
"component": "vn-ticket-service", "component": "vn-ticket-service",
"description": "Service" "description": "Service"
}, {
"url": "/request",
"state": "ticket.card.request",
"abstract": true,
"component": "ui-view"
}, { }, {
"url" : "/index", "url" : "/index",
"state": "ticket.card.request.index", "state": "ticket.card.request.index",
"component": "vn-ticket-request-index", "component": "vn-ticket-request-index",
"description": "Purchase request", "description": "Purchase request"
"acl": ["salesPerson"]
}, { }, {
"url" : "/create", "url" : "/create",
"state": "ticket.card.request.create", "state": "ticket.card.request.create",
"component": "vn-ticket-request-create", "component": "vn-ticket-request-create",
"description": "New purchase request", "description": "New purchase request"
"acl": ["salesPerson"]
}, { }, {
"url": "/create?clientFk", "url": "/create?clientFk",
"state": "ticket.create", "state": "ticket.create",

6
modules/ticket/front/weekly/index.html
View File

@ -18,13 +18,13 @@
</vn-portal> </vn-portal>
<vn-data-viewer <vn-data-viewer
model="model" model="model"
class="vn-w-md vn-mb-xl"> class="vn-w-xl">
<vn-card> <vn-card>
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th field="ticketFk" number>Ticket ID</vn-th> <vn-th field="ticketFk" number>Ticket ID</vn-th>
<vn-th field="weekDay">Client</vn-th> <vn-th field="clientName">Client</vn-th>
<vn-th>Weekday</vn-th> <vn-th>Weekday</vn-th>
<vn-th>Agency</vn-th> <vn-th>Agency</vn-th>
<vn-th>Warehouse</vn-th> <vn-th>Warehouse</vn-th>
@ -82,7 +82,7 @@
<span <span
vn-click-stop="workerDescriptor.show($event, weekly.workerFk)" vn-click-stop="workerDescriptor.show($event, weekly.workerFk)"
class="link" > class="link" >
{{::weekly.nickName}} {{::weekly.userName}}
</span> </span>
</vn-td> </vn-td>
<vn-td shrink> <vn-td shrink>

1
modules/ticket/front/weekly/locale/es.yml
View File

@ -4,3 +4,4 @@ You are going to delete this weekly ticket: Vas a eliminar este ticket programad
This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas? This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas?
Search weekly ticket by id or client id: Busca tickets programados por el identificador o el identificador del cliente Search weekly ticket by id or client id: Busca tickets programados por el identificador o el identificador del cliente
Search by weekly ticket: Buscar por tickets programados Search by weekly ticket: Buscar por tickets programados
weekDay: Dia