From 3fcebe26bf5abaada56567b921fa7a20b3cd1eca Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jan 2018 10:47:39 +0100 Subject: [PATCH 1/5] WebpackChunkHash removed (Doesn't refresh the manifest hash), Webpack updated --- debian/changelog | 2 +- package.json | 5 ++--- webpack.config.js | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index e24bc69f..05f98690 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.61) stable; urgency=low +hedera-web (1.405.62) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index f5184eec..3da344d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.405.61", + "version": "1.405.62", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { @@ -20,8 +20,7 @@ "raw-loader": "^0.5.1", "style-loader": "^0.19.0", "url-loader": "^0.5.7", - "webpack": "^3.6.0", - "webpack-chunk-hash": "^0.5.0", + "webpack": "^3.10.0", "webpack-dev-server": "^2.9.1", "webpack-merge": "^4.1.0" }, diff --git a/webpack.config.js b/webpack.config.js index 9139ef47..a4f28b87 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,7 +1,6 @@ var path = require('path'); var webpack = require('webpack'); var AssetsWebpackPlugin = require('assets-webpack-plugin'); -var WebpackChunkHash = require('webpack-chunk-hash'); var merge = require('webpack-merge'); var wpConfig = require('./webpack.config.json'); @@ -61,8 +60,7 @@ var prodConfig = { new AssetsWebpackPlugin({ path: outputPath }), - new webpack.HashedModuleIdsPlugin(), - new WebpackChunkHash() + new webpack.HashedModuleIdsPlugin() ], devtool: 'source-map' }; From f65b53b5671801c27118787e6532f919772b7d7a Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jan 2018 09:50:06 +0100 Subject: [PATCH 2/5] Client debt displayed correctly --- debian/changelog | 2 +- forms/ecomerce/confirm/ui.xml | 2 +- forms/ecomerce/orders/ui.xml | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 05f98690..7422bead 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.62) stable; urgency=low +hedera-web (1.405.63) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml index b1403f9a..b59a46f9 100644 --- a/forms/ecomerce/confirm/ui.xml +++ b/forms/ecomerce/confirm/ui.xml @@ -7,7 +7,7 @@ SELECT o.id, o.date_send, o.note, o.company_id, ag.description agency, v.code method, ad.consignee, ad.zip_code, ad.city, ad.name address, - t.*, c.credit, clientGetDebt(NULL) debt + t.*, c.credit, myClientGetDebt(NULL) debt FROM basket o JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id LEFT JOIN address_view ad ON ad.id = o.address_id diff --git a/forms/ecomerce/orders/ui.xml b/forms/ecomerce/orders/ui.xml index d4ea7df6..2c9992b7 100644 --- a/forms/ecomerce/orders/ui.xml +++ b/forms/ecomerce/orders/ui.xml @@ -26,7 +26,7 @@ - SELECT clientGetDebt(NULL) debt + SELECT -myClientGetDebt(NULL) debt diff --git a/package.json b/package.json index 3da344d1..1c3e3f5a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.405.62", + "version": "1.405.63", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { From e5d2bbc2f2f8d96cef333946aca80efc6cc7c009 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jan 2018 13:57:35 +0100 Subject: [PATCH 3/5] Packages displayed in delivery notes. --- debian/changelog | 2 +- forms/ecomerce/ticket/style.css | 15 +++++++ forms/ecomerce/ticket/ticket.js | 6 +++ forms/ecomerce/ticket/ui.xml | 62 ++++++++++++++++++++------ package.json | 2 +- reports/delivery-note/delivery-note.js | 6 +++ reports/delivery-note/style.css | 8 +++- reports/delivery-note/ui.xml | 14 ++++++ 8 files changed, 99 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7422bead..f96c6c4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.63) stable; urgency=low +hedera-web (1.405.64) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/ticket/style.css b/forms/ecomerce/ticket/style.css index f815ff9e..f6c6a1b6 100644 --- a/forms/ecomerce/ticket/style.css +++ b/forms/ecomerce/ticket/style.css @@ -35,9 +35,24 @@ { text-align: right; } +.ticket .packages +{ + margin-top: 1em; + padding-top: 1em; + border-top: 1px solid #DDD; + display: block; +} /* Lines */ +.ticket .line > .photo +{ + margin-right: 1em; + float: left; + border-radius: 50%; + height: 3.2em; + width: 3.2em; +} .ticket .line { padding: .5em 0; diff --git a/forms/ecomerce/ticket/ticket.js b/forms/ecomerce/ticket/ticket.js index 2cfcf4fe..bd34d1bb 100644 --- a/forms/ecomerce/ticket/ticket.js +++ b/forms/ecomerce/ticket/ticket.js @@ -36,5 +36,11 @@ Hedera.Ticket = new Class var discount = form.get ('discount'); return form.get ('quantity') * price * ((100 - discount) / 100); } + + ,onPackagesChanged: function (model) + { + this.$('packages').node.style.display = + model.numRows > 0 ? 'block' : 'none'; + } }); diff --git a/forms/ecomerce/ticket/ui.xml b/forms/ecomerce/ticket/ui.xml index 2f52b77d..6faa6287 100644 --- a/forms/ecomerce/ticket/ui.xml +++ b/forms/ecomerce/ticket/ui.xml @@ -2,16 +2,16 @@ + + + + + - + CALL myTicketGet (#ticket) - - - - - @@ -29,7 +29,7 @@

- + @

@@ -63,18 +63,23 @@

- + CALL myTicketGetRows (#ticket) - - - - -
+

@@ -91,6 +96,37 @@

+ + + + CALL myTicketGetPackages (#ticket) + + + +
+ +

+ +

+

+ +

+

+ @ +

+
+
+ +
diff --git a/package.json b/package.json index 1c3e3f5a..892174c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.405.63", + "version": "1.405.64", "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 3a708bdc..1319c655 100644 --- a/reports/delivery-note/delivery-note.js +++ b/reports/delivery-note/delivery-note.js @@ -14,4 +14,10 @@ Hedera.DeliveryNote = new Class var discount = form.get ('discount'); return form.get ('quantity') * price * ((100 - discount) / 100); } + + ,onPackagesChanged: function (model) + { + this.$('packages').node.style.display = + model.numRows > 0 ? 'block' : 'none'; + } }); diff --git a/reports/delivery-note/style.css b/reports/delivery-note/style.css index 66a8d98f..23eb2f6b 100644 --- a/reports/delivery-note/style.css +++ b/reports/delivery-note/style.css @@ -33,4 +33,10 @@ h2 border-top: 1px solid #333; padding-top: .3em; } - +.packages +{ + width: 50%; + padding-top: 1em; + margin-left: 0; + display: none; +} diff --git a/reports/delivery-note/ui.xml b/reports/delivery-note/ui.xml index c99fa713..7869e4c8 100644 --- a/reports/delivery-note/ui.xml +++ b/reports/delivery-note/ui.xml @@ -54,5 +54,19 @@ Total + tax

