diff --git a/debian/changelog b/debian/changelog index eb5333a9..1625e2e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.373-deb8) stable; urgency=low +hedera-web (1.376-deb8) stable; urgency=low * Initial Release. diff --git a/environ.php b/env.php similarity index 82% rename from environ.php rename to env.php index d6a81f0f..528ae42a 100644 --- a/environ.php +++ b/env.php @@ -1,6 +1,6 @@ -
+
- - -
+
+ + +
+
-
+

Password requirements

diff --git a/forms/admin/shelves/shelves.js b/forms/admin/shelves/shelves.js index 603cd32b..483ebdfb 100644 --- a/forms/admin/shelves/shelves.js +++ b/forms/admin/shelves/shelves.js @@ -6,6 +6,7 @@ Hedera.Shelves = new Class ,activate: function () { this.$('date').value = new Date (); + this.$('useIds').value = false; } ,onConfigChange: function () diff --git a/forms/cms/home/style.css b/forms/cms/home/style.css index a3e7f890..4869b367 100644 --- a/forms/cms/home/style.css +++ b/forms/cms/home/style.css @@ -63,27 +63,3 @@ width: 100%; } -/* Survey */ - -.survey -{ - position: absolute; - right: 0; - width: 6em; - top: 0; -} -.question, .survey-votes -{ - text-align: center; - margin: 1em; -} -.answers .radio -{ - text-align: right; -} -.survey button -{ - display: block; - margin: auto; -} - diff --git a/forms/cms/training/style.css b/forms/cms/training/style.css index 262a5f44..a73e03f0 100644 --- a/forms/cms/training/style.css +++ b/forms/cms/training/style.css @@ -1,12 +1,9 @@ /* News panel */ -.training -{ - margin: .5em; -} .column { + margin: .5em; max-width: 120em; } @@ -19,7 +16,7 @@ color: #222; border: none; border-radius: 0.1em; - box-shadow: 0 0.2em 0.2em #CCC; + box-shadow: 0 0.2em 0.2em rgba(1, 1, 1, 0.2); margin: .5em; } .new .top @@ -54,4 +51,3 @@ margin: auto; width: 100%; } - diff --git a/forms/cms/training/ui.xml b/forms/cms/training/ui.xml index 6f20f33c..86efa1c7 100755 --- a/forms/cms/training/ui.xml +++ b/forms/cms/training/ui.xml @@ -3,32 +3,39 @@

Training

-
- - +
+ + + + SELECT title, date_time, text, image, id FROM news + WHERE tag = 'course' + ORDER BY priority, date_time DESC + + - SELECT title, date_time, text, image, id FROM news - WHERE tag = 'course' - ORDER BY priority, date_time DESC - - - -
-
-
-

-

- -

-
- +
+
+
+

+

+ +

+
+ +
+
- -
-
- - -
+
+ + +
+
diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index 42411871..baabdb05 100755 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -194,7 +194,7 @@

- +

diff --git a/forms/ecomerce/checkout/ui.xml b/forms/ecomerce/checkout/ui.xml index 96bebaca..3ec793fc 100755 --- a/forms/ecomerce/checkout/ui.xml +++ b/forms/ecomerce/checkout/ui.xml @@ -43,7 +43,7 @@ CALL agency_list_from_date (#date, #address); - SELECT a.Id_Agencia, SUBSTR(a.description, 5) description + SELECT a.Id_Agencia, a.description FROM t_agency t JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id JOIN vn2008.Vistas v ON a.Vista = v.vista_id @@ -166,7 +166,7 @@

Arrival - +

@@ -186,7 +186,7 @@

Arrival - +

@@ -205,7 +205,7 @@

Pickup - +

Warehouse diff --git a/forms/ecomerce/confirm/confirm.js b/forms/ecomerce/confirm/confirm.js index c3ce94d1..261c4cb9 100644 --- a/forms/ecomerce/confirm/confirm.js +++ b/forms/ecomerce/confirm/confirm.js @@ -154,13 +154,8 @@ Hedera.Confirm = new Class this.$('success-dialog').show (); } } - - ,onAcceptClick: function () - { - this.$('success-dialog').hide (); - } - - ,onPopupClose: function () + + ,onDialogResponse: function () { if (this.$('pay-method').value === 'CARD') { diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml index a706ef9b..a5026c86 100755 --- a/forms/ecomerce/confirm/ui.xml +++ b/forms/ecomerce/confirm/ui.xml @@ -212,17 +212,10 @@

- -
-
- -

Order confirmed successfully

-
-
- -
-
- + diff --git a/forms/ecomerce/orders/orders.js b/forms/ecomerce/orders/orders.js index bbede0e5..1e4a6727 100644 --- a/forms/ecomerce/orders/orders.js +++ b/forms/ecomerce/orders/orders.js @@ -54,15 +54,10 @@ Hedera.Orders = new Class this.tpv.pay (amount, null); } - ,onCancelPay: function () + ,onDialogResponse: function (dialog, response) { - this.$('error-dialog').hide (); - } - - ,onRetryPay: function () - { - this.$('error-dialog').hide (); - this.tpv.retryPay (); + if (response == Htk.Dialog.Button.RETRY) + this.tpv.retryPay (); } }); diff --git a/forms/ecomerce/orders/ui.xml b/forms/ecomerce/orders/ui.xml index b908fc7b..bb2385ad 100755 --- a/forms/ecomerce/orders/ui.xml +++ b/forms/ecomerce/orders/ui.xml @@ -73,20 +73,10 @@
- -
-
- -

