verdnatura/hedera-web
verdnatura
/
hedera-web
0
1
Fork 3
Code Issues Pull Requests 7 Releases Wiki Activity

Traducciones actualizadas, Htk.Dialog, env.php, errores solucionados

This commit is contained in:
Juan Ferrer Toribio 2016-10-20 10:37:08 +02:00
parent 31176f8bb3
commit 9327e5d22f
62 changed files with 422 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.373-deb8) stable; urgency=low hedera-web (1.376-deb8) stable; urgency=low
* Initial Release. * Initial Release.

2
environ.php → env.php
View File

@ -1,6 +1,6 @@
<?php <?php
require_once __DIR__.'/../php-vn-lib/environ.php'; require_once __DIR__.'/../php-vn-lib/env.php';
set_include_path (__DIR__.PATH_SEPARATOR.get_include_path ()); set_include_path (__DIR__.PATH_SEPARATOR.get_include_path ());

20
forms/account/conf/ui.xml
View File

@ -64,7 +64,7 @@
<htk-popup <htk-popup
id="change-password" id="change-password"
modal="true"> modal="true">
<div property="child-node" class="dialog pass-change"> <div property="child-node" class="htk-dialog pass-change">
<div> <div>
<input <input
id="old-password" id="old-password"
@ -79,19 +79,21 @@
type="password" type="password"
placeholder="_Repeat password"/> placeholder="_Repeat password"/>
</div> </div>
<button class="thin" on-click="onPassModifyClick"> <div class="button-bar">
<t>Modify</t> <button class="thin" on-click="onPassModifyClick">
</button> <t>Modify</t>
<button class="thin" on-click="onPassInfoClick"> </button>
<t>Info</t> <button class="thin" on-click="onPassInfoClick">
</button> <t>Info</t>
<div class="clear"/> </button>
<div class="clear"/>
</div>
</div> </div>
</htk-popup> </htk-popup>
<htk-popup <htk-popup
id="password-info" id="password-info"
modal="true"> modal="true">
<div property="child-node" class="dialog pass-info"> <div property="child-node" class="htk-dialog pass-info">
<h3> <h3>
<t>Password requirements</t> <t>Password requirements</t>
</h3> </h3>

1
forms/admin/shelves/shelves.js
View File

@ -6,6 +6,7 @@ Hedera.Shelves = new Class
,activate: function () ,activate: function ()
{ {
this.$('date').value = new Date (); this.$('date').value = new Date ();
this.$('useIds').value = false;
} }
,onConfigChange: function () ,onConfigChange: function ()

24
forms/cms/home/style.css
View File

@ -63,27 +63,3 @@
width: 100%; 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;
}

8
forms/cms/training/style.css
View File

@ -1,12 +1,9 @@
/* News panel */ /* News panel */
.training
{
margin: .5em;
}
.column .column
{ {
margin: .5em;
max-width: 120em; max-width: 120em;
} }
@ -19,7 +16,7 @@
color: #222; color: #222;
border: none; border: none;
border-radius: 0.1em; 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; margin: .5em;
} }
.new .top .new .top
@ -54,4 +51,3 @@
margin: auto; margin: auto;
width: 100%; width: 100%;
} }

55
forms/cms/training/ui.xml
View File

@ -3,32 +3,39 @@
<h1><t>Training</t></h1> <h1><t>Training</t></h1>
</div> </div>
<div id="form" class="training"> <div id="form" class="training">
<div class="column masonry" id="news-column"> <div class="column mansonry" id="news-column">
<htk-repeater form-id="new"> <htk-repeater form-id="new">
<db-model property="model"> <db-model property="model">
<custom>
SELECT title, date_time, text, image, id FROM news
WHERE tag = 'course'
ORDER BY priority, date_time DESC
</custom>
</db-model>
<custom> <custom>
SELECT title, date_time, text, image, id FROM news <div class="masonry-box">
WHERE tag = 'course' <div class="new">
ORDER BY priority, date_time DESC <div class="top">
</custom> <h2><htk-text form="new" column="title"/></h2>
</db-model> <p class="new-info">
<custom> <htk-text format="_%a, %e %b %Y" form="new" column="date_time"/>
<div class="masonry-box"> </p>
<div class="new"> <div class="new-text">
<div class="top"> <htk-html form="new" column="text"/>
<h2><htk-text form="new" column="title"/></h2> </div>
<p class="new-info">
<htk-text format="_%a, %e %b %Y" form="new" column="date_time"/>
</p>
<div class="new-text">
<htk-html form="new" column="text"/>
</div> </div>
<htk-image
directory="news"
subdir="full"
form="new"
column="image"
editable="false"
full-dir="full"/>
</div> </div>
<htk-image directory="news/full" form="new" column="image"/> </div>
</div> </custom>
</div> </htk-repeater>
</custom> <div class="clear"/>
</htk-repeater> </div>
</div>
</div> </div>
</vn> </vn>

