mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 16:28:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Print reports date in different formats, remove sorting (#1896)

Browse Source
This commit is contained in:
FrancescoUK
2018-03-25 13:56:33 +01:00
parent b18ae57cf6
commit ae472d0176
14 changed files with 234 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/config/autoload.php
View File

@@ -89,7 +89,7 @@ $autoload['drivers'] = array();
|
| $autoload['helper'] = array('url', 'file');
*/
$autoload['helper'] = array('form', 'url', 'table', 'text', 'locale', 'html', 'download', 'directory');
$autoload['helper'] = array('form', 'url', 'tabular', 'text', 'locale', 'html', 'download', 'directory');
/*
| -------------------------------------------------------------------

80
application/controllers/Reports.php
View File

@@ -31,7 +31,7 @@ class Reports extends Secure_Controller
public function index()
{
$data['grants'] = $this->xss_clean($this->Employee->get_employee_grants($this->session->userdata('person_id')));
$this->load->view('reports/listing', $data);
}
@@ -50,7 +50,7 @@ class Reports extends Secure_Controller
foreach($report_data as $row)
{
$tabular_data[] = $this->xss_clean(array(
'sale_date' => $row['sale_date'],
'sale_date' => date($this->config->item('dateformat'), strtotime($row['sale_date'])),
'quantity' => to_quantity_decimals($row['quantity_purchased']),
'subtotal' => to_currency($row['subtotal']),
'tax' => to_currency_tax($row['tax']),
@@ -106,7 +106,7 @@ class Reports extends Secure_Controller
$this->load->view('reports/tabular', $data);
}
//Summary Expenses by Categories report
public function summary_expenses_categories($start_date, $end_date, $sale_type)
{
@@ -430,10 +430,10 @@ class Reports extends Secure_Controller
public function graphical_summary_expenses_categories($start_date, $end_date, $sale_type)
{
$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type);
$this->load->model('reports/Summary_expenses_categories');
$model = $this->Summary_expenses_categories;
$report_data = $model->getData($inputs);
$summary = $this->xss_clean($model->getSummaryData($inputs));
@@ -608,7 +608,7 @@ class Reports extends Secure_Controller
$this->load->model('reports/Summary_employees');
$model = $this->Summary_employees;
$report_data = $model->getData($inputs);
$summary = $this->xss_clean($model->getSummaryData($inputs));
@@ -642,7 +642,7 @@ class Reports extends Secure_Controller
$this->load->model('reports/Summary_taxes');
$model = $this->Summary_taxes;
$report_data = $model->getData($inputs);
$summary = $this->xss_clean($model->getSummaryData($inputs));
@@ -673,10 +673,10 @@ class Reports extends Secure_Controller
public function graphical_summary_customers($start_date, $end_date, $sale_type, $location_id = 'all')
{
$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
$this->load->model('reports/Summary_customers');
$model = $this->Summary_customers;
$report_data = $model->getData($inputs);
$summary = $this->xss_clean($model->getSummaryData($inputs));
@@ -712,7 +712,7 @@ class Reports extends Secure_Controller
$this->load->model('reports/Summary_discounts');
$model = $this->Summary_discounts;
$report_data = $model->getData($inputs);
$summary = $this->xss_clean($model->getSummaryData($inputs));
@@ -745,10 +745,10 @@ class Reports extends Secure_Controller
public function graphical_summary_payments($start_date, $end_date, $sale_type, $location_id = 'all')
{
$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
$this->load->model('reports/Summary_payments');
$model = $this->Summary_payments;
$report_data = $model->getData($inputs);
$summary = $this->xss_clean($model->getSummaryData($inputs));
@@ -778,12 +778,12 @@ class Reports extends Secure_Controller
public function specific_customer_input()
{
$data = array();
$data['specific_input_name'] = $this->lang->line('reports_customer');
$data['specific_input_name'] = $this->lang->line('reports_customer');
$customers = array();
foreach($this->Customer->get_all()->result() as $customer)
{
{
if(isset($customer->company_name))
{
{
$customers[$customer->person_id] = $this->xss_clean($customer->first_name . ' ' . $customer->last_name. ' ' . ' [ '.$customer->company_name.' ] ');
}
else
@@ -794,12 +794,12 @@ class Reports extends Secure_Controller
$data['specific_input_data'] = $customers;
$data['sale_type_options'] = $this->get_sale_type_options();
$data['payment_type'] = $this->get_payment_type();
$data['payment_type'] = $this->get_payment_type();
$this->load->view('reports/specific_customer_input', $data);
}
public function get_payment_type()
{
{
$payment_type = array( 'all' => $this->lang->line('common_none_selected_text'),
'cash' => $this->lang->line('sales_cash'),
'due' => $this->lang->line('sales_due'),
@@ -807,13 +807,13 @@ class Reports extends Secure_Controller
'credit' => $this->lang->line('sales_credit'),
'debit' => $this->lang->line('sales_debit'),
'invoices' => $this->lang->line('sales_invoice'));
return $payment_type;
}
return $payment_type;
}
public function specific_customer($start_date, $end_date, $customer_id, $sale_type, $payment_type)
{
$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'customer_id' => $customer_id, 'sale_type' => $sale_type, 'payment_type' => $payment_type);
$this->load->model('reports/Specific_customer');
$model = $this->Specific_customer;
@@ -842,7 +842,7 @@ class Reports extends Secure_Controller
$summary_data[] = $this->xss_clean(array(
'id' => $row['sale_id'],
'type_code' => $row['type_code'],
'sale_date' => $row['sale_date'],
'sale_date' => date($this->config->item('dateformat'), strtotime($row['sale_date'])),
'quantity' => to_quantity_decimals($row['items_purchased']),
'employee_name' => $row['employee_name'],
'subtotal' => to_currency($row['subtotal']),
@@ -889,8 +889,8 @@ class Reports extends Secure_Controller
else
{
$customer_name = $customer_info->company_name;
}
}
$data = array(
'title' => $this->xss_clean($customer_info->first_name . ' ' . $customer_info->last_name . ' ' . $this->lang->line('reports_report')),
'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
@@ -953,7 +953,7 @@ class Reports extends Secure_Controller
$summary_data[] = $this->xss_clean(array(
'id' => $row['sale_id'],
'type_code' => $row['type_code'],
'sale_date' => $row['sale_date'],
'sale_date' => date($this->config->item('dateformat'), strtotime($row['sale_date'])),
'quantity' => to_quantity_decimals($row['items_purchased']),
'customer_name' => $row['customer_name'],
'subtotal' => to_currency($row['subtotal']),
@@ -1028,7 +1028,7 @@ class Reports extends Secure_Controller
public function specific_discount($start_date, $end_date, $discount, $sale_type)
{
$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'discount' => $discount, 'sale_type' => $sale_type);
$this->load->model('reports/Specific_discount');
$model = $this->Specific_discount;
@@ -1057,7 +1057,7 @@ class Reports extends Secure_Controller
$summary_data[] = $this->xss_clean(array(
'id' => $row['sale_id'],
'type_code' => $row['type_code'],
'sale_date' => $row['sale_date'],
'sale_date' => date($this->config->item('dateformat'), strtotime($row['sale_date'])),
'quantity' => to_quantity_decimals($row['items_purchased']),
'employee_name' => $row['employee_name'],
'customer_name' => $row['customer_name'],
@@ -1113,7 +1113,7 @@ class Reports extends Secure_Controller
public function get_detailed_sales_row($sale_id)
{
$inputs = array('sale_id' => $sale_id);
$this->load->model('reports/Detailed_sales');
$model = $this->Detailed_sales;
@@ -1134,7 +1134,7 @@ class Reports extends Secure_Controller
$summary_data = $this->xss_clean(array(
'sale_id' => $report_data['sale_id'],
'sale_date' => $report_data['sale_date'],
'sale_date' => date($this->config->item('dateformat'), strtotime($report_data['sale_date'])),
'quantity' => to_quantity_decimals($report_data['items_purchased']),
'employee_name' => $report_data['employee_name'],
'customer_name' => $report_data['customer_name'],
@@ -1173,7 +1173,7 @@ class Reports extends Secure_Controller
public function detailed_sales($start_date, $end_date, $sale_type, $location_id = 'all')
{
$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
$this->load->model('reports/Detailed_sales');
$model = $this->Detailed_sales;
@@ -1205,7 +1205,7 @@ class Reports extends Secure_Controller
$summary_data[] = $this->xss_clean(array(
'id' => $row['sale_id'],
'type_code' => $row['type_code'],
'sale_date' => $row['sale_date'],
'sale_date' => date($this->config->item('dateformat'), strtotime($row['sale_date'])),
'quantity' => to_quantity_decimals($row['items_purchased']),
'employee_name' => $row['employee_name'],
'customer_name' => $row['customer_name'],
@@ -1269,14 +1269,14 @@ class Reports extends Secure_Controller
$this->load->model('reports/Detailed_receivings');
$model = $this->Detailed_receivings;
$model->create($inputs);
$report_data = $model->getDataByReceivingId($receiving_id);
$summary_data = $this->xss_clean(array(
'receiving_id' => $report_data['receiving_id'],
'receiving_date' => $report_data['receiving_date'],
'receiving_date' => date($this->config->item('dateformat'), strtotime($report_data['receiving_date'])),
'quantity' => to_quantity_decimals($report_data['items_purchased']),
'employee_name' => $report_data['employee_name'],
'supplier_name' => $report_data['supplier_name'],
@@ -1295,10 +1295,10 @@ class Reports extends Secure_Controller
public function detailed_receivings($start_date, $end_date, $receiving_type, $location_id = 'all')
{
$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'receiving_type' => $receiving_type, 'location_id' => $location_id);
$this->load->model('reports/Detailed_receivings');
$model = $this->Detailed_receivings;
$model->create($inputs);
$headers = $this->xss_clean($model->getDataColumns());
@@ -1313,7 +1313,7 @@ class Reports extends Secure_Controller
{
$summary_data[] = $this->xss_clean(array(
'id' => $row['receiving_id'],
'receiving_date' => $row['receiving_date'],
'receiving_date' => date($this->config->item('dateformat'), strtotime($row['receiving_date'])),
'quantity' => to_quantity_decimals($row['items_purchased']),
'employee_name' => $row['employee_name'],
'supplier_name' => $row['supplier_name'],
@@ -1365,7 +1365,7 @@ class Reports extends Secure_Controller
$model = $this->Inventory_low;
$report_data = $model->getData($inputs);
$tabular_data = array();
foreach($report_data as $row)
{
@@ -1393,7 +1393,7 @@ class Reports extends Secure_Controller
{
$this->load->model('reports/Inventory_summary');
$model = $this->Inventory_summary;
$data = array();
$data['item_count'] = $model->getItemCountDropdownArray();
@@ -1407,7 +1407,7 @@ class Reports extends Secure_Controller
public function inventory_summary($location_id = 'all', $item_count = 'all')
{
$inputs = array('location_id' => $location_id, 'item_count' => $item_count);
$this->load->model('reports/Inventory_summary');
$model = $this->Inventory_summary;
@@ -1452,7 +1452,7 @@ class Reports extends Secure_Controller
{
$subtitle .= date($this->config->item('dateformat').' '.$this->config->item('timeformat'), strtotime(rawurldecode($inputs['start_date']))) . ' - ' . date($this->config->item('dateformat').' '.$this->config->item('timeformat'), strtotime(rawurldecode($inputs['end_date'])));
}
return $subtitle;
}
}

245
application/helpers/table_helper.php → application/helpers/tabular_helper.php
View File

@@ -1,5 +1,60 @@
<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
/**
* Tabular views helper
*/
/*
Basic tabular headers function
*/
function transform_headers_readonly($array)
{
$result = array();
foreach($array as $key => $value)
{
$result[] = array('field' => $key, 'title' => $value, 'sortable' => $value != '', 'switchable' => !preg_match('(^$|&nbsp)', $value));
}
return json_encode($result);
}
/*
Basic tabular headers function
*/
function transform_headers($array, $readonly = FALSE, $editable = TRUE)
{
$result = array();
if(!$readonly)
{
$array = array_merge(array(array('checkbox' => 'select', 'sortable' => FALSE)), $array);
}
if($editable)
{
$array[] = array('edit' => '');
}
foreach($array as $element)
{
reset($element);
$result[] = array('field' => key($element),
'title' => current($element),
'switchable' => isset($element['switchable']) ? $element['switchable'] : !preg_match('(^$|&nbsp)', current($element)),
'sortable' => isset($element['sortable']) ? $element['sortable'] : current($element) != '',
'checkbox' => isset($element['checkbox']) ? $element['checkbox'] : FALSE,
'class' => isset($element['checkbox']) || preg_match('(^$|&nbsp)', current($element)) ? 'print_hide' : '',
'sorter' => isset($element['sorter']) ? $element ['sorter'] : '');
}
return json_encode($result);
}
/*
Get the header for the sales tabular view
*/
function get_sales_manage_table_headers()
{
$CI =& get_instance();
@@ -26,31 +81,8 @@ function get_sales_manage_table_headers()
}
/*
Gets the html data rows for the sales.
Get the html data row for the sales
*/
function get_sale_data_last_row($sales)
{
$CI =& get_instance();
$sum_amount_due = 0;
$sum_amount_tendered = 0;
$sum_change_due = 0;
foreach($sales->result() as $key=>$sale)
{
$sum_amount_due += $sale->amount_due;
$sum_amount_tendered += $sale->amount_tendered;
$sum_change_due += $sale->change_due;
}
return array(
'sale_id' => '-',
'sale_time' => '<b>'.$CI->lang->line('sales_total').'</b>',
'amount_due' => '<b>'.to_currency($sum_amount_due).'</b>',
'amount_tendered' => '<b>'. to_currency($sum_amount_tendered).'</b>',
'change_due' => '<b>'.to_currency($sum_change_due).'</b>'
);
}
function get_sale_data_row($sale)
{
$CI =& get_instance();
@@ -58,7 +90,7 @@ function get_sale_data_row($sale)
$row = array (
'sale_id' => $sale->sale_id,
'sale_time' => date( $CI->config->item('dateformat') . ' ' . $CI->config->item('timeformat'), strtotime($sale->sale_time) ),
'sale_time' => date($CI->config->item('dateformat') . ' ' . $CI->config->item('timeformat'), strtotime($sale->sale_time)),
'customer_name' => $sale->customer_name,
'amount_due' => to_currency($sale->amount_due),
'amount_tendered' => to_currency($sale->amount_tendered),
@@ -84,6 +116,32 @@ function get_sale_data_row($sale)
return $row;
}
/*
Get the html data last row for the sales
*/
function get_sale_data_last_row($sales)
{
$CI =& get_instance();
$sum_amount_due = 0;
$sum_amount_tendered = 0;
$sum_change_due = 0;
foreach($sales->result() as $key=>$sale)
{
$sum_amount_due += $sale->amount_due;
$sum_amount_tendered += $sale->amount_tendered;
$sum_change_due += $sale->change_due;
}
return array(
'sale_id' => '-',
'sale_time' => '<b>'.$CI->lang->line('sales_total').'</b>',
'amount_due' => '<b>'.to_currency($sum_amount_due).'</b>',
'amount_tendered' => '<b>'. to_currency($sum_amount_tendered).'</b>',
'change_due' => '<b>'.to_currency($sum_change_due).'</b>'
);
}
/*
Get the sales payments summary
*/
@@ -112,50 +170,10 @@ function get_sales_manage_payments_summary($payments, $sales)
return $table;
}
function transform_headers_readonly($array)
{
$result = array();
foreach($array as $key => $value)
{
$result[] = array('field' => $key, 'title' => $value, 'sortable' => $value != '', 'switchable' => !preg_match('(^$|&nbsp)', $value));
}
return json_encode($result);
}
function transform_headers($array, $readonly = FALSE, $editable = TRUE)
{
$result = array();
if (!$readonly)
{
$array = array_merge(array(array('checkbox' => 'select', 'sortable' => FALSE)), $array);
}
if ($editable)
{
$array[] = array('edit' => '');
}
foreach($array as $element)
{
reset($element);
$result[] = array('field' => key($element),
'title' => current($element),
'switchable' => isset($element['switchable']) ?
$element['switchable'] : !preg_match('(^$|&nbsp)', current($element)),
'sortable' => isset($element['sortable']) ?
$element['sortable'] : current($element) != '',
'checkbox' => isset($element['checkbox']) ?
$element['checkbox'] : FALSE,
'class' => isset($element['checkbox']) || preg_match('(^$|&nbsp)', current($element)) ?
'print_hide' : '',
'sorter' => isset($element['sorter']) ?
$element ['sorter'] : '');
}
return json_encode($result);
}
/*
Get the header for the people tabular view
*/
function get_people_manage_table_headers()
{
$CI =& get_instance();
@@ -176,6 +194,9 @@ function get_people_manage_table_headers()
return transform_headers($headers);
}
/*
Get the html data row for the person
*/
function get_person_data_row($person)
{
$CI =& get_instance();
@@ -194,6 +215,10 @@ function get_person_data_row($person)
));
}
/*
Get the header for the customer tabular view
*/
function get_customer_manage_table_headers()
{
$CI =& get_instance();
@@ -215,6 +240,9 @@ function get_customer_manage_table_headers()
return transform_headers($headers);
}
/*
Get the html data row for the customer
*/
function get_customer_data_row($person, $stats)
{
$CI =& get_instance();
@@ -234,6 +262,10 @@ function get_customer_data_row($person, $stats)
));
}
/*
Get the header for the suppliers tabular view
*/
function get_suppliers_manage_table_headers()
{
$CI =& get_instance();
@@ -256,6 +288,9 @@ function get_suppliers_manage_table_headers()
return transform_headers($headers);
}
/*
Get the html data row for the supplier
*/
function get_supplier_data_row($supplier)
{
$CI =& get_instance();
@@ -276,6 +311,10 @@ function get_supplier_data_row($supplier)
);
}
/*
Get the header for the items tabular view
*/
function get_items_manage_table_headers()
{
$CI =& get_instance();
@@ -298,6 +337,9 @@ function get_items_manage_table_headers()
return transform_headers($headers);
}
/*
Get the html data row for the item
*/
function get_item_data_row($item)
{
$CI =& get_instance();
@@ -354,6 +396,10 @@ function get_item_data_row($item)
));
}
/*
Get the header for the giftcard tabular view
*/
function get_giftcards_manage_table_headers()
{
$CI =& get_instance();
@@ -369,6 +415,29 @@ function get_giftcards_manage_table_headers()
return transform_headers($headers);
}
/*
Get the html data row for the giftcard
*/
function get_giftcard_data_row($giftcard)
{
$CI =& get_instance();
$controller_name=strtolower(get_class($CI));
return array (
'giftcard_id' => $giftcard->giftcard_id,
'last_name' => $giftcard->last_name,
'first_name' => $giftcard->first_name,
'giftcard_number' => $giftcard->giftcard_number,
'value' => to_currency($giftcard->value),
'edit' => anchor($controller_name."/view/$giftcard->giftcard_id", '<span class="glyphicon glyphicon-edit"></span>',
array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
));
}
/*
Get the header for the taxes tabular view
*/
function get_taxes_manage_table_headers()
{
$CI =& get_instance();
@@ -386,22 +455,9 @@ function get_taxes_manage_table_headers()
return transform_headers($headers);
}
function get_giftcard_data_row($giftcard)
{
$CI =& get_instance();
$controller_name=strtolower(get_class($CI));
return array (
'giftcard_id' => $giftcard->giftcard_id,
'last_name' => $giftcard->last_name,
'first_name' => $giftcard->first_name,
'giftcard_number' => $giftcard->giftcard_number,
'value' => to_currency($giftcard->value),
'edit' => anchor($controller_name."/view/$giftcard->giftcard_id", '<span class="glyphicon glyphicon-edit"></span>',
array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
));
}
/*
Get the html data row for the tax
*/
function get_tax_data_row($tax_code_row)
{
$CI =& get_instance();
@@ -422,6 +478,10 @@ function get_tax_data_row($tax_code_row)
));
}
/*
Get the header for the item kits tabular view
*/
function get_item_kits_manage_table_headers()
{
$CI =& get_instance();
@@ -437,6 +497,9 @@ function get_item_kits_manage_table_headers()
return transform_headers($headers);
}
/*
Get the html data row for the item kit
*/
function get_item_kit_data_row($item_kit)
{
$CI =& get_instance();
@@ -454,6 +517,9 @@ function get_item_kit_data_row($item_kit)
}
/*
Get the header for the expense categories tabular view
*/
function get_expense_category_manage_table_headers()
{
$CI =& get_instance();
@@ -468,7 +534,7 @@ function get_expense_category_manage_table_headers()
}
/*
Gets the html data rows for the expenses categories.
Gets the html data row for the expenses category
*/
function get_expense_category_data_row($expense_category)
{
@@ -485,6 +551,9 @@ function get_expense_category_data_row($expense_category)
}
/*
Get the header for the expenses tabular view
*/
function get_expenses_manage_table_headers()
{
$CI =& get_instance();
@@ -505,7 +574,7 @@ function get_expenses_manage_table_headers()
}
/*
Gets the html data rows for the expenses.
Gets the html data row for the expenses.
*/
function get_expenses_data_row($expense)
{
@@ -527,6 +596,9 @@ function get_expenses_data_row($expense)
));
}
/*
Get the html data last row for the expenses
*/
function get_expenses_data_last_row($expense)
{
$CI =& get_instance();
@@ -548,7 +620,6 @@ function get_expenses_data_last_row($expense)
);
}
/*
Get the expenses payments summary
*/

