Merge branch 'dev' into 2162-print_pdf_puppeteer

modules/ticket/back/methods/ticket-weekly/filter.js

@@ -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

modules/ticket/back/methods/ticket/specs/getTaxes.spec.js

@@ -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);
     });
 });

modules/ticket/front/routes.json

@@ -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",

modules/ticket/front/weekly/index.html

@@ -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>
@@ -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>

modules/ticket/front/weekly/locale/es.yml

@@ -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?
 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
+weekDay:  Dia