2
forms/ecomerce/catalog/ui.xml
View File

@ -194,7 +194,7 @@
<div id="right-panel" class="right-panel" on-click="onRightPanelClick"> <div id="right-panel" class="right-panel" on-click="onRightPanelClick">
<div class="basket-info"> <div class="basket-info">
<p> <p>
<htk-text form="basket" column="date_send" format="_%A, %e of %B"/> <htk-text form="basket" column="date_send" format="%D"/>
</p> </p>
<p> <p>
<span id="method"/> <span id="method"/>

8
forms/ecomerce/checkout/ui.xml
View File

@ -43,7 +43,7 @@
<db-model id="warehouses" auto-load="false" result-index="1" on-status-changed="onWarehousesReady"> <db-model id="warehouses" auto-load="false" result-index="1" on-status-changed="onWarehousesReady">
<custom> <custom>
CALL agency_list_from_date (#date, #address); 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 FROM t_agency t
JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
JOIN vn2008.Vistas v ON a.Vista = v.vista_id JOIN vn2008.Vistas v ON a.Vista = v.vista_id
@ -166,7 +166,7 @@
<div class="answers target"> <div class="answers target">
<p> <p>
<t>Arrival</t> <t>Arrival</t>
<htk-text format="_%A, %e of %B" param="date"/> <htk-text format="%D" param="date"/>
</p> </p>
<p> <p>
<htk-text form="address-form" column="name"/> <htk-text form="address-form" column="name"/>
@ -186,7 +186,7 @@
<div class="answers target"> <div class="answers target">
<p> <p>
<t>Arrival</t> <t>Arrival</t>
<htk-text format="_%A, %e of %B" param="date"/> <htk-text format="%D" param="date"/>
</p> </p>
<p> <p>
<htk-text form="address-form" column="name"/> <htk-text form="address-form" column="name"/>
@ -205,7 +205,7 @@
<div class="answers target"> <div class="answers target">
<p> <p>
<t>Pickup</t> <t>Pickup</t>
<htk-text format="_%A, %e of %B" param="date"/> <htk-text format="%D" param="date"/>
</p> </p>
<p> <p>
<t>Warehouse</t> <t>Warehouse</t>

9
forms/ecomerce/confirm/confirm.js
View File

@ -154,13 +154,8 @@ Hedera.Confirm = new Class
this.$('success-dialog').show (); this.$('success-dialog').show ();
} }
} }
,onAcceptClick: function () ,onDialogResponse: function ()
{
this.$('success-dialog').hide ();
}
,onPopupClose: function ()
{ {
if (this.$('pay-method').value === 'CARD') if (this.$('pay-method').value === 'CARD')
{ {

19
forms/ecomerce/confirm/ui.xml
View File

@ -212,17 +212,10 @@
</div> </div>
</div> </div>
</div> </div>
<htk-popup id="success-dialog" modal="true" on-closed="onPopupClose"> <htk-dialog
<div property="child-node" class="dialog"> id="success-dialog"
<div> icon="ok"
<htk-icon icon="ok" alt="_Ok"/> message="_Order confirmed successfully"
<p><t>Order confirmed successfully</t></p> buttons="ACCEPT"
<div class="clear"/> on-response="onDialogResponse"/>
</div>
<button class="thin" on-click="onAcceptClick">
<t>Accept</t>
</button>
<div class="clear"/>
</div>
</htk-popup>
</vn> </vn>

11
forms/ecomerce/orders/orders.js
View File

@ -54,15 +54,10 @@ Hedera.Orders = new Class
this.tpv.pay (amount, null); this.tpv.pay (amount, null);
} }
,onCancelPay: function () ,onDialogResponse: function (dialog, response)
{ {
this.$('error-dialog').hide (); if (response == Htk.Dialog.Button.RETRY)
} this.tpv.retryPay ();
,onRetryPay: function ()
{
this.$('error-dialog').hide ();
this.tpv.retryPay ();
} }
}); });

