From 2dab5e0fe72082d655deb338f4024675a77aca32 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Mon, 25 Apr 2016 08:58:32 +0200
Subject: [PATCH] Bootstrap-tables integration for sales module (WIP) (#293)
 Refactor manage_tables, remove public function identifiers

---
 application/controllers/Sales.php      |  6 +++---
 application/helpers/table_helper.php   |  2 +-
 application/models/Sale.php            |  2 +-
 application/views/giftcards/manage.php |  5 +++--
 application/views/item_kits/manage.php |  5 +++--
 application/views/people/manage.php    | 13 ++++--------
 application/views/sales/form.php       | 17 ++++++---------
 application/views/sales/manage.php     | 29 +++++++++++++-------------
 dist/opensourcepos.js                  | 27 +++++++++++++-----------
 js/manage_tables.js                    | 27 +++++++++++++-----------
 10 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php
index 4571515c2..bd613c0c4 100644
--- a/application/controllers/Sales.php
+++ b/application/controllers/Sales.php
@@ -47,10 +47,10 @@ class Sales extends Secure_area
 	{
 		$this->Sale->create_sales_items_temp_table();
 
-		$sale_info = $this->Sale->get_info($row_id)->result_array();
-		$data_row = get_sales_manage_sale_data_row($sale_info[0], $this);
+		$sale_info = $this->Sale->get_info($row_id)->row();
+		$data_row = get_sale_data_row($sale_info, $this);
 
-		echo $data_row;
+		echo json_encode($data_row);
 	}
 	
 	/*
diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php
index 133e1e113..71ddeb7e9 100644
--- a/application/helpers/table_helper.php
+++ b/application/helpers/table_helper.php
@@ -66,7 +66,7 @@ function get_sale_data_row($sale, $controller)
 		'customer' => character_limiter( $sale->customer_name, 25),
 		'amount_tendered' => to_currency( $sale->amount_tendered ),
 		'amount_due' => to_currency($sale->amount_due),
-		'change_due' => to_currency($sale->chang_due),
+		'change_due' => to_currency($sale->change_due),
 		'payment_type' => $sale->payment_type,
 		'invoice_number' => $sale->invoice_number,
 		'receipt' => anchor($controller_name."/receipt/$sale->sale_id", '<span class="glyphicon glyphicon-print"></span>',
diff --git a/application/models/Sale.php b/application/models/Sale.php
index 1304d0f5c..96de34226 100644
--- a/application/models/Sale.php
+++ b/application/models/Sale.php
@@ -106,7 +106,7 @@ class Sale extends CI_Model
 
 		if (empty($search))
 		{
-			$this->db->where('sale_time BETWEEN '. $this->db->escape($filters['start_date']). ' AND '. $this->db->escape($filters['end_date']));
+			//$this->db->where('sale_time BETWEEN '. $this->db->escape($filters['start_date']). ' AND '. $this->db->escape($filters['end_date']));
 		}
 		else
 		{
diff --git a/application/views/giftcards/manage.php b/application/views/giftcards/manage.php
index 6e35f20ac..2529b3de9 100644
--- a/application/views/giftcards/manage.php
+++ b/application/views/giftcards/manage.php
@@ -2,8 +2,9 @@
 <script type="text/javascript">
 $(document).ready(function()
 {
-	table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>);
-	table_support.init_delete('<?php echo $this->lang->line($controller_name."_confirm_delete")?>');
+	table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>, {
+		confirmDeteleMessage : '<?php echo $this->lang->line($controller_name."_confirm_delete")?>'
+	});
 });
 </script>
 
diff --git a/application/views/item_kits/manage.php b/application/views/item_kits/manage.php
index 800ef40bf..cc37297d7 100644
--- a/application/views/item_kits/manage.php
+++ b/application/views/item_kits/manage.php
@@ -3,8 +3,9 @@
 <script type="text/javascript">
 $(document).ready(function()
 {
-	table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>);
-    table_support.init_delete('<?php echo $this->lang->line($controller_name."_confirm_delete")?>');
+	table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>, {
+		confirmDeteleMessage: '<?php echo $this->lang->line($controller_name."_confirm_delete")?>'
+	});
 
 	$('#generate_barcodes').click(function()
 	{
diff --git a/application/views/people/manage.php b/application/views/people/manage.php
index 9cf077e62..865400a6c 100644
--- a/application/views/people/manage.php
+++ b/application/views/people/manage.php
@@ -3,8 +3,10 @@
 <script type="text/javascript">
 $(document).ready(function()
 {
-	table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>);
-	table_support.init_delete('<?php echo $this->lang->line($controller_name."_confirm_delete")?>');
+	table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>, {
+		confirmDeleteMessage : '<?php echo $this->lang->line($controller_name."_confirm_delete")?>',
+		enableActions: function() { }
+	});
 
 	$("#email").click(function(evvent)
 	{
@@ -19,14 +21,7 @@ $(document).ready(function()
 		});
 		location.href = "mailto:" + recipients.join(",");
 	};
-// TODO override enable_actions to enable/disable email HERE
-	var enable_actions = table_support.enable_actions;
-/*	table_support.enable_actions = function ()
-	{
-		enable_actions();
 
-	}
-*/
 });
 
 </script>
