Merge branch 'dev' into 2499-sale_quantity_zero

modules/claim/back/methods/claim/specs/updateClaim.spec.js

@@ -29,18 +29,18 @@ describe('Update Claim', () => {
     it(`should throw an error as the user doesn't have rights`, async() => {
         const forbiddenState = 3;
         const salesPersonId = 18;
-        let data = {
-            claimStateFk: forbiddenState,
-            observation: 'valid observation'
-        };
         let ctx = {
             req: {
                 accessToken: {
                     userId: salesPersonId
                 }
+            },
+            args: {
+                claimStateFk: forbiddenState,
+                observation: 'valid observation'
             }
         };
-        await app.models.Claim.updateClaim(ctx, newInstance.id, data)
+        await app.models.Claim.updateClaim(ctx, newInstance.id)
             .catch(e => {
                 error = e;
             });
@@ -51,23 +51,23 @@ describe('Update Claim', () => {
     it(`should success to update the claim within privileges `, async() => {
         const correctState = 4;
         const salesPersonId = 18;
-        let data = {
-            observation: 'valid observation',
-            claimStateFk: correctState,
-            hasToPickUp: false
-        };
         let ctx = {
             req: {
                 accessToken: {
                     userId: salesPersonId
                 }
+            },
+            args: {
+                observation: 'valid observation',
+                claimStateFk: correctState,
+                hasToPickUp: false
             }
         };
-        await app.models.Claim.updateClaim(ctx, newInstance.id, data);
+        await app.models.Claim.updateClaim(ctx, newInstance.id);
 
         let claimUpdated = await app.models.Claim.findById(newInstance.id);
 
-        expect(claimUpdated.observation).toEqual(data.observation);
+        expect(claimUpdated.observation).toEqual(ctx.args.observation);
     });
 
     it('should change some sensible fields as salesAssistant', async() => {
@@ -75,28 +75,28 @@ describe('Update Claim', () => {
         spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
 
         const salesAssistantId = 21;
-        let data = {
-            claimStateFk: 3,
-            workerFk: 5,
-            observation: 'another valid observation',
-            hasToPickUp: true
-        };
         const ctx = {
             req: {
                 accessToken: {userId: salesAssistantId},
                 headers: {origin: 'http://localhost'}
+            },
+            args: {
+                claimStateFk: 3,
+                workerFk: 5,
+                observation: 'another valid observation',
+                hasToPickUp: true
             }
         };
         ctx.req.__ = (value, params) => {
             return params.nickname;
         };
-        await app.models.Claim.updateClaim(ctx, newInstance.id, data);
+        await app.models.Claim.updateClaim(ctx, newInstance.id);
 
         let claimUpdated = await app.models.Claim.findById(newInstance.id);
 
-        expect(claimUpdated.observation).toEqual(data.observation);
+        expect(claimUpdated.observation).toEqual(ctx.args.observation);
-        expect(claimUpdated.claimStateFk).toEqual(data.claimStateFk);
+        expect(claimUpdated.claimStateFk).toEqual(ctx.args.claimStateFk);
-        expect(claimUpdated.workerFk).toEqual(data.workerFk);
+        expect(claimUpdated.workerFk).toEqual(ctx.args.workerFk);
         expect(chatModel.sendCheckingPresence).toHaveBeenCalled();
     });
 });

modules/claim/back/methods/claim/updateClaim.js

@@ -1,35 +1,47 @@
 const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
-    Self.remoteMethodCtx('updateClaim', {
+    Self.remoteMethod('updateClaim', {
         description: 'Update a claim with privileges',
-        accessType: 'WRITE',
         accepts: [{
+            arg: 'ctx',
+            type: 'Object',
+            http: {source: 'context'}
+        }, {
             arg: 'id',
-            type: 'number',
+            type: 'Number',
-            required: true,
             description: 'Claim id',
             http: {source: 'path'}
-        }, {
+        },
-            arg: 'data',
+        {
-            type: 'object',
+            arg: 'workerFk',
-            required: true,
+            type: 'Number'
-            description: 'Data to update on the model',
+        },
-            http: {source: 'body'}
+        {
+            arg: 'claimStateFk',
+            type: 'Number'
+        },
+        {
+            arg: 'observation',
+            type: 'String'
+        },
+        {
+            arg: 'hasToPickUp',
+            type: 'boolean'
         }],
         returns: {
             type: 'object',
             root: true
         },
         http: {
-            path: `/:id/updateClaim`,
+            verb: 'patch',
-            verb: 'post'
+            path: `/updateClaim/:id`
         }
     });
 
-    Self.updateClaim = async(ctx, id, data) => {
+    Self.updateClaim = async(ctx, id) => {
         const models = Self.app.models;
         const userId = ctx.req.accessToken.userId;
-
+        const args = ctx.args;
         const $t = ctx.req.__; // $translate
         const claim = await models.Claim.findById(id, {
             include: {
@@ -41,17 +53,20 @@ module.exports = Self => {
                 }
             }
         });
+        let changedHasToPickUp = false;
+        if (args.hasToPickUp)
+            changedHasToPickUp = true;
 
-        const canUpdate = await canChangeState(ctx, claim.claimStateFk);
+        if (args.claimStateFk) {
-        const hasRights = await canChangeState(ctx, data.claimStateFk);
+            const canUpdate = await canChangeState(ctx, claim.claimStateFk);
-        const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant');
+            const hasRights = await canChangeState(ctx, args.claimStateFk);
-        const changedHasToPickUp = claim.hasToPickUp != data.hasToPickUp;
+            const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant');
-
-        if (!canUpdate || !hasRights || changedHasToPickUp && !isSalesAssistant)
-            throw new UserError(`You don't have enough privileges to change that field`);
-
-        const updatedClaim = await claim.updateAttributes(data);
 
+            if (!canUpdate || !hasRights || changedHasToPickUp && !isSalesAssistant)
+                throw new UserError(`You don't have enough privileges to change that field`);
+        }
+        delete args.ctx;
+        const updatedClaim = await claim.updateAttributes(args);
         // Get sales person from claim client
         const salesPerson = claim.client().salesPersonUser();
         if (salesPerson && changedHasToPickUp && updatedClaim.hasToPickUp) {

modules/claim/front/basic-data/index.html

@@ -1,8 +1,7 @@
 <vn-watcher
     vn-id="watcher"
-    url="Claims/{{$ctrl.$params.id}}/updateClaim"
+    url="Claims/updateClaim"
     data="$ctrl.claim"
-    insert-mode="true"
     form="form">
 </vn-watcher>
 <vn-crud-model

modules/item/back/methods/item/specs/getWasteDetail.spec.js

@@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-xdescribe('item getWasteDetail()', () => {
+describe('item getWasteDetail()', () => {
     it('should check for the waste breakdown for every worker', async() => {
         let result = await app.models.Item.getWasteDetail();
 
@@ -14,10 +14,10 @@ xdescribe('item getWasteDetail()', () => {
         expect(result.length).toEqual(3);
         expect(firstBuyer).toEqual('CharlesXavier');
         expect(firstBuyerLines.length).toEqual(4);
-        expect(secondBuyer).toEqual('DavidCharlesHaller');
+        expect(secondBuyer).toEqual('HankPym');
         expect(secondBuyerLines.length).toEqual(3);
 
-        expect(thirdBuyer).toEqual('HankPym');
+        expect(thirdBuyer).toEqual('DavidCharlesHaller');
         expect(thirdBuyerLines.length).toEqual(3);
     });
 });

modules/route/front/tickets/index.html

@@ -31,10 +31,10 @@
                                 model="model">
                             </vn-multi-check>
                         </vn-th>
-                        <vn-th>Order</vn-th>
+                        <vn-th shrink>Order</vn-th>
                         <vn-th number>Ticket</vn-th>
                         <vn-th expand>Client</vn-th>
-                        <vn-th number>Packages</vn-th>
+                        <vn-th shrink>Packages</vn-th>
                         <vn-th number>m³</vn-th>
                         <vn-th>Warehouse</vn-th>
                         <vn-th>Postcode</vn-th>
@@ -50,7 +50,7 @@
                                 ng-model="ticket.checked">
                             </vn-check>
                         </vn-td>
-                        <vn-td number>
+                        <vn-td shrink>
                             <vn-input-number
                                 on-change="$ctrl.setPriority(ticket.id, ticket.priority)"
                                 ng-model="ticket.priority"
@@ -65,15 +65,15 @@
                                 {{ticket.id}}
                             </span>
                         </vn-td>
-                        <vn-td>
+                        <vn-td expand>
                             <span
                                 ng-click="clientDescriptor.show($event, ticket.clientFk)"
                                 class="link">
                                 {{ticket.nickname}}
                             </span>
                         </vn-td>
-                        <vn-td number>{{ticket.packages}}</vn-td>
+                        <vn-td shrink>{{ticket.packages}}</vn-td>
-                        <vn-td number>{{ticket.volume}}</vn-td>
+                        <vn-td number>{{::ticket.volume | number:1}}</vn-td>
                         <vn-td expand>{{ticket.warehouse.name}}</vn-td>
                         <vn-td>{{ticket.address.postalCode}}</vn-td>
                         <vn-td expand title="{{ticket.address.street}}">{{ticket.address.street}}</vn-td>