mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-20 07:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Export data with controller filename (#684)

Browse Source 
Upgrade table export plugin to newer fork
Fix variable substitution in .travis.yml (#616)
This commit is contained in:
jekkos committed 2016-06-21 23:19:05 +02:00
1 parent de9a4dac08
commit d72bddbd9d
7 files changed
+3363 -368
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.travis.yml
+1 -1
View File
@@ -20,5 +20,5 @@ script:
- docker-compose up -d
after_success:
- '[ -n ${$DOCKER_USERNAME} ] && docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag opensourcepos_php jekkos/opensourcepos:$TRAVIS_BRANCH && docker push jekkos/opensourcepos'
- '[ -n ${DOCKER_USERNAME} ] && docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag opensourcepos_php jekkos/opensourcepos:$TRAVIS_BRANCH && docker push jekkos/opensourcepos'
application/views/partial/header.php
+6 -3
View File
@@ -45,8 +45,11 @@
<script src="bower_components/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.js"></script>
<script src="bower_components/moment/moment.js"></script>
<script src="bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
<script src="bower_components/table-export/tableExport.js"></script>
<script src="bower_components/jquery.base64/index.js"></script>
<script src="bower_components/file-saver.js/FileSaver.js"></script>
<script src="bower_components/html2canvas/build/html2canvas.js"></script>
<script src="bower_components/jspdf/dist/jspdf.min.js"></script>
<script src="bower_components/jspdf-autotable/dist/jspdf.plugin.autotable.js"></script>
<script src="bower_components/tableExport.jquery.plugin/tableExport.min.js"></script>
<script src="bower_components/chartist/dist/chartist.min.js"></script>
<script src="bower_components/chartist-plugin-axistitle/dist/chartist-plugin-axistitle.min.js"></script>
<script src="bower_components/chartist-plugin-pointlabels/dist/chartist-plugin-pointlabels.min.js"></script>
@@ -69,7 +72,7 @@
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=725a0444ad"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=736f65c367" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=057f34d35e" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
bower.json
+1 -2
View File
@@ -35,8 +35,7 @@
"bootstrap-select": "^1.10.0",
"bootstrap-table": "^1.10.1",
"bootstrap-daterangepicker": "^2.1.22",
"table-export": "*",
"jquery.base64": "https://gist.github.com/wenzhixin/09e218c884f4f380b68a/raw/5d258d2f78225a4ac1a72d54a34cc7976d630df1/jquery.base64.js",
"tableExport.jquery.plugin": "1.5.1",
"chartist": "^0.9.7",
"chartist-plugin-axistitle": "^0.1.0",
"chartist-plugin-pointlabels": "^0.0.4",
dist/opensourcepos.js
Vendored
+3338 -353
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.js
Vendored
+13 -8
View File
File diff suppressed because one or more lines are too long.
js/manage_tables.js
+3
View File
@@ -200,6 +200,9 @@
showColumns: true,
clickToSelect: true,
showExport: true,
exportOptions: {
fileName: options.resource.replace(/.*\/(.*?)$/g, '$1')
},
onPageChange: load_success(options.onLoadSuccess),
toolbar: '#toolbar',
uniqueId: options.uniqueId || 'id',
templates/spacelab/views/partial/header.php
+1 -1
View File
@@ -73,7 +73,7 @@
<!-- 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=736f65c367" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=057f34d35e" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>