22
forms/ecomerce/orders/ui.xml
View File

@ -73,20 +73,10 @@
</htk-repeater> </htk-repeater>
</div> </div>
</div> </div>
<htk-popup id="error-dialog" modal="true"> <htk-dialog
<div property="child-node" class="dialog"> id="error-dialog"
<div> icon="error"
<htk-icon icon="error" alt="_Error"/> message="_An error has been in the payment"
<p><t>An error has been in the payment</t></p> buttons="ACCEPT_RETRY"
<div class="clear"/> on-response="onDialogResponse"/>
</div>
<button class="thin" on-click="onRetryPay">
<t>Retry</t>
</button>
<button class="thin" on-click="onCancelPay">
<t>Accept</t>
</button>
<div class="clear"/>
</div>
</htk-popup>
</vn> </vn>

2
forms/ecomerce/ticket/ui.xml
View File

@ -38,7 +38,7 @@
<htk-text column="id" form="ticket"/> <htk-text column="id" form="ticket"/>
</p> </p>
<p> <p>
<htk-text form="ticket" column="delivery" format="%A, %e of %B %Y"/> <htk-text form="ticket" column="delivery" format="%D"/>
</p> </p>
</div> </div>
<div> <div>

3
index.php
View File

@ -1,9 +1,8 @@
<?php <?php
@include_once __DIR__.'/environ.php'; @include_once __DIR__.'/env.php';
require_once 'vn-autoload.php'; require_once 'vn-autoload.php';
$webApp = new Vn\Web\App ('hedera-web'); $webApp = new Vn\Web\App ('hedera-web');
$webApp->run (); $webApp->run ();
?>

3
js/db/model.js
View File

