diff --git a/debian/changelog b/debian/changelog index eb9bacbc..54192a56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.58) stable; urgency=low +hedera-web (1.405.59) stable; urgency=low * Initial Release. diff --git a/forms/account/address-list/address-list.js b/forms/account/address-list/address-list.js index 86aeb89c..710fb324 100644 --- a/forms/account/address-list/address-list.js +++ b/forms/account/address-list/address-list.js @@ -5,15 +5,15 @@ Hedera.AddressList = new Class ,activate: function () { - this.$('user-model').setInfo ('c', 'customer_view', 'hedera'); - this.$('addresses').setInfo ('a', 'address_view', 'hedera'); + this.$('user-model').setInfo ('c', 'myClient', 'hedera'); + this.$('addresses').setInfo ('a', 'myAddress', 'hedera'); } ,onAddAddressClick: function () { this.hash.set ({ - 'form': 'account/address', - 'address': 0 + form: 'account/address', + address: 0 }); } @@ -34,8 +34,8 @@ Hedera.AddressList = new Class ,onEditAddressClick: function (button, form) { this.hash.set ({ - 'form': 'account/address', - 'address': form.get ('id') + form: 'account/address', + address: form.get ('id') }); } }); diff --git a/forms/account/address-list/ui.xml b/forms/account/address-list/ui.xml index b1203d3f..3baab1ed 100644 --- a/forms/account/address-list/ui.xml +++ b/forms/account/address-list/ui.xml @@ -3,19 +3,19 @@ - SELECT user_id, default_address - FROM customer_view c + SELECT id, defaultAddressFk + FROM myClient c - 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.nickname, p.name province, a.postalCode, + a.city, a.street, a.active, c.country + FROM myAddress a + LEFT JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.country c ON c.id = p.countryFk + WHERE a.active != FALSE @@ -32,7 +32,7 @@
@@ -57,13 +57,13 @@ on-click="onEditAddressClick"/>

- +

- +

- , + ,

