Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit

modules/claim/back/methods/claim/claimPickupEmail.js

@@ -1,8 +1,9 @@
-const {Report, Email, smtp} = require('vn-print');
+const {Email} = require('vn-print');
 
 module.exports = Self => {
     Self.remoteMethodCtx('claimPickupEmail', {
         description: 'Sends the the claim pickup order email with an attached PDF',
+        accessType: 'WRITE',
         accepts: [
             {
                 arg: 'id',
@@ -40,7 +41,7 @@ module.exports = Self => {
         }
     });
 
-    Self.claimPickupEmail = async(ctx, id) => { 
+    Self.claimPickupEmail = async ctx => {
         const args = Object.assign({}, ctx.args);
         const params = {
             recipient: args.recipient,

modules/client/back/methods/client/consumptionSendQueued.js

@@ -18,43 +18,43 @@ module.exports = Self => {
     Self.consumptionSendQueued = async() => {
         const queues = await Self.rawSql(`
             SELECT
-                    ccq.id,
+                id,
-                    c.id AS clientFk,
+                params
-                    c.email AS clientEmail,
+            FROM clientConsumptionQueue
-                    eu.email salesPersonEmail,
+            WHERE status = ''`);
-                    REPLACE(json_extract(params, '$.from'), '"', '') AS fromDate,
-                    REPLACE(json_extract(params, '$.to'), '"', '') AS toDate
-            FROM clientConsumptionQueue ccq
-                JOIN client c ON (
-                    JSON_SEARCH(
-                        JSON_ARRAY(
-                            json_extract(params, '$.clients')
-                        )
-                    , 'all', c.id) IS NOT NULL)
-                JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-                JOIN ticket t ON t.clientFk = c.id
-                JOIN sale s ON s.ticketFk = t.id
-                JOIN item i ON i.id = s.itemFk
-                JOIN itemType it ON it.id = i.typeFk
-            WHERE status = ''
-                AND it.isPackaging = FALSE
-                AND DATE(t.shipped) BETWEEN
-                    REPLACE(json_extract(params, '$.from'), '"', '') AND
-                    REPLACE(json_extract(params, '$.to'), '"', '')
-            GROUP BY c.id`);
 
         for (const queue of queues) {
             try {
-                const args = {
+                const params = JSON.parse(queue.params);
-                    id: queue.clientFk,
-                    recipient: queue.clientEmail,
-                    replyTo: queue.salesPersonEmail,
-                    from: queue.fromDate,
-                    to: queue.toDate
-                };
 
-                const email = new Email('campaign-metrics', args);
+                const clients = await Self.rawSql(`
-                await email.send();
+                    SELECT
+                            c.id AS clientFk,
+                            c.email AS clientEmail,
+                            eu.email salesPersonEmail
+                    FROM client c 
+                        JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+                        JOIN ticket t ON t.clientFk = c.id
+                        JOIN sale s ON s.ticketFk = t.id
+                        JOIN item i ON i.id = s.itemFk
+                        JOIN itemType it ON it.id = i.typeFk
+                    WHERE c.id IN(?)
+                        AND it.isPackaging = FALSE
+                        AND DATE(t.shipped) BETWEEN ? AND ?
+                    GROUP BY c.id`, [params.clients, params.from, params.to]);
+
+                for (const client of clients) {
+                    const args = {
+                        id: client.clientFk,
+                        recipient: client.clientEmail,
+                        replyTo: client.salesPersonEmail,
+                        from: params.from,
+                        to: params.to
+                    };
+
+                    const email = new Email('campaign-metrics', args);
+                    await email.send();
+                }
 
                 await Self.rawSql(`
                     UPDATE clientConsumptionQueue
@@ -69,7 +69,7 @@ module.exports = Self => {
                     WHERE id = ?`,
                 [error.message, queue.id]);
 
-                throw e;
+                throw error;
             }
         }
 

modules/client/front/notification/index.js

@@ -77,15 +77,16 @@ export default class Controller extends Section {
 
     onSendClientConsumption() {
         const clientIds = this.checked.map(client => client.id);
-        const params = {
+        const data = {
             clients: clientIds,
             from: this.campaign.from,
             to: this.campaign.to
         };
 
+        const params = JSON.stringify(data);
         this.$http.post('ClientConsumptionQueues', {params})
             .then(() => this.$.filters.hide())
-            .then(() => this.vnApp.showSuccess(this.$t('Notifications sent!')));
+            .then(() => this.vnApp.showSuccess(this.$t('Notification sent!')));
     }
 
     exprBuilder(param, value) {

modules/client/front/notification/index.spec.js

@@ -69,15 +69,16 @@ describe('Client notification', () => {
                 data[0].$checked = true;
                 data[1].$checked = true;
 
-                const params = Object.assign({
+                const args = Object.assign({
                     clients: [1101, 1102]
                 }, controller.campaign);
+                const params = JSON.stringify(args);
 
                 $httpBackend.expect('POST', `ClientConsumptionQueues`, {params}).respond(200, params);
                 controller.onSendClientConsumption();
                 $httpBackend.flush();
 
-                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Notifications sent!');
+                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Notification sent!');
             });
         });
 

modules/route/back/methods/route/driverRouteEmail.js

@@ -3,6 +3,7 @@ const {Email} = require('vn-print');
 module.exports = Self => {
     Self.remoteMethodCtx('driverRouteEmail', {
         description: 'Sends the driver route email with an attached PDF',
+        accessType: 'WRITE',
         accepts: [
             {
                 arg: 'id',

modules/ticket/back/methods/ticket-request/getItemTypeWorker.js

@@ -29,7 +29,7 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         const query =
-            `SELECT DISTINCT u.nickname
+            `SELECT DISTINCT u.id, u.nickname
                 FROM itemType it
                     JOIN worker w ON w.id = it.workerFk
                     JOIN account.user u ON u.id = w.id`;

modules/ticket/back/methods/ticket/closeAll.js

@@ -18,6 +18,7 @@ module.exports = Self => {
 
     Self.closeAll = async() => {
         const toDate = new Date();
+        toDate.setHours(0, 0, 0, 0);
         toDate.setDate(toDate.getDate() - 1);
 
         const todayMinDate = new Date();

modules/travel/front/extra-community/index.html

@@ -42,10 +42,10 @@
                         <th field="id" shrink>
                             <span translate>Id</span>
                         </th>
-                        <th field="cargoSupplierFk" expand>
+                        <th field="cargoSupplierFk">
                             <span translate>Supplier</span>
                         </th>
-                        <th field="agencyModeFk" expand>
+                        <th field="agencyModeFk">
                             <span translate>Agency</span>
                         </th>
                         <th field="ref">
@@ -100,7 +100,7 @@
                                 {{::travel.id}}
                             </span>
                         </td>
-                        <td expand vn-click-stop>
+                        <td vn-click-stop>
                             <span
                                 class="link"
                                 ng-click="supplierDescriptor.show($event, travel.cargoSupplierFk)">
@@ -110,22 +110,23 @@
                         <td expand>{{::travel.agencyModeName}}</td>
                         <td
                             name="reference"
-                            expand
+                            class="td-editable"
                             vn-click-stop>
                             <vn-textfield
                                 class="dense td-editable"
                                 ng-model="travel.ref"
                                 on-change="$ctrl.save(travel.id, {ref: value})">
                             </vn-textfield>
-                        </vn-icon>
                         </td>
                         <td number>{{::travel.stickers}}</td>
                         <td
                             name="lockedKg"
-                            expand
+                            class="number"
+                            shrink
                             vn-click-stop>
                             <vn-input-number
                                 number
+                                shrink
                                 class="td-editable number"
                                 ng-model="travel.kg"
                                 on-change="$ctrl.save(travel.id, {kg: value})"
@@ -158,7 +159,7 @@
                             </span>
                         </td>
                         <td></td>
-                        <td expand>{{::entry.ref}}</td>
+                        <td class="td-editable">{{::entry.ref}}</td>
                         <td number>{{::entry.stickers}}</td>
                         <td number></td>
                         <td number>{{::entry.loadedkg}}</td>

modules/travel/front/extra-community/style.scss

@@ -3,7 +3,7 @@
 vn-travel-extra-community {
     .header {
         margin-bottom: 16px;
-        font-size: 1.25rem;
+        font-size: 1.1rem;
         line-height: 1;
         padding: 7px;
         padding-bottom: 7px;
@@ -29,10 +29,10 @@ vn-travel-extra-community {
         outline: 0;
         height: 65px;
         pointer-events: fill;
-        user-select:all;
+        user-select: all;
     }
 
-    tr[draggable] *::selection{
+    tr[draggable] *::selection {
         background-color: transparent;
     }
 
@@ -43,16 +43,19 @@ vn-travel-extra-community {
     tr[draggable].dragging {
         background-color: $color-primary-light;
         color: $color-font-light;
-        font-weight:bold;
+        font-weight: bold;
     }
 
-    .td-editable{
+    .td-editable {
-        input{
+        max-width: 200px;
-            font-size: 1.25rem!important;
-        }
     }
 
-    .number *{
+    vn-input-number.number {
-        text-align: right;
+        min-width: 100px;
+        padding-right: 10px;
+    }
+
+    .number * {
+        text-align: center;
     }
 }