mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-14 12:02:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix payment summary in sales (#293)

Browse Source 
Add glyphicons to buttons in register + receiving views
Refactor table_support init function
Various bugfixes
This commit is contained in:
jekkos
2016-04-25 23:26:58 +02:00
parent 2dab5e0fe7
commit c9142ca69b
13 changed files with 185 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/Sales.php
View File

@@ -53,9 +53,6 @@ class Sales extends Secure_area
echo json_encode($data_row);
}
/*
Returns Sales table data rows. This will be called with AJAX.
*/
function search()
{
$this->Sale->create_sales_items_temp_table();
@@ -78,7 +75,7 @@ class Sales extends Secure_area
// check if any filter is set in the multiselect dropdown
$filledup = array_fill_keys($this->input->get('filters'), true);
$filledup = array_fill_keys($this->input->get('filters'), TRUE);
$filters = array_merge($filters, $filledup);
$sales = $this->Sale->search($search, $filters, $offset, $limit);

4
application/models/Sale.php
View File

@@ -40,7 +40,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('DATE(sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
}
else
{
@@ -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('DATE(sale_time) BETWEEN '. $this->db->escape($filters['start_date']). ' AND '. $this->db->escape($filters['end_date']));
}
else
{

8
application/views/giftcards/manage.php
View File

@@ -2,8 +2,10 @@
<script type="text/javascript">
$(document).ready(function()
{
table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>, {
confirmDeteleMessage : '<?php echo $this->lang->line($controller_name."_confirm_delete")?>'
table_support.init({
resource: '<?php echo site_url($controller_name);?>',
headers: <?php echo $table_headers; ?>,
confirmDeleteMessage : '<?php echo $this->lang->line($controller_name."_confirm_delete")?>'
});
});
</script>
@@ -17,7 +19,7 @@ $(document).ready(function()
<div id="toolbar">
<div class="pull-left btn-toolbar">
<button id="delete" class="btn btn-default btn-sm" data-href='<?php echo site_url($controller_name."/delete"); ?>'><span class="glyphicon glyphicon-trash"></span>
<button id="delete" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-trash"></span>
<?php echo $this->lang->line("common_delete");?></button>
</div>
</div>

6
application/views/item_kits/manage.php
View File

@@ -3,7 +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({
resource: '<?php echo site_url($controller_name);?>',
headers: <?php echo $table_headers; ?>,
confirmDeteleMessage: '<?php echo $this->lang->line($controller_name."_confirm_delete")?>'
});
@@ -30,7 +32,7 @@ $(document).ready(function()
<div id="toolbar">
<div class="pull-left btn-toolbar">
<button id="delete" class="btn btn-default btn-sm" data-href='<?php echo site_url($controller_name."/delete"); ?>'><span class="glyphicon glyphicon-trash"></span>
<button id="delete" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-trash"></span>
<?php echo $this->lang->line("common_delete");?></button>
<button id="generate_barcodes" class="btn btn-default btn-sm" data-href='<?php echo site_url($controller_name."/generate_barcodes"); ?>'><span class="glyphicon glyphicon-barcode"></span>

2
application/views/items/form.php
View File

@@ -346,7 +346,7 @@
{
dialog_support.hide();
}
table_support.handle_submit('<?php echo site_url('item_kits'); ?>', response, stay_open);
table_support.handle_submit('<?php echo site_url('items'); ?>', response, stay_open);
},
dataType: 'json'
});

23
application/views/items/manage.php
View File

@@ -27,20 +27,23 @@ $(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({
resource: '<?php echo site_url($controller_name);?>',
headers: <?php echo $table_headers; ?>,
confirmDeleteMessage : '<?php echo $this->lang->line($controller_name."_confirm_delete")?>',
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")?>');
var handle_submit = table_support.handle_submit;
table_support.handle_submit = function() {
debugger;;
handle_submit.apply(this, arguments) && $('a.rollover').imgPreview();
}
};
});
</script>
@@ -61,7 +64,7 @@ $(document).ready(function()
<div id="toolbar">
<div class="pull-left form-inline" role="toolbar">
<button id="delete" class="btn btn-default btn-sm" data-href='<?php echo site_url($controller_name."/delete"); ?>'>
<button id="delete" class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-trash"></span>
<?php echo $this->lang->line("common_delete");?>
</button>

10
application/views/people/manage.php
View File

@@ -3,9 +3,13 @@
<script type="text/javascript">
$(document).ready(function()
{
table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>, {
table_support.init({
resource: '<?php echo site_url($controller_name);?>',
headers: <?php echo $table_headers; ?>,
confirmDeleteMessage : '<?php echo $this->lang->line($controller_name."_confirm_delete")?>',
enableActions: function() { }
enableActions: function() {
// should only enable if email filed in
}
});
$("#email").click(function(evvent)
@@ -46,7 +50,7 @@ $(document).ready(function()
<div id="toolbar">
<div class="pull-left btn-toolbar">
<button id="delete" class="btn btn-default btn-sm" data-href='<?php echo site_url($controller_name."/delete"); ?>'><span class="glyphicon glyphicon-trash"></span>
<button id="delete" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-trash"></span>
<?php echo $this->lang->line("common_delete");?></button>
<button id="email" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-envelope"></span>
<?php echo $this->lang->line("common_email");?></button>

31
application/views/receivings/receiving.php
View File

@@ -75,8 +75,10 @@ if (isset($error))
<?php echo form_input(array('name'=>'item', 'id'=>'item', 'class'=>'form-control input-sm', 'size'=>'50', 'tabindex'=>'1')); ?>
</li>
<li class="pull-right">
<?php echo anchor("items/view/-1", $this->lang->line('sales_new_item'),
array('class'=>'btn btn-info btn-sm modal-dlg modal-btn-new modal-btn-submit', 'id'=>'new_item_button', 'title'=>$this->lang->line('sales_new_item'))); ?>
<button id='new_item_button' class='btn btn-info btn-sm pull-right modal-dlg modal-btn-submit' data-href='<?php echo site_url("items/view"); ?>'
title='<?php echo $this->lang->line('sales_new_item'); ?>'>
<span class="glyphicon glyphicon-tag"></span><?php echo $this->lang->line('sales_new_item'); ?>
</button>
</li>
</ul>
</div>
@@ -233,9 +235,12 @@ if (isset($error))
<div class="form-group" id="select_customer">
<label id="supplier_label" for="supplier" class="control-label" style="margin-bottom: 1em; margin-top: -1em;"><?php echo $this->lang->line('recvs_select_supplier'); ?></label>
<?php echo form_input(array('name'=>'supplier', 'id'=>'supplier', 'class'=>'form-control input-sm', 'value'=>$this->lang->line('recvs_start_typing_supplier_name'))); ?>
<?php echo anchor("suppliers/view/-1", $this->lang->line('recvs_new_supplier'),
array('class'=>'btn btn-info btn-sm modal-dlg modal-btn-submit none', 'id'=>'new_supplier_button', 'title'=>$this->lang->line('recvs_new_supplier'))); ?>
<button id='new_supplier_button' class='btn btn-info btn-sm modal-dlg modal-btn-submit' data-href='<?php echo site_url("suppliers/view"); ?>'
title='<?php echo $this->lang->line('recvs_new_supplier'); ?>'>
<span class="glyphicon glyphicon-user"></span><?php echo $this->lang->line('recvs_new_supplier'); ?>
</button>
</div>
<?php echo form_close(); ?>
<?php
@@ -425,7 +430,9 @@ $(document).ready(function()
}
});
$('#supplier').blur(function()
dialog_support.init("a.modal-dlg, button.modal-dlg");
$('#supplier').blur(function()
{
$(this).attr('value',"<?php echo $this->lang->line('recvs_start_typing_supplier_name'); ?>");
});
@@ -448,7 +455,12 @@ $(document).ready(function()
{
if(response.success)
{
if (resource.match(/customers$/).length > 0)
if (resource.match(/suppliers$/))
{
$("#supplier").attr("value",response.id);
$("#select_supplier_form").submit();
}
else
{
$("#item").attr("value",response.id);
if (stay_open)
@@ -460,11 +472,6 @@ $(document).ready(function()
$("#add_item_form").submit();
}
}
else
{
$("#supplier").attr("value",response.id);
$("#select_supplier_form").submit();
}
}
}
});

35
application/views/sales/form.php
View File

@@ -93,9 +93,6 @@
</fieldset>
<?php echo form_close(); ?>
<?php echo form_open("sales/delete/".$sale_info['sale_id'], array('id'=>'sales_delete_form')); ?>
<?php echo form_hidden('sale_id', $sale_info['sale_id']);?>
<?php echo form_close(); ?>
<script type="text/javascript" language="javascript">
$(document).ready(function()
@@ -159,6 +156,11 @@ $(document).ready(function()
focus: fill_value
});
$('button#delete').click(function() {
dialog_support.hide();
table_support.do_delete();
});
var submit_form = function()
{
$(this).ajaxSubmit(
@@ -168,10 +170,6 @@ $(document).ready(function()
dialog_support.hide();
table_support.handle_submit('<?php echo site_url('sales'); ?>', response);
},
error: function(jqXHR, textStatus, errorThrown)
{
table_support.handle_submit('<?php echo site_url('sales'); ?>', { message : errorThrown, success: false });;
},
dataType: 'json'
});
};
@@ -207,28 +205,5 @@ $(document).ready(function()
}
}, dialog_support.error));
$('#sales_delete_form').submit(function()
{
if (confirm('<?php echo $this->lang->line("sales_delete_confirmation"); ?>'))
{
var id = $("input[name='sale_id']").val();
$(this).ajaxSubmit({
success: function(response)
{
dialog_support.hide();
set_feedback(response.message, 'alert alert-dismissible alert-success', false);
table().remove({
field: 'id',
values: [id]
});
},
error: function(jqXHR, textStatus, errorThrown) {
set_feedback(textStatus, 'alert alert-dismissible alert-danger', true);
},
dataType:'json'
});
}
return false;
});
});
</script>