+ + + + CALL myTicketGetPackages (#ticket) + + + + + + From f20e2d65c3aa5ef7eaa247702757f7d05455ffbd Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 12 Jan 2018 12:35:58 +0100 Subject: [PATCH 4/5] Login bug solved (history.back) --- debian/changelog | 2 +- js/hedera/app.js | 15 +++++++++------ js/hedera/login.js | 2 +- package.json | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index f96c6c4a..fe467a77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.64) stable; urgency=low +hedera-web (1.405.65) stable; urgency=low * Initial Release. diff --git a/js/hedera/app.js b/js/hedera/app.js index cd6ce000..7713cf2e 100644 --- a/js/hedera/app.js +++ b/js/hedera/app.js @@ -42,13 +42,16 @@ module.exports = new Class ,_onLogin: function () { this._freeLogin (); + + if (this._gui) + return; var gui = this._gui = new Gui ({conn: this._conn}); gui.on ('logout', this._onLogout, this); gui.show (); } - ,_onLogout: function (gui) + ,_onLogout: function () { this.clearAutoLogin (); this._freeGui (); @@ -100,7 +103,7 @@ module.exports = new Class this._gui.logout (); } - ,_newVersion: function (error) + ,_newVersion: function () { if (this.ignoreVersion) return; @@ -126,10 +129,10 @@ module.exports = new Class Htk.Toast.showError (_('Something went wrong')); var params = { - 'file': error.fileName - ,'line': error.lineNumber - ,'message': error.message - ,'stack': error.stack + file: error.fileName + ,line: error.lineNumber + ,message: error.message + ,stack: error.stack }; this._conn.send ('core/log', params); } diff --git a/js/hedera/login.js b/js/hedera/login.js index 575b3095..3bfc4368 100644 --- a/js/hedera/login.js +++ b/js/hedera/login.js @@ -44,7 +44,7 @@ module.exports = new Class this.$('spinner').stop (); } - ,show: function (firstLogin) + ,show: function () { document.body.appendChild (this.node); diff --git a/package.json b/package.json index 892174c5..5e071a3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.405.64", + "version": "1.405.65", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { From a6af942424baf9325d93e850dd7caf34873f2ed5 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 15 Jan 2018 09:24:15 +0100 Subject: [PATCH 5/5] Supplant bugs solved --- debian/changelog | 2 +- js/hedera/gui.js | 17 +++++++++++++++-- package.json | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index fe467a77..f5bf8847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.65) stable; urgency=low +hedera-web (1.405.66) stable; urgency=low * Initial Release. diff --git a/js/hedera/gui.js b/js/hedera/gui.js index 4b98622f..b097a645 100644 --- a/js/hedera/gui.js +++ b/js/hedera/gui.js @@ -88,6 +88,8 @@ module.exports = new Class localStorage.setItem ('hederaCookies', true); Htk.Toast.showWarning (_('By using this site you accept cookies')); } + + this.supplantInit (); } ,hide: function () @@ -512,17 +514,26 @@ module.exports = new Class //++++++++++++++++++++++++++++++++++++++++++++++++++++++ Supplant + ,supplantInit: function () + { + var user = sessionStorage.getItem ('supplantUser'); + + if (user != null) + this.supplantUser (user); + } + ,supplantUser: function (user, callback) { this._conn.supplantUser (user, - this._onUserSupplant.bind (this, callback)); + this._onUserSupplant.bind (this, callback, user)); } - ,_onUserSupplant: function (callback, supplantOk) + ,_onUserSupplant: function (callback, user, supplantOk) { if (!supplantOk) return; + sessionStorage.setItem ('supplantUser', user); this.loadMenu (); var sql = 'SELECT nickname FROM account.userView'; @@ -543,6 +554,8 @@ module.exports = new Class { Vn.Node.hide (this.$('supplant')); this._conn.supplantEnd (); + sessionStorage.removeItem ('supplantUser', + sessionStorage.getItem ('supplantUser')); this.loadMenu (); this._onFormChange (); } diff --git a/package.json b/package.json index 5e071a3e..ac38d638 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.405.65", + "version": "1.405.66", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": {