diff --git a/forms/account/address/address.js b/forms/account/address/address.js index bbd623a3..88ae18dc 100644 --- a/forms/account/address/address.js +++ b/forms/account/address/address.js @@ -5,8 +5,8 @@ Hedera.Address = new Class ,activate: function () { - this.$('model').setInfo ('a', 'address_view', 'hedera', ['id'], 'id'); - this.$('model').setDefault ('customer_id', 'a', + this.$('model').setInfo ('a', 'myAddress', 'hedera', ['id'], 'id'); + this.$('model').setDefault ('clientFk', 'a', new Sql.Function ({schema: 'account', name: 'userGetId'})); } diff --git a/forms/account/address/ui.xml b/forms/account/address/ui.xml index 750f37fe..0596de11 100644 --- a/forms/account/address/ui.xml +++ b/forms/account/address/ui.xml @@ -10,11 +10,12 @@ mode="ON_DEMAND" on-operations-done="onOperationsDone"> - SELECT a.id, a.name, a.consignee, a.city, a.zip_code, a.province_id, c.Id country_id - FROM address_view a - LEFT JOIN vn2008.province p ON p.province_id = a.province_id - JOIN vn2008.Paises c ON c.Id = p.Paises_Id - WHERE active != FALSE AND a.id = #address + SELECT a.id, a.street, a.nickname, a.city, + a.postalCode, a.provinceFk, c.id countryFk + FROM myAddress a + LEFT JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.country c ON c.id = p.countryFk + WHERE a.active AND a.id = #address @@ -42,11 +43,11 @@
- +
- +
@@ -54,7 +55,7 @@
- +
@@ -63,23 +64,23 @@ id="country" property="param" form="iter" - column="country_id" + column="countryFk" one-way="true"/> - SELECT Id, Pais FROM vn2008.Paises - ORDER BY Pais + SELECT id, country FROM vn.country + ORDER BY country
- + - SELECT province_id, name FROM vn2008.province - WHERE Paises_Id = #country + SELECT id, name FROM vn.province + WHERE countryFk = #country ORDER BY name diff --git a/forms/account/conf/conf.js b/forms/account/conf/conf.js index bedca053..95fb03a5 100644 --- a/forms/account/conf/conf.js +++ b/forms/account/conf/conf.js @@ -5,8 +5,7 @@ Hedera.Conf = new Class ,activate: function () { - this.$('user-model').setInfo ('c', 'customer_view', 'hedera'); - this.$('addresses').setInfo ('a', 'address_view', 'hedera'); + this.$('user-model').setInfo ('c', 'myClient', 'hedera'); } ,onPassChangeClick: function () @@ -38,8 +37,8 @@ Hedera.Conf = new Class throw new Error (_('Passwords doesn\'t match')); var params = { - 'oldPassword': oldPassword, - 'newPassword': newPassword + oldPassword: oldPassword, + newPassword: newPassword }; this.conn.send ('core/change-password', params, this._onPassChange.bind (this)); @@ -72,7 +71,7 @@ Hedera.Conf = new Class ,onAddressesClick: function () { - this.hash.set ({'form': 'account/address-list'}); + this.hash.set ({form: 'account/address-list'}); } }); diff --git a/forms/account/conf/ui.xml b/forms/account/conf/ui.xml index 49e8405a..c4d51e37 100644 --- a/forms/account/conf/ui.xml +++ b/forms/account/conf/ui.xml @@ -12,23 +12,13 @@ SELECT u.id, u.name, u.email, u.recoverPass, - u.nickname, u.lang, c.mail, c.user_id + u.nickname, u.lang, c.isToBeMailed, c.id clientFk FROM account.userView u - LEFT JOIN customer_view c - ON u.id = c.user_id + LEFT JOIN myClient c + ON u.id = c.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 - -

Configuration

@@ -70,7 +60,7 @@
- +
diff --git a/forms/ecomerce/orders/orders.js b/forms/ecomerce/orders/orders.js index cc1c6df6..c1ecdef3 100644 --- a/forms/ecomerce/orders/orders.js +++ b/forms/ecomerce/orders/orders.js @@ -24,7 +24,7 @@ Hedera.Orders = new Class { res.$('link').href = this.hash.make ({ form: 'ecomerce/ticket', - ticket: form.get ('ticket_id') + ticket: form.get ('id') }); } diff --git a/forms/ecomerce/orders/ui.xml b/forms/ecomerce/orders/ui.xml index 4d57a3f7..d4ea7df6 100644 --- a/forms/ecomerce/orders/ui.xml +++ b/forms/ecomerce/orders/ui.xml @@ -44,7 +44,7 @@ - CALL ticket_list (); + CALL myTicketList (NULL, NULL); @@ -53,16 +53,16 @@

- +

- @ + @

- +

- +

diff --git a/forms/ecomerce/ticket/locale/ca.json b/forms/ecomerce/ticket/locale/ca.json index fe99237b..eade92a5 100644 --- a/forms/ecomerce/ticket/locale/ca.json +++ b/forms/ecomerce/ticket/locale/ca.json @@ -5,6 +5,7 @@ ,"Delivery": "Entrega" ,"Total": "Total" + ,"Total + tax": "Total + IVA" ,"Tax base": "Base imposable" ,"VAT": "IVA" diff --git a/forms/ecomerce/ticket/locale/en.json b/forms/ecomerce/ticket/locale/en.json index dc7ccbf6..e151483b 100644 --- a/forms/ecomerce/ticket/locale/en.json +++ b/forms/ecomerce/ticket/locale/en.json @@ -5,6 +5,7 @@ ,"Delivery": "Delivery" ,"Total": "Total" + ,"Total + tax": "Total + tax" ,"Tax base": "Tax base" ,"VAT": "VAT" diff --git a/forms/ecomerce/ticket/locale/es.json b/forms/ecomerce/ticket/locale/es.json index be06236d..76094125 100644 --- a/forms/ecomerce/ticket/locale/es.json +++ b/forms/ecomerce/ticket/locale/es.json @@ -5,6 +5,7 @@ ,"Delivery": "Entrega" ,"Total": "Total" + ,"Total + tax": "Total + IVA" ,"Tax base": "Base imponible" ,"VAT": "IVA" diff --git a/forms/ecomerce/ticket/locale/fr.json b/forms/ecomerce/ticket/locale/fr.json index 4f30ab04..37a2d6d5 100644 --- a/forms/ecomerce/ticket/locale/fr.json +++ b/forms/ecomerce/ticket/locale/fr.json @@ -5,6 +5,7 @@ ,"Delivery": "Livraison" ,"Total": "Total" + ,"Total + tax": "Total + impôt" ,"Tax base": "Imposable" ,"VAT": "TVA" diff --git a/forms/ecomerce/ticket/locale/mn.json b/forms/ecomerce/ticket/locale/mn.json index dc7ccbf6..e151483b 100644 --- a/forms/ecomerce/ticket/locale/mn.json +++ b/forms/ecomerce/ticket/locale/mn.json @@ -5,6 +5,7 @@ ,"Delivery": "Delivery" ,"Total": "Total" + ,"Total + tax": "Total + tax" ,"Tax base": "Tax base" ,"VAT": "VAT" diff --git a/forms/ecomerce/ticket/locale/pt.json b/forms/ecomerce/ticket/locale/pt.json index 486f2eb8..eacbcf8b 100644 --- a/forms/ecomerce/ticket/locale/pt.json +++ b/forms/ecomerce/ticket/locale/pt.json @@ -5,6 +5,7 @@ ,"Delivery": "Entrega" ,"Total": "Total" + ,"Total + tax": "Total + imposto" ,"Tax base": "Tributável" ,"VAT": "IVA" diff --git a/forms/ecomerce/ticket/ticket.js b/forms/ecomerce/ticket/ticket.js index 859bc98a..2cfcf4fe 100644 --- a/forms/ecomerce/ticket/ticket.js +++ b/forms/ecomerce/ticket/ticket.js @@ -10,10 +10,10 @@ Hedera.Ticket = new Class var batch = new Sql.Batch (); batch.addValue ('ticket', ticket.value); - this.conn.execQuery ('CALL ticketLog (#ticket)', null, batch); + this.conn.execQuery ('CALL myTicketLogAccess (#ticket)', null, batch); } - ,onPrintClick: function (event) + ,onPrintClick: function () { var batch = new Sql.Batch (); batch.addValue ('ticket', this.$('ticket-id').value); @@ -34,11 +34,7 @@ Hedera.Ticket = new Class { var price = form.get ('price'); var discount = form.get ('discount'); - - if (price && form.get ('fixed')) - return form.get ('amount') * price * ((100 - discount) / 100); - else - return null; + return form.get ('quantity') * price * ((100 - discount) / 100); } }); diff --git a/forms/ecomerce/ticket/ui.xml b/forms/ecomerce/ticket/ui.xml index 8732530e..2f52b77d 100644 --- a/forms/ecomerce/ticket/ui.xml +++ b/forms/ecomerce/ticket/ui.xml @@ -5,13 +5,7 @@ - SELECT t.id, date, a.Agencia, note, p.name province, - zip_code, city, c.name, consignee, invoice, delivery - FROM ticket_view t - JOIN address_view c ON t.address_id = c.id - JOIN vn2008.Agencias a ON t.agency_id = a.Id_Agencia - JOIN vn2008.province p ON c.province_id = p.province_id - WHERE t.id = #ticket + CALL myTicketGet (#ticket) @@ -38,21 +32,21 @@

