From b8f255cc5013601fcfc5f707d6e89b290e4eade7 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Sun, 29 Dec 2019 17:50:17 +0100
Subject: [PATCH] Refresh tables after import + close after invoice email
 (#478)

---
 application/views/customers/form_csv_import.php | 2 +-
 application/views/items/form_csv_import.php     | 2 +-
 application/views/sales/form.php                | 3 +--
 public/js/manage_tables.js                      | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/views/customers/form_csv_import.php b/application/views/customers/form_csv_import.php
index 880b29781..b19512512 100644
--- a/application/views/customers/form_csv_import.php
+++ b/application/views/customers/form_csv_import.php
@@ -30,7 +30,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
+					table_support.handle_submit('<?php echo site_url('customers'); ?>', response);
 				},
 				dataType: 'json'
 			});
diff --git a/application/views/items/form_csv_import.php b/application/views/items/form_csv_import.php
index adf61bbfb..6844a63cb 100644
--- a/application/views/items/form_csv_import.php
+++ b/application/views/items/form_csv_import.php
@@ -30,7 +30,7 @@ $(document).ready(function()
 				success:function(response)
 				{
 					dialog_support.hide();
-					$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
+					table_support.handle_submit('<?php echo site_url('items'); ?>', response);
 				},
 				dataType: 'json'
 			});
diff --git a/application/views/sales/form.php b/application/views/sales/form.php
index 35561e39c..687eb3340 100755
--- a/application/views/sales/form.php
+++ b/application/views/sales/form.php
@@ -126,8 +126,7 @@ $(document).ready(function()
 			if (confirm("<?php echo $this->lang->line('sales_invoice_confirm') . ' ' . $sale_info['email'] ?>")) {
 				$.get("<?php echo site_url($controller_name . '/send_pdf/' . $sale_info['sale_id']); ?>",
 					function(response) {
-						dialog_support.hide();
-						table_support.handle_submit("<?php echo site_url('sales'); ?>", response);
+						BootstrapDialog.closeAll();
 						$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
 					}, 'json'
 				);	
diff --git a/public/js/manage_tables.js b/public/js/manage_tables.js
index b951335c6..5e2de9a83 100644
--- a/public/js/manage_tables.js
+++ b/public/js/manage_tables.js
@@ -3,7 +3,7 @@
 	var btn_id, dialog_ref;
 
 	var hide = function() {
-		dialog_ref.close();
+		dialog_ref && dialog_ref.close();
 	};
 
 	var clicked_id = function() {