Merge branch 'dev' into 3003-worker_sections_without_contract_faults

db/export-structure.sh

@@ -3,7 +3,6 @@
 SCHEMAS=(
     account
     bs
-    bi
     cache
     edi
     hedera

loopback/server/datasources.json

@@ -18,13 +18,8 @@
         "acquireTimeout": 20000
     },
     "osticket": {
-        "connector": "vn-mysql",
+        "connector": "memory",
-        "database": "vn",
+        "timezone": "local"
-        "debug": false,
-        "host": "localhost",
-        "port": "3306",
-        "username": "root",
-        "password": "root"
     },
     "tempStorage": {
         "name": "tempStorage",

modules/client/front/balance/create/index.html

@@ -60,7 +60,8 @@
         <vn-horizontal>
             <vn-input-number
                 ng-model="$ctrl.deliveredAmount"
-                label="Delivered amount">
+                label="Delivered amount"
+                step="0.01">
             </vn-input-number>
             <vn-input-number
                 disabled="true"

modules/invoiceOut/back/methods/invoiceOut/filter.js

@@ -10,73 +10,73 @@ module.exports = Self => {
         accepts: [
             {
                 arg: 'filter',
-                type: 'Object',
+                type: 'object',
                 description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
                 http: {source: 'query'}
             },
             {
                 arg: 'search',
-                type: 'String',
+                type: 'string',
                 description: 'Searchs the invoiceOut by id',
                 http: {source: 'query'}
             },
             {
                 arg: 'clientFk',
-                type: 'Integer',
+                type: 'integer',
                 description: 'The client id',
                 http: {source: 'query'}
             },
             {
                 arg: 'fi',
-                type: 'String',
+                type: 'string',
                 description: 'The client fiscal id',
                 http: {source: 'query'}
             },
             {
                 arg: 'hasPdf',
-                type: 'Boolean',
+                type: 'boolean',
                 description: 'Whether the the invoiceOut has PDF or not',
                 http: {source: 'query'}
             },
             {
                 arg: 'amount',
-                type: 'Number',
+                type: 'number',
                 description: 'The amount filter',
                 http: {source: 'query'}
             },
             {
                 arg: 'min',
-                type: 'Number',
+                type: 'number',
                 description: 'The minimun amount flter',
                 http: {source: 'query'}
             },
             {
                 arg: 'max',
-                type: 'Number',
+                type: 'number',
                 description: 'The maximun amount flter',
                 http: {source: 'query'}
             },
             {
                 arg: 'issued',
-                type: 'Date',
+                type: 'date',
                 description: 'The issued date filter',
                 http: {source: 'query'}
             },
             {
                 arg: 'created',
-                type: 'Date',
+                type: 'date',
                 description: 'The created date filter',
                 http: {source: 'query'}
             },
             {
                 arg: 'dued',
-                type: 'Date',
+                type: 'date',
                 description: 'The due date filter',
                 http: {source: 'query'}
             }
         ],
         returns: {
-            type: ['Object'],
+            type: ['object'],
             root: true
         },
         http: {

modules/item/back/methods/item/filter.js

@@ -10,48 +10,57 @@ module.exports = Self => {
         accepts: [
             {
                 arg: 'filter',
-                type: 'Object',
+                type: 'object',
                 description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
-            }, {
+            },
+            {
                 arg: 'tags',
-                type: ['Object'],
+                type: ['object'],
                 description: 'List of tags to filter with',
-            }, {
+            },
+            {
                 arg: 'search',
-                type: 'String',
+                type: 'string',
                 description: `If it's and integer searchs by id, otherwise it searchs by name`,
-            }, {
+            },
+            {
                 arg: 'id',
-                type: 'Integer',
+                type: 'integer',
                 description: 'Item id',
-            }, {
+            },
+            {
                 arg: 'categoryFk',
-                type: 'Integer',
+                type: 'integer',
                 description: 'Category id',
-            }, {
+            },
+            {
                 arg: 'typeFk',
-                type: 'Integer',
+                type: 'integer',
                 description: 'Type id',
-            }, {
+            },
+            {
                 arg: 'isActive',
-                type: 'Boolean',
+                type: 'boolean',
                 description: 'Whether the the item is or not active',
-            }, {
+            },
+            {
                 arg: 'salesPersonFk',
-                type: 'Integer',
+                type: 'integer',
                 description: 'The buyer of the item',
-            }, {
+            },
+            {
                 arg: 'description',
-                type: 'String',
+                type: 'string',
                 description: 'The item description',
-            }, {
+            },
+            {
                 arg: 'stemMultiplier',
-                type: 'Integer',
+                type: 'integer',
                 description: 'The item multiplier',
             }
         ],
         returns: {
-            type: ['Object'],
+            type: ['object'],
             root: true
         },
         http: {
@@ -60,23 +69,28 @@ module.exports = Self => {
         }
     });
 
-    Self.filter = async(ctx, filter) => {
+    Self.filter = async(ctx, filter, options) => {
-        let conn = Self.dataSource.connector;
+        const conn = Self.dataSource.connector;
+        let myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
         let codeWhere;
 
         if (ctx.args.search) {
-            let items = await Self.app.models.ItemBarcode.find({
+            const items = await Self.app.models.ItemBarcode.find({
                 where: {code: ctx.args.search},
                 fields: ['itemFk']
-            });
+            }, myOptions);
-            let itemIds = [];
+            const itemIds = [];
             for (const item of items)
                 itemIds.push(item.itemFk);
 
             codeWhere = {'i.id': {inq: itemIds}};
         }
 
-        let where = buildFilter(ctx.args, (param, value) => {
+        const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
                 return /^\d+$/.test(value)
@@ -90,8 +104,8 @@ module.exports = Self => {
                 return {'i.stemMultiplier': value};
             case 'typeFk':
                 return {'i.typeFk': value};
-            case 'category':
+            case 'categoryFk':
-                return {'ic.name': value};
+                return {'ic.id': value};
             case 'salesPersonFk':
                 return {'it.workerFk': value};
             case 'origin':
@@ -104,7 +118,7 @@ module.exports = Self => {
         });
         filter = mergeFilters(filter, {where});
 
-        let stmts = [];
+        const stmts = [];
         let stmt;
 
         stmt = new ParameterizedSQL(
@@ -173,9 +187,10 @@ module.exports = Self => {
         stmt.merge(conn.makeWhere(filter.where));
         stmt.merge(conn.makePagination(filter));
 
-        let itemsIndex = stmts.push(stmt) - 1;
+        const itemsIndex = stmts.push(stmt) - 1;
-        let sql = ParameterizedSQL.join(stmts, ';');
+        const sql = ParameterizedSQL.join(stmts, ';');
-        let result = await conn.executeStmt(sql);
+        const result = await conn.executeStmt(sql, myOptions);
+
         return itemsIndex === 0 ? result : result[itemsIndex];
     };
 };

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

@@ -2,29 +2,62 @@ const app = require('vn-loopback/server/server');
 
 describe('item filter()', () => {
     it('should return 1 result filtering by id', async() => {
-        let filter = {};
+        const tx = await app.models.Item.beginTransaction({});
-        let result = await app.models.Item.filter({args: {filter: filter, search: 1}});
+        const options = {transaction: tx};
+
+        try {
+            const filter = {};
+            const ctx = {args: {filter: filter, search: 1}};
+            const result = await app.models.Item.filter(ctx, filter, options);
 
             expect(result.length).toEqual(1);
             expect(result[0].id).toEqual(1);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 
     it('should return 1 result filtering by barcode', async() => {
-        let filter = {};
+        const tx = await app.models.Item.beginTransaction({});
-        let result = await app.models.Item.filter({args: {filter: filter, search: 4444444444}});
+        const options = {transaction: tx};
+
+        try {
+            const filter = {};
+            const ctx = {args: {filter: filter, search: 4444444444}};
+            const result = await app.models.Item.filter(ctx, filter, options);
 
             expect(result.length).toEqual(1);
             expect(result[0].id).toEqual(2);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 
     it('should return 2 results using filter and tags', async() => {
-        let filter = {
+        const tx = await app.models.Item.beginTransaction({});
+        const options = {transaction: tx};
+
+        try {
+            const filter = {
                 order: 'isActive ASC, name',
                 limit: 8
             };
-        let tags = [{value: 'medical box', tagFk: 58}];
+            const tags = [{value: 'medical box', tagFk: 58}];
-        let result = await app.models.Item.filter({args: {filter: filter, typeFk: 5, tags: tags}});
+            const ctx = {args: {filter: filter, typeFk: 5, tags: tags}};
+            const result = await app.models.Item.filter(ctx, filter, options);
 
             expect(result.length).toEqual(2);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 });

print/templates/reports/driver-route/driver-route.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html v-bind:lang="$i18n.locale">
-    <body>
+<body>
     <table class="grid">
         <tbody>
             <tr>
@@ -91,6 +91,7 @@
                                                 <th width="50%">{{$t('client')}}</th>
                                                 <th class="number">{{$t('address')}}</th>
                                                 <th class="number">{{$t('packages')}}</th>
+                                                <th>{{$t('packagingType')}}</th>
                                             </tr>
                                         </thead>
                                         <tbody>
@@ -99,12 +100,14 @@
                                                 <td class="number">{{ticket.id}}</td>
                                                 <td width="50%">{{ticket.clientFk}} {{ticket.addressName}}</td>
                                                 <td v-if="ticket.addressFk" class="number">
-                                                        {{ticket.addressFk.toString().substr(0, ticket.addressFk.toString().length - 3)}}
+                                                    {{ticket.addressFk.toString().substr(0,
+                                                    ticket.addressFk.toString().length - 3)}}
                                                     <span class="black-container">
                                                         {{ticket.addressFk.toString().substr(-3, 3)}}
                                                     </span>
                                                 </td>
                                                 <td class="number">{{ticket.packages}}</td>
+                                                <td>{{ticket.itemPackingTypes}}</td>
                                             </tr>
                                         </tbody>
                                     </table>
@@ -159,5 +162,5 @@
             </tr>
         </tbody>
     </table>
-    </body>
+</body>
 </html>

print/templates/reports/driver-route/driver-route.js

@@ -30,7 +30,7 @@ module.exports = {
             return this.rawSqlFromDef('routes', [routesId]);
         },
         fetchTickets(routesId) {
-            return this.rawSqlFromDef('tickets', [routesId]);
+            return this.rawSqlFromDef('tickets', [routesId, routesId]);
         }
     },
     components: {

print/templates/reports/driver-route/locale/es.yml

@@ -10,6 +10,7 @@ order: Orden
 client: Cliente
 address: Consignatario
 packages: Bultos
+packagingType: Encajado
 street: Dirección
 postcode: Código Postal
 city: Ciudad

print/templates/reports/driver-route/sql/tickets.sql

@@ -18,7 +18,8 @@ SELECT
     am.name ticketAgency,
     tob.description,
     s.shipFk,
-    u.nickName salesPersonName
+    u.nickName salesPersonName,
+    ipkg.itemPackingTypes
 FROM route r
     LEFT JOIN ticket t ON t.routeFk = r.id
     LEFT JOIN address a ON a.id = t.addressFk
@@ -30,5 +31,15 @@ FROM route r
     LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
     LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
     LEFT JOIN stowaway s ON s.id = t.id
-WHERE r.id IN(?)
+    LEFT JOIN (
-ORDER BY t.priority, t.id
+        SELECT t.id AS ticketFk, 
+               GROUP_CONCAT(DISTINCT(i.itemPackingTypeFk)) AS itemPackingTypes
+        FROM route r
+            JOIN ticket t ON t.routeFk = r.id
+            JOIN sale s ON s.ticketFk = t.id
+            JOIN item i ON i.id = s.itemFk
+        WHERE r.id IN (?)
+        GROUP BY t.id
+    ) ipkg ON ipkg.ticketFk = t.id
+WHERE r.id IN (?)
+ORDER BY t.priority, t.id;

print/templates/reports/receipt/sql/receipt.sql

@@ -1,9 +1,11 @@
 SELECT 
     r.id, 
     r.amountPaid, 
-    r.amountUnpaid, 
+    cr.amount AS amountUnpaid, 
     r.payed, 
     r.companyFk
 FROM receipt r
     JOIN client c ON c.id = r.clientFk
+    JOIN vn.clientRisk cr ON cr.clientFk = c.id
+        AND cr.companyFk = r.companyFk
 WHERE r.id = ?