diff --git a/client/client/routes.json b/client/client/routes.json index 173224037..054f95ab9 100644 --- a/client/client/routes.json +++ b/client/client/routes.json @@ -30,7 +30,7 @@ }, "menu": { "description": "Basic data", - "icon": "person" + "icon": "settings" } }, { @@ -54,7 +54,7 @@ }, "menu": { "description": "Pay method", - "icon": "assignment" + "icon": "icon-payment" } }, { @@ -94,7 +94,7 @@ }, "menu": { "description": "Web access", - "icon": "language" + "icon": "cloud" } }, { @@ -186,7 +186,7 @@ "component": "vn-client-invoices", "menu": { "description": "Invoices", - "icon": "insert_drive_file" + "icon": "icon-invoices" } }, { @@ -204,7 +204,7 @@ }, "menu": { "description": "Recovery", - "icon": "credit_card" + "icon": "icon-recovery" } }, { "url": "/create", diff --git a/client/client/src/index/item-client.html b/client/client/src/index/item-client.html index 3daed725e..7ebb6b8f0 100644 --- a/client/client/src/index/item-client.html +++ b/client/client/src/index/item-client.html @@ -14,7 +14,7 @@ + icon="desktop_windows"> diff --git a/client/core/src/styles/fontello-icons.css b/client/core/src/styles/fontello-icons.css index 4a1201de1..03698f3cf 100644 --- a/client/core/src/styles/fontello-icons.css +++ b/client/core/src/styles/fontello-icons.css @@ -1,6 +1,18 @@ -.icon-tags:before { content: '\e800'; } -.icon-tree:before { content: '\e801'; } -.icon-clone2:before { content: '\e802'; } -.icon-preview:before { content: '\e803'; } -.icon-history:before { content: '\f1da'; } \ No newline at end of file +.icon-barcode:before { content: '\e800'; } /* '' */ +.icon-volume:before { content: '\e801'; } /* '' */ +.icon-bucket:before { content: '\e802'; } /* '' */ +.icon-disabled:before { content: '\e80b'; } /* '' */ +.icon-invoices:before { content: '\e80c'; } /* '' */ +.icon-noweb:before { content: '\e812'; } /* '' */ +.icon-payment:before { content: '\e813'; } /* '' */ +.icon-recovery:before { content: '\e815'; } /* '' */ +.icon-risk:before { content: '\e816'; } /* '' */ +.icon-lines:before { content: '\e819'; } /* '' */ +.icon-volum:before { content: '\e81b'; } /* '' */ +.icon-components:before { content: '\e81c'; } /* '' */ +.icon-clone:before { content: '\e81d'; } /* '' */ +.icon-addperson:before { content: '\e81e'; } /* '' */ +.icon-bin:before { content: '\e81f'; } /* '' */ +.icon-sms:before { content: '\e820'; } /* '' */ +.icon-tags:before { content: '\e821'; } /* '' */ \ No newline at end of file diff --git a/client/core/src/styles/fontello.woff2 b/client/core/src/styles/fontello.woff2 index 22d0e459c..eea564017 100644 Binary files a/client/core/src/styles/fontello.woff2 and b/client/core/src/styles/fontello.woff2 differ diff --git a/client/item/routes.json b/client/item/routes.json index ac1c55820..541f9cdf6 100644 --- a/client/item/routes.json +++ b/client/item/routes.json @@ -35,7 +35,7 @@ }, "menu": { "description": "Basic data", - "icon": "folder" + "icon": "settings" }, "acl": ["buyer"] }, @@ -48,7 +48,7 @@ }, "menu": { "description": "Tags", - "icon": "folder" + "icon": "icon-tags" }, "acl": ["buyer"] }, @@ -70,7 +70,7 @@ }, "menu": { "description": "History", - "icon": "folder" + "icon": "history" } }, { @@ -107,7 +107,7 @@ }, "menu": { "description": "Barcode", - "icon": "folder" + "icon": "icon-barcode" }, "acl": ["buyer","replenisher"] },{ diff --git a/client/item/src/list/item-product.html b/client/item/src/list/item-product.html index 0c9eb1739..30663314c 100644 --- a/client/item/src/list/item-product.html +++ b/client/item/src/list/item-product.html @@ -20,12 +20,12 @@ + icon="icon-clone"> + icon="desktop_windows"> diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 1a839a0cb..7ff92e006 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -150,8 +150,8 @@ export default { itemsIndex: { createItemButton: `${components.vnFloatButton}`, searchResult: `vn-item-product a`, - searchResultPreviewButton: `vn-item-product .buttons > [icon="icon-preview"]`, - searchResultCloneButton: `vn-item-product .buttons > [icon="icon-clone2"]`, + searchResultPreviewButton: `vn-item-product .buttons > [icon="desktop_windows"]`, + searchResultCloneButton: `vn-item-product .buttons > [icon="icon-clone"]`, acceptClonationAlertButton: `vn-item-list [vn-id="clone"] [response="ACCEPT"]`, searchItemInput: `${components.vnTextfield}`, searchButton: `${components.vnSearchBar} > vn-icon-button > button`, diff --git a/services/loopback/common/models/client.js b/services/loopback/common/models/client.js index f55d23021..fd12caa37 100644 --- a/services/loopback/common/models/client.js +++ b/services/loopback/common/models/client.js @@ -25,12 +25,6 @@ module.exports = function(Self) { Self.validatesUniquenessOf('socialName', { message: 'La razón social debe ser única' }); - Self.validatesFormatOf('postcode', { - message: 'El código postal solo debe contener números', - allowNull: true, - allowBlank: true, - with: /^\d+$/ - }); Self.validatesFormatOf('email', { message: 'Correo electrónico inválido', allowNull: true,