Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4682-searchbar_filter

db/changes/10503-november/00-collection_missingTrash.sql

@@ -0,0 +1 @@
+DROP PROCEDURE IF EXISTS `vn`.`collection_missingTrash`;

db/changes/10503-november/00-greuge.userFK_userFk.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`greuge` CHANGE `userFK` `userFk` int(10) unsigned DEFAULT NULL NULL;

db/changes/10503-november/00-timeBusiness_calculate.sql

@@ -0,0 +1,88 @@
+DROP PROCEDURE IF EXISTS `vn`.`timeBusiness_calculate`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`timeBusiness_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
+BEGIN
+/**
+ * Horas que debe trabajar un empleado según contrato y día.
+ * @param vDatedFrom workerTimeControl
+ * @param vDatedTo workerTimeControl
+ * @table tmp.user(userFk)
+ * @return tmp.timeBusinessCalculate
+ */
+	DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate;
+	CREATE TEMPORARY TABLE tmp.timeBusinessCalculate
+			(INDEX (departmentFk))
+		SELECT dated,
+				businessFk,
+				userFk,
+				departmentFk,
+				hourStart,
+				hourEnd,
+				timeTable,
+				timeWorkSeconds,
+				SEC_TO_TIME(timeWorkSeconds) timeWorkSexagesimal,
+				timeWorkSeconds / 3600 timeWorkDecimal,
+				timeWorkSeconds timeBusinessSeconds,
+				SEC_TO_TIME(timeWorkSeconds) timeBusinessSexagesimal,
+				timeWorkSeconds / 3600 timeBusinessDecimal,
+				name type,
+				permissionRate,
+				hoursWeek,
+				discountRate,
+				isAllowedToWork
+			FROM(SELECT t.dated,
+						b.id businessFk,
+						w.userFk,
+						b.departmentFk,
+						IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.start,5) ORDER BY j.start ASC SEPARATOR ' - ')) hourStart ,
+						IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.end,5) ORDER BY j.end ASC SEPARATOR ' - ')) hourEnd,
+						IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.start,5), " - ",  LEFT(j.end,5) ORDER BY j.end ASC SEPARATOR ' - ')) timeTable,
+						IF(j.start = NULL, 0, IFNULL(SUM(TIME_TO_SEC(j.end)) - SUM(TIME_TO_SEC(j.start)), 0)) timeWorkSeconds,
+						at2.name,
+						at2.permissionRate,
+						at2.discountRate,
+						cl.hours_week hoursWeek,
+						at2.isAllowedToWork
+					FROM time t
+						LEFT JOIN business b ON t.dated BETWEEN b.started AND IFNULL(b.ended, vDatedTo)
+						LEFT JOIN worker w ON w.id = b.workerFk
+						JOIN tmp.`user` u ON u.userFK = w.userFK
+						LEFT JOIN workCenter wc ON wc.id = b.workcenterFK
+						LEFT JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = b.calendarTypeFk
+						LEFT JOIN postgresql.journey j ON j.business_id = b.id AND j.day_id = WEEKDAY(t.dated) + 1
+						LEFT JOIN postgresql.calendar_employee ce ON ce.businessFk = b.id AND ce.date = t.dated
+						LEFT JOIN absenceType at2 ON at2.id = ce.calendar_state_id
+					WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
+					GROUP BY w.userFk, t.dated
+				)sub;
+
+	UPDATE tmp.timeBusinessCalculate t
+		LEFT JOIN  postgresql.journey j ON j.business_id = t.businessFk
+		SET t.timeWorkSeconds = t.hoursWeek / 5 * 3600,
+			t.timeWorkSexagesimal = SEC_TO_TIME( t.hoursWeek / 5 * 3600),
+			t.timeWorkDecimal =  t.hoursWeek / 5,
+			t.timeBusinessSeconds = t.hoursWeek / 5 * 3600,
+			t.timeBusinessSexagesimal = SEC_TO_TIME( t.hoursWeek / 5 * 3600),
+			t.timeBusinessDecimal = t.hoursWeek / 5
+		WHERE DAYOFWEEK(t.dated) IN(2,3,4,5,6) AND j.journey_id IS NULL  ;
+
+	UPDATE tmp.timeBusinessCalculate t
+		SET t.timeWorkSeconds = t.timeWorkSeconds - (t.timeWorkSeconds * permissionRate)  ,
+			t.timeWorkSexagesimal = SEC_TO_TIME ((t.timeWorkDecimal - (t.timeWorkDecimal * permissionRate)) * 3600),
+			t.timeWorkDecimal = t.timeWorkDecimal - (t.timeWorkDecimal * permissionRate)
+		WHERE permissionRate <> 0;
+
+	UPDATE tmp.timeBusinessCalculate t
+			JOIN calendarHolidays ch ON ch.dated = t.dated
+			JOIN business b ON b.id = t.businessFk
+				AND b.workcenterFk = ch.workcenterFk
+		SET t.timeWorkSeconds = 0,
+			t.timeWorkSexagesimal = 0,
+			t.timeWorkDecimal = 0,
+			t.permissionrate = 1,
+			t.type = 'Festivo'
+		WHERE t.type IS NULL;
+END$$
+DELIMITER ;

modules/client/back/methods/client/setPassword.js

@@ -23,12 +23,6 @@ module.exports = Self => {
 
     Self.setPassword = async function(ctx, id, newPassword) {
         const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
-
-        const isSalesPerson = await models.Account.hasRole(userId, 'salesPerson');
-
-        if (!isSalesPerson)
-            throw new UserError(`Not enough privileges to edit a client`);
 
         const isClient = await models.Client.findById(id, null);
         const isUserAccount = await models.UserAccount.findById(id, null);

modules/client/back/methods/client/specs/setPassword.spec.js

@@ -6,21 +6,6 @@ describe('Client setPassword', () => {
         req: {accessToken: {userId: salesPersonId}}
     };
 
-    it(`should throw an error if you don't have enough permissions`, async() => {
-        let error;
-        const employeeId = 1;
-        const ctx = {
-            req: {accessToken: {userId: employeeId}}
-        };
-        try {
-            await models.Client.setPassword(ctx, 1, 't0pl3v3l.p455w0rd!');
-        } catch (e) {
-            error = e;
-        }
-
-        expect(error.message).toEqual(`Not enough privileges to edit a client`);
-    });
-
     it('should throw an error the setPassword target is not just a client but a worker', async() => {
         let error;
 

modules/client/back/models/greuge.js

@@ -1,6 +1,21 @@
+const LoopBackContext = require('loopback-context');
+
 module.exports = function(Self) {
     require('../methods/greuge/sumAmount')(Self);
 
+    Self.observe('before save', function(ctx, next) {
+        const loopBackContext = LoopBackContext.getCurrentContext();
+
+        let userFk = loopBackContext.active.accessToken.userId;
+
+        if (ctx.instance)
+            ctx.instance.userFk = userFk;
+        else
+            ctx.data.userFk = userFk;
+
+        next();
+    });
+
     Self.validatesLengthOf('description', {
         max: 45,
         message: 'Description should have maximum of 45 characters'

modules/client/back/models/greuge.json

@@ -35,7 +35,6 @@
             "type": "number",
             "required": true
         }
-
     },
     "relations": {
         "client": {
@@ -52,6 +51,11 @@
             "type": "belongsTo",
             "model": "GreugeType",
             "foreignKey": "greugeTypeFk"
+        },
+        "user": {
+            "type": "belongsTo",
+            "model": "Account",
+            "foreignKey": "userFk"
         }
     }
 }

modules/client/front/greuge/index/index.html

@@ -29,6 +29,7 @@
                 <vn-thead>
                     <vn-tr>
                         <vn-th field="shipped" default-order="DESC" expand>Date</vn-th>
+                        <vn-th field="userFk">Created by</vn-thfield></vn-th>
                         <vn-th field="description">Comment</vn-th>
                         <vn-th field="greugeTypeFk">Type</vn-th>
                         <vn-th field="amount" number>Amount</vn-th>
@@ -37,6 +38,8 @@
                 <vn-tbody>
                     <vn-tr ng-repeat="greuge in greuges">
                         <vn-td shrink-datetime>{{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }}</vn-td>
+                        <vn-td><span ng-click="workerDescriptor.show($event, greuge.user.id)"
+                        class="link">{{::greuge.user.name}}</span></vn-td>
                         <vn-td>
                             <span title="{{::greuge.description}}">{{::greuge.description}}</span>
                         </vn-td>
@@ -57,3 +60,4 @@
     vn-bind="+"
     fixed-bottom-right>
 </vn-float-button>
+<vn-worker-descriptor-popover vn-id="workerDescriptor"></vn-worker-descriptor-popover>

modules/client/front/greuge/index/index.js

@@ -8,6 +8,12 @@ class Controller extends Section {
             include: [
                 {
                     relation: 'greugeType',
+                    scope: {
+                        fields: ['id', 'name']
+                    },
+                },
+                {
+                    relation: 'user',
                     scope: {
                         fields: ['id', 'name']
                     }

modules/client/front/greuge/index/locale/es.yml

@@ -2,3 +2,4 @@ Date: Fecha
 Comment: Comentario
 Amount: Importe
 Type: Tipo
+Created by: Creado por

modules/monitor/back/methods/sales-monitor/ordersFilter.js

@@ -53,7 +53,7 @@ module.exports = Self => {
                 JOIN client c ON c.id = o.customer_id
                 JOIN address a ON a.id = o.address_id
                 JOIN agencyMode am ON am.id = o.agency_id
-                JOIN user u ON u.id = c.salesPersonFk
+                JOIN account.user u ON u.id = c.salesPersonFk
                 JOIN workerTeamCollegues wtc ON c.salesPersonFk = wtc.collegueFk`);
 
         if (!filter.where) filter.where = {};

modules/route/front/descriptor/index.html

@@ -20,6 +20,13 @@
             translate>
             Update volume
         </vn-item>
+        <vn-item
+            ng-click="$ctrl.deleteCurrentRoute()"
+            vn-acl="deliveryBoss"
+            vn-acl-action="remove"
+            translate>
+            Delete route
+        </vn-item>
     </slot-menu>
     <slot-body>
         <div class="attributes">

modules/route/front/descriptor/index.js

@@ -34,6 +34,14 @@ class Controller extends Descriptor {
             });
     }
 
+    deleteCurrentRoute() {
+        this.$http.delete(`Routes/${this.id}`)
+            .then(() => {
+                this.vnApp.showSuccess(this.$t('Route deleted'));
+                this.$state.go('route.index');
+            });
+    }
+
     loadData() {
         const filter = {
             fields: [

modules/route/front/descriptor/index.spec.js

@@ -23,4 +23,20 @@ describe('vnRouteDescriptorPopover', () => {
             expect(controller.route).toEqual(response);
         });
     });
+
+    describe('deleteCurrentRoute()', () => {
+        it(`should perform a delete query to delete the current route`, () => {
+            const id = 1;
+
+            jest.spyOn(controller.vnApp, 'showSuccess');
+
+            controller._id = id;
+            $httpBackend.expectDELETE(`Routes/${id}`).respond(200);
+            controller.deleteCurrentRoute();
+            $httpBackend.flush();
+
+            expect(controller.route).toBeUndefined();
+            expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Route deleted');
+        });
+    });
 });

modules/route/front/descriptor/locale/es.yml

@@ -4,4 +4,6 @@ Send route report: Enviar informe de ruta
 Show route report: Ver informe de ruta
 Update volume: Actualizar volumen
 Volume updated: Volumen actualizado
+Delete route: Borrar ruta
+Route deleted: Ruta borrada
 Are you sure you want to update the volume?: Estas seguro que quieres actualizar el volumen?

modules/ticket/front/sale/index.js

@@ -89,7 +89,7 @@ class Controller extends Section {
     getUsesMana() {
         this.$http.get(`Sales/usesMana`)
             .then(res => {
-                this.useMana = res.data;
+                this.usesMana = res.data;
             });
     }
 

modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js

@@ -12,11 +12,6 @@ describe('workerTimeControl sendMail()', () => {
 
     };
 
-    beforeAll(function() {
-        originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
-        jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
-    });
-
     it('should fill time control of a worker without records in Journey and with rest', async() => {
         const tx = await models.WorkerTimeControl.beginTransaction({});
 
@@ -124,9 +119,5 @@ describe('workerTimeControl sendMail()', () => {
             throw e;
         }
     });
-
-    afterAll(function() {
-        jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
-    });
 });
 

print/templates/email/client-welcome/client-welcome.html

@@ -9,7 +9,7 @@
             <div>{{$t('clientId')}}: <strong>{{client.id}}</strong></div>
             <div>{{$t('user')}}: <strong>{{client.userName}}</strong></div>
             <div>{{$t('password')}}: <strong>********</strong>
-                (<a href="https://verdnatura.es">{{$t('passwordResetText')}}</a>)
+                (<a href="https://shop.verdnatura.es">{{$t('passwordResetText')}}</a>)
             </div>
             </p>
 

print/templates/email/client-welcome/locale/es.yml

@@ -1,8 +1,8 @@
 subject: Bienvenido a Verdnatura
 title: "¡Te damos la bienvenida!"
 dearClient: Estimado cliente
-clientData: 'Tus datos para poder comprar en la web de Verdnatura (<a href="https://verdnatura.es"
+clientData: 'Tus datos para poder comprar en la web de Verdnatura (<a href="https://shop.verdnatura.es"
-	title="Visitar Verdnatura" target="_blank" style="color: #8dba25">https://verdnatura.es</a>)
+	title="Visitar Verdnatura" target="_blank" style="color: #8dba25">https://shop.verdnatura.es</a>)
 	o en nuestras aplicaciones para <a href="https://goo.gl/3hC2mG" title="App Store"
 	target="_blank" style="color: #8dba25">iOS</a> y <a href="https://goo.gl/8obvLc"
 	title="Google Play" target="_blank" style="color: #8dba25">Android</a>, son'

print/templates/email/vehicle-event-expired/assets/css/import.js

@@ -0,0 +1,11 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
+    .mergeStyles();

print/templates/email/vehicle-event-expired/attachments.json

@@ -0,0 +1,6 @@
+[
+    {
+        "filename": "vehicle-event-expired.pdf",
+        "component": "vehicle-event-expired"
+    }
+]

print/templates/email/vehicle-event-expired/locale/es.yml

@@ -0,0 +1,3 @@
+subject: Expiración Tarjetas Vehículos
+title: Expiración Tarjetas Vehículos
+description: A continuación se adjunta el informe de expiración de tarjetas vehículos

print/templates/email/vehicle-event-expired/vehicle-event-expired.html

@@ -0,0 +1,8 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <h1>{{ $t('title') }}</h1>
+            <p v-html="$t('description')"></p>
+        </div>
+    </div>
+</email-body>

print/templates/email/vehicle-event-expired/vehicle-event-expired.js

@@ -0,0 +1,9 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+    name: 'vehicle-event-expired',
+    components: {
+        'email-body': emailBody.build()
+    }
+};

print/templates/reports/vehicle-event-expired/assets/css/import.js

@@ -1,9 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/layout.css`,
-    `${appPath}/common/css/report.css`,
+    `${vnPrintPath}/common/css/report.css`,
     `${__dirname}/style.css`])
     .mergeStyles();

print/templates/reports/vehicle-event-expired/vehicle-event-expired.js

@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const reportBody = new Component('report-body');
 
 module.exports = {

print/templates/reports/zone/zone.js

@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const reportBody = new Component('report-body');
 
 module.exports = {