mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-20 07:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

set the filters in Items and Sales/Takings on the right side (#116 #293)

Browse Source
This commit is contained in:
FrancescoUK committed 2016-03-31 16:33:30 +01:00
1 parent 2359af5fbb
commit 83edcaf955
7 files changed
+58 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

application/views/giftcards/manage.php
+9 -2
View File
@@ -7,7 +7,7 @@ $(document).ready(function()
enable_checkboxes();
enable_row_selection();
enable_search({suggest_url: '<?php echo site_url("$controller_name/suggest_search")?>',
confirm_message: '<?php echo $this->lang->line("common_confirm_search")?>'});
confirm_message: '<?php echo $this->lang->line("common_confirm_search")?>'});
enable_delete('<?php echo $this->lang->line($controller_name."_confirm_delete")?>','<?php echo $this->lang->line($controller_name."_none_selected")?>');
});
@@ -45,6 +45,9 @@ function post_giftcard_form_submit(response)
}
else //refresh entire table
{
// reset page number when selecting a specific page number
$('#limit_from').val("0");
do_search(true,function()
{
//highlight new row
@@ -69,7 +72,11 @@ function post_giftcard_form_submit(response)
<div id="table_action_header" class="form-group">
<ul>
<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
<li class="float_right"><input type="text" name="search" id="search", class="form-control input-sm"/><input type="hidden" name="limit_from" id="limit_from"/></li>
<li class="float_right">
<?php echo form_input(array('name'=>'search', 'class'=>'form-control input-sm', 'id'=>'search')); ?>
<?php echo form_input(array('name'=>'limit_from', 'type'=>'hidden', 'id'=>'limit_from')); ?>
</li>
</ul>
</div>
</fieldset>
application/views/item_kits/manage.php
+10 -3
View File
@@ -7,8 +7,8 @@ $(document).ready(function()
enable_select_all();
enable_checkboxes();
enable_row_selection();
enable_search({suggest_url : '<?php echo site_url("$controller_name/suggest_search")?>',
confirm_message : '<?php echo $this->lang->line("common_confirm_search")?>'});
enable_search({suggest_url: '<?php echo site_url("$controller_name/suggest_search")?>',
confirm_message: '<?php echo $this->lang->line("common_confirm_search")?>'});
enable_delete('<?php echo $this->lang->line($controller_name."_confirm_delete")?>','<?php echo $this->lang->line($controller_name."_none_selected")?>');
$('#generate_barcodes').click(function()
@@ -58,6 +58,9 @@ function post_item_kit_form_submit(response)
}
else //refresh entire table
{
// reset page number when selecting a specific page number
$('#limit_from').val("0");
do_search(true,function()
{
//highlight new row
@@ -83,7 +86,11 @@ function post_item_kit_form_submit(response)
<ul>
<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
<li class="float_left"><?php echo anchor("$controller_name/generate_barcodes", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("items_generate_barcodes") . '</span></div>', array('id'=>'generate_barcodes', 'target' =>'_blank', 'title'=>$this->lang->line('items_generate_barcodes'))); ?></li>
<li class="float_right"><input type="text" name="search" id="search", class="form-control input-sm"/><input type="hidden" name="limit_from" id="limit_from"/></li>
<li class="float_right">
<?php echo form_input(array('name'=>'search', 'class'=>'form-control input-sm', 'id'=>'search')); ?>
<?php echo form_input(array('name'=>'limit_from', 'type'=>'hidden', 'id'=>'limit_from')); ?>
</li>
</ul>
</div>
</fieldset>
application/views/items/manage.php
+12 -11
View File
@@ -161,24 +161,25 @@ function post_bulk_form_submit(response)
<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
<li class="float_left"><?php echo anchor("$controller_name/bulk_edit", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("items_bulk_edit") . '</span></div>', array('id'=>'bulk_edit', 'class'=>'modal-dlg modal-btn-submit', 'title'=>$this->lang->line('items_edit_multiple_items'))); ?></li>
<li class="float_left"><?php echo anchor("$controller_name/generate_barcodes", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("items_generate_barcodes") . '</span></div>', array('id'=>'generate_barcodes', 'target' =>'_blank', 'title'=>$this->lang->line('items_generate_barcodes'))); ?></li>
<li class="float_right">
<?php echo form_input(array('name'=>'search', 'class'=>'form-control input-sm', 'id'=>'search')); ?>
<?php echo form_input(array('name'=>'limit_from', 'type'=>'hidden', 'id'=>'limit_from')); ?>
</li>
<li class="float_right">
<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm pull-right', 'id'=>'daterangepicker')); ?>
<?php echo form_input(array('name'=>'start_date', 'type'=>'hidden', 'id'=>'start_date')); ?>
<?php echo form_input(array('name'=>'end_date', 'type'=>'hidden', 'id'=>'end_date')); ?>
</li>
<li class="float_right"><div id="multi_filter"><?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></li>
<?php
if (count($stock_locations) > 1)
{
?>
<li class="float_left"><?php echo form_dropdown('stock_location', $stock_locations, $stock_location, array('id'=>'stock_location', 'onchange'=>"$('#search_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?></li>
<li class="float_right"><?php echo form_dropdown('stock_location', $stock_locations, $stock_location, array('id'=>'stock_location', 'onchange'=>"$('#search_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?></li>
<?php
}
?>
<li class="float_left"><div id="multi_filter"><?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></li>
<li class="float_left">
<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
<?php echo form_input(array('name'=>'start_date', 'type'=>'hidden', 'id'=>'start_date')); ?>
<?php echo form_input(array('name'=>'end_date', 'type'=>'hidden', 'id'=>'end_date')); ?>
</li>
<li class="float_right">
<input type="text" name="search" id="search", class="form-control input-sm"/>
<input type="hidden" name="limit_from" id="limit_from"/>
</li>
</ul>
</div>
</fieldset>
application/views/partial/daterangepicker.php
-1
View File
@@ -87,7 +87,6 @@ $('#daterangepicker').daterangepicker({
"firstDay": <?php echo $this->lang->line("datepicker_weekstart"); ?>
},
"alwaysShowCalendars": true,
"opens": "center",
"startDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>",
"endDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>",
"minDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,01,01,2010));?>",
application/views/people/manage.php
+10 -4
View File
@@ -6,8 +6,8 @@ $(document).ready(function()
init_table_sorting();
enable_select_all();
enable_row_selection();
enable_search({ suggest_url : '<?php echo site_url("$controller_name/suggest_search")?>',
confirm_search_message : '<?php echo $this->lang->line("common_confirm_search")?>'});
enable_search({suggest_url: '<?php echo site_url("$controller_name/suggest_search")?>',
confirm_search_message: '<?php echo $this->lang->line("common_confirm_search")?>'});
enable_email('<?php echo site_url("$controller_name/mailto")?>');
enable_delete('<?php echo $this->lang->line($controller_name."_confirm_delete")?>','<?php echo $this->lang->line($controller_name."_none_selected")?>');
});
@@ -25,7 +25,6 @@ function init_table_sorting()
0: { sorter: 'false'},
5: { sorter: 'false'}
}
});
}
}
@@ -47,6 +46,9 @@ function post_person_form_submit(response)
}
else //refresh entire table
{
// reset page number when selecting a specific page number
$('#limit_from').val("0");
do_search(true,function()
{
//highlight new row
@@ -91,7 +93,11 @@ function post_person_form_submit(response)
<ul>
<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
<li class="float_left"><span><a href="#" id="email"><div class="btn btn-default btn-sm"><?php echo $this->lang->line("common_email");?></div></a></span></li>
<li class="float_right"><input type="text" name="search" id="search", class="form-control input-sm"/><input type="hidden" name="limit_from" id="limit_from"/></li>
<li class="float_right">
<?php echo form_input(array('name'=>'search', 'class'=>'form-control input-sm', 'id'=>'search')); ?>
<?php echo form_input(array('name'=>'limit_from', 'type'=>'hidden', 'id'=>'limit_from')); ?>
</li>
</ul>
</div>
</fieldset>
application/views/sales/manage.php
+7 -8
View File
@@ -199,17 +199,16 @@ function init_table_sorting()
<ul>
<li class="float_left print_hide"><?php echo anchor($controller_name . "/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
<!-- li class="float_left print_hide"><?php echo anchor($controller_name . "/update_invoice_numbers", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line('sales_invoice_update') . '</span></div>', array('id'=>'update_invoice_numbers')); ?></li -->
<li class="float_left print_show"><div id="multi_filter"><?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')); ?></div></li>
<li class="float_left print_show"><?php echo form_label($this->lang->line('sales_date_range').':', 'start_date');?></li>
<li class="float_left print_show"><?php echo form_input(array('name'=>'start_date', 'value'=>$start_date, 'class'=>'date_filter form-control input-sm'));?></li>
<li class="float_left print_show"><?php echo form_label('-', 'end_date');?></li>
<li class="float_left print_show"><?php echo form_input(array('name'=>'end_date', 'value'=>$end_date, 'class'=>'date_filter form-control input-sm'));?></li>
<li class="float_right print_hide">
<input type="text" name="search" id="search", class="form-control input-sm"/>
<input type="hidden" name="limit_from" id="limit_from"/>
<?php echo form_input(array('name'=>'search', 'class'=>'form-control input-sm', 'id'=>'search')); ?>
<?php echo form_input(array('name'=>'limit_from', 'type'=>'hidden', 'id'=>'limit_from')); ?>
</li>
<li class="float_right print_show"><?php echo form_input(array('name'=>'end_date', 'value'=>$end_date, 'class'=>'date_filter form-control input-sm'));?></li>
<li class="float_right print_show"><?php echo form_label('-', 'end_date');?></li>
<li class="float_right print_show"><?php echo form_input(array('name'=>'start_date', 'value'=>$start_date, 'class'=>'date_filter form-control input-sm'));?></li>
<li class="float_right print_show"><?php echo form_label($this->lang->line('sales_date_range').':', 'start_date');?></li>
<li class="float_right print_show"><div id="multi_filter"><?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')); ?></div></li>
</ul>
</div>
</fieldset>
application/views/suppliers/manage.php
+10 -2
View File
@@ -6,7 +6,8 @@ $(document).ready(function()
init_table_sorting();
enable_select_all();
enable_row_selection();
enable_search({suggest_url : '<?php echo site_url("$controller_name/suggest_search")?>', confirm_search_message : '<?php echo $this->lang->line("common_confirm_search")?>'});
enable_search({suggest_url: '<?php echo site_url("$controller_name/suggest_search")?>',
confirm_search_message: '<?php echo $this->lang->line("common_confirm_search")?>'});
enable_email('<?php echo site_url("$controller_name/mailto")?>');
enable_delete('<?php echo $this->lang->line($controller_name."_confirm_delete")?>','<?php echo $this->lang->line($controller_name."_none_selected")?>');
});
@@ -46,6 +47,9 @@ function post_person_form_submit(response)
}
else //refresh entire table
{
// reset page number when selecting a specific page number
$('#limit_from').val("0");
do_search(true,function()
{
//highlight new row
@@ -71,7 +75,11 @@ function post_person_form_submit(response)
<ul>
<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
<li class="float_left"><span><a href="#" id="email"><div class="btn btn-default btn-sm"><?php echo $this->lang->line("common_email");?></div></a></span></li>
<li class="float_right"><input type="text" name="search" id="search", class="form-control input-sm"/><input type="hidden" name="limit_from" id="limit_from"/></li>
<li class="float_right">
<?php echo form_input(array('name'=>'search', 'class'=>'form-control input-sm', 'id'=>'search')); ?>
<?php echo form_input(array('name'=>'limit_from', 'type'=>'hidden', 'id'=>'limit_from')); ?>
</li>
</ul>
</div>
</fieldset>