mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-13 10:13:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Show invoice icon if invoices enabled in config (#507)

Browse Source 
Fix limit query for customers table (#507)
Add reference to translation when no persons found (#507)
This commit is contained in:
jekkos
2016-05-03 18:09:58 +02:00
parent c2f895c1d4
commit e2f6bf283c
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Customers.php
View File

@@ -24,7 +24,7 @@ class Customers extends Person_controller
$limit = $this->input->get('limit');
$offset = $this->input->get('offset');
$customers = $this->Customer->search($search, $offset, $limit);
$customers = $this->Customer->search($search, $limit, $offset);
$total_rows = $this->Customer->get_found_rows($search);
$data_rows = array();

1
application/helpers/table_helper.php
View File

@@ -19,6 +19,7 @@ function get_sales_manage_table_headers()
if($CI->config->item('invoice_enable') == TRUE)
{
$headers[] = array('invoice_number' => $CI->lang->line('sales_invoice_number'));
$headers[] = array('invoice' => '&nbsp');
}
return transform_headers(array_merge($headers, array(array( 'receipt' => '&nbsp' ))));

2
application/views/customers/form_excel_import.php
View File

@@ -31,7 +31,7 @@ $(document).ready(function()
success:function(response)
{
dialog_support.hide();
table_support.handle_submit('customers', response);
table_support.handle_submit('<?php echo site_url('customers'); ?>', response);
},
dataType:'json'
});

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

@@ -31,7 +31,7 @@ $(document).ready(function()
success:function(response)
{
dialog_support.hide();
table_support.handle_submit(response);
table_support.handle_submit('<?php echo site_url('items'); ?>', response);
},
dataType:'json'
});

3
application/views/partial/bootstrap_tables_locale.php
View File

@@ -15,7 +15,8 @@
return '<?php echo $this->lang->line('common_search'); ?>';
},
formatNoMatches: function () {
return '<?php echo $this->lang->line($controller_name . '_no_' . $controller_name .'_to_display'); ?>';
return '<?php echo $this->lang->line(preg_match('(customers|suppliers|employees)', $controller_name) ?
'common_no_persons_to_display' : $controller_name . '_no_' . $controller_name .'_to_display'); ?>';
},
formatPaginationSwitch: function () {
return '<?php echo $this->lang->line('tables_hide_show_pagination'); ?>';