@ -859,9 +859,8 @@ Model.implement
return; return;
} }
var isOperation = false;
resultSet.fetchResult (); resultSet.fetchResult ();
var isOperation = false;
for (var i = 0; i < ops.length; i++) for (var i = 0; i < ops.length; i++)
{ {

58
js/hedera/app.js
View File

@ -66,31 +66,21 @@ module.exports = new Class
,_onConnError: function (conn, error) ,_onConnError: function (conn, error)
{ {
if (error instanceof Vn.JsonException) if (error instanceof Vn.JsonException)
switch (error.exception)
{ {
if (error.exception) case 'BadLogin':
var exception = error.exception Htk.Toast.showError (_('Invalid login'));
.replace (/\\/g, '.') this._logout ();
.replace (/Exception$/, '') break;
.replace (/^Vn\.Web\./, ''); case 'SessionExpired':
else Htk.Toast.showError (_('You\'ve been too idle'));
var exception = null; this._logout ();
break;
switch (exception) case 'OutdatedVersion':
{ this._newVersion (error);
case 'BadLogin': break;
Htk.Toast.showError (_('Invalid login')); default:
this._logout (); Htk.Toast.showError (error.message);
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 else
{ {
@ -107,18 +97,28 @@ module.exports = new Class
,_newVersion: function (error) ,_newVersion: function (error)
{ {
if (this.skipVersion) if (this.ignoreVersion)
return; return;
this.skipVersion = true; this.ignoreVersion = true;
if (confirm (_('New version available'))) var dialog = new Htk.Dialog ({
location.reload (); 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) ,_notifyError: function (error)
{ {
Htk.Toast.showError (_('There was an internal error')); Htk.Toast.showError (_('Something went wrong'));
var params = { var params = {
'file': error.fileName 'file': error.fileName

20
js/hedera/login.css
View File

@ -31,15 +31,13 @@
.vn-login .body .vn-login .body
{ {
height: inherit; height: inherit;
} }
.vn-login .column .vn-login .column
{ {
position: relative; position: relative;
overflow: auto;
margin: 0 auto; margin: 0 auto;
max-width: 40em; max-width: 40em;
height: 100%; height: inherit;
background-color: white; background-color: white;
box-shadow: 0 0 .3em 0 rgba(1, 1, 1, 0.4); box-shadow: 0 0 .3em 0 rgba(1, 1, 1, 0.4);
} }
@ -70,7 +68,7 @@
.vn-login .header .vn-login .header
{ {
margin-bottom: 3em; margin-bottom: 2em;
} }
.vn-login .header img .vn-login .header img
{ {
@ -182,10 +180,22 @@ hr
.vn-login .footer .vn-login .footer
{ {
margin-top: 3em; margin-top: 2em;
} }
.vn-login .contact .vn-login .contact
{ {
text-align: center; text-align: center;
} }
@media (max-height: 670px)
{
.vn-login
{
height: auto;
}
.vn-login .login
{
padding-top: 3.5em;
}
}

31
js/hedera/style.css
View File

@ -456,37 +456,6 @@ img.icon
.masonry-box { width: 25%; } .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 */ /* Social bar */
.htk-social-bar .htk-social-bar

184
js/htk/dialog.js Normal file
View File

@ -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);
}
});

2
js/htk/field/date-chooser.js
View File

@ -58,7 +58,7 @@ module.exports = new Class
this.calendar.on ('changed', this._onCalendarChange.bind (this)); this.calendar.on ('changed', this._onCalendarChange.bind (this));
this.popup = new Htk.Popup (); this.popup = new Htk.Popup ();
this.popup.setChild (this.calendar); this.popup.child = this.calendar;
} }
else if (!editable) else if (!editable)
this.node.appendChild (this.label); this.node.appendChild (this.label);

9
js/htk/grid.js
View File

@ -42,7 +42,7 @@ module.exports = new Class
emptyMessage: emptyMessage:
{ {
type: String type: String
,value: _('NoData') ,value: null
}, },
/** /**
* Wether to display the header with column titles. * Wether to display the header with column titles.
@ -188,9 +188,12 @@ module.exports = new Class
,onModelChange: function () ,onModelChange: function ()
{ {
var emptyMessage = this.emptyMessage ?
this.emptyMessage : _('NoData');
if (!this._model) if (!this._model)
{ {
this.showMessage (this.emptyMessage, 'refresh.svg'); this.showMessage (emptyMessage, 'refresh.svg');
return; return;
} }
@ -212,7 +215,7 @@ module.exports = new Class
this.showMessage (_('Loading'), null); this.showMessage (_('Loading'), null);
break; break;
case Db.Model.Status.CLEAN: case Db.Model.Status.CLEAN:
this.showMessage (this.emptyMessage, 'refresh'); this.showMessage (emptyMessage, 'refresh');
break; break;
case Db.Model.Status.ERROR: case Db.Model.Status.ERROR:
this.showMessage (_('ErrorLoadingData'), 'error'); this.showMessage (_('ErrorLoadingData'), 'error');

1
js/htk/htk.js
View File

@ -7,6 +7,7 @@ Htk = module.exports = {
,Widget : require ('./widget') ,Widget : require ('./widget')
,Component : require ('./component') ,Component : require ('./component')
,Popup : require ('./popup') ,Popup : require ('./popup')
,Dialog : require ('./dialog')
,Toast : require ('./toast') ,Toast : require ('./toast')
,Repeater : require ('./repeater') ,Repeater : require ('./repeater')
,Grid : require ('./grid') ,Grid : require ('./grid')

11
js/htk/popup.js
View File

@ -19,7 +19,7 @@ module.exports = new Class
,set: function (x) ,set: function (x)
{ {
this._child = x; this._child = x;
this.setChildNode (x.node); this._setChildNode (x.node);
} }
,get: function () ,get: function ()
{ {
@ -35,7 +35,7 @@ module.exports = new Class
,set: function (x) ,set: function (x)
{ {
this._child = null; this._child = null;
this.setChildNode (x); this._setChildNode (x);
} }
,get: function () ,get: function ()
{ {
@ -76,12 +76,7 @@ module.exports = new Class
div.className = 'htk-popup'; div.className = 'htk-popup';
} }
,setChild: function (child) ,_setChildNode: function (childNode)
{
this.setChildNode (child.node);
}
,setChildNode: function (childNode)
{ {
Vn.Node.removeChilds (this.node); Vn.Node.removeChilds (this.node);
this.node.appendChild (childNode); this.node.appendChild (childNode);

8
js/htk/repeater.js
View File

@ -68,7 +68,7 @@ module.exports = new Class
,emptyMessage: ,emptyMessage:
{ {
type: String type: String
,value: _('NoData') ,value: null
} }
} }
@ -157,8 +157,12 @@ module.exports = new Class
this._showMessage (_('Loading'), null); this._showMessage (_('Loading'), null);
break; break;
case Db.Model.Status.CLEAN: case Db.Model.Status.CLEAN:
this._showMessage (this.emptyMessage, 'refresh'); {
var emptyMessage = this.emptyMessage ?
this.emptyMessage : _('NoData');
this._showMessage (emptyMessage, 'refresh');
break; break;
}
case Db.Model.Status.ERROR: case Db.Model.Status.ERROR:
this._showMessage (_('ErrorLoadingData'), 'error'); this._showMessage (_('ErrorLoadingData'), 'error');
break; break;

31
js/htk/style.css
View File

@ -446,6 +446,37 @@ td.cell-image .htk-image
font-size: 1.2em; 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 */ /* Assistant */
.htk-assistant > div .htk-assistant > div

41
js/vn/json-connection.js
View File

@ -19,15 +19,26 @@ module.exports = new Class
,initialize: function () ,initialize: function ()
{ {
this.parent (); this.parent ();
this.token = this.fetchToken (); this.fetchToken ();
} }
,fetchToken: function () ,fetchToken: function ()
{ {
var token = null;
if (sessionStorage.getItem ('vnToken')) if (sessionStorage.getItem ('vnToken'))
return sessionStorage.getItem ('vnToken'); token = sessionStorage.getItem ('vnToken');
if (localStorage.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 () ,_closeClient: function ()
{ {
this._connected = false; this._connected = false;
this.token = null; this.clearToken ();
localStorage.removeItem ('vnToken');
sessionStorage.removeItem ('vnToken');
} }
/** /**
@ -136,7 +144,7 @@ module.exports = new Class
**/ **/
,supplantEnd: function () ,supplantEnd: function ()
{ {
this.token = this.fetchToken (); this.fetchToken ();
} }
/** /**
@ -229,7 +237,7 @@ module.exports = new Class
if (request.status == 0) if (request.status == 0)
{ {
var ex = new JsonException (); 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; throw ex;
} }
@ -261,8 +269,16 @@ module.exports = new Class
} }
else else
{ {
var exception = jsData.exception;
if (exception)
exception = exception
.replace (/\\/g, '.')
.replace (/Exception$/, '')
.replace (/^Vn\.Web\./, '');
var ex = new JsonException (); var ex = new JsonException ();
ex.exception = jsData.exception; ex.exception = exception;
ex.message = jsData.message; ex.message = jsData.message;
ex.code = jsData.code; ex.code = jsData.code;
ex.file = jsData.file; ex.file = jsData.file;
@ -288,7 +304,12 @@ module.exports = new Class
} }
if (error) if (error)
{
if (error.exception == 'SessionExpired')
this.clearToken ();
this.signalEmit ('error', error); this.signalEmit ('error', error);
}
} }
}); });

9
js/vn/json-exception.js
View File

@ -10,11 +10,14 @@ module.exports = new Class
,line: null ,line: null
,trace: null ,trace: null
,initialize: function (domain, code, message) ,initialize: function (exception, message, code, file, line, trace)
{ {
this.domain = domain; this.exception = exception;
this.code = code;
this.message = message; this.message = message;
this.code = code;
this.file = file;
this.line = line;
this.trace = trace;
} }
}); });

1
locale/ca/forms/ecomerce/catalog.json
View File

@ -14,7 +14,6 @@
,"StartOrder": "Començar comanda" ,"StartOrder": "Començar comanda"
,"ShoppingBasket": "Cistella de la compra" ,"ShoppingBasket": "Cistella de la compra"
,"%A, %e of %B": "%A, %e de %B"
,"Agency": "Agència" ,"Agency": "Agència"
,"Warehouse": "Magatzem" ,"Warehouse": "Magatzem"

1
locale/ca/forms/ecomerce/checkout.json
View File

@ -18,7 +18,6 @@
,"ConfirmToAccessCatalog": "Confirma les dades per accedir al catàleg" ,"ConfirmToAccessCatalog": "Confirma les dades per accedir al catàleg"
,"Arrival": "Arribada" ,"Arrival": "Arribada"
,"Pickup": "Recollida" ,"Pickup": "Recollida"
,"%A, %e of %B": "%A, %e de %B"
,"Agency": "Agència" ,"Agency": "Agència"
,"Warehouse": "Magatzem" ,"Warehouse": "Magatzem"
,"Confirm": "Confirmar" ,"Confirm": "Confirmar"

1
locale/ca/forms/ecomerce/ticket.json
View File

@ -1,7 +1,6 @@
{ {
"OrderDetail": "Detall de l'encarrec" "OrderDetail": "Detall de l'encarrec"
,"%A, %e of %B %Y": "%A, %e de %B %Y"
,"Print delivery note": "Imprimir albarà" ,"Print delivery note": "Imprimir albarà"
,"Delivery": "Entrega" ,"Delivery": "Entrega"

1
locale/ca/js/hedera.json
View File

@ -13,7 +13,6 @@
,"You've been too idle": "Has estat massa temps inactiu i la sessió ha expirat" ,"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" ,"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" ,"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" ,"A mail has been sent wich you can recover your password": "T'hem enviat un correu on podràs recuperar la teva contrasenya"

5
locale/ca/js/vn.json
View File

@ -42,4 +42,9 @@
,"Dec": "Des" ,"Dec": "Des"
,"%A, %B %e": "%A, %e de %B" ,"%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"
} }

1
locale/en/forms/ecomerce/catalog.json
View File

@ -14,7 +14,6 @@
,"StartOrder": "Start order" ,"StartOrder": "Start order"
,"ShoppingBasket": "Shopping basket" ,"ShoppingBasket": "Shopping basket"
,"%A, %e of %B": "%A, %e of %B"
,"Agency": "Agency" ,"Agency": "Agency"
,"Warehouse": "Warehouse" ,"Warehouse": "Warehouse"

1
locale/en/forms/ecomerce/checkout.json
View File

@ -18,7 +18,6 @@
,"ConfirmToAccessCatalog": "Confirm the data to access the catalog" ,"ConfirmToAccessCatalog": "Confirm the data to access the catalog"
,"Arrival": "Arrival" ,"Arrival": "Arrival"
,"Pickup": "Pickup" ,"Pickup": "Pickup"
,"%A, %e of %B": "%A, %e of %B"
,"Agency": "Agency" ,"Agency": "Agency"
,"Warehouse": "Store" ,"Warehouse": "Store"
,"Confirm": "Confirm" ,"Confirm": "Confirm"

1
locale/en/forms/ecomerce/ticket.json
View File

@ -1,7 +1,6 @@
{ {
"OrderDetail": "Order detail" "OrderDetail": "Order detail"
,"%A, %e of %B %Y": "%A, %e of %B %Y"
,"Print delivery note": "Print delivery note" ,"Print delivery note": "Print delivery note"
,"Delivery": "Delivery" ,"Delivery": "Delivery"

1
locale/en/js/hedera.json
View File

@ -13,7 +13,6 @@
,"You've been too idle": "You have been idle too long and your session has expired" ,"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" ,"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" ,"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" ,"A mail has been sent wich you can recover your password": "A mail has been sent wich you can recover your password"

5
locale/en/js/vn.json
View File

@ -42,4 +42,9 @@
,"Dec": "Dic" ,"Dec": "Dic"
,"%A, %B %e": "%A, %B %e" ,"%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"
} }

3
locale/en/vn/web.json
View File

@ -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" ,"Missing parameters": "Missing parameters"
} }

1
locale/es/forms/ecomerce/catalog.json
View File

@ -14,7 +14,6 @@
,"StartOrder": "Empezar pedido" ,"StartOrder": "Empezar pedido"
,"ShoppingBasket": "Cesta de la compra" ,"ShoppingBasket": "Cesta de la compra"
,"%A, %e of %B": "%A, %e de %B"
,"Agency": "Agencia" ,"Agency": "Agencia"
,"Warehouse": "Almacén" ,"Warehouse": "Almacén"

1
locale/es/forms/ecomerce/checkout.json
View File

@ -18,7 +18,6 @@
,"ConfirmToAccessCatalog": "Confirma los datos para acceder al catálogo" ,"ConfirmToAccessCatalog": "Confirma los datos para acceder al catálogo"
,"Arrival": "Llegada" ,"Arrival": "Llegada"
,"Pickup": "Recogida" ,"Pickup": "Recogida"
,"%A, %e of %B": "%A, %e de %B"
,"Agency": "Agencia" ,"Agency": "Agencia"
,"Warehouse": "Almacén" ,"Warehouse": "Almacén"
,"Confirm": "Confirmar" ,"Confirm": "Confirmar"

1
locale/es/forms/ecomerce/ticket.json
View File

@ -1,7 +1,6 @@
{ {
"OrderDetail": "Detalle del pedido" "OrderDetail": "Detalle del pedido"
,"%A, %e of %B %Y": "%A, %e de %B %Y"
,"Print delivery note": "Imprimir albarán" ,"Print delivery note": "Imprimir albarán"
,"Delivery": "Entrega" ,"Delivery": "Entrega"

1
locale/es/js/hedera.json
View File

@ -13,7 +13,6 @@
,"You've been too idle": "Has estado demasiado tiempo inactivo y la sesión ha expirado" ,"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" ,"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" ,"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" ,"A mail has been sent wich you can recover your password": "Te hemos enviado un correo donde podrás recuperar tu contraseña"

5
locale/es/js/vn.json
View File

@ -42,4 +42,9 @@
,"Dec": "Dic" ,"Dec": "Dic"
,"%A, %B %e": "%A, %e de %B" ,"%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"
} }

3
locale/es/vn/web.json
View File

@ -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" ,"Missing parameters": "Faltan parámetros"
} }

1
locale/fr/forms/ecomerce/catalog.json
View File

@ -14,7 +14,6 @@
,"StartOrder": "Acheter" ,"StartOrder": "Acheter"
,"ShoppingBasket": "Mon panier" ,"ShoppingBasket": "Mon panier"
,"%A, %e of %B": "%A, %e de %B"
,"Agency": "Agence" ,"Agency": "Agence"
,"Warehouse": "Entrepôt" ,"Warehouse": "Entrepôt"

1
locale/fr/forms/ecomerce/checkout.json
View File

@ -18,7 +18,6 @@
,"ConfirmToAccessCatalog": "Confirme les coordonnées pour accéder au catalogue" ,"ConfirmToAccessCatalog": "Confirme les coordonnées pour accéder au catalogue"
,"Arrival": "Arrivée" ,"Arrival": "Arrivée"
,"Pickup": "Retrait" ,"Pickup": "Retrait"
,"%A, %e of %B": "%A, %e %B"
,"Agency": "Agence" ,"Agency": "Agence"
,"Warehouse": "MAgasin" ,"Warehouse": "MAgasin"
,"Confirm": "Confirmer" ,"Confirm": "Confirmer"

1
locale/fr/forms/ecomerce/ticket.json
View File

@ -1,7 +1,6 @@
{ {
"OrderDetail": "Détails de la commande" "OrderDetail": "Détails de la commande"
,"%A, %e of %B %Y": "%A, %e de %B %Y"
,"Print delivery note": "Imprimer bulletin de livraison" ,"Print delivery note": "Imprimer bulletin de livraison"
,"Delivery": "Accouchement" ,"Delivery": "Accouchement"

1
locale/fr/js/hedera.json
View File

@ -13,7 +13,6 @@
,"You've been too idle": "Il a eu le temps de trop paresseux et votre session a expiré" ,"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" ,"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" ,"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" ,"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"

5
locale/fr/js/vn.json
View File

@ -42,4 +42,9 @@
,"Dec": "Déc" ,"Dec": "Déc"
,"%A, %B %e": "%A, %B %e" ,"%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"
} }

1
locale/mn/forms/ecomerce/catalog.json
View File

@ -14,7 +14,6 @@
,"StartOrder": "Start order" ,"StartOrder": "Start order"
,"ShoppingBasket": "Shopping basket" ,"ShoppingBasket": "Shopping basket"
,"%A, %e of %B": "%A, %e of %B"
,"Agency": "Agency" ,"Agency": "Agency"
,"Warehouse": "Warehouse" ,"Warehouse": "Warehouse"

1
locale/mn/forms/ecomerce/checkout.json
View File

@ -18,7 +18,6 @@
,"ConfirmToAccessCatalog": "Confirm the data to access the catalog" ,"ConfirmToAccessCatalog": "Confirm the data to access the catalog"
,"Arrival": "Arrival" ,"Arrival": "Arrival"
,"Pickup": "Pickup" ,"Pickup": "Pickup"
,"%A, %e of %B": "%A, %e of %B"
,"Agency": "Agency" ,"Agency": "Agency"
,"Warehouse": "Store" ,"Warehouse": "Store"
,"Confirm": "Confirm" ,"Confirm": "Confirm"

1
locale/mn/forms/ecomerce/ticket.json
View File

@ -1,7 +1,6 @@
{ {
"OrderDetail": "Order detail" "OrderDetail": "Order detail"
,"%A, %e of %B %Y": "%A, %e of %B %Y"
,"Print delivery note": "Print delivery note" ,"Print delivery note": "Print delivery note"
,"Delivery": "Delivery" ,"Delivery": "Delivery"

1
locale/mn/js/hedera.json
View File

@ -13,7 +13,6 @@
,"You've been too idle": "Та нар ч бас зогссон байсан, чуулган хугацаа дууссан байна" ,"You've been too idle": "Та нар ч бас зогссон байсан, чуулган хугацаа дууссан байна"
,"Invalid login": "Хэрэглэгчийн нэр эсвэл нууц үг буруу, Тэр хэргийг мэдрэмтгий гэдгийг санаарай" ,"Invalid login": "Хэрэглэгчийн нэр эсвэл нууц үг буруу, Тэр хэргийг мэдрэмтгий гэдгийг санаарай"
,"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": "Мэйл та нууц үгээ сэргээх боломжтой А байна илгээсэн"

5
locale/mn/js/vn.json
View File

@ -42,4 +42,9 @@
,"Dec": "Арв" ,"Dec": "Арв"
,"%A, %B %e": "%A, %B %e" ,"%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"
} }

1
locale/pt/forms/ecomerce/catalog.json
View File

@ -14,7 +14,6 @@
,"StartOrder": "Iniciar pedido" ,"StartOrder": "Iniciar pedido"
,"ShoppingBasket": "Cesta da compra" ,"ShoppingBasket": "Cesta da compra"
,"%A, %e of %B": "%A, %e of %B"
,"Agency": "Agência" ,"Agency": "Agência"
,"Warehouse": "Armazém" ,"Warehouse": "Armazém"

1
locale/pt/forms/ecomerce/checkout.json
View File

@ -18,7 +18,6 @@
,"ConfirmToAccessCatalog": "Confirme os dados para entrar no catálogo" ,"ConfirmToAccessCatalog": "Confirme os dados para entrar no catálogo"
,"Arrival": "Chegada" ,"Arrival": "Chegada"
,"Pickup": "Recolhida" ,"Pickup": "Recolhida"
,"%A, %e of %B": "%A, %e de %B"
,"Agency": "Agência" ,"Agency": "Agência"
,"Warehouse": "Armazém" ,"Warehouse": "Armazém"
,"Confirm": "Confirmar" ,"Confirm": "Confirmar"

1
locale/pt/forms/ecomerce/ticket.json
View File

@ -1,7 +1,6 @@
{ {
"OrderDetail": "Detalhe do pedido" "OrderDetail": "Detalhe do pedido"
,"%A, %e of %B %Y": "%A, %e de %B %Y"
,"Print delivery note": "Imprimir guía de remessa" ,"Print delivery note": "Imprimir guía de remessa"
,"Delivery": "Entrega" ,"Delivery": "Entrega"

1
locale/pt/js/hedera.json
View File

@ -13,7 +13,6 @@
,"You've been too idle": "Muito tempo de inatividade, a sessão foi finalizada" ,"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" ,"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" ,"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" ,"A mail has been sent wich you can recover your password": "Um e-mail foi enviado a qual poderá recuperar sua senha"

5
locale/pt/js/vn.json
View File

@ -42,4 +42,9 @@
,"Dec": "Dez" ,"Dec": "Dez"
,"%A, %B %e": "%A, %B %e" ,"%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"
} }

2
reports/delivery-note/ui.xml
View File

@ -23,7 +23,7 @@
<htk-text form="ticket" column="consignee"/> <htk-text form="ticket" column="consignee"/>
</p> </p>
<p> <p>
<htk-text form="ticket" column="date" format="%A, %e of %B %Y"/> <htk-text form="ticket" column="date" format="%D"/>
</p> </p>
<p> <p>
<htk-text form="ticket" column="name"/> <htk-text form="ticket" column="name"/>

4
web/json-service.php
View File

@ -61,7 +61,7 @@ class JsonService extends RestService
if (_DEV_MODE || $errno & $eUser) if (_DEV_MODE || $errno & $eUser)
$json->message = $message; $json->message = $message;
else else
$json->message = 'Something went wrong'; $json->message = s('Something went wrong');
if (_DEV_MODE) if (_DEV_MODE)
{ {
@ -99,7 +99,7 @@ class JsonService extends RestService
else else
{ {
$json->exception = 'Exception'; $json->exception = 'Exception';
$json->message = 'Something went wrong'; $json->message = s('Something went wrong');
} }
if (_DEV_MODE) if (_DEV_MODE)