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

Merge branch 'master' into dev

This commit is contained in:
Juan Ferrer Toribio 2016-10-28 09:51:23 +02:00
parent 0ad3bd1a44 cdde9362c9
commit b87746e1db
5 changed files with 8 additions and 6 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.381-deb8) stable; urgency=low
hedera-web (1.383-deb8) stable; urgency=low
* Initial Release.

2
env.php
View File

@ -10,4 +10,4 @@ const _DEV_MODE = TRUE;
const _CONFIG_DIR = __DIR__.'/../../.config';
const _LOG_DIR = '/tmp';
const _DATA_DIR = '/tmp';
const _HEDERA_DIR = __DIR__;

3
forms/ecomerce/checkout/checkout.js
View File

@ -196,8 +196,7 @@ Hedera.Checkout = new Class
,calendarRestrict: function (date)
{
return date.getTime () >= this.today.getTime ()
&& date.getDay () != 0;
return date.getTime () >= this.today.getTime ();
}
});

5
hedera-web.php
View File

@ -4,6 +4,9 @@
@include_once __DIR__.'/env.php';
require_once 'vn-autoload.php';
$cliApp = new Vn\Lib\CliApp ('hedera-web', __DIR__.'/rest');
if (!defined ('_HEDERA_DIR'))
define ('_HEDERA_DIR', '/usr/share/hedera-web');
$cliApp = new Vn\Lib\CliApp ('hedera-web', _HEDERA_DIR.'/rest');
$cliApp->run ();

2
js/htk/field/calendar.js
View File

@ -174,7 +174,7 @@ module.exports = new Class
if (this._restrictFunc)
{
cell.enabled = this._restrictFunc (cellDate);
cellDate.setTime (cellDate.getTime () + 86400000);
cellDate.setDate (cellDate.getDate () + 1);
}
}
else