Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive

modules/client/back/methods/client/specs/updateAddress.spec.js

@@ -49,7 +49,6 @@ describe('Address updateAddress', () => {
             error = e;
         }
 
-        expect(error).toBeDefined();
         expect(error.message).toEqual('Incoterms is required for a non UEE member');
     });
 
@@ -73,7 +72,6 @@ describe('Address updateAddress', () => {
             error = e;
         }
 
-        expect(error).toBeDefined();
         expect(error.message).toEqual('Customs agent is required for a non UEE member');
     });
 
@@ -106,7 +104,9 @@ describe('Address updateAddress', () => {
 
     it('should return an error for a user without enough privileges', async() => {
         const tx = await models.Client.beginTransaction({});
-        const employeeId = 1;
+
+        let error;
+
         try {
             const options = {transaction: tx};
             ctx.req.accessToken.userId = employeeId;
@@ -141,8 +141,10 @@ describe('Address updateAddress', () => {
             expect(address.isLogifloraAllowed).toEqual(true);
 
             await tx.rollback();
+            ctx.req.accessToken.userId = employeeId;
         } catch (e) {
             await tx.rollback();
+            ctx.req.accessToken.userId = employeeId;
             throw e;
         }
     });

modules/client/back/methods/client/updateAddress.js

@@ -89,11 +89,12 @@ module.exports = function(Self) {
         const args = ctx.args;
         const userId = ctx.req.accessToken.userId;
         const myOptions = {};
-        const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant', myOptions);
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
+        const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant', myOptions);
+
         if (args.isLogifloraAllowed && !isSalesAssistant)
             throw new UserError(`You don't have enough privileges`);
 

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

@@ -1,12 +1,11 @@
-const models = require('vn-loopback/server/server').models;
+const {models} = require('vn-loopback/server/server');
-
 describe('item lastEntriesFilter()', () => {
-    const minDate = new Date(value);
+    it('should return one entry for the given item', async() => {
-    minHour.setHours(0, 0, 0, 0);
+        const minDate = new Date();
-    const maxDate = new Date(value);
+        minDate.setHours(0, 0, 0, 0);
-    maxHour.setHours(23, 59, 59, 59);
+        const maxDate = new Date();
+        maxDate.setHours(23, 59, 59, 59);
 
-    it('should return one entry for a given item', async() => {
         const tx = await models.Item.beginTransaction({});
         const options = {transaction: tx};
 
@@ -23,13 +22,18 @@ describe('item lastEntriesFilter()', () => {
         }
     });
 
-    it('should return five entries for a given item', async() => {
+    it('should return five entries for the given item', async() => {
+        const minDate = new Date();
+        minDate.setHours(0, 0, 0, 0);
+        minDate.setMonth(minDate.getMonth() - 2, 1);
+
+        const maxDate = new Date();
+        maxDate.setHours(23, 59, 59, 59);
+
         const tx = await models.Item.beginTransaction({});
         const options = {transaction: tx};
 
         try {
-            minDate.setMonth(minDate.getMonth() - 2, 1);
-
             const filter = {where: {itemFk: 1, landed: {between: [minDate, maxDate]}}};
             const result = await models.Item.lastEntriesFilter(filter, options);
 

modules/monitor/back/methods/sales-monitor/salesFilter.js

@@ -304,7 +304,7 @@ module.exports = Self => {
                 {'tp.hasTicketRequest': true},
                 {'tp.hasComponentLack': true},
                 {'tp.isTaxDataChecked': false},
-                {'tp.isAvailable': false}
+                {'tp.itemShortage': {neq: null}}
             ]};
         } else if (hasProblems === false) {
             whereProblems = {and: [
@@ -313,7 +313,7 @@ module.exports = Self => {
                 {'tp.hasTicketRequest': false},
                 {'tp.hasComponentLack': false},
                 {'tp.isTaxDataChecked': true},
-                {'tp.isAvailable': true}
+                {'tp.itemShortage': null}
             ]};
         }
 

modules/monitor/front/index/tickets/index.html

@@ -98,8 +98,8 @@
                                 icon="icon-buyrequest">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.isAvailable === 0"
+                                ng-show="::ticket.itemShortage"
-                                translate-attr="{title: 'Not available'}"
+                                translate-attr="{title: 'Not visible'}"
                                 class="bright"
                                 icon="icon-unavailable">
                             </vn-icon>

modules/route/back/methods/route/getSuggestedTickets.js

@@ -59,6 +59,12 @@ module.exports = Self => {
                         fields: ['id', 'name']
                     }
                 },
+                {
+                    relation: 'agencyMode',
+                    scope: {
+                        fields: ['id', 'name']
+                    }
+                },
                 {
                     relation: 'address',
                     scope: {

modules/route/front/locale/en.yml

@@ -0,0 +1 @@
+Unlink zone: Unlink zone {{zoneName}} from agency {{agencyName}}

modules/route/front/locale/es.yml

@@ -2,3 +2,4 @@ Routes: Rutas
 Search routes by id: Buscar rutas por identificador
 New route: Nueva ruta
 route: ruta
+Unlink zone: Desvincular zona {{zoneName}} de agencia {{agencyName}}

modules/route/front/ticket-popup/index.html

@@ -33,7 +33,7 @@
                     </vn-th>
                     <vn-th expand>PC</vn-th>
                     <vn-th>Address</vn-th>
-                    <vn-th shrink>Warehouse</vn-th>
+                    <vn-th shrink>Zone</vn-th>
                 </vn-tr>
             </vn-thead>
             <vn-tbody>
@@ -62,7 +62,7 @@
                         <vn-icon-button
                             icon="link_off"
                             class="pointer"
-                            translate-attr="{title: 'Unlink zone: {{::ticket.zone.name}} from agency: {{::ticket.agencyMode.name}}'}"
+                            title="{{'Unlink zone' | translate: {zoneName: ticket.zone.name, agencyName: ticket.agencyMode.name} }}"
                             ng-click="unlinkZoneConfirmation.show(ticket)">
                         </vn-icon-button>
                     </vn-td>
@@ -76,4 +76,9 @@
         question="{{$ctrl.confirmationMessage}}"
         message="Unlink selected zone?">
     </vn-confirm>
+    <vn-ticket-descriptor-popover  vn-id="ticket-descriptor">
+    </vn-ticket-descriptor-popover>
+    <vn-client-descriptor-popover vn-id="client-descriptor">
+    </vn-client-descriptor-popover>
 </tpl-body>
+

modules/ticket/back/methods/ticket/filter.js

@@ -324,7 +324,7 @@ module.exports = Self => {
         case true:
             condition = `or`;
             hasProblem = true;
-            range = 0;
+            range = {neq: null};
             hasWhere = true;
             break;
 
@@ -340,7 +340,7 @@ module.exports = Self => {
             {'tp.isFreezed': hasProblem},
             {'tp.risk': hasProblem},
             {'tp.hasTicketRequest': hasProblem},
-            {'tp.isAvailable': range}
+            {'tp.itemShortage': range}
         ]};
 
         if (hasWhere)

modules/ticket/back/methods/ticket/getSales.js

@@ -94,7 +94,7 @@ module.exports = Self => {
             sale.visible = itemStock.visible;
             sale.claim = claimedSales.get(sale.id);
             if (problems) {
-                sale.isAvailable = problems.isAvailable;
+                sale.itemShortage = problems.itemShortage;
                 sale.hasTicketRequest = problems.hasTicketRequest;
                 sale.hasComponentLack = problems.hasComponentLack;
             }

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

@@ -39,7 +39,7 @@ describe('ticket filter()', () => {
             const filter = {};
             const result = await models.Ticket.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toEqual(6);
 
             await tx.rollback();
         } catch (e) {

modules/ticket/front/index/index.html

@@ -52,8 +52,8 @@
                             icon="icon-buyrequest">
                         </vn-icon>
                         <vn-icon
-                            ng-show="::ticket.isAvailable === 0"
+                            ng-show="::ticket.itemShortage"
-                            translate-attr="{title: 'Not available'}"
+                            translate-attr="{title: 'Not visible'}"
                             class="bright"
                             icon="icon-unavailable">
                         </vn-icon>

modules/ticket/front/index/locale/es.yml

@@ -1,6 +1,7 @@
 Weekly tickets: Tickets programados
 Go to lines: Ir a lineas
 Not available: No disponible
+Not visible: No visible
 Payment on account...: Pago a cuenta...
 Set as delivered and open delivery note(s): Marcar como servido/s y abrir albarán/es
 Closure: Cierre

modules/ticket/front/sale/index.html

@@ -95,8 +95,8 @@
                             translate-attr="{title: 'Reserved'}">
                         </vn-icon>
                         <vn-icon
-                            ng-show="::sale.isAvailable === 0"
+                            ng-show="::sale.itemShortage"
-                            translate-attr="{title: 'Not available'}"
+                            translate-attr="{title: 'Not visible'}"
                             class="bright"
                             icon="icon-unavailable">
                         </vn-icon>

modules/ticket/front/summary/index.html

@@ -157,8 +157,8 @@
                                 translate-attr="{title: 'Reserved'}">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::sale.isAvailable === 0"
+                                ng-show="::sale.itemShortage"
-                                translate-attr="{title: 'Not available'}"
+                                translate-attr="{title: 'Not visible'}"
                                 class="bright"
                                 icon="icon-unavailable">
                             </vn-icon>