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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index

This commit is contained in:
Bernat Exposito Domenech 2020-07-09 08:17:03 +02:00
parent 122dacffb5 1fa2bd1e1d
commit 7d6ac265b4
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

3095
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(
`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
JOIN ticket t ON t.id = tw.ticketFk
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() => {
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",
"component": "vn-ticket-weekly-index",
"description": "Weekly tickets"
}, {
"url": "/request",
"state": "ticket.card.request",
"abstract": true,
"component": "ui-view"
}, {
"url": "/service",
"state": "ticket.card.service",
"component": "vn-ticket-service",
"description": "Service"
}, {
"url": "/request",
"state": "ticket.card.request",
"abstract": true,
"component": "ui-view"
}, {
"url" : "/index",
"state": "ticket.card.request.index",
"component": "vn-ticket-request-index",
"description": "Purchase request",
"acl": ["salesPerson"]
"description": "Purchase request"
}, {
"url" : "/create",
"state": "ticket.card.request.create",
"component": "vn-ticket-request-create",
"description": "New purchase request",
"acl": ["salesPerson"]
"description": "New purchase request"
}, {
"url": "/create?clientFk",
"state": "ticket.create",

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

@ -18,13 +18,13 @@
</vn-portal>
<vn-data-viewer
model="model"
class="vn-w-md vn-mb-xl">
class="vn-w-xl">
<vn-card>
<vn-table model="model">
<vn-thead>
<vn-tr>
<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>Agency</vn-th>
<vn-th>Warehouse</vn-th>
@ -53,7 +53,7 @@
</span>
</vn-td>
<vn-td vn-click-stop>
<vn-autocomplete
<vn-autocomplete
vn-id="weekday"
ng-model="weekly.weekDay"
data="$ctrl.weekdays"
@ -82,7 +82,7 @@
<span
vn-click-stop="workerDescriptor.show($event, weekly.workerFk)"
class="link" >
{{::weekly.nickName}}
{{::weekly.userName}}
</span>
</vn-td>
<vn-td shrink>

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

@ -3,4 +3,5 @@ Weekly tickets: Tickets programados
You are going to delete this weekly ticket: Vas a eliminar este ticket programado
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 by weekly ticket: Buscar por tickets programados
Search by weekly ticket: Buscar por tickets programados
weekDay: Dia