2
application/models/reports/Detailed_receivings.php
View File

@@ -15,7 +15,7 @@ class Detailed_receivings extends Report
$columns = array(
'summary' => array(
array('id' => $this->lang->line('reports_receiving_id')),
array('receiving_date' => $this->lang->line('reports_date')),
array('receiving_date' => $this->lang->line('reports_date'), 'sortable' => FALSE),
array('quantity' => $this->lang->line('reports_quantity')),
array('employee_name' => $this->lang->line('reports_received_by')),
array('supplier_name' => $this->lang->line('reports_supplied_by')),

4
application/models/reports/Detailed_sales.php
View File

@@ -16,7 +16,7 @@ class Detailed_sales extends Report
'summary' => array(
array('id' => $this->lang->line('reports_sale_id')),
array('type_code' => $this->lang->line('reports_code_type')),
array('sale_date' => $this->lang->line('reports_date')),
array('sale_date' => $this->lang->line('reports_date'), 'sortable' => FALSE),
array('quantity' => $this->lang->line('reports_quantity')),
array('employee_name' => $this->lang->line('reports_sold_by')),
array('customer_name' => $this->lang->line('reports_sold_to')),
@@ -25,7 +25,7 @@ class Detailed_sales extends Report
array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'),
array('payment_type' => $this->lang->line('reports_payment_type')),
array('payment_type' => $this->lang->line('reports_payment_type'), 'sortable' => FALSE),
array('comment' => $this->lang->line('reports_comments'))),
'details' => array(
$this->lang->line('reports_name'),

4
application/models/reports/Specific_customer.php
View File

@@ -16,7 +16,7 @@ class Specific_customer extends Report
'summary' => array(
array('id' => $this->lang->line('reports_sale_id')),
array('type_code' => $this->lang->line('reports_code_type')),
array('sale_date' => $this->lang->line('reports_date')),
array('sale_date' => $this->lang->line('reports_date'), 'sortable' => FALSE),
array('quantity' => $this->lang->line('reports_quantity')),
array('employee_name' => $this->lang->line('reports_sold_by')),
array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
@@ -24,7 +24,7 @@ class Specific_customer extends Report
array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'),
array('payment_type' => $this->lang->line('reports_payment_type')),
array('payment_type' => $this->lang->line('reports_payment_type'), 'sortable' => FALSE),
array('comment' => $this->lang->line('reports_comments'))),
'details' => array(
$this->lang->line('reports_name'),

4
application/models/reports/Specific_discount.php
View File

@@ -16,7 +16,7 @@ class Specific_discount extends Report
'summary' => array(
array('id' => $this->lang->line('reports_sale_id')),
array('type_code' => $this->lang->line('reports_code_type')),
array('sale_date' => $this->lang->line('reports_date')),
array('sale_date' => $this->lang->line('reports_date'), 'sortable' => FALSE),
array('quantity' => $this->lang->line('reports_quantity')),
array('employee_name' => $this->lang->line('reports_sold_by')),
array('customer_name' => $this->lang->line('reports_sold_to')),
@@ -25,7 +25,7 @@ class Specific_discount extends Report
array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'),
array('payment_type' => $this->lang->line('reports_payment_type')),
array('payment_type' => $this->lang->line('reports_payment_type'), 'sortable' => FALSE),
array('comment' => $this->lang->line('reports_comments'))),
'details' => array(
$this->lang->line('reports_name'),

4
application/models/reports/Specific_employee.php
View File

@@ -16,7 +16,7 @@ class Specific_employee extends Report
'summary' => array(
array('id' => $this->lang->line('reports_sale_id')),
array('type_code' => $this->lang->line('reports_code_type')),
array('sale_date' => $this->lang->line('reports_date')),
array('sale_date' => $this->lang->line('reports_date'), 'sortable' => FALSE),
array('quantity' => $this->lang->line('reports_quantity')),
array('customer_name' => $this->lang->line('reports_sold_to')),
array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
@@ -24,7 +24,7 @@ class Specific_employee extends Report
array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'),
array('payment_type' => $this->lang->line('reports_payment_type')),
array('payment_type' => $this->lang->line('reports_payment_type'), 'sortable' => FALSE),
array('comment' => $this->lang->line('reports_comments'))),
'details' => array(
$this->lang->line('reports_name'),

2
application/models/reports/Summary_expenses_categories.php
View File

@@ -8,7 +8,7 @@ class Summary_expenses_categories extends Summary_report
{
return array(
array('category_name' => $this->lang->line('reports_expenses_category')),
array('count' => $this->lang->line('reports_count'), 'sorter' => 'number_sorter'),
array('count' => $this->lang->line('reports_count')),
array('total_amount' => $this->lang->line('reports_expenses_amount'), 'sorter' => 'number_sorter'),
array('total_tax_amount' => $this->lang->line('reports_expenses_tax_amount'), 'sorter' => 'number_sorter'));
}

2
application/models/reports/Summary_sales.php
View File

@@ -7,7 +7,7 @@ class Summary_sales extends Summary_report
protected function _get_data_columns()
{
return array(
array('sale_date' => $this->lang->line('reports_date')),
array('sale_date' => $this->lang->line('reports_date'), 'sortable' => FALSE),
array('quantity' => $this->lang->line('reports_quantity')),
array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),

4
application/views/partial/header.php
View File

@@ -72,10 +72,10 @@
<![endif]-->
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui/jquery-ui.min.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=1831dfe53b"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=a9e24293b8"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=a3f7c802fe"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=2b33cdf0fb"></script>
<!-- end minjs template tags -->
<?php endif; ?>

6
application/views/reports/tabular.php
View File

@@ -14,18 +14,18 @@
<div id="report_summary">
<?php
foreach($summary_data as $name=>$value)
foreach($summary_data as $name => $value)
{
if($name == "total_quantity")
{
?>
<div class="summary_row"><?php echo $this->lang->line('reports_'.$name) . ': ' .$value; ?></div>
<div class="summary_row"><?php echo $this->lang->line('reports_'.$name) . ': ' .$value; ?></div>
<?php
}
else
{
?>
<div class="summary_row"><?php echo $this->lang->line('reports_'.$name) . ': ' . to_currency($value); ?></div>
<div class="summary_row"><?php echo $this->lang->line('reports_'.$name) . ': ' . to_currency($value); ?></div>
<?php
}
}

24
application/views/reports/tabular_details.php
View File

@@ -20,12 +20,11 @@
</div>
<script type="text/javascript">
$(document).ready(function()
{
<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
var detail_data = <?php echo json_encode($details_data); ?>;
var details_data = <?php echo json_encode($details_data); ?>;
<?php
if($this->config->item('customer_reward_enable') == TRUE && !empty($details_data_rewards))
{
@@ -34,13 +33,16 @@
<?php
}
?>
var init_dialog = function()
{
<?php if (isset($editable)): ?>
table_support.submit_handler('<?php echo site_url("reports/get_detailed_" . $editable . "_row")?>');
dialog_support.init("a.modal-dlg");
<?php endif; ?>
var init_dialog = function() {
<?php
if(isset($editable))
{
?>
table_support.submit_handler('<?php echo site_url("reports/get_detailed_" . $editable . "_row")?>');
dialog_support.init("a.modal-dlg");
<?php
}
?>
};
$('#table').bootstrapTable({
@@ -59,7 +61,6 @@
iconSize: 'sm',
paginationVAlign: 'bottom',
detailView: true,
uniqueId: 'id',
escape: false,
onPageChange: init_dialog,
onPostBody: function() {
@@ -68,8 +69,9 @@
onExpandRow: function (index, row, $detail) {
$detail.html('<table></table>').find("table").bootstrapTable({
columns: <?php echo transform_headers_readonly($headers['details']); ?>,
data: detail_data[(!isNaN(row.id) && row.id) || $(row[0] || row.id).text().replace(/(POS|RECV)\s*/g, '')]
data: details_data[(!isNaN(row.id) && row.id) || $(row[0] || row.id).text().replace(/(POS|RECV)\s*/g, '')]
});
<?php
if($this->config->item('customer_reward_enable') == TRUE && !empty($details_data_rewards))
{

15
public/js/manage_tables.js
View File

@@ -213,7 +213,7 @@
var options;
var toggle_column_visbility = function() {
var toggle_column_visibility = function() {
if (localStorage[options.employee_id]) {
var user_settings = JSON.parse(localStorage[options.employee_id]);
user_settings[options.resource] && $.each(user_settings[options.resource], function(index, element) {
@@ -274,7 +274,7 @@
enable_actions();
init_delete();
init_restore();
toggle_column_visbility();
toggle_column_visibility();
dialog_support.init("button.modal-dlg");
};
@@ -382,11 +382,8 @@
})(window.form_support = window.form_support || {}, jQuery);
function number_sorter(a, b)
{
a = +a.replace(/[^\-0-9\.]+/g,"");
b = +b.replace(/[^\-0-9\.]+/g,"");
if (a > b) return 1;
if (a < b) return -1;
return 0;
function number_sorter(a, b) {
a = +a.replace(/[^\-0-9\.]+/g, '');
b = +b.replace(/[^\-0-9\.]+/g, '');
return a - b;
}