mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-02-18 14:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updated bootstrap-daterangepicker js plugin and regen dist files

Browse Source
This commit is contained in:
FrancescoUK
2016-06-02 12:33:33 +01:00
parent 5e42684f27
commit fdb7cd9ac4
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/views/partial/header.php
View File

@@ -66,10 +66,10 @@
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=9f6707893f"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=869909486d"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=104339e3c2" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=decc6655f8" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

2
bower.json
View File

@@ -34,7 +34,7 @@
"smalot-bootstrap-datetimepicker": "^2.3.11",
"bootstrap-select": "^1.10.0",
"bootstrap-table": "^1.10.1",
"bootstrap-daterangepicker": "^2.1.20",
"bootstrap-daterangepicker": "^2.1.21",
"table-export": "*",
"jquery.base64": "https://raw.githubusercontent.com/carlo/jquery-base64/master/jquery.base64.js",
"chartist": "^0.9.7",

4
dist/opensourcepos.js vendored
View File

@@ -15048,7 +15048,7 @@ return jQuery;
}));
/**
* @version: 2.1.20
* @version: 2.1.21
* @author: Dan Grossman http://www.dangrossman.info/
* @copyright: Copyright (c) 2012-2016 Dan Grossman. All rights reserved.
* @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
@@ -15612,7 +15612,7 @@ return jQuery;
this.rightCalendar.month = this.startDate.clone().date(2).add(1, 'month');
}
}
if (this.maxDate && this.linkedCalendars && this.rightCalendar.month > this.maxDate) {
if (this.maxDate && this.linkedCalendars && !this.singleDatePicker && this.rightCalendar.month > this.maxDate) {
this.rightCalendar.month = this.maxDate.clone().date(2);
this.leftCalendar.month = this.maxDate.clone().date(2).subtract(1, 'month');
}

2
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
templates/spacelab/views/partial/header.php
View File

@@ -69,11 +69,11 @@
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=9f6707893f"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=869909486d"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=104339e3c2" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=decc6655f8" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>