From 4b015714c083641aabef7b7ece3df179fce425aa Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 17 Nov 2015 11:34:33 +0100 Subject: [PATCH] =?UTF-8?q?Traducciones=20actualizadas,=20m=C3=A1s=20funci?= =?UTF-8?q?onalidad=20para=20informes,=20archivos=20obsoletos=20eliminados?= =?UTF-8?q?=20del=20proyecto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/address-list/address-list.js | 2 +- web/forms/account/address/address.js | 2 +- web/forms/account/conf/conf.js | 2 +- web/forms/account/conf/ui.xml | 24 +- web/forms/admin/access-log/access-log.js | 2 +- web/forms/admin/items/items.js | 23 + web/forms/admin/items/style.css | 44 + web/forms/admin/items/ui.xml | 48 + web/forms/admin/links/links.js | 2 +- web/forms/admin/links/ui.xml | 8 +- web/forms/admin/photos/photos.js | 2 +- web/forms/admin/shelves/shelves.js | 2 +- web/forms/admin/shelves/ui.xml | 36 +- web/forms/admin/users/users.js | 2 +- web/forms/admin/visits/visits.js | 2 +- web/forms/agencies/packages/packages.js | 2 +- web/forms/agencies/packages/ui.xml | 4 +- web/forms/agencies/provinces/provinces.js | 2 +- web/forms/agencies/provinces/ui.xml | 15 +- web/forms/cms/about/about.js | 2 +- web/forms/cms/contact/contact.js | 2 +- web/forms/cms/home/home.js | 2 +- web/forms/cms/location/location.js | 2 +- web/forms/cms/training/training.js | 2 +- web/forms/cms/why/why.js | 2 +- web/forms/ecomerce/basket/basket.js | 2 +- web/forms/ecomerce/basket/ui.xml | 14 +- web/forms/ecomerce/catalog/catalog.js | 91 +- web/forms/ecomerce/catalog/style.css | 13 + web/forms/ecomerce/catalog/ui.xml | 218 +++-- web/forms/ecomerce/checkout/checkout.js | 2 +- web/forms/ecomerce/confirm/confirm.js | 2 +- web/forms/ecomerce/confirm/ui.xml | 42 +- web/forms/ecomerce/invoices/invoices.js | 2 +- web/forms/ecomerce/orders/orders.js | 2 +- web/forms/ecomerce/ticket/ticket.js | 2 +- web/forms/ecomerce/ticket/ui.xml | 46 +- web/forms/news/new/new.js | 2 +- web/forms/news/news/news.js | 2 +- web/global/metatags.php | 15 - web/global/mobile.css | 124 --- web/global/opensans.ttf | Bin 217360 -> 0 bytes web/global/report.css | 12 - web/global/style.css | 822 ------------------ web/js/db/model.js | 25 +- web/js/hedera/form.js | 93 ++ web/js/hedera/gui.js | 172 ++-- web/js/hedera/login.js | 2 +- web/js/hedera/login.xml | 10 +- web/js/hedera/main.js | 1 + web/js/hedera/module.js | 150 ++-- web/js/hedera/report.js | 70 +- web/js/htk/field/radio-group.js | 8 +- web/js/htk/field/radio.js | 10 +- web/js/htk/field/select.js | 21 + web/js/htk/grid.js | 2 + web/js/htk/repeater.js | 3 +- web/js/htk/widget.js | 1 + web/js/sql/filter-item.js | 25 +- web/js/sql/filter.js | 30 +- web/js/vn/builder.js | 78 +- web/js/vn/object.js | 5 + web/js/vn/vn.js | 1 - web/locale/ca/js/db.js | 1 - web/locale/ca/js/hedera.js | 32 +- web/locale/en/forms/account/address-list.json | 11 + web/locale/en/forms/account/address.json | 15 + web/locale/en/forms/account/conf.json | 19 + web/locale/en/forms/admin/access-log.json | 15 + web/locale/en/forms/admin/items.json | 9 + web/locale/en/forms/admin/links.json | 6 + web/locale/en/forms/admin/photos.json | 12 + web/locale/en/forms/admin/shelves.json | 21 + web/locale/en/forms/admin/users.json | 12 + web/locale/en/forms/admin/visits.json | 31 + web/locale/en/forms/agencies/packages.json | 9 + web/locale/en/forms/agencies/provinces.json | 10 + web/locale/en/forms/cms/about.json | 47 + web/locale/en/forms/cms/contact.json | 20 + web/locale/en/forms/cms/home.json | 13 + web/locale/en/forms/cms/location.json | 3 + web/locale/en/forms/cms/training.json | 1 + web/locale/en/forms/cms/why.json | 25 + web/locale/en/forms/ecomerce/basket.json | 29 + web/locale/en/forms/ecomerce/catalog.json | 49 ++ web/locale/en/forms/ecomerce/checkout.json | 31 + web/locale/en/forms/ecomerce/confirm.json | 25 + web/locale/en/forms/ecomerce/invoices.json | 8 + web/locale/en/forms/ecomerce/orders.json | 36 + web/locale/en/forms/ecomerce/ticket.json | 30 + web/locale/en/forms/news/new.json | 12 + web/locale/en/forms/news/news.json | 12 + web/locale/en/js/db.js | 8 + web/locale/en/js/hedera.js | 57 ++ web/locale/en/js/htk.js | 29 + web/locale/en/js/vn.js | 44 + web/locale/en/pages/tpv.json | 4 + web/locale/en/pages/update-browser.json | 4 + web/locale/en/pages/version-menu.json | 8 + web/locale/en/rest/query.json | 5 + web/locale/es/forms/admin/items.json | 9 + web/locale/es/forms/ecomerce/catalog.json | 20 +- web/locale/es/js/db.js | 1 - web/locale/es/js/hedera.js | 29 +- web/locale/es/js/vn.js | 2 +- web/locale/es/rest/query.json | 2 +- web/locale/fr/forms/account/address-list.json | 2 +- web/locale/fr/forms/account/address.json | 2 +- web/locale/fr/forms/account/conf.json | 4 +- web/locale/fr/forms/admin/access-log.json | 2 +- web/locale/fr/forms/admin/links.json | 2 +- web/locale/fr/forms/admin/photos.json | 6 +- web/locale/fr/forms/admin/users.json | 8 +- web/locale/fr/forms/agencies/packages.json | 12 +- web/locale/fr/forms/agencies/provinces.json | 8 +- web/locale/fr/forms/cms/contact.json | 12 +- web/locale/fr/forms/cms/location.json | 2 +- web/locale/fr/forms/cms/why.json | 6 +- web/locale/fr/forms/ecomerce/basket.json | 6 +- web/locale/fr/forms/ecomerce/catalog.json | 8 +- web/locale/fr/forms/ecomerce/checkout.json | 34 +- web/locale/fr/forms/ecomerce/confirm.json | 6 +- web/locale/fr/js/db.js | 1 - web/locale/fr/js/hedera.js | 32 +- web/locale/fr/pages/tpv.json | 2 +- web/locale/fr/pages/version-menu.json | 2 +- web/locale/fr/rest/query.json | 4 +- web/locale/mn/forms/account/address-list.json | 11 + web/locale/mn/forms/account/address.json | 15 + web/locale/mn/forms/account/conf.json | 19 + web/locale/mn/forms/admin/access-log.json | 15 + web/locale/mn/forms/admin/items.json | 9 + web/locale/mn/forms/admin/links.json | 6 + web/locale/mn/forms/admin/photos.json | 12 + web/locale/mn/forms/admin/shelves.json | 21 + web/locale/mn/forms/admin/users.json | 12 + web/locale/mn/forms/admin/visits.json | 31 + web/locale/mn/forms/agencies/packages.json | 9 + web/locale/mn/forms/agencies/provinces.json | 10 + web/locale/mn/forms/cms/about.json | 47 + web/locale/mn/forms/cms/contact.json | 20 + web/locale/mn/forms/cms/home.json | 13 + web/locale/mn/forms/cms/location.json | 3 + web/locale/mn/forms/cms/training.json | 1 + web/locale/mn/forms/cms/why.json | 25 + web/locale/mn/forms/ecomerce/basket.json | 29 + web/locale/mn/forms/ecomerce/catalog.json | 49 ++ web/locale/mn/forms/ecomerce/checkout.json | 31 + web/locale/mn/forms/ecomerce/confirm.json | 25 + web/locale/mn/forms/ecomerce/invoices.json | 8 + web/locale/mn/forms/ecomerce/orders.json | 36 + web/locale/mn/forms/ecomerce/ticket.json | 30 + web/locale/mn/forms/news/new.json | 12 + web/locale/mn/forms/news/news.json | 12 + web/locale/mn/js/db.js | 8 + web/locale/mn/js/hedera.js | 57 ++ web/locale/mn/js/htk.js | 29 + web/locale/mn/js/vn.js | 44 + web/locale/mn/pages/tpv.json | 4 + web/locale/mn/pages/update-browser.json | 4 + web/locale/mn/pages/version-menu.json | 8 + web/locale/mn/rest/query.json | 5 + web/{global => pages/main}/analytics.php | 0 web/pages/main/head.php | 11 +- web/{global => pages/main}/roboto.ttf | Bin web/pages/main/style.css | 1 + web/reports/items-report/items-report.js | 5 + web/reports/items-report/style.css | 45 + web/reports/items-report/ui.xml | 53 ++ .../shelves-report.js} | 0 .../{shelves => shelves-report}/style.css | 0 .../report.xml => shelves-report/ui.xml} | 0 172 files changed, 2532 insertions(+), 1536 deletions(-) create mode 100755 web/forms/admin/items/items.js create mode 100755 web/forms/admin/items/style.css create mode 100755 web/forms/admin/items/ui.xml delete mode 100755 web/global/metatags.php delete mode 100755 web/global/mobile.css delete mode 100755 web/global/opensans.ttf delete mode 100755 web/global/report.css delete mode 100755 web/global/style.css create mode 100755 web/js/hedera/form.js create mode 100755 web/locale/en/forms/account/address-list.json create mode 100755 web/locale/en/forms/account/address.json create mode 100755 web/locale/en/forms/account/conf.json create mode 100644 web/locale/en/forms/admin/access-log.json create mode 100644 web/locale/en/forms/admin/items.json create mode 100755 web/locale/en/forms/admin/links.json create mode 100755 web/locale/en/forms/admin/photos.json create mode 100644 web/locale/en/forms/admin/shelves.json create mode 100755 web/locale/en/forms/admin/users.json create mode 100755 web/locale/en/forms/admin/visits.json create mode 100755 web/locale/en/forms/agencies/packages.json create mode 100755 web/locale/en/forms/agencies/provinces.json create mode 100755 web/locale/en/forms/cms/about.json create mode 100755 web/locale/en/forms/cms/contact.json create mode 100755 web/locale/en/forms/cms/home.json create mode 100755 web/locale/en/forms/cms/location.json create mode 100755 web/locale/en/forms/cms/training.json create mode 100755 web/locale/en/forms/cms/why.json create mode 100755 web/locale/en/forms/ecomerce/basket.json create mode 100755 web/locale/en/forms/ecomerce/catalog.json create mode 100755 web/locale/en/forms/ecomerce/checkout.json create mode 100755 web/locale/en/forms/ecomerce/confirm.json create mode 100755 web/locale/en/forms/ecomerce/invoices.json create mode 100755 web/locale/en/forms/ecomerce/orders.json create mode 100755 web/locale/en/forms/ecomerce/ticket.json create mode 100755 web/locale/en/forms/news/new.json create mode 100755 web/locale/en/forms/news/news.json create mode 100755 web/locale/en/js/db.js create mode 100755 web/locale/en/js/hedera.js create mode 100755 web/locale/en/js/htk.js create mode 100755 web/locale/en/js/vn.js create mode 100755 web/locale/en/pages/tpv.json create mode 100755 web/locale/en/pages/update-browser.json create mode 100755 web/locale/en/pages/version-menu.json create mode 100755 web/locale/en/rest/query.json create mode 100644 web/locale/es/forms/admin/items.json create mode 100755 web/locale/mn/forms/account/address-list.json create mode 100755 web/locale/mn/forms/account/address.json create mode 100755 web/locale/mn/forms/account/conf.json create mode 100644 web/locale/mn/forms/admin/access-log.json create mode 100644 web/locale/mn/forms/admin/items.json create mode 100755 web/locale/mn/forms/admin/links.json create mode 100755 web/locale/mn/forms/admin/photos.json create mode 100644 web/locale/mn/forms/admin/shelves.json create mode 100755 web/locale/mn/forms/admin/users.json create mode 100755 web/locale/mn/forms/admin/visits.json create mode 100755 web/locale/mn/forms/agencies/packages.json create mode 100755 web/locale/mn/forms/agencies/provinces.json create mode 100755 web/locale/mn/forms/cms/about.json create mode 100755 web/locale/mn/forms/cms/contact.json create mode 100755 web/locale/mn/forms/cms/home.json create mode 100755 web/locale/mn/forms/cms/location.json create mode 100755 web/locale/mn/forms/cms/training.json create mode 100755 web/locale/mn/forms/cms/why.json create mode 100755 web/locale/mn/forms/ecomerce/basket.json create mode 100755 web/locale/mn/forms/ecomerce/catalog.json create mode 100755 web/locale/mn/forms/ecomerce/checkout.json create mode 100755 web/locale/mn/forms/ecomerce/confirm.json create mode 100755 web/locale/mn/forms/ecomerce/invoices.json create mode 100755 web/locale/mn/forms/ecomerce/orders.json create mode 100755 web/locale/mn/forms/ecomerce/ticket.json create mode 100755 web/locale/mn/forms/news/new.json create mode 100755 web/locale/mn/forms/news/news.json create mode 100755 web/locale/mn/js/db.js create mode 100755 web/locale/mn/js/hedera.js create mode 100755 web/locale/mn/js/htk.js create mode 100755 web/locale/mn/js/vn.js create mode 100755 web/locale/mn/pages/tpv.json create mode 100755 web/locale/mn/pages/update-browser.json create mode 100755 web/locale/mn/pages/version-menu.json create mode 100755 web/locale/mn/rest/query.json rename web/{global => pages/main}/analytics.php (100%) rename web/{global => pages/main}/roboto.ttf (100%) create mode 100755 web/reports/items-report/items-report.js create mode 100644 web/reports/items-report/style.css create mode 100755 web/reports/items-report/ui.xml rename web/reports/{shelves/shelves.js => shelves-report/shelves-report.js} (100%) rename web/reports/{shelves => shelves-report}/style.css (100%) rename web/reports/{shelves/report.xml => shelves-report/ui.xml} (100%) diff --git a/web/forms/account/address-list/address-list.js b/web/forms/account/address-list/address-list.js index 7e602c3f..57141a56 100755 --- a/web/forms/account/address-list/address-list.js +++ b/web/forms/account/address-list/address-list.js @@ -1,7 +1,7 @@ Vn.AddressList = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,activate: function () { diff --git a/web/forms/account/address/address.js b/web/forms/account/address/address.js index c9ad6d9e..aca0a781 100755 --- a/web/forms/account/address/address.js +++ b/web/forms/account/address/address.js @@ -1,7 +1,7 @@ Vn.Address = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,activate: function () { diff --git a/web/forms/account/conf/conf.js b/web/forms/account/conf/conf.js index 3f89b752..440f12f3 100755 --- a/web/forms/account/conf/conf.js +++ b/web/forms/account/conf/conf.js @@ -1,7 +1,7 @@ Vn.Conf = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,activate: function () { diff --git a/web/forms/account/conf/ui.xml b/web/forms/account/conf/ui.xml index 8a5a9d38..a2773aa0 100755 --- a/web/forms/account/conf/ui.xml +++ b/web/forms/account/conf/ui.xml @@ -1,19 +1,23 @@ - - SELECT id, u.name, email, mail, c.user_id, c.default_address - FROM user_view u - LEFT JOIN customer_view c - ON u.id = c.user_id + + + SELECT id, u.name, email, mail, c.user_id, c.default_address + FROM user_view u + LEFT JOIN customer_view c + ON u.id = c.user_id + - SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country - FROM address_view a - LEFT JOIN vn2008.province p ON a.province_id = p.province_id - JOIN vn2008.Paises c ON c.Id = p.Paises_Id - WHERE active != FALSE + + SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country + FROM address_view a + LEFT JOIN vn2008.province p ON a.province_id = p.province_id + JOIN vn2008.Paises c ON c.Id = p.Paises_Id + WHERE active != FALSE +
diff --git a/web/forms/admin/access-log/access-log.js b/web/forms/admin/access-log/access-log.js index 108fc6cd..f226a950 100755 --- a/web/forms/admin/access-log/access-log.js +++ b/web/forms/admin/access-log/access-log.js @@ -1,6 +1,6 @@ Vn.AccessLog = new Class ({ - Extends: Vn.Module + Extends: Vn.Form }); diff --git a/web/forms/admin/items/items.js b/web/forms/admin/items/items.js new file mode 100755 index 00000000..bb42361d --- /dev/null +++ b/web/forms/admin/items/items.js @@ -0,0 +1,23 @@ + +Vn.Items = new Class +({ + Extends: Vn.Form + + ,activate: function () + { + this.$('warehouse').value = 7; + this.$('realm').value = null; + } + + ,onPreviewClick: function () + { + var batch = new Sql.Batch (); + batch.addValues ({ + 'warehouse': this.$('warehouse').value + ,'realm': this.$('realm').value + ,'rate': this.$('rate').value + }); + this.gui.openReport ('items-report', batch); + } +}); + diff --git a/web/forms/admin/items/style.css b/web/forms/admin/items/style.css new file mode 100755 index 00000000..2d290eb3 --- /dev/null +++ b/web/forms/admin/items/style.css @@ -0,0 +1,44 @@ + +.items +{ + padding: 1em; +} +.items .box +{ + max-width: 40em; + padding: 2em; +} +.items .body +{ + max-width: 20em; + margin: auto; + padding: 0; +} +.items .form-group +{ + padding: 0.4em; +} +.items form label +{ + display: block; + margin-bottom: 0.5em; +} +.items input[type=text], +.items select +{ + margin: 0; + width: 100%; +} + +/* Footer */ + +.items .footer +{ + text-align: center; + margin-top: 1.5em; +} +.items .footer > button +{ + margin: 0 .2em; +} + diff --git a/web/forms/admin/items/ui.xml b/web/forms/admin/items/ui.xml new file mode 100755 index 00000000..629059c8 --- /dev/null +++ b/web/forms/admin/items/ui.xml @@ -0,0 +1,48 @@ + +
+

Item list

+
+
+
+
+
+ + + + + + SELECT id, name FROM vn2008.warehouse + WHERE reserve ORDER BY name + + + +
+
+ + + + + + SELECT id, reino FROM vn2008.reinos + WHERE display != FALSE ORDER BY reino + + + +
+
+ + +
+
+ +
+
+
diff --git a/web/forms/admin/links/links.js b/web/forms/admin/links/links.js index c5a3ea5a..b695fd2a 100755 --- a/web/forms/admin/links/links.js +++ b/web/forms/admin/links/links.js @@ -1,7 +1,7 @@ Vn.Links = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,activate: function () { diff --git a/web/forms/admin/links/ui.xml b/web/forms/admin/links/ui.xml index eb0cb4de..401ec4dd 100755 --- a/web/forms/admin/links/ui.xml +++ b/web/forms/admin/links/ui.xml @@ -5,9 +5,11 @@
- - SELECT image, name, description, link FROM link - ORDER BY name + + + SELECT image, name, description, link FROM link + ORDER BY name + diff --git a/web/forms/admin/photos/photos.js b/web/forms/admin/photos/photos.js index 8033f604..0f2b7da4 100755 --- a/web/forms/admin/photos/photos.js +++ b/web/forms/admin/photos/photos.js @@ -1,7 +1,7 @@ Vn.Photos = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,activate: function () { diff --git a/web/forms/admin/shelves/shelves.js b/web/forms/admin/shelves/shelves.js index 5b9c3613..494282d8 100755 --- a/web/forms/admin/shelves/shelves.js +++ b/web/forms/admin/shelves/shelves.js @@ -1,7 +1,7 @@ Vn.Shelves = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,activate: function () { diff --git a/web/forms/admin/shelves/ui.xml b/web/forms/admin/shelves/ui.xml index 6a3a9a37..8b8c9dfd 100755 --- a/web/forms/admin/shelves/ui.xml +++ b/web/forms/admin/shelves/ui.xml @@ -1,10 +1,12 @@ - SELECT c.id, c.name, c.name_prefix, c.warehouse_id, c.family_id, - c.shelf_id, c.max_amount, c.show_packing, c.stack, t.reino_id - FROM shelf_config c - JOIN vn2008.Tipos t ON t.tipo_id = c.family_id + + SELECT c.id, c.name, c.name_prefix, c.warehouse_id, c.family_id, + c.shelf_id, c.max_amount, c.show_packing, c.stack, t.reino_id + FROM shelf_config c + JOIN vn2008.Tipos t ON t.tipo_id = c.family_id +
@@ -30,8 +32,10 @@ - SELECT id, reino FROM vn2008.reinos - WHERE display != FALSE ORDER BY reino + + SELECT id, reino FROM vn2008.reinos + WHERE display != FALSE ORDER BY reino +
@@ -39,10 +43,14 @@ - SELECT tipo_id, Tipo FROM vn2008.Tipos - WHERE reino_id = #reign ORDER BY Tipo + + SELECT tipo_id, Tipo FROM vn2008.Tipos + WHERE reino_id = #reign ORDER BY Tipo + - + + + @@ -51,8 +59,10 @@ - SELECT id, name FROM vn2008.warehouse - WHERE reserve ORDER BY name + + SELECT id, name FROM vn2008.warehouse + WHERE reserve ORDER BY name +
@@ -60,7 +70,9 @@ - SELECT id, name FROM shelf + + SELECT id, name FROM shelf +
diff --git a/web/forms/admin/users/users.js b/web/forms/admin/users/users.js index c60d290f..88c535f1 100755 --- a/web/forms/admin/users/users.js +++ b/web/forms/admin/users/users.js @@ -1,7 +1,7 @@ Vn.Users = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,onChangeUserClick: function (column, value) { diff --git a/web/forms/admin/visits/visits.js b/web/forms/admin/visits/visits.js index e77debac..bce5c005 100755 --- a/web/forms/admin/visits/visits.js +++ b/web/forms/admin/visits/visits.js @@ -1,7 +1,7 @@ Vn.Visits = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,activate: function () { diff --git a/web/forms/agencies/packages/packages.js b/web/forms/agencies/packages/packages.js index b63aab73..d3f0db86 100755 --- a/web/forms/agencies/packages/packages.js +++ b/web/forms/agencies/packages/packages.js @@ -1,7 +1,7 @@ Vn.Packages = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,onShowClick: function (column, agencyId) { diff --git a/web/forms/agencies/packages/ui.xml b/web/forms/agencies/packages/ui.xml index dde003b9..fea7f9c6 100755 --- a/web/forms/agencies/packages/ui.xml +++ b/web/forms/agencies/packages/ui.xml @@ -6,7 +6,9 @@
- CALL vn2008.agencia_volume () + + CALL vn2008.agencia_volume () + - - - + +

ByProvince

@@ -10,10 +9,14 @@
- - CALL vn2008.desglose_volume (#agency) + + + CALL vn2008.desglose_volume (#agency) + - + + + diff --git a/web/forms/cms/about/about.js b/web/forms/cms/about/about.js index 3afbcc80..fa65a1cc 100755 --- a/web/forms/cms/about/about.js +++ b/web/forms/cms/about/about.js @@ -1,6 +1,6 @@ Vn.About = new Class ({ - Extends: Vn.Module + Extends: Vn.Form }); diff --git a/web/forms/cms/contact/contact.js b/web/forms/cms/contact/contact.js index 10aa5f8f..7e562d8c 100755 --- a/web/forms/cms/contact/contact.js +++ b/web/forms/cms/contact/contact.js @@ -1,7 +1,7 @@ Vn.Contact = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,activate: function () { diff --git a/web/forms/cms/home/home.js b/web/forms/cms/home/home.js index 2f099370..135d826e 100755 --- a/web/forms/cms/home/home.js +++ b/web/forms/cms/home/home.js @@ -1,6 +1,6 @@ Vn.Home = new Class ({ - Extends: Vn.Module + Extends: Vn.Form }); diff --git a/web/forms/cms/location/location.js b/web/forms/cms/location/location.js index 361addde..a1f051bf 100755 --- a/web/forms/cms/location/location.js +++ b/web/forms/cms/location/location.js @@ -3,7 +3,7 @@ var gmapsIsLoaded = false; Vn.Location = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,locations: null diff --git a/web/forms/cms/training/training.js b/web/forms/cms/training/training.js index d9cca5cb..2e7b514b 100755 --- a/web/forms/cms/training/training.js +++ b/web/forms/cms/training/training.js @@ -1,5 +1,5 @@ Vn.Training = new Class ({ - Extends: Vn.Module + Extends: Vn.Form }); diff --git a/web/forms/cms/why/why.js b/web/forms/cms/why/why.js index f07cdd3d..a29a3c04 100755 --- a/web/forms/cms/why/why.js +++ b/web/forms/cms/why/why.js @@ -1,6 +1,6 @@ Vn.Why = new Class ({ - Extends: Vn.Module + Extends: Vn.Form }); diff --git a/web/forms/ecomerce/basket/basket.js b/web/forms/ecomerce/basket/basket.js index 9ca00bdf..7171d5f5 100755 --- a/web/forms/ecomerce/basket/basket.js +++ b/web/forms/ecomerce/basket/basket.js @@ -1,7 +1,7 @@ Vn.Basket = new Class ({ - Extends: Vn.Module + Extends: Vn.Form ,open: function () { diff --git a/web/forms/ecomerce/basket/ui.xml b/web/forms/ecomerce/basket/ui.xml index 6389b2f1..ac891399 100755 --- a/web/forms/ecomerce/basket/ui.xml +++ b/web/forms/ecomerce/basket/ui.xml @@ -23,12 +23,14 @@
- - SELECT i.id, i.amount, i.price, a.Article, a.Categoria, - a.Medida, a.Tallos, a.Color, o.Abreviatura, a.Foto - FROM basket_item i - JOIN vn2008.Articles a ON a.Id_Article = i.item_id - LEFT JOIN vn2008.Origen o ON a.id_origen = o.id; + + + SELECT i.id, i.amount, i.price, a.Article, a.Categoria, + a.Medida, a.Tallos, a.Color, o.Abreviatura, a.Foto + FROM basket_item i + JOIN vn2008.Articles a ON a.Id_Article = i.item_id + LEFT JOIN vn2008.Origen o ON a.id_origen = o.id + button { @@ -107,6 +111,10 @@ option.placeholder padding: .2em; margin-right: .2em; } +.right-panel .remove-filters +{ + margin-top: 1.2em; +} button.basket { @@ -287,6 +295,11 @@ td.third-category padding: 0; font-size: .9em; } +.item-box > .producer +{ + text-transform: uppercase; + font-size: 1em; +} .item-box > h2 { font-size: 1.1em; diff --git a/web/forms/ecomerce/catalog/ui.xml b/web/forms/ecomerce/catalog/ui.xml index 17d17f0e..da7dc0c0 100755 --- a/web/forms/ecomerce/catalog/ui.xml +++ b/web/forms/ecomerce/catalog/ui.xml @@ -1,34 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -38,18 +8,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - SELECT item_id, warehouse_id, SUM(amount) amount @@ -57,7 +55,7 @@ GROUP BY warehouse_id - + CREATE TEMPORARY TABLE tmp.bionic_calc (INDEX (item_id)) @@ -65,29 +63,26 @@ SELECT Id_Article item_id FROM vn2008.Articles WHERE #filter; CALL bionic_calc (); - SELECT a.Id_Article item_id, t.available, t.price, p.name producer, - a.Foto, a.Article, a.Categoria, a.Medida, a.Tallos, a.Color, o.Abreviatura + SELECT a.Id_Article item_id, a.description, t.available, t.price, + p.name producer, a.Foto, a.Article, a.Categoria, a.Medida, + a.Tallos, i.name color, o.Abreviatura, o.Origen FROM tmp.bionic_item t JOIN vn2008.Articles a ON a.Id_Article = t.item_id LEFT JOIN vn2008.producer p ON p.producer_id = a.producer_id + LEFT JOIN vn2008.Tintas i ON i.Id_Tinta = a.Color LEFT JOIN vn2008.Origen o ON a.id_origen = o.id WHERE t.available > 0 ORDER BY a.Article, a.Medida LIMIT 400; - - - - - CALL bionic_from_item (#item); - SELECT p.warehouse_id, p.grouping, p.price, p.rate, l.available + SELECT p.warehouse_id, w.name warehouse, p.grouping, p.price, p.rate, l.available FROM tmp.bionic_lot l - JOIN tmp.bionic_price p - ON p.warehouse_id = l.warehouse_id + JOIN tmp.bionic_price p ON p.warehouse_id = l.warehouse_id + JOIN vn2008.warehouse w ON w.id = p.warehouse_id ORDER BY warehouse_id, grouping; @@ -137,9 +132,12 @@ title="_Name" column="Article" renderer="nameRenderer"/> + + column="Categoria"/> @@ -174,15 +172,17 @@

-

+

- - - + +

+

+ +

@@ -204,12 +204,12 @@
- - + - - - + - + CALL item_available (); - SELECT DISTINCT t.tipo_id, LEFT(t.Tipo, 18) type + SELECT DISTINCT t.tipo_id, t.Tipo type FROM vn2008.Tipos t JOIN vn2008.Articles a ON a.tipo_id = t.tipo_id JOIN tmp.item_available i ON i.item_id = a.Id_Article - /*WHERE #filter*/ + WHERE #filter ORDER BY t.Tipo - + CALL item_available (); @@ -270,37 +280,16 @@ FROM vn2008.Tintas c JOIN vn2008.Articles a ON a.Color = c.Id_Tinta JOIN tmp.item_available i ON i.item_id = a.Id_Article - /*WHERE #filter*/ + WHERE #filter ORDER BY c.name - - - - CALL item_available (); - SELECT DISTINCT o.id, o.Origen, o.Abreviatura - FROM vn2008.Origen o - JOIN vn2008.Articles a ON a.id_origen = o.id - JOIN tmp.item_available i ON i.item_id = a.Id_Article - /*WHERE #filter*/ - ORDER BY o.Origen - - - - - - - CALL item_available (); - SELECT DISTINCT a.Categoria, a.Categoria category - FROM vn2008.Articles a - JOIN tmp.item_available i ON i.item_id = a.Id_Article - /*WHERE #filter*/ - ORDER BY a.Categoria - - - - + CALL item_available (); @@ -308,11 +297,47 @@ FROM vn2008.producer p JOIN vn2008.Articles a ON a.producer_id = p.producer_id JOIN tmp.item_available i ON i.item_id = a.Id_Article - /*WHERE #filter*/ + WHERE #filter ORDER BY p.name + + + + CALL item_available (); + SELECT DISTINCT o.id, o.Origen, o.Abreviatura + FROM vn2008.Origen o + JOIN vn2008.Articles a ON a.id_origen = o.id + JOIN tmp.item_available i ON i.item_id = a.Id_Article + WHERE #filter + ORDER BY o.Origen + + + + + + + CALL item_available (); + SELECT DISTINCT a.Categoria, a.Categoria category + FROM vn2008.Articles a + JOIN tmp.item_available i ON i.item_id = a.Id_Article + WHERE #filter + ORDER BY a.Categoria + + + +