- +

- Delivery + Delivery

- +

- +

- + ()

@@ -60,23 +54,18 @@

Total - - - + +

+

+ Total + tax +

- SELECT m.item_id, amount, concept, Categoria, Medida, Tallos, Color, - Abreviatura, IF(fixed != FALSE, price, NULL) price, fixed, discount - FROM ticket_row_view m - INNER JOIN vn2008.Articles a - ON m.item_id = a.Id_Article AND ticket_id = #ticket - LEFT JOIN vn2008.Origen o - ON a.id_origen = o.id - ORDER BY concept + CALL myTicketGetRows (#ticket) @@ -88,11 +77,11 @@

- - + +

- x + x

diff --git a/package.json b/package.json index 74fd99db..5912c479 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.405.58", + "version": "1.405.59", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/reports/delivery-note/delivery-note.js b/reports/delivery-note/delivery-note.js index ead9ba53..3a708bdc 100644 --- a/reports/delivery-note/delivery-note.js +++ b/reports/delivery-note/delivery-note.js @@ -12,10 +12,6 @@ Hedera.DeliveryNote = new Class { var price = form.get ('price'); var discount = form.get ('discount'); - - if (price && form.get ('fixed')) - return form.get ('amount') * price * ((100 - discount) / 100); - else - return null; + return form.get ('quantity') * price * ((100 - discount) / 100); } }); diff --git a/reports/delivery-note/style.css b/reports/delivery-note/style.css index 3c96c9af..66a8d98f 100644 --- a/reports/delivery-note/style.css +++ b/reports/delivery-note/style.css @@ -21,13 +21,16 @@ h2 text-align: right; margin: .1em 0; } -.footer +.important { font-size: 1.2em; font-weight: bold; + text-align: right; +} +.footer +{ margin-top: .2em; border-top: 1px solid #333; padding-top: .3em; - text-align: right; } diff --git a/reports/delivery-note/ui.xml b/reports/delivery-note/ui.xml index e92107b1..c99fa713 100644 --- a/reports/delivery-note/ui.xml +++ b/reports/delivery-note/ui.xml @@ -3,13 +3,7 @@ - SELECT t.id, date, a.Agencia, note, p.name province, - zip_code, city, c.name, consignee, invoice - FROM ticket_view t - JOIN address_view c ON t.address_id = c.id - JOIN vn2008.Agencias a ON t.agency_id = a.Id_Agencia - JOIN vn2008.province p ON c.province_id = p.province_id - WHERE t.id = #ticket + CALL myTicketGet (#ticket) @@ -20,48 +14,45 @@

- +

- +

- +

- + - () + () aaa

- Delivery + Delivery

- SELECT m.item_id, amount, concept, Categoria, Medida, Tallos, Color, - Abreviatura, IF(fixed != FALSE, price, NULL) price, fixed, discount - FROM ticket_row_view m - INNER JOIN vn2008.Articles a - ON m.item_id = a.Id_Article AND ticket_id = #ticket - LEFT JOIN vn2008.Origen o - ON a.id_origen = o.id - ORDER BY concept + CALL myTicketGetRows (#ticket) - - + + - - + + -

+

+

+ Total + tax + +