From c784a537dd348dfeb7ebd25f91c8a34e44688a63 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Sat, 2 Dec 2017 17:42:57 +0000
Subject: [PATCH] Fix export all records #868

---
 application/views/partial/header.php          | 2 +-
 application/views/reports/tabular.php         | 4 ++--
 application/views/reports/tabular_details.php | 1 +
 bower.json                                    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 2a56c35a6..a2cda1484 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -74,7 +74,7 @@
 		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=1a7dd79d6d"/>
 		<!-- end mincss template tags -->
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=63c868fd57"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=b190459b50"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 
diff --git a/application/views/reports/tabular.php b/application/views/reports/tabular.php
index 5954c0e4a..9e06a49d0 100644
--- a/application/views/reports/tabular.php
+++ b/application/views/reports/tabular.php
@@ -34,9 +34,9 @@
 			striped: true,
 			sortable: true,
 			showExport: true,
+			exportDataType: 'all',
 			pagination: true,
 			showColumns: true,
-			showExport: true,
 			data: <?php echo json_encode($data); ?>,
 			iconSize: 'sm',
 			paginationVAlign: 'bottom',
@@ -46,4 +46,4 @@
 	});
 </script>
 
-<?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
+<?php $this->load->view("partial/footer"); ?>
diff --git a/application/views/reports/tabular_details.php b/application/views/reports/tabular_details.php
index 77b9cd610..2b01a13c8 100644
--- a/application/views/reports/tabular_details.php
+++ b/application/views/reports/tabular_details.php
@@ -52,6 +52,7 @@
 			showColumns: true,
 			uniqueId: 'id',
 			showExport: true,
+			exportDataType: 'all',
 			data: <?php echo json_encode($summary_data); ?>,
 			iconSize: 'sm',
 			paginationVAlign: 'bottom',
diff --git a/bower.json b/bower.json
index 5c33f52da..50cedaf3c 100644
--- a/bower.json
+++ b/bower.json
@@ -33,7 +33,7 @@
     "bootswatch": "^3.3.7",
     "smalot-bootstrap-datetimepicker": "~2.4.4",
     "bootstrap-select": "~1.12.4",
-    "bootstrap-table": "master",
+    "bootstrap-table": "https://github.com/opensourcepos/bootstrap-table.git#master",
     "bootstrap-daterangepicker": "~2.1.25",
     "tableExport.jquery.plugin": "1.5.1",
     "chartist": "~0.9.8",