Merge branch 'dev' of https://git.verdnatura.es/salix into dev

client/salix/src/components/main-menu/main-menu.html

@@ -1,14 +1,5 @@
 <div style="position: fixed; top: 0; right: 0; padding: .8em 1.5em; z-index: 10;">
     <vn-icon icon="apps" id="apps" translate-attr="{title: 'Applications'}"></vn-icon>
-    <ul for="langs" class="mdl-menu mdl-js-menu mdl-menu--bottom-right" pad-small>
-        <li
-            ng-repeat="lang in ::$ctrl.langs"
-            class="mdl-menu__item"
-            ng-click="$ctrl.onChangeLangClick(lang)">
-            <span>{{::lang}}</span>
-        </li>
-    </ul>
-    <vn-icon icon="language" id="langs" translate-attr="{title: 'Change language'}"></vn-icon>
     <ul for="apps" class="mdl-menu mdl-js-menu mdl-menu--bottom-right" pad-small>
         <li ng-repeat="mod in ::$ctrl.modules" class="mdl-menu__item" ui-sref="{{::mod.route.state}}">
             <vn-icon ng-if="::mod.icon && !mod.icon.startsWith('/')" icon="{{::mod.icon}}"></vn-icon>
@@ -16,6 +7,16 @@
             <span translate="{{::mod.name}}"></span>
         </li>
     </ul>
+    <vn-icon id="lang-button" icon="language" translate-attr="{title: 'Change language'}"></vn-icon>
+    <ul id="langs" for="lang-button" class="mdl-menu mdl-js-menu mdl-menu--bottom-right" pad-small>
+        <li
+            ng-repeat="lang in ::$ctrl.langs"
+            name="{{::lang}}"
+            class="mdl-menu__item"
+            ng-click="$ctrl.onChangeLangClick(lang)">
+            <span>{{::lang}}</span>
+        </li>
+    </ul>
     <vn-icon icon="exit_to_app" translate-attr="{title: 'Logout'}" ng-click="$ctrl.onLogoutClick()"></vn-icon>
 <!--
     TODO: Keep it commented until they are functional

e2e/helpers/extensions.js

@@ -128,17 +128,17 @@ Nightmare.action('waitForTextInElement', function(selector, name, done) {
 });
 
 Nightmare.action('changeLanguageToEnglish', function(done) {
-    this.wait(selectors.globalItems.languageButton)
+    this.wait('#lang-button')
     .evaluate(selector => {
         return document.querySelector(selector).title;
-    }, selectors.globalItems.languageButton)
+    }, '#lang-button')
-    .then(result => {
+    .then(title => {
-        if (result === 'Cambiar idioma') {
+        if (title === 'Change language') {
-            this.click(selectors.globalItems.languageButton)
-            .then(done);
-        }
-        if (result === 'Change language') {
             this.then(done);
+        } else {
+            this.click('#lang-button')
+            .click('#langs > li[name="en"]')
+            .then(done);
         }
     });
 });

e2e/helpers/selectors.js

@@ -10,7 +10,6 @@ export default {
     globalItems: {
         topBar: `${components.vnTopbar}`,
         logOutButton: `${components.vnIcon}[icon="exit_to_app"]`,
-        languageButton: `${components.vnIcon}[icon="language"]`,
         snackbarIsActive: '.mdl-snackbar--active > .mdl-snackbar__text',
         applicationsMenuButton: `${components.vnIcon}[icon="apps"]`,
         applicationsMenuVisible: `${components.vnMainMenu} .is-visible > div`,

gulpfile.js

@@ -52,7 +52,7 @@ gulp.task('services', async () => {
 });
 
 /**
- * Starts all backend services.
+ * Starts backend services.
  */
 gulp.task('services-only', async () => {
     const services = await getServices();

services/loopback/common/locale/en.json

@@ -4,5 +4,6 @@
 	"Unable to mark the equivalence surcharge": "Unable to mark the equivalence surcharge",
 	"The default consignee can not be unchecked": "The default consignee can not be unchecked",
 	"Unable to default a disabled consignee": "Unable to default a disabled consignee",
-	"El método de pago seleccionado requiere que se especifique el IBAN": "El método de pago seleccionado requiere que se especifique el IBAN"
+	"El método de pago seleccionado requiere que se especifique el IBAN": "El método de pago seleccionado requiere que se especifique el IBAN",
+	"Ya existe un usuario con ese nombre": "Ya existe un usuario con ese nombre"
 }