Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1959-client_fiscal_data_check_phone

modules/client/back/methods/client/lastActiveTickets.js

@@ -1,6 +1,6 @@
 module.exports = Self => {
     Self.remoteMethod('lastActiveTickets', {
-        description: 'Returns the last three tickets of a client that have the alertLevel at 0 and the shiped day is gt today',
+        description: 'Returns the last three active tickets of a client',
         accessType: 'READ',
         accepts: [{
             arg: 'id',
@@ -24,16 +24,18 @@ module.exports = Self => {
     });
 
     Self.lastActiveTickets = async(id, ticketId) => {
+        const ticket = await Self.app.models.Ticket.findById(ticketId);
         const query = `
             SELECT t.id, t.shipped, a.name AS agencyName, w.name AS warehouseName
                 FROM vn.ticket t
                     JOIN vn.ticketState ts ON t.id = ts.ticketFk
                     JOIN vn.agencyMode a ON t.agencyModeFk = a.id
                     JOIN vn.warehouse w ON t.warehouseFk = w.id
-                WHERE t.shipped >= CURDATE() AND t.clientFk = ? AND ts.alertLevel = 0 AND t.id <> ?
+                WHERE t.shipped >= CURDATE() AND t.clientFk = ? AND ts.alertLevel = 0 
+                    AND t.id <> ? AND t.warehouseFk = ?
                 ORDER BY t.shipped
                 LIMIT 3`;
 
-        return Self.rawSql(query, [id, ticketId]);
+        return Self.rawSql(query, [id, ticketId, ticket.warehouseFk]);
     };
 };

modules/ticket/front/basic-data/step-one/index.html

@@ -32,6 +32,13 @@
                         , {{::street}}, {{::city}}, {{::province.name}} - {{::agencyMode.name}}
                     </span>
                 </tpl-item>
+                <append>
+                    <vn-icon-button
+                        ui-sref="client.card.address.edit({id: $ctrl.clientId, addressId: $ctrl.addressId})"
+                        icon="edit"
+                        vn-tooltip="Edit address">
+                    </vn-icon-button>
+                </append>
             </vn-autocomplete>
             <vn-autocomplete vn-one
                 url="Warehouses"

modules/ticket/front/dms/create/index.js

@@ -47,12 +47,11 @@ class Controller {
         }};
         this.$http.get('DmsTypes/findOne', {params}).then(res => {
             const dmsTypeId = res.data && res.data.id;
-            const companyId = this.vnConfig.companyFk;
             const warehouseId = this.vnConfig.warehouseFk;
             const defaultParams = {
                 reference: this.ticket.id,
                 warehouseId: warehouseId,
-                companyId: companyId,
+                companyId: this.ticket.companyFk,
                 dmsTypeId: dmsTypeId,
                 description: this.$translate.instant('FileDescription', {
                     ticketId: this.ticket.id,

modules/worker/back/model-config.json

@@ -8,10 +8,10 @@
     "Holiday": {
         "dataSource": "vn"
     },
-    "HolidayDetail": {
+    "CalendarHolidaysName": {
         "dataSource": "vn"
     },
-    "HolidayType": {
+    "CalendarHolidaysType": {
         "dataSource": "vn"
     },
     "WorkCenter": {

modules/worker/back/models/calendar-holidays-name.json

@@ -1,9 +1,9 @@
 {
-	"name": "HolidayDetail",
+	"name": "CalendarHolidaysName",
 	"base": "VnModel",
 	"options": {
 		"mysql": {
-			"table": "holidayDetail"
+			"table": "calendarHolidaysName"
 		}
 	},
 	"properties": {
@@ -11,7 +11,7 @@
 			"id": true,
 			"type": "Number"
 		},
-		"description": {
+		"name": {
 			"type": "String"
 		}
 	},

modules/worker/back/models/calendar-holidays-type.json

@@ -1,9 +1,9 @@
 {
-	"name": "HolidayType",
+	"name": "CalendarHolidaysType",
 	"base": "VnModel",
 	"options": {
 		"mysql": {
-			"table": "holidayType"
+			"table": "calendarHolidaysType"
 		}
 	},
 	"properties": {

modules/worker/back/models/holiday.json

@@ -22,12 +22,12 @@
 	"relations": {
 		"detail": {
 			"type": "belongsTo",
-			"model": "HolidayDetail",
+			"model": "CalendarHolidaysName",
 			"foreignKey": "holidayDetailFk"
 		},
 		"type": {
 			"type": "belongsTo",
-			"model": "HolidayType",
+			"model": "CalendarHolidaysType",
 			"foreignKey": "holidayTypeFk"
 		},
 		"workCenter": {

modules/worker/front/index/index.html

@@ -34,6 +34,11 @@
                 </vn-label-value>
             </vn-item-section>
             <vn-item-section side>
+                <vn-icon-button
+                    ng-click="$ctrl.goToTimeControl($event, worker.id)"
+                    vn-tooltip="Preview"
+                    icon="access_time">
+                </vn-icon-button>
                 <vn-icon-button
                     ng-click="$ctrl.preview($event, worker)"
                     vn-tooltip="Preview"

modules/worker/front/index/index.js

@@ -18,6 +18,7 @@ export default class Controller {
 
     preview(event, worker) {
         if (event.defaultPrevented) return;
+
         event.preventDefault();
         event.stopPropagation();
 
@@ -25,6 +26,14 @@ export default class Controller {
         this.$.preview.show();
     }
 
+
+    goToTimeControl(event, workerId) {
+        if (event.defaultPrevented) return;
+
+        event.preventDefault();
+        event.stopPropagation();
+        this.$state.go('worker.card.timeControl', {id: workerId}, {absolute: true});
+    }
     onMoreChange(callback) {
         callback.call(this);
     }