diff --git a/debian/cron.d b/debian/cron.d index 8b976597..e95bde6b 100644 --- a/debian/cron.d +++ b/debian/cron.d @@ -5,4 +5,3 @@ MAILTO=webmaster 0 5 * * * root hedera-web.php -m edi/update */1 * * * * root hedera-web.php -m misc/mail 0 5 * * * root hedera-web.php -m misc/exchange-rate -45 14 20 11 * root hedera-web.php -m misc/exchange-rate diff --git a/forms/account/conf/locale/ca.json b/forms/account/conf/locale/ca.json index 86df23d6..abbae588 100755 --- a/forms/account/conf/locale/ca.json +++ b/forms/account/conf/locale/ca.json @@ -4,6 +4,8 @@ ,"Username": "Nom d'usuari" ,"Password": "Contrasenya" ,"Email": "Correu electrònic" + ,"Display name": "Nom a mostrar" + ,"Language": "Idioma" ,"Billing": "Facturació" ,"Receive invoices by email": "Rebre factures per correu electrònic" diff --git a/forms/account/conf/locale/en.json b/forms/account/conf/locale/en.json index 9fa1867c..9c17ba83 100755 --- a/forms/account/conf/locale/en.json +++ b/forms/account/conf/locale/en.json @@ -4,6 +4,8 @@ ,"Username": "Username" ,"Password": "Password" ,"Email": "Email" + ,"Display name": "Display name" + ,"Language": "Language" ,"Billing": "Billing" ,"Receive invoices by email": "Receive invoices by email" diff --git a/forms/account/conf/locale/es.json b/forms/account/conf/locale/es.json index 4a2a95ac..3fada437 100755 --- a/forms/account/conf/locale/es.json +++ b/forms/account/conf/locale/es.json @@ -4,6 +4,8 @@ ,"Username": "Nombre de usuario" ,"Password": "Contraseña" ,"Email": "Correo electrónico" + ,"Display name": "Nombre a mostrar" + ,"Language": "Idioma" ,"Billing": "Facturación" ,"Receive invoices by email": "Recibir facturas por correo electrónico" diff --git a/forms/account/conf/locale/fr.json b/forms/account/conf/locale/fr.json index 009e08d2..893cbbf4 100755 --- a/forms/account/conf/locale/fr.json +++ b/forms/account/conf/locale/fr.json @@ -4,6 +4,8 @@ ,"Username": "Utilisateur" ,"Password": "Mot de passe" ,"Email": "Courriel" + ,"Display name": "Nom à afficher" + ,"Language": "Langage" ,"Billing": "Facturation" ,"Receive invoices by email": "Recevoir des factures par e-mail" diff --git a/forms/account/conf/locale/pt.json b/forms/account/conf/locale/pt.json index 2692b2df..e811a61f 100644 --- a/forms/account/conf/locale/pt.json +++ b/forms/account/conf/locale/pt.json @@ -4,6 +4,8 @@ ,"Username": "Nome de usuario" ,"Password": "Palavra-Passe" ,"Email": "E-Mail" + ,"Display name": "Nome para mostrar" + ,"Language": "Linguagem" ,"Billing": "Facturação" ,"Receive invoices by email": "Receber facturas por e-mail" diff --git a/forms/account/conf/ui.xml b/forms/account/conf/ui.xml index 73b2d8b4..b5730408 100755 --- a/forms/account/conf/ui.xml +++ b/forms/account/conf/ui.xml @@ -1,14 +1,13 @@ - - - SELECT length, nAlpha, nUpper, nDigits, nPunct - FROM account.userPassword - - + + SELECT length, nAlpha, nUpper, nDigits, nPunct + FROM account.userPassword + - SELECT u.id, u.name, u.email, u.recoverPass, c.mail, c.user_id + SELECT u.id, u.name, u.email, u.recoverPass, + u.nickname, u.lang, c.mail, c.user_id FROM account.userView u LEFT JOIN customer_view c ON u.id = c.user_id @@ -38,6 +37,19 @@ +
+ + +
+
+ + + + SELECT code, name FROM language WHERE active + + +
diff --git a/js/hedera/gui.xml b/js/hedera/gui.xml index 86b4824c..13183e92 100755 --- a/js/hedera/gui.xml +++ b/js/hedera/gui.xml @@ -1,7 +1,7 @@ - SELECT name FROM customer_user + SELECT nickname FROM account.userView SELECT default_form, image_dir, image_host FROM config; @@ -24,7 +24,7 @@ -

{{user.name}}

+

{{user.nickname}}