An error has been in the payment

-
-
- - -
-
- + diff --git a/forms/ecomerce/ticket/ui.xml b/forms/ecomerce/ticket/ui.xml index 78ce6d03..153b16a4 100755 --- a/forms/ecomerce/ticket/ui.xml +++ b/forms/ecomerce/ticket/ui.xml @@ -38,7 +38,7 @@

- +

diff --git a/index.php b/index.php index 3d522da3..b9b0cad3 100755 --- a/index.php +++ b/index.php @@ -1,9 +1,8 @@ run (); -?> diff --git a/js/db/model.js b/js/db/model.js index 2df10aee..600bcf7d 100644 --- a/js/db/model.js +++ b/js/db/model.js @@ -859,9 +859,8 @@ Model.implement return; } - var isOperation = false; - resultSet.fetchResult (); + var isOperation = false; for (var i = 0; i < ops.length; i++) { diff --git a/js/hedera/app.js b/js/hedera/app.js index 460ce7ba..065abf16 100644 --- a/js/hedera/app.js +++ b/js/hedera/app.js @@ -66,31 +66,21 @@ module.exports = new Class ,_onConnError: function (conn, error) { if (error instanceof Vn.JsonException) + switch (error.exception) { - if (error.exception) - var exception = error.exception - .replace (/\\/g, '.') - .replace (/Exception$/, '') - .replace (/^Vn\.Web\./, ''); - else - var exception = null; - - switch (exception) - { - case 'BadLogin': - Htk.Toast.showError (_('Invalid login')); - this._logout (); - break; - case 'SessionExpired': - Htk.Toast.showError (_('You\'ve been too idle')); - this._logout (); - break; - case 'OutdatedVersion': - this._newVersion (error); - break; - default: - Htk.Toast.showError (error.message); - } + case 'BadLogin': + Htk.Toast.showError (_('Invalid login')); + this._logout (); + break; + case 'SessionExpired': + Htk.Toast.showError (_('You\'ve been too idle')); + this._logout (); + break; + case 'OutdatedVersion': + this._newVersion (error); + break; + default: + Htk.Toast.showError (error.message); } else { @@ -107,18 +97,28 @@ module.exports = new Class ,_newVersion: function (error) { - if (this.skipVersion) + if (this.ignoreVersion) return; - this.skipVersion = true; + this.ignoreVersion = true; - if (confirm (_('New version available'))) - location.reload (); + var dialog = new Htk.Dialog ({ + message: _('New version available') + ,buttons: Htk.Dialog.Button.ACCEPT + ,icon: 'warning' + }); + dialog.on ('response', this._onNewVersionResponse, this); + dialog.open (); + } + + ,_onNewVersionResponse: function () + { + location.reload (); } ,_notifyError: function (error) { - Htk.Toast.showError (_('There was an internal error')); + Htk.Toast.showError (_('Something went wrong')); var params = { 'file': error.fileName diff --git a/js/hedera/login.css b/js/hedera/login.css index 53e93656..8083949a 100644 --- a/js/hedera/login.css +++ b/js/hedera/login.css @@ -31,15 +31,13 @@ .vn-login .body { height: inherit; - } .vn-login .column { position: relative; - overflow: auto; margin: 0 auto; max-width: 40em; - height: 100%; + height: inherit; background-color: white; box-shadow: 0 0 .3em 0 rgba(1, 1, 1, 0.4); } @@ -70,7 +68,7 @@ .vn-login .header { - margin-bottom: 3em; + margin-bottom: 2em; } .vn-login .header img { @@ -182,10 +180,22 @@ hr .vn-login .footer { - margin-top: 3em; + margin-top: 2em; } .vn-login .contact { text-align: center; } +@media (max-height: 670px) +{ + .vn-login + { + height: auto; + } + .vn-login .login + { + padding-top: 3.5em; + } +} + diff --git a/js/hedera/style.css b/js/hedera/style.css index 7c8a4631..698ccf29 100644 --- a/js/hedera/style.css +++ b/js/hedera/style.css @@ -456,37 +456,6 @@ img.icon .masonry-box { width: 25%; } } -/* Dialog */ - -.dialog -{ - padding: 1.5em; - max-width: 35em; - font-weight: normal; - color: #555; -} -.dialog p -{ - margin: 0; -} -.dialog img -{ - float: left; - height: 3em; - margin-top: 0; - margin-right: 1em; -} -.dialog p -{ - padding: 0; -} -.dialog > button -{ - float: right; - margin-left: 1em; - margin-top: .5em; -} - /* Social bar */ .htk-social-bar diff --git a/js/htk/dialog.js b/js/htk/dialog.js new file mode 100644 index 00000000..b8aeebbe --- /dev/null +++ b/js/htk/dialog.js @@ -0,0 +1,184 @@ + +var Popup = require ('./popup'); + +/** + * Class to show message dialogs with buttons. + **/ +var Dialog = new Class (); +module.exports = Dialog; + +var Button = +{ + OK : 1 << 1 + ,ACCEPT : 1 << 2 + ,CANCEL : 1 << 3 + ,RETRY : 1 << 4 + ,YES : 1 << 5 + ,NO : 1 << 6 +}; + +var labels = +[{ + response: Button.NO + ,label: 'No' +},{ + response: Button.CANCEL + ,label: 'Cancel' +},{ + response: Button.RETRY + ,label: 'Retry' +},{ + response: Button.ACCEPT + ,label: 'Accept' +},{ + response: Button.OK + ,label: 'Ok' +},{ + response: Button.YES + ,label: 'Yes' +}]; + +Button.CANCEL_ACCEPT = Button.CANCEL | Button.ACCEPT; +Button.ACCEPT_RETRY = Button.ACCEPT | Button.RETRY; +Button.YES_NO = Button.YES | Button.NO; + +Dialog.extend +({ + Button: Button +}); + +Dialog.implement +({ + Extends: Popup + ,Tag: 'htk-dialog' + ,Properties: + { + /** + * The message displayed to the user. + **/ + message: + { + type: String + ,set: function (x) + { + this._message = x; + } + ,get: function () + { + return this._message; + } + } + /** + * The dialog icon. + **/ + ,icon: + { + type: String + ,set: function (x) + { + this._icon = x; + } + ,get: function () + { + return this._icon; + } + } + /** + * The dialog buttons. + **/ + ,buttons: + { + enumType: Button + ,set: function (x) + { + this._buttons = x; + } + ,get: function () + { + return this._buttons; + } + } + } + + ,_modal: true + ,_icon: 'info' + ,_buttons: Button.ACCEPT + + ,initialize: function (props) + { + this.parent (props); + this.on ('closed', this._onClosed, this); + } + + ,open: function () + { + this.parent (); + + // Dialog body + + var root = this.createElement ('div'); + root.className = 'htk-dialog'; + + var body = this.createElement ('div'); + root.appendChild (body); + + if (this._icon) + { + var icon = new Htk.Icon ({ + doc: this.doc, + icon: this._icon + }); + body.appendChild (icon.node); + } + + var p = this.createElement ('p'); + body.appendChild (p); + + if (this._message) + p.appendChild (this.createTextNode (this._message)); + + var clear = this.createElement ('div'); + clear.style.clear = 'both'; + body.appendChild (clear); + + // Button bar + + var buttonBar = this._buttonBar = this.createElement ('div'); + buttonBar.className = 'button-bar'; + root.appendChild (buttonBar); + + var i = labels.length; + + while (i--) + if (this._buttons & labels[i].response) + this.createButton (_(labels[i].label), labels[i].response); + + var clear = this.createElement ('div'); + clear.style.clear = 'both'; + root.appendChild (clear); + + this.childNode = root; + } + + ,createButton: function (label, response) + { + var button = this.createElement ('button'); + button.className = 'thin'; + button.appendChild (this.createTextNode (label)); + button.addEventListener ('click', + this._onButtonClick.bind (this, response)); + this._buttonBar.appendChild (button); + } + + ,_onButtonClick: function (response) + { + this.hide (); + this.signalEmit ('response', response); + } + + ,_onClosed: function () + { + this.signalEmit ('response', null); + } +}); + diff --git a/js/htk/field/date-chooser.js b/js/htk/field/date-chooser.js index f6dfdcf4..275bb793 100644 --- a/js/htk/field/date-chooser.js +++ b/js/htk/field/date-chooser.js @@ -58,7 +58,7 @@ module.exports = new Class this.calendar.on ('changed', this._onCalendarChange.bind (this)); this.popup = new Htk.Popup (); - this.popup.setChild (this.calendar); + this.popup.child = this.calendar; } else if (!editable) this.node.appendChild (this.label); diff --git a/js/htk/grid.js b/js/htk/grid.js index ff77a4a1..da578b03 100644 --- a/js/htk/grid.js +++ b/js/htk/grid.js @@ -42,7 +42,7 @@ module.exports = new Class emptyMessage: { type: String - ,value: _('NoData') + ,value: null }, /** * Wether to display the header with column titles. @@ -188,9 +188,12 @@ module.exports = new Class ,onModelChange: function () { + var emptyMessage = this.emptyMessage ? + this.emptyMessage : _('NoData'); + if (!this._model) { - this.showMessage (this.emptyMessage, 'refresh.svg'); + this.showMessage (emptyMessage, 'refresh.svg'); return; } @@ -212,7 +215,7 @@ module.exports = new Class this.showMessage (_('Loading'), null); break; case Db.Model.Status.CLEAN: - this.showMessage (this.emptyMessage, 'refresh'); + this.showMessage (emptyMessage, 'refresh'); break; case Db.Model.Status.ERROR: this.showMessage (_('ErrorLoadingData'), 'error'); diff --git a/js/htk/htk.js b/js/htk/htk.js index 31d86678..496b9777 100644 --- a/js/htk/htk.js +++ b/js/htk/htk.js @@ -7,6 +7,7 @@ Htk = module.exports = { ,Widget : require ('./widget') ,Component : require ('./component') ,Popup : require ('./popup') + ,Dialog : require ('./dialog') ,Toast : require ('./toast') ,Repeater : require ('./repeater') ,Grid : require ('./grid') diff --git a/js/htk/popup.js b/js/htk/popup.js index bc7b60b8..55852615 100644 --- a/js/htk/popup.js +++ b/js/htk/popup.js @@ -19,7 +19,7 @@ module.exports = new Class ,set: function (x) { this._child = x; - this.setChildNode (x.node); + this._setChildNode (x.node); } ,get: function () { @@ -35,7 +35,7 @@ module.exports = new Class ,set: function (x) { this._child = null; - this.setChildNode (x); + this._setChildNode (x); } ,get: function () { @@ -76,12 +76,7 @@ module.exports = new Class div.className = 'htk-popup'; } - ,setChild: function (child) - { - this.setChildNode (child.node); - } - - ,setChildNode: function (childNode) + ,_setChildNode: function (childNode) { Vn.Node.removeChilds (this.node); this.node.appendChild (childNode); diff --git a/js/htk/repeater.js b/js/htk/repeater.js index b25f8cd9..8e7dc5ee 100644 --- a/js/htk/repeater.js +++ b/js/htk/repeater.js @@ -68,7 +68,7 @@ module.exports = new Class ,emptyMessage: { type: String - ,value: _('NoData') + ,value: null } } @@ -157,8 +157,12 @@ module.exports = new Class this._showMessage (_('Loading'), null); break; case Db.Model.Status.CLEAN: - this._showMessage (this.emptyMessage, 'refresh'); + { + var emptyMessage = this.emptyMessage ? + this.emptyMessage : _('NoData'); + this._showMessage (emptyMessage, 'refresh'); break; + } case Db.Model.Status.ERROR: this._showMessage (_('ErrorLoadingData'), 'error'); break; diff --git a/js/htk/style.css b/js/htk/style.css index b2c06930..99aa58b9 100644 --- a/js/htk/style.css +++ b/js/htk/style.css @@ -446,6 +446,37 @@ td.cell-image .htk-image font-size: 1.2em; } +/* Dialog */ + +.htk-dialog +{ + padding: 1.5em; + max-width: 25em; + font-weight: normal; + color: #555; +} +.htk-dialog p +{ + margin: 0; +} +.htk-dialog img +{ + float: left; + height: 3em; + margin-top: 0; + margin-right: 1em; +} +.htk-dialog p +{ + padding: 0; +} +.htk-dialog .button-bar > button +{ + float: right; + margin-left: 1em; + margin-top: .5em; +} + /* Assistant */ .htk-assistant > div diff --git a/js/vn/json-connection.js b/js/vn/json-connection.js index 7c59bbd0..74e94c3d 100644 --- a/js/vn/json-connection.js +++ b/js/vn/json-connection.js @@ -19,15 +19,26 @@ module.exports = new Class ,initialize: function () { this.parent (); - this.token = this.fetchToken (); + this.fetchToken (); } ,fetchToken: function () { + var token = null; + if (sessionStorage.getItem ('vnToken')) - return sessionStorage.getItem ('vnToken'); + token = sessionStorage.getItem ('vnToken'); if (localStorage.getItem ('vnToken')) - return localStorage.getItem ('vnToken'); + token = localStorage.getItem ('vnToken'); + + this.token = token; + } + + ,clearToken: function () + { + this.token = null; + localStorage.removeItem ('vnToken'); + sessionStorage.removeItem ('vnToken'); } /** @@ -103,10 +114,7 @@ module.exports = new Class ,_closeClient: function () { this._connected = false; - this.token = null; - - localStorage.removeItem ('vnToken'); - sessionStorage.removeItem ('vnToken'); + this.clearToken (); } /** @@ -136,7 +144,7 @@ module.exports = new Class **/ ,supplantEnd: function () { - this.token = this.fetchToken (); + this.fetchToken (); } /** @@ -229,7 +237,7 @@ module.exports = new Class if (request.status == 0) { var ex = new JsonException (); - ex.message = _('The server does not respond, please check you Internet connection'); + ex.message = _('The server does not respond, please check your Internet connection'); throw ex; } @@ -261,8 +269,16 @@ module.exports = new Class } else { + var exception = jsData.exception; + + if (exception) + exception = exception + .replace (/\\/g, '.') + .replace (/Exception$/, '') + .replace (/^Vn\.Web\./, ''); + var ex = new JsonException (); - ex.exception = jsData.exception; + ex.exception = exception; ex.message = jsData.message; ex.code = jsData.code; ex.file = jsData.file; @@ -288,7 +304,12 @@ module.exports = new Class } if (error) + { + if (error.exception == 'SessionExpired') + this.clearToken (); + this.signalEmit ('error', error); + } } }); diff --git a/js/vn/json-exception.js b/js/vn/json-exception.js index c78c83f7..cd7ebc13 100644 --- a/js/vn/json-exception.js +++ b/js/vn/json-exception.js @@ -10,11 +10,14 @@ module.exports = new Class ,line: null ,trace: null - ,initialize: function (domain, code, message) + ,initialize: function (exception, message, code, file, line, trace) { - this.domain = domain; - this.code = code; + this.exception = exception; this.message = message; + this.code = code; + this.file = file; + this.line = line; + this.trace = trace; } }); diff --git a/locale/ca/forms/ecomerce/catalog.json b/locale/ca/forms/ecomerce/catalog.json index a39efd6d..0589742e 100755 --- a/locale/ca/forms/ecomerce/catalog.json +++ b/locale/ca/forms/ecomerce/catalog.json @@ -14,7 +14,6 @@ ,"StartOrder": "Començar comanda" ,"ShoppingBasket": "Cistella de la compra" - ,"%A, %e of %B": "%A, %e de %B" ,"Agency": "Agència" ,"Warehouse": "Magatzem" diff --git a/locale/ca/forms/ecomerce/checkout.json b/locale/ca/forms/ecomerce/checkout.json index 0b70dc20..3f0764fc 100755 --- a/locale/ca/forms/ecomerce/checkout.json +++ b/locale/ca/forms/ecomerce/checkout.json @@ -18,7 +18,6 @@ ,"ConfirmToAccessCatalog": "Confirma les dades per accedir al catàleg" ,"Arrival": "Arribada" ,"Pickup": "Recollida" - ,"%A, %e of %B": "%A, %e de %B" ,"Agency": "Agència" ,"Warehouse": "Magatzem" ,"Confirm": "Confirmar" diff --git a/locale/ca/forms/ecomerce/ticket.json b/locale/ca/forms/ecomerce/ticket.json index 4c450fa0..fe99237b 100755 --- a/locale/ca/forms/ecomerce/ticket.json +++ b/locale/ca/forms/ecomerce/ticket.json @@ -1,7 +1,6 @@ { "OrderDetail": "Detall de l'encarrec" - ,"%A, %e of %B %Y": "%A, %e de %B %Y" ,"Print delivery note": "Imprimir albarà" ,"Delivery": "Entrega" diff --git a/locale/ca/js/hedera.json b/locale/ca/js/hedera.json index 35889e05..d60b1289 100644 --- a/locale/ca/js/hedera.json +++ b/locale/ca/js/hedera.json @@ -13,7 +13,6 @@ ,"You've been too idle": "Has estat massa temps inactiu i la sessió ha expirat" ,"Invalid login": "Usuari o contrasenya incorrectes, recorda que s'hi distingeix entre majúscula i minúscula" - ,"There was an internal error": "S'ha produït un error intern" ,"Please write your user name": "Si us plau introdueix el teu nom d'usuari" ,"A mail has been sent wich you can recover your password": "T'hem enviat un correu on podràs recuperar la teva contrasenya" diff --git a/locale/ca/js/vn.json b/locale/ca/js/vn.json index 147f984d..77a72036 100644 --- a/locale/ca/js/vn.json +++ b/locale/ca/js/vn.json @@ -42,4 +42,9 @@ ,"Dec": "Des" ,"%A, %B %e": "%A, %e de %B" + + ,"Something went wrong": + "Alguna cosa ha anat malament" + ,"The server does not respond, please check your Internet connection": + "El servidor no respon, si us plau comprova la teva connexió a Internet" } diff --git a/locale/en/forms/ecomerce/catalog.json b/locale/en/forms/ecomerce/catalog.json index 8096ada0..981bc119 100755 --- a/locale/en/forms/ecomerce/catalog.json +++ b/locale/en/forms/ecomerce/catalog.json @@ -14,7 +14,6 @@ ,"StartOrder": "Start order" ,"ShoppingBasket": "Shopping basket" - ,"%A, %e of %B": "%A, %e of %B" ,"Agency": "Agency" ,"Warehouse": "Warehouse" diff --git a/locale/en/forms/ecomerce/checkout.json b/locale/en/forms/ecomerce/checkout.json index 2ee47c1b..9ba28bcc 100755 --- a/locale/en/forms/ecomerce/checkout.json +++ b/locale/en/forms/ecomerce/checkout.json @@ -18,7 +18,6 @@ ,"ConfirmToAccessCatalog": "Confirm the data to access the catalog" ,"Arrival": "Arrival" ,"Pickup": "Pickup" - ,"%A, %e of %B": "%A, %e of %B" ,"Agency": "Agency" ,"Warehouse": "Store" ,"Confirm": "Confirm" diff --git a/locale/en/forms/ecomerce/ticket.json b/locale/en/forms/ecomerce/ticket.json index ccb4cd01..dc7ccbf6 100755 --- a/locale/en/forms/ecomerce/ticket.json +++ b/locale/en/forms/ecomerce/ticket.json @@ -1,7 +1,6 @@ { "OrderDetail": "Order detail" - ,"%A, %e of %B %Y": "%A, %e of %B %Y" ,"Print delivery note": "Print delivery note" ,"Delivery": "Delivery" diff --git a/locale/en/js/hedera.json b/locale/en/js/hedera.json index 79df4760..aa7b2bd5 100644 --- a/locale/en/js/hedera.json +++ b/locale/en/js/hedera.json @@ -13,7 +13,6 @@ ,"You've been too idle": "You have been idle too long and your session has expired" ,"Invalid login": "Username or password incorrect, remember that it is case-sensitive" - ,"There was an internal error": "There was an internal error" ,"Please write your user name": "Please write your user name" ,"A mail has been sent wich you can recover your password": "A mail has been sent wich you can recover your password" diff --git a/locale/en/js/vn.json b/locale/en/js/vn.json index 6ab3efb8..f2ee6372 100644 --- a/locale/en/js/vn.json +++ b/locale/en/js/vn.json @@ -42,4 +42,9 @@ ,"Dec": "Dic" ,"%A, %B %e": "%A, %B %e" + + ,"Something went wrong": + "Something went wrong" + ,"The server does not respond, please check your Internet connection": + "The server does not respond, please check you Internet connection" } diff --git a/locale/en/vn/web.json b/locale/en/vn/web.json index bfee1158..77ef30c8 100755 --- a/locale/en/vn/web.json +++ b/locale/en/vn/web.json @@ -1,4 +1,5 @@ { - "You don't have enough privileges": "You don't have enough privileges" + "Something went wrong": "Something went wrong" + ,"You don't have enough privileges": "You don't have enough privileges" ,"Missing parameters": "Missing parameters" } diff --git a/locale/es/forms/ecomerce/catalog.json b/locale/es/forms/ecomerce/catalog.json index f6169903..4a588d82 100755 --- a/locale/es/forms/ecomerce/catalog.json +++ b/locale/es/forms/ecomerce/catalog.json @@ -14,7 +14,6 @@ ,"StartOrder": "Empezar pedido" ,"ShoppingBasket": "Cesta de la compra" - ,"%A, %e of %B": "%A, %e de %B" ,"Agency": "Agencia" ,"Warehouse": "Almacén" diff --git a/locale/es/forms/ecomerce/checkout.json b/locale/es/forms/ecomerce/checkout.json index af1c34b0..b2f1bcab 100755 --- a/locale/es/forms/ecomerce/checkout.json +++ b/locale/es/forms/ecomerce/checkout.json @@ -18,7 +18,6 @@ ,"ConfirmToAccessCatalog": "Confirma los datos para acceder al catálogo" ,"Arrival": "Llegada" ,"Pickup": "Recogida" - ,"%A, %e of %B": "%A, %e de %B" ,"Agency": "Agencia" ,"Warehouse": "Almacén" ,"Confirm": "Confirmar" diff --git a/locale/es/forms/ecomerce/ticket.json b/locale/es/forms/ecomerce/ticket.json index ef5acf3e..be06236d 100755 --- a/locale/es/forms/ecomerce/ticket.json +++ b/locale/es/forms/ecomerce/ticket.json @@ -1,7 +1,6 @@ { "OrderDetail": "Detalle del pedido" - ,"%A, %e of %B %Y": "%A, %e de %B %Y" ,"Print delivery note": "Imprimir albarán" ,"Delivery": "Entrega" diff --git a/locale/es/js/hedera.json b/locale/es/js/hedera.json index 4c81f8af..a02db79d 100644 --- a/locale/es/js/hedera.json +++ b/locale/es/js/hedera.json @@ -13,7 +13,6 @@ ,"You've been too idle": "Has estado demasiado tiempo inactivo y la sesión ha expirado" ,"Invalid login": "Usuario o contraseña incorrectos, recuerda que se hace distinción entre mayúsculas y minúsculas" - ,"There was an internal error": "Se ha producido un error interno" ,"Please write your user name": "Por favor escribe tu nombre de usuario" ,"A mail has been sent wich you can recover your password": "Te hemos enviado un correo donde podrás recuperar tu contraseña" diff --git a/locale/es/js/vn.json b/locale/es/js/vn.json index 697d3d52..400dee13 100644 --- a/locale/es/js/vn.json +++ b/locale/es/js/vn.json @@ -42,4 +42,9 @@ ,"Dec": "Dic" ,"%A, %B %e": "%A, %e de %B" + + ,"Something went wrong": + "Algo salió mal" + ,"The server does not respond, please check your Internet connection": + "El servidor no responde, por favor comprueba tu conexión a Internet" } diff --git a/locale/es/vn/web.json b/locale/es/vn/web.json index ced29b1a..ff5f8aaa 100755 --- a/locale/es/vn/web.json +++ b/locale/es/vn/web.json @@ -1,4 +1,5 @@ { - "You don't have enough privileges": "No tienes suficientes privilegios" + "Something went wrong": "Algo salió mal" + ,"You don't have enough privileges": "No tienes suficientes privilegios" ,"Missing parameters": "Faltan parámetros" } diff --git a/locale/fr/forms/ecomerce/catalog.json b/locale/fr/forms/ecomerce/catalog.json index 587ff699..9c9b99eb 100755 --- a/locale/fr/forms/ecomerce/catalog.json +++ b/locale/fr/forms/ecomerce/catalog.json @@ -14,7 +14,6 @@ ,"StartOrder": "Acheter" ,"ShoppingBasket": "Mon panier" - ,"%A, %e of %B": "%A, %e de %B" ,"Agency": "Agence" ,"Warehouse": "Entrepôt" diff --git a/locale/fr/forms/ecomerce/checkout.json b/locale/fr/forms/ecomerce/checkout.json index 429aca89..13be44cc 100755 --- a/locale/fr/forms/ecomerce/checkout.json +++ b/locale/fr/forms/ecomerce/checkout.json @@ -18,7 +18,6 @@ ,"ConfirmToAccessCatalog": "Confirme les coordonnées pour accéder au catalogue" ,"Arrival": "Arrivée" ,"Pickup": "Retrait" - ,"%A, %e of %B": "%A, %e %B" ,"Agency": "Agence" ,"Warehouse": "MAgasin" ,"Confirm": "Confirmer" diff --git a/locale/fr/forms/ecomerce/ticket.json b/locale/fr/forms/ecomerce/ticket.json index 89fc71d6..4a3764a1 100755 --- a/locale/fr/forms/ecomerce/ticket.json +++ b/locale/fr/forms/ecomerce/ticket.json @@ -1,7 +1,6 @@ { "OrderDetail": "Détails de la commande" - ,"%A, %e of %B %Y": "%A, %e de %B %Y" ,"Print delivery note": "Imprimer bulletin de livraison" ,"Delivery": "Accouchement" diff --git a/locale/fr/js/hedera.json b/locale/fr/js/hedera.json index 2cf30b85..e77ce879 100644 --- a/locale/fr/js/hedera.json +++ b/locale/fr/js/hedera.json @@ -13,7 +13,6 @@ ,"You've been too idle": "Il a eu le temps de trop paresseux et votre session a expiré" ,"Invalid login": "Utilisateur ou mot de passe incorrect, n'oubliez pas de distinction entre majuscules et minuscules" - ,"There was an internal error": "Il ya eu une erreur interne" ,"Please write your user name": "S'il vous plaît entrer votre nom d'utilisateur" ,"A mail has been sent wich you can recover your password": "Nous avons envoyé un e-mail où vous pouvez récupérer votre mot de passe" diff --git a/locale/fr/js/vn.json b/locale/fr/js/vn.json index 7fec0639..07c3e725 100644 --- a/locale/fr/js/vn.json +++ b/locale/fr/js/vn.json @@ -42,4 +42,9 @@ ,"Dec": "Déc" ,"%A, %B %e": "%A, %B %e" + + ,"Something went wrong": + "Quelque-chose s'est mal passé" + ,"The server does not respond, please check your Internet connection": + "Le serveur ne répond pas, s'il vous plaît vérifier votre connexion Internet" } diff --git a/locale/mn/forms/ecomerce/catalog.json b/locale/mn/forms/ecomerce/catalog.json index 8096ada0..981bc119 100755 --- a/locale/mn/forms/ecomerce/catalog.json +++ b/locale/mn/forms/ecomerce/catalog.json @@ -14,7 +14,6 @@ ,"StartOrder": "Start order" ,"ShoppingBasket": "Shopping basket" - ,"%A, %e of %B": "%A, %e of %B" ,"Agency": "Agency" ,"Warehouse": "Warehouse" diff --git a/locale/mn/forms/ecomerce/checkout.json b/locale/mn/forms/ecomerce/checkout.json index 2ee47c1b..9ba28bcc 100755 --- a/locale/mn/forms/ecomerce/checkout.json +++ b/locale/mn/forms/ecomerce/checkout.json @@ -18,7 +18,6 @@ ,"ConfirmToAccessCatalog": "Confirm the data to access the catalog" ,"Arrival": "Arrival" ,"Pickup": "Pickup" - ,"%A, %e of %B": "%A, %e of %B" ,"Agency": "Agency" ,"Warehouse": "Store" ,"Confirm": "Confirm" diff --git a/locale/mn/forms/ecomerce/ticket.json b/locale/mn/forms/ecomerce/ticket.json index ccb4cd01..dc7ccbf6 100755 --- a/locale/mn/forms/ecomerce/ticket.json +++ b/locale/mn/forms/ecomerce/ticket.json @@ -1,7 +1,6 @@ { "OrderDetail": "Order detail" - ,"%A, %e of %B %Y": "%A, %e of %B %Y" ,"Print delivery note": "Print delivery note" ,"Delivery": "Delivery" diff --git a/locale/mn/js/hedera.json b/locale/mn/js/hedera.json index d1d37267..9af24bc8 100644 --- a/locale/mn/js/hedera.json +++ b/locale/mn/js/hedera.json @@ -13,7 +13,6 @@ ,"You've been too idle": "Та нар ч бас зогссон байсан, чуулган хугацаа дууссан байна" ,"Invalid login": "Хэрэглэгчийн нэр эсвэл нууц үг буруу, Тэр хэргийг мэдрэмтгий гэдгийг санаарай" - ,"There was an internal error": "Дотоод алдаа гарлаа" ,"Please write your user name": "Хэрэглэгчийн нэрээ бичнэ үү" ,"A mail has been sent wich you can recover your password": "Мэйл та нууц үгээ сэргээх боломжтой А байна илгээсэн" diff --git a/locale/mn/js/vn.json b/locale/mn/js/vn.json index 1de82659..de1f336b 100644 --- a/locale/mn/js/vn.json +++ b/locale/mn/js/vn.json @@ -42,4 +42,9 @@ ,"Dec": "Арв" ,"%A, %B %e": "%A, %B %e" + + ,"Something went wrong": + "Something went wrong" + ,"The server does not respond, please check your Internet connection": + "The server does not respond, please check you Internet connection" } diff --git a/locale/pt/forms/ecomerce/catalog.json b/locale/pt/forms/ecomerce/catalog.json index ab4574a0..bfe501f8 100644 --- a/locale/pt/forms/ecomerce/catalog.json +++ b/locale/pt/forms/ecomerce/catalog.json @@ -14,7 +14,6 @@ ,"StartOrder": "Iniciar pedido" ,"ShoppingBasket": "Cesta da compra" - ,"%A, %e of %B": "%A, %e of %B" ,"Agency": "Agência" ,"Warehouse": "Armazém" diff --git a/locale/pt/forms/ecomerce/checkout.json b/locale/pt/forms/ecomerce/checkout.json index 12997f03..7d511ba3 100644 --- a/locale/pt/forms/ecomerce/checkout.json +++ b/locale/pt/forms/ecomerce/checkout.json @@ -18,7 +18,6 @@ ,"ConfirmToAccessCatalog": "Confirme os dados para entrar no catálogo" ,"Arrival": "Chegada" ,"Pickup": "Recolhida" - ,"%A, %e of %B": "%A, %e de %B" ,"Agency": "Agência" ,"Warehouse": "Armazém" ,"Confirm": "Confirmar" diff --git a/locale/pt/forms/ecomerce/ticket.json b/locale/pt/forms/ecomerce/ticket.json index a70e10cc..486f2eb8 100644 --- a/locale/pt/forms/ecomerce/ticket.json +++ b/locale/pt/forms/ecomerce/ticket.json @@ -1,7 +1,6 @@ { "OrderDetail": "Detalhe do pedido" - ,"%A, %e of %B %Y": "%A, %e de %B %Y" ,"Print delivery note": "Imprimir guía de remessa" ,"Delivery": "Entrega" diff --git a/locale/pt/js/hedera.json b/locale/pt/js/hedera.json index 7e8601ae..21409416 100644 --- a/locale/pt/js/hedera.json +++ b/locale/pt/js/hedera.json @@ -13,7 +13,6 @@ ,"You've been too idle": "Muito tempo de inatividade, a sessão foi finalizada" ,"Invalid login": "Usuário ou Palavra-Passe incorreto, lembre-se de diferenciar maiusculas e minusculas" - ,"There was an internal error": "Houve um erro interno" ,"Please write your user name": "Por favor, escreva seu nome de usuário" ,"A mail has been sent wich you can recover your password": "Um e-mail foi enviado a qual poderá recuperar sua senha" diff --git a/locale/pt/js/vn.json b/locale/pt/js/vn.json index d236b833..538ed138 100644 --- a/locale/pt/js/vn.json +++ b/locale/pt/js/vn.json @@ -42,4 +42,9 @@ ,"Dec": "Dez" ,"%A, %B %e": "%A, %B %e" + + ,"Something went wrong": + "Algo deu errado" + ,"The server does not respond, please check your Internet connection": + "O servidor não responde, por favor, verifique sua conexão com a Internet" } diff --git a/reports/delivery-note/ui.xml b/reports/delivery-note/ui.xml index 5b5ae0f8..e92107b1 100755 --- a/reports/delivery-note/ui.xml +++ b/reports/delivery-note/ui.xml @@ -23,7 +23,7 @@

- +

diff --git a/web/json-service.php b/web/json-service.php index 3c849699..846ee32b 100644 --- a/web/json-service.php +++ b/web/json-service.php @@ -61,7 +61,7 @@ class JsonService extends RestService if (_DEV_MODE || $errno & $eUser) $json->message = $message; else - $json->message = 'Something went wrong'; + $json->message = s('Something went wrong'); if (_DEV_MODE) { @@ -99,7 +99,7 @@ class JsonService extends RestService else { $json->exception = 'Exception'; - $json->message = 'Something went wrong'; + $json->message = s('Something went wrong'); } if (_DEV_MODE)