Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

back/methods/mrw-config/createShipment.js

@@ -57,14 +57,14 @@ module.exports = Self => {
                 DATE_FORMAT(t.shipped, '%d/%m/%Y') created,
                 t.shipped,
                 CONCAT( e.ticketFk, LPAD(e.counter, mc.counterWidth, '0')) reference,
-                LPAD(IF(mw.params IS NULL, ms.serviceType, mw.serviceType), mc.serviceTypeWidth,'0') serviceType,
+                LPAD(IF(mw.serviceType IS NULL, ms.serviceType, mw.serviceType), mc.serviceTypeWidth,'0') serviceType,
                 IF(mw.weekdays, 'S', 'N') weekDays,
                 oa.description deliveryObservation
             FROM expedition e
                 JOIN ticket t ON e.ticketFk = t.id
                 JOIN agencyMode am ON am.id = t.agencyModeFk
                 JOIN mrwService ms ON ms.agencyModeCodeFk = am.code
-                LEFT JOIN mrwServiceWeekday mw ON mw.weekdays = DATE_FORMAT(t.shipped, '%a') 
+                LEFT JOIN mrwServiceWeekday mw ON mw.weekdays | 1 << WEEKDAY(t.landed)
                 JOIN client c ON t.clientFk = c.id
                 JOIN address a ON t.addressFk = a.id
                 LEFT JOIN addressObservation oa ON oa.addressFk = a.id

modules/ticket/front/card/index.js

@@ -1,5 +1,6 @@
 import ngModule from '../module';
 import ModuleCard from 'salix/components/module-card';
+import UserError from 'core/lib/user-error';
 
 class Controller extends ModuleCard {
     reload() {
@@ -59,6 +60,10 @@ class Controller extends ModuleCard {
             ],
         };
 
+        if (!this.$params.id) {
+            this.$state.go('ticket.index');
+            throw new UserError(`You must select a ticket`);
+        }
         return this.$http.get(`Tickets/${this.$params.id}`, {filter})
             .then(res => this.onData(res.data));
     }

modules/ticket/front/locale/es.yml

@@ -64,6 +64,7 @@ You are going to delete this ticket: Vas a eliminar este ticket
 Ticket deleted. You can undo this action within the first hour: Ticket eliminado. Puedes deshacer esta acción durante la primera hora
 Search ticket by id or alias: Buscar tickets por identificador o alias
 ticket: ticket
+You must select a ticket: Debes seleccionar un ticket
 
 #sections
 List: Listado

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.24.3",
+    "version": "24.26.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",