From 563fcf23857dc79d4f7b8659bbb0853a783f4060 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Sun, 25 Feb 2018 14:22:02 +0000
Subject: [PATCH] Rollback JQuery validator to vs 1.14.0 (#1858)

---
 application/controllers/Config.php            |  2 +-
 application/views/configs/locale_config.php   | 24 ++++++++-----------
 .../views/configs/mailchimp_config.php        |  2 +-
 application/views/partial/header.php          |  3 +--
 bower.json                                    |  5 ++--
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/application/controllers/Config.php b/application/controllers/Config.php
index 98d3a1fae..72d59d6b4 100644
--- a/application/controllers/Config.php
+++ b/application/controllers/Config.php
@@ -322,7 +322,7 @@ class Config extends Secure_Controller
 		));
 	}
 
-	public function check_number_locale()
+	public function ajax_check_number_locale()
 	{
 		$number_locale = $this->input->post('number_locale');
 		$fmt = new \NumberFormatter($number_locale, \NumberFormatter::CURRENCY);
diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php
index b331f1fbc..0ca28abc8 100644
--- a/application/views/configs/locale_config.php
+++ b/application/views/configs/locale_config.php
@@ -231,11 +231,12 @@ $(document).ready(function()
 		var value = $(this).is(":checkbox") ? $(this).is(":checked") : $(this).val();
 		var data = { number_locale: $("#number_locale").val() };
 		data[field] = value;
-		$.post("<?php echo site_url($controller_name . '/check_number_locale')?>",
+		$.post("<?php echo site_url($controller_name . '/ajax_check_number_locale')?>",
 			$.extend(csrf_form_base(), data),
 			function(response) {
 				$("#number_locale_example").text(response.number_locale_example);
-			}
+			},
+			'json'
 		);
 	});
 
@@ -246,19 +247,14 @@ $(document).ready(function()
 			number_locale:
 			{
 				required: true,
-				remote: $.extend({
-						url: "<?php echo site_url($controller_name . '/check_number_locale')?>",
-						type: "POST"
-					}, {
+				remote: {
+					url: "<?php echo site_url($controller_name . '/ajax_check_number_locale')?>",
+					type: 'post',
 					data: $.extend(csrf_form_base(), {
-						"number_locale" : function() {
-							return $("#number_locale").val();
-						},
-						"thousands_separator": function() {
-							return $("#thousands_separator").is(":checked");
-						}
+						'number_locale': $("#number_locale").val(),
+						'thousands_separator': $("#thousands_separator").is(":checked")
 					}),
-					dataFilter: function(data, dataType) {
+					dataFilter: function(data) {
 						setup_csrf_token();
 						var response = JSON.parse(data);
 						$("#number_locale_example").text(response.number_locale_example);
@@ -266,7 +262,7 @@ $(document).ready(function()
 						$("#thousands_separator").prop('checked', response.thousands_separator);
 						return response.success;
 					}
-				})
+				}
 			}
 		},
 
diff --git a/application/views/configs/mailchimp_config.php b/application/views/configs/mailchimp_config.php
index 58ebef6d4..528f86fbd 100644
--- a/application/views/configs/mailchimp_config.php
+++ b/application/views/configs/mailchimp_config.php
@@ -52,7 +52,7 @@ $(document).ready(function()
 	$('#mailchimp_api_key').change(function() {
 		$.post("<?php echo site_url($controller_name . '/ajax_check_mailchimp_api_key')?>",
 			$.extend(csrf_form_base(), {
-					'mailchimp_api_key': $('#mailchimp_api_key').val()
+				'mailchimp_api_key': $('#mailchimp_api_key').val()
 			}),
 			function(response) {
 				$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index a483f93b1..931d8d1fb 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -61,7 +61,6 @@
 		<script src="bower_components/js-cookie/src/js.cookie.js"></script>
 		<script src="bower_components/blockUI/jquery.blockUI.js"></script>
 		<script src="bower_components/bootstrap-tagsinput/dist/bootstrap-tagsinput.js"></script>
-		<script src="bower_components/accounting-js/accounting.js"></script>
 		<!-- endbower -->
 		<!-- start js template tags -->
 		<script type="text/javascript" src="js/imgpreview.full.jquery.js"></script>
@@ -77,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=a5c8dae3d1"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=5418ab9c6b"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 
diff --git a/bower.json b/bower.json
index 6f26accbd..244e7b6d5 100644
--- a/bower.json
+++ b/bower.json
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "jquery-form": "~4.2.2",
-    "jquery-validate": "~1.17.0",
+    "jquery-validate": "~1.14.0",
     "jquery": "~2.1.4",
     "jquery-ui": "~1.11.4",
     "bootstrap3-dialog": "https://github.com/nakupanda/bootstrap3-dialog.git#master",
@@ -44,8 +44,7 @@
     "remarkable-bootstrap-notify": "~3.1.3",
     "js-cookie": "~2.1.4",
     "blockUI": "*",
-    "bootstrap-tagsinput": "~0.8.0",
-    "accounting-js": "~0.4.2"
+    "bootstrap-tagsinput": "~0.8.0"
   },
   "overrides": {
     "jquery-ui": {