16
application/views/sales/manage.php
View File

@@ -4,9 +4,8 @@
$(document).ready(function()
{
// when any filter is clicked and the dropdown window is closed
$('#filters').on('hidan.bs.select', function(e)
$('#filters').on('hidden.bs.select', function(e)
{
// reset page number when selecting a specific page number
table_support.refresh();
});
@@ -20,14 +19,13 @@ $(document).ready(function()
table_support.refresh();
});
table_support.init('<?php echo site_url($controller_name);?>', <?php echo $table_headers; ?>, {
table_support.init({
resource: '<?php echo site_url($controller_name);?>',
headers: <?php echo $table_headers; ?>,
confirmDeleteMessage : '<?php echo $this->lang->line($controller_name."_confirm_delete")?>',
loadSuccess: function(response) {
onLoadSuccess: function(response) {
$("#payment_summary").html(response.payment_summary);
},
queryParams: function() {
return $.extend(arguments[0], {
start_date: start_date,
@@ -53,13 +51,13 @@ $(document).ready(function()
<div id="toolbar">
<div class="pull-left form-inline" role="toolbar">
<button id="delete" class="btn btn-default btn-sm" data-href='<?php echo site_url($controller_name."/delete"); ?>'>
<button id="delete" class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-trash"></span>
<?php echo $this->lang->line("common_delete");?>
</button>
<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
<?php echo form_multiselect('filters[]', $filters, '', array('id'=>'filters', 'class'=>'selectpicker show-menu-arrow', 'data-selected-text-format'=>'count > 3', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
<?php echo form_multiselect('filters[]', $filters, '', array('id'=>'filters', 'class'=>'selectpicker show-menu-arrow', 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</div>
</div>

29
application/views/sales/register.php
View File

@@ -46,8 +46,13 @@ if (isset($success))
?>
<li class="pull-right">
<?php echo anchor("sales/suspended", $this->lang->line('sales_suspended_sales'),
array('class'=>'btn btn-default btn-sm modal-dlg none', 'id'=>'show_suspended_sales_button', 'title'=>$this->lang->line('sales_suspended_sales'))); ?>
<button class='btn btn-default btn-sm modal-dlg' id='show_suspended_sales_button'
data-href='<?php echo site_url($controller_name."/suspended"); ?>'
title='<?php echo $this->lang->line('sales_suspended_sales'); ?>'>
<span class="glyphicon glyphicon-star"></span><?php echo $this->lang->line('sales_suspended_sales'); ?>
</button>
</li>
<?php
@@ -76,8 +81,10 @@ if (isset($success))
<span class="ui-helper-hidden-accessible" role="status"></span>
</li>
<li class="pull-right">
<?php echo anchor("items/view/-1", $this->lang->line('sales_new_item'),
array('class'=>'btn btn-info btn-sm modal-dlg modal-btn-new modal-btn-submit', 'id'=>'new_item_button', 'title'=>$this->lang->line('sales_new_item'))); ?>
<button id='new_item_button' class='btn btn-info btn-sm pull-right modal-dlg modal-btn-submit' data-href='<?php echo site_url("items/view"); ?>'
title='<?php echo $this->lang->line($controller_name . '_new_item'); ?>'>
<span class="glyphicon glyphicon-tag"></span><?php echo $this->lang->line($controller_name. '_new_item'); ?>
</button>
</li>
</ul>
</div>
@@ -297,9 +304,12 @@ if (isset($success))
<label id="customer_label" for="customer" class="control-label" style="margin-bottom: 1em; margin-top: -1em;"><?php echo $this->lang->line('sales_select_customer'); ?></label>
<?php echo form_input(array('name'=>'customer', 'id'=>'customer', 'class'=>'form-control input-sm', 'value'=>$this->lang->line('sales_start_typing_customer_name')));?>
<?php echo anchor("customers/view/-1", $this->lang->line('sales_new_customer'),
array('class'=>'btn btn-info btn-sm modal-dlg modal-btn-submit none', 'id'=>'new_customer_button', 'title'=>$this->lang->line('sales_new_customer'))); ?>
</div>
<button class='btn btn-info btn-sm modal-dlg modal-btn-submit' data-href='<?php echo site_url("customers/view"); ?>'
title='<?php echo $this->lang->line($controller_name. '_new_customer'); ?>'>
<span class="glyphicon glyphicon-user"></span><?php echo $this->lang->line($controller_name. '_new_customer'); ?>
</button>
</div>
<?php echo form_close(); ?>
<?php
}
@@ -645,10 +655,13 @@ $(document).ready(function()
}
});
dialog_support.init("a.modal-dlg, button.modal-dlg");
table_support.handle_submit = function(resource, response, stay_open)
{
debugger;;
if(response.success) {
if (resource.match(/customers$/).length > 0)
if (resource.match(/customers$/))
{
$("#customer").val(response.id);
$("#select_customer_form").submit();

125
dist/opensourcepos.js vendored
View File

@@ -49292,16 +49292,19 @@ $.tablesorter.addWidget({
var submit = function(button_id) {
return function(dlog_ref) {
btn_id = button_id;
debugger;;
dialog_ref = dlog_ref;
if (button_id == 'delete') {
$("form[id*='delete_form']").submit();
} else {
if (button_id == 'submit') {
$('form', dlog_ref.$modalBody).first().submit();
}
}
};
var button_class = {
'submit' : 'btn-primary',
'delete' : 'btn-danger'
};
var init = function(selector) {
var buttons = function(event) {
@@ -49319,7 +49322,7 @@ $.tablesorter.addWidget({
buttons.push({
id: btn_name,
label: btn_name.charAt(0).toUpperCase() + btn_name.slice(1),
cssClass: is_submit ? 'btn-primary' : (btn_name == 'delete' ? 'btn-danger' : ''),
cssClass: button_class[btn_name],
hotkey: is_submit ? 13 : undefined, // Enter.
action: submit(btn_name)
});
@@ -49380,37 +49383,6 @@ $.tablesorter.addWidget({
})(window.dialog_support = window.dialog_support || {}, jQuery);
(function(table_support, $) {
var init_autocomplete = function () {
var widget = $("#search").autocomplete({
source: function (request, response) {
var extra_params = {limit: 100};
$.each(options.extra_params, function (key, param) {
extra_params[key] = typeof param == "function" ? param() : param;
});
$.ajax({
type: "POST",
url: options.suggest_url,
dataType: "json",
data: $.extend(request, extra_params),
success: function (data) {
response($.map(data, function (item) {
return {
value: item.label,
};
}))
}
});
},
delay: 10,
autoFocus: false,
select: function (a, ui) {
$(this).val(ui.item.value);
do_search(true, options.on_complete);
}
});
};
var enable_actions = function(callback) {
var selection_empty = selected_rows().length == 0;
@@ -49432,30 +49404,6 @@ $.tablesorter.addWidget({
return $("#table input:checkbox:checked").parents("tr");
};
var do_delete = function (url) {
$.post(url, {'ids[]': selected_ids()}, function (response) {
//delete was successful, remove checkbox rows
if (response.success) {
table().remove({
field: 'id',
values: selected_ids()
});
// animated delete below
/*$(selected_rows()).each(function (index, dom) {
/*$(this).find("td").animate({backgroundColor: "green"}, 1200, "linear")
.end().animate({opacity: 0}, 1200, "linear", function () {
$(this).remove();
});
});*/
set_feedback(response.message, 'alert alert-dismissible alert-success', false);
} else {
set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
}
enable_actions();
}, "json");
};
var highlight_rows = function (id, color) {
var original = $("tr.selected").css('backgroundColor');
var selector = ((id && "tr[data-uniqueid='" + id + "']")) || "tr.selected";
@@ -49465,21 +49413,51 @@ $.tablesorter.addWidget({
$("tr input:checkbox:checked").prop("checked", false);
};
var load_callback;
var do_delete = function () {
if (confirm(options.confirmDeleteMessage)) {
$.post(options.resource + '/delete', {'ids[]': selected_ids()}, function (response) {
//delete was successful, remove checkbox rows
if (response.success) {
table().remove({
field: 'id',
values: selected_ids()
});
// animated delete below
/*$(selected_rows()).each(function (index, dom) {
/*$(this).find("td").animate({backgroundColor: "green"}, 1200, "linear")
.end().animate({opacity: 0}, 1200, "linear", function () {
$(this).remove();
});
});*/
set_feedback(response.message, 'alert alert-dismissible alert-success', false);
} else {
set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
}
refresh();
enable_actions();
}, "json");
} else {
return false;
}
};
var load_success = function(callback) {
return function(response) {
typeof load_callback == 'function' && load_callback();
typeof options.load_callback == 'function' && options.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, options) {
$('#table').bootstrapTable({
columns: headers,
url: resource + '/search',
var options;
var init = function (_options) {
options = _options;
$('#table').bootstrapTable($.extend(options, {
columns: options.headers,
url: options.resource + '/search',
sidePagination: 'server',
striped: true,
pagination: true,
@@ -49493,20 +49471,15 @@ $.tablesorter.addWidget({
onCheckAll: enable_actions,
onUncheckAll: enable_actions,
onLoadSuccess: load_success(options.onLoadSuccess),
queryParams: options.queryParams,
queryParamsType: 'limit'
});
}));
enable_actions();
init_delete(options.confirmDeleteMessage)
init_delete();
};
var init_delete = function (confirm_message) {
var init_delete = function (confirmMessage) {
$("#delete").click(function (event) {
if (confirm(confirm_message)) {
do_delete($(this).attr('href') || $(this).data('href'));
} else {
return false;
}
do_delete();
});
};
@@ -49543,11 +49516,13 @@ $.tablesorter.addWidget({
set_feedback(message, 'alert alert-dismissible alert-success', false);
}
}
enable_actions();
};
$.extend(table_support, {
handle_submit: handle_submit,
init: init,
do_delete: do_delete,
refresh : refresh,
selected_ids : selected_ids
});

125
js/manage_tables.js
View File

@@ -13,16 +13,19 @@
var submit = function(button_id) {
return function(dlog_ref) {
btn_id = button_id;
debugger;;
dialog_ref = dlog_ref;
if (button_id == 'delete') {
$("form[id*='delete_form']").submit();
} else {
if (button_id == 'submit') {
$('form', dlog_ref.$modalBody).first().submit();
}
}
};
var button_class = {
'submit' : 'btn-primary',
'delete' : 'btn-danger'
};
var init = function(selector) {
var buttons = function(event) {
@@ -40,7 +43,7 @@
buttons.push({
id: btn_name,
label: btn_name.charAt(0).toUpperCase() + btn_name.slice(1),
cssClass: is_submit ? 'btn-primary' : (btn_name == 'delete' ? 'btn-danger' : ''),
cssClass: button_class[btn_name],
hotkey: is_submit ? 13 : undefined, // Enter.
action: submit(btn_name)
});
@@ -101,37 +104,6 @@
})(window.dialog_support = window.dialog_support || {}, jQuery);
(function(table_support, $) {
var init_autocomplete = function () {
var widget = $("#search").autocomplete({
source: function (request, response) {
var extra_params = {limit: 100};
$.each(options.extra_params, function (key, param) {
extra_params[key] = typeof param == "function" ? param() : param;
});
$.ajax({
type: "POST",
url: options.suggest_url,
dataType: "json",
data: $.extend(request, extra_params),
success: function (data) {
response($.map(data, function (item) {
return {
value: item.label,
};
}))
}
});
},
delay: 10,
autoFocus: false,
select: function (a, ui) {
$(this).val(ui.item.value);
do_search(true, options.on_complete);
}
});
};
var enable_actions = function(callback) {
var selection_empty = selected_rows().length == 0;
@@ -153,30 +125,6 @@
return $("#table input:checkbox:checked").parents("tr");
};
var do_delete = function (url) {
$.post(url, {'ids[]': selected_ids()}, function (response) {
//delete was successful, remove checkbox rows
if (response.success) {
table().remove({
field: 'id',
values: selected_ids()
});
// animated delete below
/*$(selected_rows()).each(function (index, dom) {
/*$(this).find("td").animate({backgroundColor: "green"}, 1200, "linear")
.end().animate({opacity: 0}, 1200, "linear", function () {
$(this).remove();
});
});*/
set_feedback(response.message, 'alert alert-dismissible alert-success', false);
} else {
set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
}
enable_actions();
}, "json");
};
var highlight_rows = function (id, color) {
var original = $("tr.selected").css('backgroundColor');
var selector = ((id && "tr[data-uniqueid='" + id + "']")) || "tr.selected";
@@ -186,21 +134,51 @@
$("tr input:checkbox:checked").prop("checked", false);
};
var load_callback;
var do_delete = function () {
if (confirm(options.confirmDeleteMessage)) {
$.post(options.resource + '/delete', {'ids[]': selected_ids()}, function (response) {
//delete was successful, remove checkbox rows
if (response.success) {
table().remove({
field: 'id',
values: selected_ids()
});
// animated delete below
/*$(selected_rows()).each(function (index, dom) {
/*$(this).find("td").animate({backgroundColor: "green"}, 1200, "linear")
.end().animate({opacity: 0}, 1200, "linear", function () {
$(this).remove();
});
});*/
set_feedback(response.message, 'alert alert-dismissible alert-success', false);
} else {
set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
}
refresh();
enable_actions();
}, "json");
} else {
return false;
}
};
var load_success = function(callback) {
return function(response) {
typeof load_callback == 'function' && load_callback();
typeof options.load_callback == 'function' && options.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, options) {
$('#table').bootstrapTable({
columns: headers,
url: resource + '/search',
var options;
var init = function (_options) {
options = _options;
$('#table').bootstrapTable($.extend(options, {
columns: options.headers,
url: options.resource + '/search',
sidePagination: 'server',
striped: true,
pagination: true,
@@ -214,20 +192,15 @@
onCheckAll: enable_actions,
onUncheckAll: enable_actions,
onLoadSuccess: load_success(options.onLoadSuccess),
queryParams: options.queryParams,
queryParamsType: 'limit'
});
}));
enable_actions();
init_delete(options.confirmDeleteMessage)
init_delete();
};
var init_delete = function (confirm_message) {
var init_delete = function (confirmMessage) {
$("#delete").click(function (event) {
if (confirm(confirm_message)) {
do_delete($(this).attr('href') || $(this).data('href'));
} else {
return false;
}
do_delete();
});
};
@@ -264,11 +237,13 @@
set_feedback(message, 'alert alert-dismissible alert-success', false);
}
}
enable_actions();
};
$.extend(table_support, {
handle_submit: handle_submit,
init: init,
do_delete: do_delete,
refresh : refresh,
selected_ids : selected_ids
});