diff --git a/back/model-config.json b/back/model-config.json index 0a0772b04..537ffb569 100644 --- a/back/model-config.json +++ b/back/model-config.json @@ -32,9 +32,6 @@ "Sip": { "dataSource": "vn" }, - "Route": { - "dataSource": "vn" - }, "Vehicle": { "dataSource": "vn" }, diff --git a/back/models/route.json b/back/models/route.json deleted file mode 100644 index 1bfddd3de..000000000 --- a/back/models/route.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "Route", - "base": "VnModel", - "options": { - "mysql": { - "table": "route" - } - }, - "properties": { - "id": { - "type": "Number", - "id": true, - "description": "Identifier" - }, - "date": { - "type": "date" - } - } -} \ No newline at end of file diff --git a/front/core/components/icon/icon.js b/front/core/components/icon/icon.js index 01087b0c7..1b78f4693 100644 --- a/front/core/components/icon/icon.js +++ b/front/core/components/icon/icon.js @@ -26,7 +26,7 @@ class Icon { Icon.$inject = ['$attrs']; ngModule.component('vnIcon', { - template: '{{::$ctrl.iconContent}}', + template: '{{::$ctrl.iconContent}}', controller: Icon, bindings: { icon: '@' diff --git a/front/core/components/icon/style.scss b/front/core/components/icon/style.scss index bed29630d..07a1584e3 100644 --- a/front/core/components/icon/style.scss +++ b/front/core/components/icon/style.scss @@ -2,6 +2,7 @@ vn-icon { display: inline-block; font-size: 18pt; text-align: center; + outline: 0; & > i, & > i.material-icons { diff --git a/front/core/components/treeview/index.js b/front/core/components/treeview/index.js index a71a3a342..0737bf8cb 100644 --- a/front/core/components/treeview/index.js +++ b/front/core/components/treeview/index.js @@ -23,28 +23,6 @@ export default class Treeview extends Component { }); } - /* hasCheckedChilds(node) { - if (!node.childs) return false; - - const childs = node.childs; - for (let i = 0; i < childs.length; i++) { - if (childs[i].selected || this.hasCheckedChilds(childs[i])) - return true; - } - - return false; - } - - hasCheckedParents(node) { - if (!node.parent) return false; - - const parent = node.parent; - if (parent.selected || this.hasCheckedParents(parent)) - return true; - - return false; - } */ - onSelection(item, value) { this.emit('selection', {item, value}); } @@ -67,12 +45,15 @@ export default class Treeview extends Component { } item.childs = newData.sort((a, b) => { - let priority = (b.isIncluded - a.isIncluded) - 1; + if (b.isIncluded !== a.isIncluded) { + if (a.isIncluded == null) + return 1; + if (b.isIncluded == null) + return -1; + return b.isIncluded - a.isIncluded; + } - if (b.name > a.name) - priority++; - - return priority; + return a.name.localeCompare(b.name); }); }); } diff --git a/modules/agency/back/methods/zone-geo/getLeaves.js b/modules/agency/back/methods/zone-geo/getLeaves.js index 631286465..64bb68318 100644 --- a/modules/agency/back/methods/zone-geo/getLeaves.js +++ b/modules/agency/back/methods/zone-geo/getLeaves.js @@ -116,16 +116,7 @@ module.exports = Self => { const parentNodes = nodes.filter(element => { return element.depth === minorDepth; }); - - const sortedLeaves = parentNodes.sort((a, b) => { - let priority = (b.isIncluded - a.isIncluded) - 1; - - if (b.name > a.name) - priority++; - - return priority; - }); - const leaves = Object.assign([], sortedLeaves); + const leaves = Object.assign([], sortNodes(parentNodes)); nestLeaves(leaves); @@ -143,9 +134,23 @@ module.exports = Self => { && element.depth === parent.depth + 1; }); - return elements; + return sortNodes(elements); } return leaves; }; + + function sortNodes(nodes) { + return nodes.sort((a, b) => { + if (b.isIncluded !== a.isIncluded) { + if (a.isIncluded == null) + return 1; + if (b.isIncluded == null) + return -1; + return b.isIncluded - a.isIncluded; + } + + return a.name.localeCompare(b.name); + }); + } }; diff --git a/modules/client/front/basic-data/locale/es.yml b/modules/client/front/basic-data/locale/es.yml index 34edb5986..7d7722e43 100644 --- a/modules/client/front/basic-data/locale/es.yml +++ b/modules/client/front/basic-data/locale/es.yml @@ -4,7 +4,7 @@ Social name: Razón social Phone: Teléfono Mobile: Móvil Fax: Fax -Email: Correo electrónico +Email: E-mail Salesperson: Comercial Channel: Canal You can save multiple emails: >- diff --git a/modules/client/front/create/locale/es.yml b/modules/client/front/create/locale/es.yml index 5c33aace1..6922ba917 100644 --- a/modules/client/front/create/locale/es.yml +++ b/modules/client/front/create/locale/es.yml @@ -2,7 +2,7 @@ Name: Nombre Tax number: NIF/CIF Business name: Razón social Web user: Usuario Web -Email: Correo electrónico +Email: E-mail Create and edit: Crear y editar You can save multiple emails: >- Puede guardar varios correos electrónicos encadenándolos mediante comas diff --git a/modules/client/front/index/locale/es.yml b/modules/client/front/index/locale/es.yml index 71bd4963a..35c21976c 100644 --- a/modules/client/front/index/locale/es.yml +++ b/modules/client/front/index/locale/es.yml @@ -1,5 +1,5 @@ Client id: Id cliente Phone: Teléfono Town/City: Ciudad -Email: Correo electrónico +Email: E-mail View client: Ver cliente \ No newline at end of file diff --git a/modules/client/front/search-panel/locale/es.yml b/modules/client/front/search-panel/locale/es.yml index 590d0e6d8..93d2faf53 100644 --- a/modules/client/front/search-panel/locale/es.yml +++ b/modules/client/front/search-panel/locale/es.yml @@ -4,5 +4,5 @@ Name: Nombre Social name: Razon social Town/City: Ciudad Postcode: Código postal -Email: Correo electrónico +Email: E-mail Phone: Teléfono \ No newline at end of file diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html index d8b27efe3..54e743845 100644 --- a/modules/order/front/line/index.html +++ b/modules/order/front/line/index.html @@ -36,15 +36,21 @@ - {{row.itemFk | zeroFill:6}} + {{::row.itemFk | zeroFill:6}} - - {{row.warehouse.name}} - {{row.shipped | date: 'dd/MM/yyyy'}} - {{row.quantity}} + + + + + {{::row.warehouse.name}} + {{::row.shipped | date: 'dd/MM/yyyy'}} + {{::row.quantity}} - {{row.price | currency: 'EUR':2}} + {{::row.price | currency: 'EUR':2}} - {{row.itemFk | zeroFill:6}} + {{::row.itemFk | zeroFill:6}} - + + + + {{::row.quantity}} {{::row.price | currency: 'EUR':2}} {{::row.quantity * row.price | currency: 'EUR':2}} diff --git a/modules/order/front/volume/index.html b/modules/order/front/volume/index.html index acc6fd892..359e9e37b 100644 --- a/modules/order/front/volume/index.html +++ b/modules/order/front/volume/index.html @@ -38,7 +38,13 @@ {{::row.itemFk}} - + + + + {{::row.quantity}} {{::row.volume | number:3}} diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html index 165d3addb..9274a4c18 100644 --- a/modules/ticket/front/component/index.html +++ b/modules/ticket/front/component/index.html @@ -48,7 +48,11 @@ - + + {{::sale.quantity}} diff --git a/modules/ticket/front/data/step-two/index.html b/modules/ticket/front/data/step-two/index.html index b4d07a548..e343ad9e9 100644 --- a/modules/ticket/front/data/step-two/index.html +++ b/modules/ticket/front/data/step-two/index.html @@ -15,7 +15,13 @@ {{("000000"+sale.itemFk).slice(-6)}} - + + + + {{::sale.quantity}} {{::sale.price | currency: 'EUR': 2}} {{::sale.component.newPrice | currency: 'EUR': 2}} diff --git a/modules/ticket/front/sale-checked/index.html b/modules/ticket/front/sale-checked/index.html index 89256c95e..3c8a925c2 100644 --- a/modules/ticket/front/sale-checked/index.html +++ b/modules/ticket/front/sale-checked/index.html @@ -30,10 +30,16 @@ - {{sale.itemFk | zeroFill:6}} + {{::sale.itemFk | zeroFill:6}} - + + + + {{::sale.quantity}} diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html index da33b4be1..f166b7882 100644 --- a/modules/ticket/front/sale-tracking/index.html +++ b/modules/ticket/front/sale-tracking/index.html @@ -37,7 +37,13 @@ {{sale.itemFk | zeroFill:6}} - + + + + {{::sale.quantity}} {{::sale.originalQuantity}} diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index 62dc10294..24517d2a6 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -108,7 +108,11 @@ - + + {{sale.quantity}} diff --git a/modules/ticket/front/volume/index.html b/modules/ticket/front/volume/index.html index 4121ec4ab..34de1e470 100644 --- a/modules/ticket/front/volume/index.html +++ b/modules/ticket/front/volume/index.html @@ -38,7 +38,7 @@ {{sale.itemFk | zeroFill:6}} - + {{::sale.quantity}} {{::sale.volume.m3 | number:3}}