diff --git a/debian/changelog b/debian/changelog index 026d8642..754a470c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.211-deb8) stable; urgency=low +hedera-web (1.212-deb8) stable; urgency=low * Initial Release. diff --git a/web/forms/admin/photos/ui.xml b/web/forms/admin/photos/ui.xml index adb49a48..c0b67e9f 100755 --- a/web/forms/admin/photos/ui.xml +++ b/web/forms/admin/photos/ui.xml @@ -33,7 +33,7 @@ - diff --git a/web/forms/ecomerce/invoices/download.php b/web/forms/ecomerce/invoices/download.php new file mode 100644 index 00000000..986bc458 --- /dev/null +++ b/web/forms/ecomerce/invoices/download.php @@ -0,0 +1,36 @@ +getValue ($query, ['invoice' => (int) $_GET['invoice']]); + + if (!$pdfPath) + throw new Exception (s('Invoice id not found')); + + Vn\Web\printFile ($pdfPath); +} +catch (Exception $e) +{ + error_log ($e->getMessage ()); + header ('HTTP/1.0 500 Internal Server Error'); +} + +Web::deinit (); + +?> diff --git a/web/forms/ecomerce/invoices/get-invoice-path.sql b/web/forms/ecomerce/invoices/get-invoice-path.sql new file mode 100644 index 00000000..1a64cc0e --- /dev/null +++ b/web/forms/ecomerce/invoices/get-invoice-path.sql @@ -0,0 +1,5 @@ + +SELECT CONCAT_WS('/', c.pdfs_dir, invoice_get_path (#invoice)) + FROM config c + JOIN invoice_view i + WHERE i.invoice_id = #invoice; diff --git a/web/forms/ecomerce/invoices/invoices.js b/web/forms/ecomerce/invoices/invoices.js new file mode 100755 index 00000000..456ed352 --- /dev/null +++ b/web/forms/ecomerce/invoices/invoices.js @@ -0,0 +1,17 @@ + +Vn.Invoices = new Class +({ + Extends: Vn.Module + + ,activate: function () {} + + ,onDownloadClick: function (column, invoiceId) + { + if (!invoiceId) + return; + + var url = '//www.verdnatura.es/hedera-web/forms/ecomerce/invoices/download.php?invoice='+ invoiceId; + window.open (url, '_blank'); + } +}); + diff --git a/web/forms/ecomerce/invoices/style.css b/web/forms/ecomerce/invoices/style.css new file mode 100755 index 00000000..35acf384 --- /dev/null +++ b/web/forms/ecomerce/invoices/style.css @@ -0,0 +1,14 @@ +.invoices +{ + padding: 1em; +} +.invoices .box +{ + max-width: 40em; +} +.invoices .box > .header, +.invoices .htk-grid > thead > tr +{ + background-color: #3F51B6; +} + diff --git a/web/forms/ecomerce/invoices/ui.xml b/web/forms/ecomerce/invoices/ui.xml new file mode 100755 index 00000000..74c0c392 --- /dev/null +++ b/web/forms/ecomerce/invoices/ui.xml @@ -0,0 +1,27 @@ + +
+
+
+

Invoices

+
+
+ + + SELECT invoice_id, serial_num, issued, amount + FROM invoice_view + ORDER BY issued DESC + LIMIT 100 + + + + + + +
+
+
+ diff --git a/web/image/download.svg b/web/image/download.svg new file mode 100644 index 00000000..727573e8 --- /dev/null +++ b/web/image/download.svg @@ -0,0 +1,169 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + + diff --git a/web/locale/ca/forms/ecomerce/invoices.json b/web/locale/ca/forms/ecomerce/invoices.json new file mode 100755 index 00000000..139e621e --- /dev/null +++ b/web/locale/ca/forms/ecomerce/invoices.json @@ -0,0 +1,8 @@ +{ + "Invoices": "Factures" + + ,"Serial": "Sèrie" + ,"Date": "Data" + ,"Import": "Import" + ,"Donwload PDF": "Descarregar PDF" +} diff --git a/web/locale/ca/js/vn.js b/web/locale/ca/js/vn.js index 34941c3a..801faee8 100755 --- a/web/locale/ca/js/vn.js +++ b/web/locale/ca/js/vn.js @@ -49,7 +49,6 @@ Vn.Locale.add ,"Remember": "Recordar" ,"Enter": "Entrar" ,"Exit": "Sortir" - ,"Menu": "Menú" ,"ErrorLoadingForm": "Error al carregar formulari" ,"YoureVisitor": "Solament estàs de visita?" ,"NewVersionAvailable": "Hi ha una nova actualització, la pàgina recargargará automàticament per descarregar-la" @@ -58,23 +57,30 @@ Vn.Locale.add ,"ReturnToOldWebsite": "Web antiga" ,"TestTheNewWebsite": "Prova la nova web!" + ,"Menu": "Menú" + ,"Home": "Inici" ,"Orders": "Encàrrecs" + ,"Basket": "Cistella" + ,"Last orders": "Últims comandes" + ,"Invoices": "Factures" ,"Catalog": "Catàleg" - ,"Training": "Formació" - ,"Configuration": "Configuració" - ,"Account": "Compte" - ,"Adresses": "Direccions" ,"About": "Coneix-nos" - ,"Why": "Per què?" + ,"About us": "Quant a" + ,"Why": "Per què?" ,"Location": "Localització" ,"Administration": "Administració" - ,"Users": "Usuaris" - ,"Visits": "Visites" - ,"Photos": "Fotos" - ,"Agencies": "Agències" - ,"News": "Noticies" + ,"Control panel": "Panell de control" + ,"Users": "Usuaris" + ,"Visits": "Visites" + ,"News": "Noticies" + ,"Photos": "Fotos" ,"Contact": "Vull ser client" + ,"Training": "Formació" + ,"Agencies": "Agències" + ,"Configuration": "Configuració" + ,"Account": "Compte" + ,"Addresses": "Direccions" ,"SessionExpired": "Has estat massa temps inactiu i la sessió ha expirat." ,"InvalidLogin": "Usuari o contrasenya incorrectes. Recorda que s'hi distingeix entre majúscula i minúscula." diff --git a/web/locale/es/forms/ecomerce/invoices.json b/web/locale/es/forms/ecomerce/invoices.json new file mode 100755 index 00000000..059af357 --- /dev/null +++ b/web/locale/es/forms/ecomerce/invoices.json @@ -0,0 +1,8 @@ +{ + "Invoices": "Facturas" + + ,"Serial": "Serie" + ,"Date": "Fecha" + ,"Import": "Importe" + ,"Download PDF": "Descargar PDF" +} diff --git a/web/locale/es/js/vn.js b/web/locale/es/js/vn.js index db49c6f9..e0a85c0b 100755 --- a/web/locale/es/js/vn.js +++ b/web/locale/es/js/vn.js @@ -49,7 +49,6 @@ Vn.Locale.add ,"Remember": "Recordar" ,"Enter": "Entrar" ,"Exit": "Salir" - ,"Menu": "Menú" ,"ErrorLoadingForm": "Error al cargar formulario" ,"YoureVisitor": "¿Solo estás de visita?" ,"NewVersionAvailable": "Hay una nueva actualización, la página se recargargará automaticamente para descargarla" @@ -58,23 +57,30 @@ Vn.Locale.add ,"ReturnToOldWebsite": "Web antigua" ,"TestTheNewWebsite": "¡Prueba la nueva web!" + ,"Menu": "Menú" + ,"Home": "Inicio" ,"Orders": "Pedidos" + ,"Basket": "Cesta" + ,"Last orders": "Últimos pedidos" + ,"Invoices": "Facturas" ,"Catalog": "Catálogo" - ,"Training": "Formación" - ,"Configuration": "Configuración" - ,"Account": "Cuenta" - ,"Adresses": "Direcciones" ,"About": "Conócenos" - ,"Why": "¿Por qué?" + ,"About us": "Sobre nosotros" + ,"Why": "¿Por qué?" ,"Location": "Localización" ,"Administration": "Administración" - ,"Users": "Usuarios" - ,"Visits": "Visitas" - ,"Photos": "Fotos" - ,"Agencies": "Agencias" - ,"News": "Noticias" + ,"Control panel": "Panel de control" + ,"Users": "Usuarios" + ,"Visits": "Visitas" + ,"News": "Noticias" + ,"Photos": "Fotos" ,"Contact": "Quiero ser cliente" + ,"Training": "Formación" + ,"Agencies": "Agencias" + ,"Configuration": "Configuración" + ,"Account": "Cuenta" + ,"Addresses": "Direcciones" ,"SessionExpired": "Has estado demasiado tiempo inactivo y la sesión ha expirado." ,"InvalidLogin": "Usuario o contraseña incorrectos. Recuerda que se hace distinción entre mayúsculas y minúsculas." diff --git a/web/locale/fr/forms/ecomerce/invoices.json b/web/locale/fr/forms/ecomerce/invoices.json new file mode 100755 index 00000000..62a04a0a --- /dev/null +++ b/web/locale/fr/forms/ecomerce/invoices.json @@ -0,0 +1,8 @@ +{ + "Invoices": "Factures" + + ,"Serial": "Série" + ,"Date": "Date" + ,"Import": "Montant" + ,"Donwload PDF": "Télécharger le PDF" +} diff --git a/web/locale/fr/js/vn.js b/web/locale/fr/js/vn.js index 069fb925..aa43f38d 100755 --- a/web/locale/fr/js/vn.js +++ b/web/locale/fr/js/vn.js @@ -49,7 +49,6 @@ Vn.Locale.add ,"Remember": "Rappeler" ,"Enter": "entrer" ,"Exit": "Laisser" - ,"Menu": "Menu" ,"ErrorLoadingForm": "Forme erreur de chargement" ,"YoureVisitor": "¿Solo estás de visita?" ,"NewVersionAvailable": "Il ya une nouvelle mise à jour, la page sera automatiquement recargargará pour télécharger" @@ -58,23 +57,30 @@ Vn.Locale.add ,"ReturnToOldWebsite": "Ancien site web" ,"TestTheNewWebsite": "Testez le nouveau site!" + ,"Menu": "Menu" + ,"Home": "Accueil" ,"Orders": "Commandes" + ,"Basket": "Panier" + ,"Last orders": "Dernières commandes" + ,"Invoices": "Facturas" ,"Catalog": "Catalogue" - ,"Training": "Formation" - ,"Configuration": "Configuration" - ,"Account": "Compte" - ,"Adresses": "Adresses" ,"About": "Nous" - ,"Why": "Pourquoi?" + ,"About us": "A propos de nous" + ,"Why": "Pourquoi?" ,"Location": "Emplacement" ,"Administration": "Administration" - ,"Users": "Utilisateurs" - ,"Visits": "Visites" - ,"Photos": "Photos" - ,"Agencies": "Agences" - ,"News": "Nouvelles" + ,"Control panel": "Panneau de contrôle" + ,"Users": "Utilisateurs" + ,"Visits": "Visites" + ,"News": "Nouvelles" + ,"Photos": "Photos" ,"Contact": "Je veux être client" + ,"Training": "Formation" + ,"Agencies": "Agences" + ,"Configuration": "Configuration" + ,"Account": "Compte" + ,"Addresses": "Adresses" ,"SessionExpired": "Il a eu le temps de trop paresseux et votre session a expiré." ,"InvalidLogin": "Utilisateur ou mot de passe incorrect. N'oubliez pas de distinction entre majuscules et minuscules." diff --git a/web/pages/version-menu/html.php b/web/pages/version-menu/html.php index a0b2a5f2..d63868d2 100755 --- a/web/pages/version-menu/html.php +++ b/web/pages/version-menu/html.php @@ -12,7 +12,7 @@

- +

@@ -26,7 +26,7 @@

- +

diff --git a/web/pages/web/mobile.css b/web/pages/web/mobile.css index 9b95ca78..6b2c72fc 100755 --- a/web/pages/web/mobile.css +++ b/web/pages/web/mobile.css @@ -20,3 +20,7 @@ ul.submenu background-color: white; box-shadow: none; } +.htk-toast +{ + margin-left: -11em; +} diff --git a/web/pages/web/style.css b/web/pages/web/style.css index 5cecfaf0..ca2ad951 100755 --- a/web/pages/web/style.css +++ b/web/pages/web/style.css @@ -275,4 +275,8 @@ ul.submenu a left: 15em; overflow: auto; } +.htk-toast +{ + margin-left: -3em; +}