diff --git a/application/views/sales/form.php b/application/views/sales/form.php
index d463c1a6c..a33411f64 100755
--- a/application/views/sales/form.php
+++ b/application/views/sales/form.php
@@ -106,7 +106,7 @@ $(document).ready(function()
 				$.get('<?php echo site_url() . "/sales/send_invoice/" . $sale_info['sale_id']; ?>',
 						function(response) {
 							dialog_support.hide();
-							post_form_submit(response);
+							table_support.handle_submit('<?php echo site_url('sales'); ?>', response);
 						}, "json"
 				);	
 			}
@@ -166,11 +166,11 @@ $(document).ready(function()
 			success: function(response)
 			{
 				dialog_support.hide();
-				post_form_submit(response);
+				table_support.handle_submit('<?php echo site_url('sales'); ?>', response);
 			},
 			error: function(jqXHR, textStatus, errorThrown) 
 			{
-				post_form_submit({message: errorThrown});
+				table_support.handle_submit('<?php echo site_url('sales'); ?>', { message : errorThrown, success: false });;
 			},
 			dataType: 'json'
 		});
@@ -217,14 +217,9 @@ $(document).ready(function()
 				{
 					dialog_support.hide();
 					set_feedback(response.message, 'alert alert-dismissible alert-success', false);
-					var $element = get_table_row(id).parent().parent();
-					$element.find("td").animate({backgroundColor:"green"},1200,"linear")
-					.end().animate({opacity:0},1200,"linear",function()
-					{
-						$element.next().remove();
-						$(this).remove();
-						//Re-init sortable table as we removed a row
-						update_sortable_table();
+					table().remove({
+						field: 'id',
+						values: [id]
 					});
 				},
 				error: function(jqXHR, textStatus, errorThrown) {
diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php
index 0b783a893..22e707e19 100755
--- a/application/views/sales/manage.php
+++ b/application/views/sales/manage.php
@@ -3,12 +3,6 @@
 <script type="text/javascript">
 $(document).ready(function()
 {
-	// refresh payment summaries at page bottom when a search complete takes place
-	var on_complete = function(response)
-	{
-		$("#payment_summary").html(response.payment_summary);
-	};
-
 	// when any filter is clicked and the dropdown window is closed
 	$('#filters').on('hidan.bs.select', function(e)
 	{
@@ -26,14 +20,22 @@ $(document).ready(function()
 		table_support.refresh();
 	});
 
-	table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>, function() {
-		return $.extend(arguments[0], {
-			start_date: start_date,
-			end_date: end_date,
-			filters: $("#filters").val() || [""]
-		});
+	table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>, {
+
+		confirmDeleteMessage : '<?php echo $this->lang->line($controller_name."_confirm_delete")?>',
+
+		loadSuccess: function(response) {
+			$("#payment_summary").html(response.payment_summary);
+		},
+
+		queryParams: function() {
+			return $.extend(arguments[0], {
+				start_date: start_date,
+				end_date: end_date,
+				filters: $("#filters").val() || [""]
+			});
+		}
 	});
-	table_support.init_delete('<?php echo $this->lang->line($controller_name."_confirm_delete")?>');
 
 });
 
@@ -66,7 +68,6 @@ $(document).ready(function()
 </div>
 
 <div id="payment_summary">
-	<?php //echo $payments_summary; ?>
 </div>
 
 <?php $this->load->view("partial/footer"); ?>
diff --git a/dist/opensourcepos.js b/dist/opensourcepos.js
index a6553dc8d..970e38604 100644
--- a/dist/opensourcepos.js
+++ b/dist/opensourcepos.js
@@ -49412,9 +49412,10 @@ $.tablesorter.addWidget({
 		});
 	};
 
-	var enable_actions = function() {
+	var enable_actions = function(callback) {
 		var selection_empty = selected_rows().length == 0;
 		$("#toolbar button:not(.dropdown-toggle)").attr('disabled', selection_empty);
+		typeof callback == 'function' && callback();
 	};
 
 	var table = function() {
@@ -49466,13 +49467,16 @@ $.tablesorter.addWidget({
 
 	var load_callback;
 
-	var load_success = function() {
-		typeof load_callback == 'function' && load_callback();
-		load_callback = undefined;
-		dialog_support.init("a.modal-dlg, button.modal-dlg");
+	var load_success = function(callback) {
+		return function(response) {
+			typeof load_callback == 'function' && load_callback();
+			load_callback = undefined;
+			dialog_support.init("a.modal-dlg, button.modal-dlg");
+			typeof callback == 'function' && callback.call(this, response);
+		}
 	};
 
-	var init = function (resource, headers, queryParams) {
+	var init = function (resource, headers, options) {
 		$('#table').bootstrapTable({
 			columns: headers,
 			url: resource + '/search',
@@ -49488,11 +49492,12 @@ $.tablesorter.addWidget({
 			onUncheck: enable_actions,
 			onCheckAll: enable_actions,
 			onUncheckAll: enable_actions,
-			onLoadSuccess: load_success,
-			queryParams: queryParams,
+			onLoadSuccess: load_success(options.onLoadSuccess),
+			queryParams: options.queryParams,
 			queryParamsType: 'limit'
 		});
-		table_support.enable_actions();
+		enable_actions();
+		init_delete(options.confirmDeleteMessage)
 	};
 
 	var init_delete = function (confirm_message) {
@@ -49542,11 +49547,9 @@ $.tablesorter.addWidget({
 
 	$.extend(table_support, {
 		handle_submit: handle_submit,
-		init_delete: init_delete,
 		init: init,
 		refresh : refresh,
-		selected_ids : selected_ids,
-		enable_actions : enable_actions
+		selected_ids : selected_ids
 	});
 
 })(window.table_support = window.table_support || {}, jQuery);;(function($) {
diff --git a/js/manage_tables.js b/js/manage_tables.js
index 5d767e640..a42563224 100644
--- a/js/manage_tables.js
+++ b/js/manage_tables.js
@@ -133,9 +133,10 @@
 		});
 	};
 
-	var enable_actions = function() {
+	var enable_actions = function(callback) {
 		var selection_empty = selected_rows().length == 0;
 		$("#toolbar button:not(.dropdown-toggle)").attr('disabled', selection_empty);
+		typeof callback == 'function' && callback();
 	};
 
 	var table = function() {
@@ -187,13 +188,16 @@
 
 	var load_callback;
 
-	var load_success = function() {
-		typeof load_callback == 'function' && load_callback();
-		load_callback = undefined;
-		dialog_support.init("a.modal-dlg, button.modal-dlg");
+	var load_success = function(callback) {
+		return function(response) {
+			typeof load_callback == 'function' && load_callback();
+			load_callback = undefined;
+			dialog_support.init("a.modal-dlg, button.modal-dlg");
+			typeof callback == 'function' && callback.call(this, response);
+		}
 	};
 
-	var init = function (resource, headers, queryParams) {
+	var init = function (resource, headers, options) {
 		$('#table').bootstrapTable({
 			columns: headers,
 			url: resource + '/search',
@@ -209,11 +213,12 @@
 			onUncheck: enable_actions,
 			onCheckAll: enable_actions,
 			onUncheckAll: enable_actions,
-			onLoadSuccess: load_success,
-			queryParams: queryParams,
+			onLoadSuccess: load_success(options.onLoadSuccess),
+			queryParams: options.queryParams,
 			queryParamsType: 'limit'
 		});
-		table_support.enable_actions();
+		enable_actions();
+		init_delete(options.confirmDeleteMessage)
 	};
 
 	var init_delete = function (confirm_message) {
@@ -263,11 +268,9 @@
 
 	$.extend(table_support, {
 		handle_submit: handle_submit,
-		init_delete: init_delete,
 		init: init,
 		refresh : refresh,
-		selected_ids : selected_ids,
-		enable_actions : enable_actions
+		selected_ids : selected_ids
 	});
 
 })(window.table_support = window.table_support || {}, jQuery);
\ No newline at end of file