mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-29 03:15:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1115 from jlctmaster/date_or_time_format

Browse Source 
Fixed bug sales data preview of day (#932)
This commit is contained in:
FrancescoUK
2017-02-03 22:04:30 +00:00
committed by GitHub
parent a175111b59 7a4525319a
commit ceb9687e5e
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/views/partial/daterangepicker.php
View File

@@ -106,9 +106,8 @@
{
?>
$('#daterangepicker').css("width","305");
var start_date = "<?php echo date('Y-m-d H:i:s')?>";
var end_date = "<?php echo date('Y-m-d H:i:s')?>";
var start_date = "<?php echo date('Y-m-d H:i:s',mktime(0,0,0,date("m"),date("d"),date("Y")))?>";
var end_date = "<?php echo date('Y-m-d H:i:s',mktime(23,59,59,date("m"),date("d"),date("Y")))?>";
$('#daterangepicker').daterangepicker({
"ranges": {
"<?php echo $this->lang->line("datepicker_today"); ?>": [
@@ -198,9 +197,9 @@
"timePickerSeconds": true,
"alwaysShowCalendars": true,
"startDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d"),date("Y")));?>",
"endDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>",
"endDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>",
"minDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,01,01,2010));?>",
"maxDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
"maxDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
}, function(start, end, label) {
start_date = start.format('YYYY-MM-DD HH:mm:ss');
end_date = end.format('YYYY-MM-DD HH:mm:ss');

3
database/2.4_to_3.0.sql
View File

@@ -69,7 +69,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('theme', 'flatly'),
('statistics', '1'),
('language', 'english'),
('language_code', 'en');
('language_code', 'en'),
('date_or_time_format','');
-- add messages (SMS) module and permissions

3
database/database.sql
View File

@@ -83,7 +83,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('theme', 'flatly'),
('statistics', '1'),
('language', 'english'),
('language_code', 'en');
('language_code', 'en'),
('date_or_time_format','');
-- --------------------------------------------------------