From e994cf0e3857e581307229b40b360e0d47075205 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 13 Sep 2017 09:51:57 +0200 Subject: [PATCH 1/5] Exchange rate actualizado --- debian/cron.d | 1 - rest/misc/exchange-rate.php | 11 +++-------- rest/misc/exrate-add.sql | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) 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/rest/misc/exchange-rate.php b/rest/misc/exchange-rate.php index 6cbb6912..ad4e06d8 100755 --- a/rest/misc/exchange-rate.php +++ b/rest/misc/exchange-rate.php @@ -3,7 +3,7 @@ /** * Ejemplo: * - **/ + */ class ExchangeRate extends Vn\Lib\Method { function run ($db) @@ -22,9 +22,9 @@ class ExchangeRate extends Vn\Lib\Method { $xmlDate = new DateTime ($cube['time']); - // Si existen datos más recientes de la máxima fecha los añade + // Si existen datos más recientes de la máxima fecha los añade - if ($maxDate < $xmlDate) + if ($maxDate <= $xmlDate) foreach ($cube->Cube as $subCube) if ($subCube['currency'] == 'USD') { @@ -37,11 +37,6 @@ class ExchangeRate extends Vn\Lib\Method VALUES (2, #date, #rate)', $params ); - $db->query ( - 'REPLACE INTO reference_rate (moneda_id, date, rate) - VALUES (2, TIMESTAMPADD(DAY, 1, #date), #rate)', - $params - ); } } diff --git a/rest/misc/exrate-add.sql b/rest/misc/exrate-add.sql index dec99c25..ada56a9c 100644 --- a/rest/misc/exrate-add.sql +++ b/rest/misc/exrate-add.sql @@ -3,4 +3,4 @@ INSERT INTO reference_rate (moneda_id, date, rate) FROM reference_rate r1 LEFT JOIN reference_rate r2 ON TIMESTAMPADD(DAY, 1, r1.date) = r2.date - WHERE r2.date IS NULL AND r1.date < TIMESTAMPADD (DAY, -1, CURDATE()) + WHERE r2.date IS NULL AND r1.date < TIMESTAMPADD (DAY, -2, CURDATE()) From 2558a6d9bc260e232892edc80dd26ee78a0cf3fb Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 13 Sep 2017 09:52:29 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Versi=C3=B3n=20incrementada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0ecd7ce0..a7ad38bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.9) stable; urgency=low +hedera-web (1.405.10) stable; urgency=low * Initial Release. From eb215274e4ac17ff466351f68a68d80ff87532ed Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 16 Nov 2017 16:14:19 +0100 Subject: [PATCH 3/5] Referenced new i18n tables --- debian/changelog | 2 +- forms/ecomerce/catalog/ui.xml | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index a7ad38bd..714c5b2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.10) stable; urgency=low +hedera-web (1.405.11) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index 64920f5f..6bc8705d 100755 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -71,12 +71,12 @@ CALL bionic_calc (); SELECT a.Id_Article item_id, a.description, b.available, b.price, b.producer, a.Foto, a.Article, a.Categoria, a.Medida, - IF(a.Tallos > 1, a.Tallos, NULL) Tallos, c.str color + IF(a.Tallos > 1, a.Tallos, NULL) Tallos, c.name color FROM tmp.bionic_item b JOIN vn2008.Articles a ON a.Id_Article = b.item_id LEFT JOIN vn2008.producer p ON p.producer_id = a.producer_id - LEFT JOIN vn_locale.color_view c ON c.color_id = a.Color - LEFT JOIN vn_locale.origin_view o ON o.origin_id = a.id_origen + LEFT JOIN vn.inkL10n c ON c.id = a.Color + LEFT JOIN vn.originL10n o ON o.id = a.id_origen WHERE b.available > 0 ORDER BY a.relevancy DESC, a.Article, a.Medida LIMIT 400; @@ -99,9 +99,9 @@ batch="card-batch" on-status-changed-after="onStatusChange"> - SELECT a.description, o.str origin + SELECT a.description, o.name origin FROM vn2008.Articles a - LEFT JOIN vn_locale.origin_view o ON o.origin_id = a.id_origen + LEFT JOIN vn.originL10n o ON o.id = a.id_origen WHERE a.Id_Article = #item @@ -217,9 +217,9 @@ property="model" on-status-changed="refreshTitleColor"> - SELECT r.id, l.str name, r.color + SELECT r.id, l.name, r.color FROM vn2008.reinos r - LEFT JOIN vn_locale.realm_view l ON l.realm_id = r.id + JOIN vn.itemCategoryL10n l ON l.id = r.id WHERE r.display != FALSE ORDER BY name @@ -249,11 +249,11 @@ on-status-changed="refreshTitle"> CALL item_available (); - SELECT DISTINCT t.tipo_id, l.str name + SELECT DISTINCT t.tipo_id, l.name FROM vn2008.Tipos t JOIN vn2008.Articles a ON a.tipo_id = t.tipo_id - LEFT JOIN vn_locale.family_view l ON l.family_id = t.tipo_id JOIN tmp.item_available i ON i.item_id = a.Id_Article + JOIN vn.itemTypeL10n l ON l.id = t.tipo_id WHERE #filter ORDER BY name @@ -271,11 +271,11 @@ CALL item_available (); - SELECT DISTINCT c.Id_Tinta, l.str name + SELECT DISTINCT c.Id_Tinta, l.name FROM vn2008.Tintas c JOIN vn2008.Articles a ON a.Color = c.Id_Tinta JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id - LEFT JOIN vn_locale.color_view l ON l.color_id = c.Id_Tinta + JOIN vn.colorL10n l ON l.id = c.Id_Tinta JOIN tmp.item_available i ON i.item_id = a.Id_Article WHERE #filter ORDER BY name @@ -320,11 +320,11 @@ CALL item_available (); - SELECT DISTINCT o.id, l.str name, o.Abreviatura + SELECT DISTINCT o.id, l.name, o.Abreviatura FROM vn2008.Origen o JOIN vn2008.Articles a ON a.id_origen = o.id JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id - LEFT JOIN vn_locale.origin_view l ON l.origin_id = o.id + JOIN vn.originL10n l ON l.id = o.id JOIN tmp.item_available i ON i.item_id = a.Id_Article WHERE #filter ORDER BY name From c7469fc554f031c2eea3eb0756566a8760faea7f Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 21 Nov 2017 13:14:41 +0100 Subject: [PATCH 4/5] Bugs solved --- debian/changelog | 2 +- forms/ecomerce/catalog/ui.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 714c5b2b..bc91bc6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.11) stable; urgency=low +hedera-web (1.405.12) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index 6bc8705d..5054641e 100755 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -275,7 +275,7 @@ FROM vn2008.Tintas c JOIN vn2008.Articles a ON a.Color = c.Id_Tinta JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id - JOIN vn.colorL10n l ON l.id = c.Id_Tinta + JOIN vn.inkL10n l ON l.id = c.Id_Tinta JOIN tmp.item_available i ON i.item_id = a.Id_Article WHERE #filter ORDER BY name From 7cea5f2cfabe3ba502478a81f3897294e9a5b3cb Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 24 Nov 2017 12:10:52 +0100 Subject: [PATCH 5/5] Idioma y nombre a mostrar configurables --- debian/changelog | 2 +- forms/account/conf/locale/ca.json | 2 ++ forms/account/conf/locale/en.json | 2 ++ forms/account/conf/locale/es.json | 2 ++ forms/account/conf/locale/fr.json | 2 ++ forms/account/conf/locale/pt.json | 2 ++ forms/account/conf/ui.xml | 23 +++++++++++++++++++---- 7 files changed, 30 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index bc91bc6c..b8ed3f2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.12) stable; urgency=low +hedera-web (1.405.13) stable; urgency=low * Initial Release. 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 f2bd29b4..49e8405a 100755 --- a/forms/account/conf/ui.xml +++ b/forms/account/conf/ui.xml @@ -11,7 +11,8 @@ - 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 @@ -47,15 +48,29 @@
- +
- + +
+
+ + +
+
+ + + + + SELECT code, name FROM language WHERE active + + +
- +