From a7ada7e85a6a705864aa7228128518e49854356f Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Sun, 4 Feb 2018 20:58:58 +0000
Subject: [PATCH] Fix broken chartist plugin dependency

---
 application/views/partial/header.php | 2 +-
 bower.json                           | 7 +++++--
 database/database.sql                | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index f4d580cae..2fe7cc00f 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -76,7 +76,7 @@
 		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=1831dfe53b"/>
 		<!-- end mincss template tags -->
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=7538b4ac08"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=3d4bb30c88"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 
diff --git a/bower.json b/bower.json
index 4c41d644f..406ff48d8 100644
--- a/bower.json
+++ b/bower.json
@@ -37,9 +37,9 @@
     "bootstrap-daterangepicker": "~2.1.25",
     "tableExport.jquery.plugin": "1.5.1",
     "chartist": "~0.9.8",
-    "chartist-plugin-axistitle": "~0.1.0",
+    "chartist-plugin-axistitle": "~0.0.5",
     "chartist-plugin-pointlabels": "~0.0.4",
-    "chartist-plugin-tooltip": "~0.0.18",
+    "chartist-plugin-tooltip": "https://github.com/tmmdata/chartist-plugin-tooltip.git#~0.0.18",
     "chartist-plugin-barlabels": "https://github.com/mtgibbs/chartist-plugin-barlabels.git#~0.0.5",
     "remarkable-bootstrap-notify": "~3.1.3",
     "js-cookie": "~2.1.4",
@@ -68,5 +68,8 @@
         "dist/extensions/sticky-header/bootstrap-table-sticky-header.css"
       ]
     }
+  },
+  "resolutions": {
+    "chartist": "~0.9.8"
   }
 }
diff --git a/database/database.sql b/database/database.sql
index 01a1aec04..941db7d8b 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -39,7 +39,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('barcode_second_row', 'item_code'),
 ('barcode_third_row', 'unit_price'),
 ('barcode_num_in_row', '2'),
-('barcode_page_width', '100'),
+('barcode_page_width', '100'),      
 ('barcode_page_cellspacing', '20'),
 ('barcode_generate_if_empty', '0'),
 ('receipt_show_company_name', '1'),
@@ -997,7 +997,7 @@ ALTER TABLE `ospos_item_quantities`
 --
 ALTER TABLE `ospos_suppliers`
   ADD CONSTRAINT `ospos_suppliers_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
-
+  
 --
 -- Constraints for table `ospos_giftcards`
 --