db/changes/234601/00-ACLticketTrackingState.sql

@@ -0,0 +1,12 @@
+UPDATE `salix`.`ACL`
+    SET `property` = 'state',
+        `model` = 'Ticket'
+    WHERE `property` = 'changeState';
+
+REVOKE INSERT, UPDATE, DELETE ON `vn`.`ticketTracking` FROM 'productionboss'@;
+REVOKE INSERT, UPDATE, DELETE ON `vn`.`ticketTracking` FROM 'productionAssi'@;
+REVOKE INSERT, UPDATE, DELETE ON `vn`.`ticketTracking` FROM 'hr'@;
+REVOKE INSERT, UPDATE, DELETE ON `vn`.`ticketTracking` FROM 'salesPerson'@;
+REVOKE INSERT, UPDATE, DELETE ON `vn`.`ticketTracking` FROM 'deliveryPerson'@;
+REVOKE INSERT, UPDATE, DELETE ON `vn`.`ticketTracking` FROM 'employee'@;
+REVOKE EXECUTE ON `vn`.`ticket_setState` FROM 'employee'@;

db/changes/234601/00-ticketSetStateRefactor.sql

@@ -0,0 +1,55 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setState`(
+	vSelf INT,
+	vStateCode VARCHAR(255) COLLATE utf8_general_ci
+)
+BEGIN
+/**
+ * Modifica el estado de un ticket si se cumplen las condiciones necesarias.
+ *
+ * @param vSelf el id del ticket
+ * @param vStateCode estado a modificar del ticket
+ */
+	DECLARE vticketAlertLevel INT;
+	DECLARE vTicketStateCode VARCHAR(255);
+	DECLARE vCanChangeState BOOL;
+	DECLARE vPackedAlertLevel INT;
+	DECLARE vZoneFk INT;
+
+	SELECT s.alertLevel, s.`code`, t.zoneFk
+		INTO vticketAlertLevel, vTicketStateCode,  vZoneFk
+		FROM state s
+			JOIN ticketTracking tt ON tt.stateFk = s.id
+			JOIN ticket t ON t.id = tt.ticketFk
+		WHERE tt.ticketFk = vSelf
+		ORDER BY tt.created DESC
+		LIMIT 1;
+
+	SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED'; 
+
+	IF vStateCode = 'OK' AND vZoneFk IS NULL THEN
+		CALL util.throw('ASSIGN_ZONE_FIRST');
+	END IF;
+
+	SET vCanChangeState = (
+			vStateCode <> 'ON_CHECKING' OR 
+			vticketAlertLevel < vPackedAlertLevel
+		)AND NOT (
+			vTicketStateCode IN ('CHECKED', 'CHECKING')
+			AND vStateCode IN ('PREPARED', 'ON_PREPARATION')
+		);
+
+	IF vCanChangeState THEN
+		INSERT INTO ticketTracking (stateFk, ticketFk, workerFk)
+			SELECT id, vSelf, account.myUser_getId()
+				FROM state
+				WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
+				
+		IF vStateCode = 'PACKED' THEN
+			CALL ticket_doCmr(vSelf);
+		END IF;
+	ELSE
+		CALL util.throw('INCORRECT_TICKET_STATE');
+	END IF;
+END$$
+DELIMITER ;

modules/ticket/back/methods/ticket-tracking/setDelivered.js

@@ -47,7 +47,7 @@ module.exports = Self => {
 
             const promises = [];
             for (const id of ticketIds) {
-                const promise = models.TicketTracking.changeState(ctx, {
+                const promise = await models.Ticket.state(ctx, {
                     stateFk: state.id,
                     workerFk: worker.id,
                     ticketFk: id

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

@@ -1,7 +1,7 @@
 const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
 
-describe('ticket changeState()', () => {
+describe('ticket state()', () => {
     const salesPersonId = 18;
     const employeeId = 1;
     const productionId = 49;
@@ -47,7 +47,7 @@ describe('ticket changeState()', () => {
             activeCtx.accessToken.userId = salesPersonId;
             const params = {ticketFk: 2, stateFk: 3};
 
-            await models.TicketTracking.changeState(ctx, params, options);
+            await models.Ticket.state(ctx, params, options);
 
             await tx.rollback();
         } catch (e) {
@@ -69,7 +69,7 @@ describe('ticket changeState()', () => {
             activeCtx.accessToken.userId = employeeId;
             const params = {ticketFk: 11, stateFk: 13};
 
-            await models.TicketTracking.changeState(ctx, params, options);
+            await models.Ticket.state(ctx, params, options);
 
             await tx.rollback();
         } catch (e) {
@@ -80,7 +80,8 @@ describe('ticket changeState()', () => {
         expect(error.code).toBe('ACCESS_DENIED');
     });
 
-    it('should be able to create a ticket tracking line for a not editable ticket if the user has the production role', async() => {
+    it('should be able to create a ticket tracking line for a not' +
+        ' editable ticket if the user has the production role', async() => {
         const tx = await models.TicketTracking.beginTransaction({});
 
         try {
@@ -91,7 +92,7 @@ describe('ticket changeState()', () => {
             activeCtx.accessToken.userId = productionId;
             const params = {ticketFk: ticket.id, stateFk: 3};
 
-            const ticketTracking = await models.TicketTracking.changeState(ctx, params, options);
+            const ticketTracking = await models.Ticket.state(ctx, params, options);
 
             expect(ticketTracking.__data.ticketFk).toBe(params.ticketFk);
             expect(ticketTracking.__data.stateFk).toBe(params.stateFk);
@@ -105,7 +106,8 @@ describe('ticket changeState()', () => {
         }
     });
 
-    it('should update the ticket tracking line when the user is salesperson, uses the state assigned and a valid worker id', async() => {
+    it('should update the ticket tracking line when the user is salesperson,' +
+        ' uses the state assigned and a valid worker id', async() => {
         const tx = await models.TicketTracking.beginTransaction({});
 
         try {
@@ -115,7 +117,7 @@ describe('ticket changeState()', () => {
             const ctx = {req: {accessToken: {userId: 18}}};
             const assignedState = await models.State.findOne({where: {code: 'PICKER_DESIGNED'}}, options);
             const params = {ticketFk: ticket.id, stateFk: assignedState.id, workerFk: 1};
-            const res = await models.TicketTracking.changeState(ctx, params, options);
+            const res = await models.Ticket.state(ctx, params, options);
 
             expect(res.__data.ticketFk).toBe(params.ticketFk);
             expect(res.__data.stateFk).toBe(params.stateFk);

modules/ticket/back/methods/ticket/state.js

@@ -1,7 +1,7 @@
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
-    Self.remoteMethodCtx('changeState', {
+    Self.remoteMethodCtx('state', {
         description: 'Change the state of a ticket',
         accessType: 'WRITE',
         accepts: [
@@ -18,12 +18,12 @@ module.exports = Self => {
             root: true
         },
         http: {
-            path: `/changeState`,
+            path: `/state`,
             verb: 'POST'
         }
     });
 
-    Self.changeState = async(ctx, params, options) => {
+    Self.state = async(ctx, params, options) => {
         const models = Self.app.models;
         const myOptions = {};
         let tx;

modules/ticket/back/models/ticket-tracking.js

@@ -1,5 +1,4 @@
 module.exports = function(Self) {
-    require('../methods/ticket-tracking/changeState')(Self);
     require('../methods/ticket-tracking/setDelivered')(Self);
 
     Self.validatesPresenceOf('stateFk', {message: 'State cannot be blank'});

modules/ticket/back/models/ticket.js

@@ -1,4 +1,4 @@
 module.exports = Self => {
-    // Methods
     require('./ticket-methods')(Self);
+    require('../methods/ticket/state')(Self);
 };

modules/ticket/front/sale/index.html

@@ -15,7 +15,7 @@
                 <vn-button
                     disabled="!$ctrl.isEditable || $ctrl.ticketState == 'OK'"
                     label="Ok"
-                    vn-http-click="$ctrl.changeState('OK')"
+                    vn-http-click="$ctrl.state('OK')"
                     vn-tooltip="Change ticket state to 'Ok'">
                 </vn-button>
                 <vn-button-menu
@@ -24,7 +24,7 @@
                     value-field="code"
                     fields="['id', 'name', 'alertLevel', 'code']"
                     url="States/editableStates"
-                    on-change="$ctrl.changeState(value)">
+                    on-change="$ctrl.state(value)">
                 </vn-button-menu>
                 <vn-button icon="keyboard_arrow_down"
                     label="More"

modules/ticket/front/sale/index.js

@@ -171,9 +171,9 @@ class Controller extends Section {
         this.card.reload();
     }
 
-    changeState(value) {
+    state(value) {
         const params = {ticketFk: this.$params.id, code: value};
-        return this.$http.post('TicketTrackings/changeState', params).then(() => {
+        return this.$http.post('Tickets/state', params).then(() => {
             this.vnApp.showSuccess(this.$t('Data saved!'));
             this.card.reload();
         }).finally(() => this.resetChanges());

modules/ticket/front/sale/index.spec.js

@@ -228,15 +228,16 @@ describe('Ticket', () => {
             });
         });
 
-        describe('changeState()', () => {
+        describe('state()', () => {
-            it('should make an HTTP post query, then call the showSuccess(), reload() and resetChanges() methods', () => {
+            it('should make an HTTP post query, then call the showSuccess(),' +
+                ' reload() and resetChanges() methods', () => {
                 jest.spyOn(controller.card, 'reload').mockReturnThis();
                 jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
                 jest.spyOn(controller, 'resetChanges').mockReturnThis();
 
                 const expectedParams = {ticketFk: 1, code: 'OK'};
-                $httpBackend.expect('POST', `TicketTrackings/changeState`, expectedParams).respond(200);
+                $httpBackend.expect('POST', `Tickets/state`, expectedParams).respond(200);
-                controller.changeState('OK');
+                controller.state('OK');
                 $httpBackend.flush();
 
                 expect(controller.card.reload).toHaveBeenCalledWith();
@@ -246,7 +247,8 @@ describe('Ticket', () => {
         });
 
         describe('removeSales()', () => {
-            it('should make an HTTP post query, then call the showSuccess(), removeSelectedSales() and resetChanges() methods', () => {
+            it('should make an HTTP post query, then call the showSuccess(),' +
+                ' removeSelectedSales() and resetChanges() methods', () => {
                 jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
                 jest.spyOn(controller, 'removeSelectedSales').mockReturnThis();
                 jest.spyOn(controller, 'resetChanges').mockReturnThis();
@@ -352,7 +354,8 @@ describe('Ticket', () => {
         });
 
         describe('updatePrice()', () => {
-            it('should make an HTTP POST query, update the sale price and then call to the resetChanges() method', () => {
+            it('should make an HTTP POST query, update the sale price ' +
+                'and then call to the resetChanges() method', () => {
                 jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
                 jest.spyOn(controller, 'resetChanges').mockReturnThis();
 
@@ -418,7 +421,8 @@ describe('Ticket', () => {
                 expect(controller.$.editDiscount.hide).toHaveBeenCalledWith();
             });
 
-            it('should not call to the updateDiscount() method and then to the editDiscountDialog hide() method', () => {
+            it('should not call to the updateDiscount() method and then' +
+                ' to the editDiscountDialog hide() method', () => {
                 jest.spyOn(controller, 'updateDiscount').mockReturnThis();
 
                 const firstSelectedSale = controller.sales[0];
@@ -444,7 +448,8 @@ describe('Ticket', () => {
         });
 
         describe('updateDiscount()', () => {
-            it('should make an HTTP POST query, update the sales discount and then call to the resetChanges() method', () => {
+            it('should make an HTTP POST query, update the sales discount ' +
+                'and then call to the resetChanges() method', () => {
                 jest.spyOn(controller, 'resetChanges').mockReturnThis();
                 jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
 

modules/ticket/front/summary/index.html

@@ -18,7 +18,7 @@
             value-field="code"
             fields="['id', 'name', 'alertLevel', 'code']"
             url="States/editableStates"
-            on-change="$ctrl.changeState(value)">
+            on-change="$ctrl.state(value)">
         </vn-button-menu>
         <vn-ticket-descriptor-menu
             ng-if="!$ctrl.isOnTicketCard"

modules/ticket/front/summary/index.js

@@ -59,13 +59,12 @@ class Controller extends Summary {
         this.$.invoiceOutDescriptor.show(event.target, this.summary.invoiceOut.id);
     }
 
-    changeState(value) {
+    state(value) {
         const params = {
             ticketFk: 'id' in this.ticket ? this.ticket.id : this.$params.id,
             code: value
         };
-
+        this.$http.post(`Tickets/state`, params)
-        this.$http.post(`TicketTrackings/changeState`, params)
             .then(() => {
                 if ('id' in this.$params) this.reload();
             })

modules/ticket/front/summary/index.spec.js

@@ -43,15 +43,15 @@ describe('Ticket', () => {
             });
         });
 
-        describe('changeState()', () => {
+        describe('state()', () => {
             it('should change the state', () => {
                 jest.spyOn(controller.vnApp, 'showSuccess');
                 const value = 'myTicketState';
 
                 let res = {id: 1, nickname: 'myNickname'};
                 $httpBackend.when('GET', `Tickets/1/summary`).respond(200, res);
-                $httpBackend.expectPOST(`TicketTrackings/changeState`).respond(200, 'ok');
+                $httpBackend.expectPOST(`Tickets/state`).respond(200, 'ok');
-                controller.changeState(value);
+                controller.state(value);
                 $httpBackend.flush();
 
                 expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');

modules/ticket/front/tracking/edit/index.html

@@ -1,4 +1,4 @@
-<mg-ajax path="TicketTrackings/changeState" options="vnPost"></mg-ajax>
+<mg-ajax path="Tickets/state" options="vnPost"></mg-ajax>
 <vn-watcher
     vn-id="watcher"
     data="$ctrl.params"

modules/ticket/front/tracking/edit/index.js

@@ -53,7 +53,7 @@ class Controller extends Section {
     }
 
     onSubmit() {
-        this.$http.post(`TicketTrackings/changeState`, this.params).then(() => {
+        this.$http.post(`Tickets/state`, this.params).then(() => {
             this.$.watcher.updateOriginalData();
             this.card.reload();
             this.vnApp.showSuccess(this.$t('Data saved!'));

modules/ticket/front/tracking/edit/index.spec.js

@@ -61,7 +61,7 @@ describe('Ticket', () => {
                 jest.spyOn(controller.vnApp, 'showSuccess');
                 jest.spyOn(controller.$state, 'go');
 
-                $httpBackend.expectPOST(`TicketTrackings/changeState`, controller.params).respond({});
+                $httpBackend.expectPOST(`Tickets/state`, controller.params).respond({});
                 controller.onSubmit();
                 $httpBackend.flush();
 

modules/worker/front/time-control/index.js

@@ -403,7 +403,7 @@ class Controller extends Section {
         });
     }
 
-    changeState(state, reason) {
+    state(state, reason) {
         this.state = state;
         this.reason = reason;
         this.repaint();