diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index 856656351..24ef4177e 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -43,22 +43,25 @@ class Reports extends Secure_area $report_data = $model->getDataBySaleId($sale_id); - $summary_data = array(anchor('#', - 'POS '.$report_data['sale_id'], - array('class'=>'modal-dlg modal-btn-submit')), - $report_data['sale_date'], - to_quantity_decimals($report_data['items_purchased']), - $report_data['employee_name'], - $report_data['customer_name'], - to_currency($report_data['subtotal']), - to_currency($report_data['total']), - to_currency($report_data['tax']), - to_currency($report_data['cost']), - to_currency($report_data['profit']), - $report_data['payment_type'], - $report_data['comment']); + $summary_data = array( + 'id' => $report_data['sale_id'], + 'sale_date' => $report_data['sale_date'], + 'quantity' => to_quantity_decimals($report_data['items_purchased']), + 'employee' => $report_data['employee_name'], + 'customer' => $report_data['customer_name'], + 'subtotal' => to_currency($report_data['subtotal']), + 'total' => to_currency($report_data['total']), + 'tax' => to_currency($report_data['tax']), + 'cost' => to_currency($report_data['cost']), + 'profit' => to_currency($report_data['profit']), + 'payment_type' => $report_data['payment_type'], + 'comment' => $report_data['comment'], + 'edit' => anchor("sales/edit/". $report_data['receiving_id'], '', + array('class'=>"modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title'=>$CI->lang->line('sales_update')) + ) + ); - echo get_detailed_data_row($summary_data, $this); + echo json_encode($summary_data); } function get_detailed_receivings_row($receiving_id) @@ -68,23 +71,27 @@ class Reports extends Secure_area $report_data = $model->getDataByReceivingId($receiving_id); - $summary_data = array('RECV '.$report_data['receiving_id'], - $report_data['receiving_date'], - to_quantity_decimals($report_data['items_purchased']), - $report_data['employee_name'], - $report_data['supplier_name'], - to_currency($report_data['total']), - $report_data['payment_type'] + $summary_data = array( + 'id' => $report_data['receiving_id'], + 'receiving_date' => $report_data['receiving_date'], + 'quantity' => to_quantity_decimals($report_data['items_purchased']), + 'employee' => $report_data['employee_name'], + 'supplier' => $report_data['supplier_name'], + 'total' => to_currency($report_data['total']), + 'payment_type' => $report_data['payment_type'], + 'edit' => anchor("receivings/edit/". $report_data['receiving_id'], '', + array('class'=>"modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title'=>$CI->lang->line('receivings_update')) + ) ); if($this->config->item('invoice_enable') == TRUE) { - $summary_data[] = $report_data['invoice_number']; + $summary_data[]['invoice_number'] = $report_data['invoice_number']; } $summary_data[] = $report_data['comment']; - echo get_detailed_data_row($summary_data, $this); + echo json_encode($summary_data); } function get_summary_data($start_date, $end_date=null, $sale_type=0) @@ -110,12 +117,12 @@ class Reports extends Secure_area foreach($report_data as $row) { - $tabular_data[] = array($row['sale_date'], - to_quantity_decimals($row['quantity_purchased']), - to_currency($row['subtotal']), - to_currency($row['total']), - to_currency($row['tax']), - to_currency($row['cost']), + $tabular_data[] = array($row['sale_date'], + to_quantity_decimals($row['quantity_purchased']), + to_currency($row['subtotal']), + to_currency($row['total']), + to_currency($row['tax']), + to_currency($row['cost']), to_currency($row['profit'])); } @@ -141,12 +148,12 @@ class Reports extends Secure_area foreach($report_data as $row) { - $tabular_data[] = array($row['category'], - to_quantity_decimals($row['quantity_purchased']), - to_currency($row['subtotal']), - to_currency($row['total']), - to_currency($row['tax']), - to_currency($row['cost']), + $tabular_data[] = array($row['category'], + to_quantity_decimals($row['quantity_purchased']), + to_currency($row['subtotal']), + to_currency($row['total']), + to_currency($row['tax']), + to_currency($row['cost']), to_currency($row['profit'])); } @@ -172,12 +179,12 @@ class Reports extends Secure_area foreach($report_data as $row) { - $tabular_data[] = array($row['customer'], - to_quantity_decimals($row['quantity_purchased']), - to_currency($row['subtotal']), - to_currency($row['total']), - to_currency($row['tax']), - to_currency($row['cost']), + $tabular_data[] = array($row['customer'], + to_quantity_decimals($row['quantity_purchased']), + to_currency($row['subtotal']), + to_currency($row['total']), + to_currency($row['tax']), + to_currency($row['cost']), to_currency($row['profit'])); } @@ -203,12 +210,12 @@ class Reports extends Secure_area foreach($report_data as $row) { - $tabular_data[] = array($row['supplier'], - to_quantity_decimals($row['quantity_purchased']), - to_currency($row['subtotal']), - to_currency($row['total']), - to_currency($row['tax']), - to_currency($row['cost']), + $tabular_data[] = array($row['supplier'], + to_quantity_decimals($row['quantity_purchased']), + to_currency($row['subtotal']), + to_currency($row['total']), + to_currency($row['tax']), + to_currency($row['cost']), to_currency($row['profit'])); } @@ -234,12 +241,12 @@ class Reports extends Secure_area foreach($report_data as $row) { - $tabular_data[] = array(character_limiter($row['name'], 40), - to_quantity_decimals($row['quantity_purchased']), - to_currency($row['subtotal']), - to_currency($row['total']), - to_currency($row['tax']), - to_currency($row['cost']), + $tabular_data[] = array(character_limiter($row['name'], 40), + to_quantity_decimals($row['quantity_purchased']), + to_currency($row['subtotal']), + to_currency($row['total']), + to_currency($row['tax']), + to_currency($row['cost']), to_currency($row['profit'])); } @@ -265,12 +272,12 @@ class Reports extends Secure_area foreach($report_data as $row) { - $tabular_data[] = array($row['employee'], - to_quantity_decimals($row['quantity_purchased']), - to_currency($row['subtotal']), - to_currency($row['total']), - to_currency($row['tax']), - to_currency($row['cost']), + $tabular_data[] = array($row['employee'], + to_quantity_decimals($row['quantity_purchased']), + to_currency($row['subtotal']), + to_currency($row['total']), + to_currency($row['tax']), + to_currency($row['cost']), to_currency($row['profit'])); } @@ -325,7 +332,7 @@ class Reports extends Secure_area foreach($report_data as $row) { - $tabular_data[] = array($row['discount_percent'], + $tabular_data[] = array($row['discount_percent'], $row['count']); } @@ -351,8 +358,8 @@ class Reports extends Secure_area foreach($report_data as $row) { - $tabular_data[] = array($row['payment_type'], - $row['count'], + $tabular_data[] = array($row['payment_type'], + $row['count'], to_currency($row['payment_amount'])); } @@ -786,7 +793,6 @@ class Reports extends Secure_area "headers" => $model->getDataColumns(), "summary_data" => $summary_data, "details_data" => $details_data, - "header_width" => intval(100 / count($headers['summary'])), "overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'customer_id' =>$customer_id, 'sale_type'=>$sale_type)), "export_excel" => $export_excel ); @@ -837,7 +843,6 @@ class Reports extends Secure_area "headers" => $model->getDataColumns(), "summary_data" => $summary_data, "details_data" => $details_data, - "header_width" => intval(100 / count($headers)), "overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'employee_id' =>$employee_id, 'sale_type'=>$sale_type)), "export_excel" => $export_excel ); @@ -887,7 +892,6 @@ class Reports extends Secure_area "headers" => $headers, "summary_data" => $summary_data, "details_data" => $details_data, - "header_width" => intval(100 / count($headers['summary'])), "overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'discount' =>$discount, 'sale_type'=>$sale_type)), "export_excel" => $export_excel ); @@ -910,7 +914,23 @@ class Reports extends Secure_area foreach($report_data['summary'] as $key=>$row) { - $summary_data[] = array('POS '.$row['sale_id'], $row['sale_date'], to_quantity_decimals($row['items_purchased']), $row['employee_name'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']); + $summary_data[] = array( + 'id' => $row['sale_id'], + 'sale_date' => $row['sale_date'], + 'quantity' => to_quantity_decimals($row['items_purchased']), + 'employee' => $row['employee_name'], + 'customer' => $row['customer_name'], + 'subtotal' => to_currency($row['subtotal']), + 'total' => to_currency($row['total']), + 'tax' => to_currency($row['tax']), + 'cost' => to_currency($row['cost']), + 'profit' => to_currency($row['profit']), + 'payment_type' => $row['payment_type'], + 'comment' => $row['comment'], + 'edit' => anchor("sales/edit/".$row['sale_id'], '', + array('class' => "modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title' => $this->lang->line('sales_update')) + ) + ); foreach($report_data['details'][$key] as $drow) { @@ -930,7 +950,6 @@ class Reports extends Secure_area "editable" => "sales", "summary_data" => $summary_data, "details_data" => $details_data, - "header_width" => intval(100 / count($headers['summary'])), "overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type, 'location_id'=>$location_id)), "export_excel" => $export_excel ); @@ -953,30 +972,22 @@ class Reports extends Secure_area foreach($report_data['summary'] as $key=>$row) { - if($this->config->item('invoice_enable') == TRUE) + $summary_data[] = array( + 'id' => $row['receiving_id'], + 'receiving_date' => $row['receiving_date'], + 'quantity' => to_quantity_decimals($row['items_purchased']), + 'employee' => $row['employee_name'], $row['supplier_name'], + 'total' => to_currency($row['total']), + 'payment_type' => $row['payment_type'], + 'invoice_number' => $row['invoice_number'], + 'comment' => $row['comment'], + 'edit' => anchor("receivings/edit/" . $row['receiving_id'], '', + array('class' => "modal-dlg modal-btn-submit print_hide", 'title' => $this->lang->line('receivings_update')) + ) + ); + if($this->config->item('invoice_enable')) { - $summary_data[] = array( - 'RECV '.$row['receiving_id'], - $row['receiving_date'], - to_quantity_decimals($row['items_purchased']), - $row['employee_name'], $row['supplier_name'], - to_currency($row['total']), - $row['payment_type'], - $row['invoice_number'], - $row['comment'] - ); - } - else - { - $summary_data[] = array( - 'RECV '.$row['receiving_id'], - $row['receiving_date'], - to_quantity_decimals($row['items_purchased']), - $row['employee_name'], $row['supplier_name'], - to_currency($row['total']), - $row['payment_type'], - $row['comment'] - ); + unset($summary_data['invoice_number']); } foreach($report_data['details'][$key] as $drow) @@ -994,11 +1005,9 @@ class Reports extends Secure_area "title" => $this->lang->line('reports_detailed_receivings_report'), "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), - "header_width" => intval(100 / count($headers['summary'])), "editable" => "receivings", "summary_data" => $summary_data, "details_data" => $details_data, - "header_width" => intval(100 / count($headers['summary'])), "overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'receiving_type'=>$receiving_type, 'location_id'=>$location_id)), "export_excel" => $export_excel ); diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php index 2a47a3e2d..e7b815cef 100644 --- a/application/helpers/table_helper.php +++ b/application/helpers/table_helper.php @@ -111,6 +111,16 @@ function get_sales_manage_payments_summary($payments, $sales, $controller) return $table; } +function transform_headers_readonly($array) +{ + $result = array(); + foreach($array as $key => $value) + { + $result[] = array('field' => $key, 'title' => $value); + } + return json_encode($result); +} + function transform_headers($array) { return json_encode(array_map(function($v) { @@ -155,21 +165,6 @@ function get_person_data_row($person, $controller) { )); } -function get_detailed_data_row($row, $controller) -{ - $table_data_row=''; - $table_data_row.='+'; - foreach($row as $cell) - { - $table_data_row.=''; - $table_data_row.=$cell; - $table_data_row.=''; - } - $table_data_row.=''; - - return $table_data_row; -} - function get_suppliers_manage_table_headers() { $CI =& get_instance(); diff --git a/application/language/de-CH/reports_lang.php b/application/language/de-CH/reports_lang.php index 5c282da2f..5a07ce444 100644 --- a/application/language/de-CH/reports_lang.php +++ b/application/language/de-CH/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "Zwischentotal"; $lang["reports_total_inventory_value"] = "Total Inventarwert"; $lang["reports_zero_and_less"] = "Null und weniger"; $lang["reports_more_than_zero"] = "Mehr als Null"; +$lang["reports_no_reports_to_display"] = "Keine Artikel zum Anzeigen"; diff --git a/application/language/en/reports_lang.php b/application/language/en/reports_lang.php index 1e9fbca6a..181e5cf3a 100644 --- a/application/language/en/reports_lang.php +++ b/application/language/en/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "Sub Total"; $lang["reports_total_inventory_value"] = "Total Inventory Value"; $lang["reports_zero_and_less"] = "Zero and less"; $lang["reports_more_than_zero"] = "More than zero"; +$lang["reports_no_reports_to_display"] = "No Items to display"; diff --git a/application/language/es/reports_lang.php b/application/language/es/reports_lang.php index a5e9436b7..7a942c9ed 100644 --- a/application/language/es/reports_lang.php +++ b/application/language/es/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "Subtotal"; $lang["reports_total_inventory_value"] = "Total Inventory Value"; $lang["reports_zero_and_less"] = "Zero and less"; $lang["reports_more_than_zero"] = "More than zero"; +$lang["reports_no_reports_to_display"] = "No hay artículos que mostrar"; diff --git a/application/language/fr/reports_lang.php b/application/language/fr/reports_lang.php index 7c654bf48..87bcbebb7 100644 --- a/application/language/fr/reports_lang.php +++ b/application/language/fr/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "Sous-Total"; $lang["reports_total_inventory_value"] = "Total Inventory Value"; $lang["reports_zero_and_less"] = "Zero and less"; $lang["reports_more_than_zero"] = "More than zero"; +$lang["reports_no_reports_to_display"] = "Aucun Items à afficher"; diff --git a/application/language/hr-HR/reports_lang.php b/application/language/hr-HR/reports_lang.php index 30a0b969a..d12a692a1 100644 --- a/application/language/hr-HR/reports_lang.php +++ b/application/language/hr-HR/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "Iznos međuzbroja"; $lang["reports_total_inventory_value"] = "Ukupan iznos inventure"; $lang["reports_zero_and_less"] = "Nula i manje"; $lang["reports_more_than_zero"] = "Više od nule"; +$lang["reports_no_reports_to_display"] = "Nema artikla za prikazati"; diff --git a/application/language/hu-HU/reports_lang.php b/application/language/hu-HU/reports_lang.php index eff11f83c..f26da3dc1 100644 --- a/application/language/hu-HU/reports_lang.php +++ b/application/language/hu-HU/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "Sub Total"; $lang["reports_total_inventory_value"] = "Total Inventory Value"; $lang["reports_zero_and_less"] = "Nulla és kevesebb"; $lang["reports_more_than_zero"] = "Több mint nulla"; +$lang["reports_no_reports_to_display"] = "Nincsenek megjeleníthető termékek"; diff --git a/application/language/id/reports_lang.php b/application/language/id/reports_lang.php index 0d3054d00..78fdefeef 100644 --- a/application/language/id/reports_lang.php +++ b/application/language/id/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "Sub Total"; $lang["reports_total_inventory_value"] = "Total Nilai Persediaan"; $lang["reports_zero_and_less"] = "Stok habis dan minus"; $lang["reports_more_than_zero"] = "Stok belum habis"; +$lang["reports_no_reports_to_display"] = "Tidak ada item untuk ditampilkan"; diff --git a/application/language/nl-BE/reports_lang.php b/application/language/nl-BE/reports_lang.php index 028667969..3d4b5ca47 100755 --- a/application/language/nl-BE/reports_lang.php +++ b/application/language/nl-BE/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "Subtotaal"; $lang["reports_total_inventory_value"] = "Totale waarde stock"; $lang["reports_zero_and_less"] = "Nul en minder"; $lang["reports_more_than_zero"] = "Meer dan nul"; +$lang["reports_no_reports_to_display"] = "Er werden geen producten gevonden"; diff --git a/application/language/pt-BR/reports_lang.php b/application/language/pt-BR/reports_lang.php index 08d195cdf..b52a13f76 100644 --- a/application/language/pt-BR/reports_lang.php +++ b/application/language/pt-BR/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "Sub Total"; $lang["reports_total_inventory_value"] = "Valor Total Inventário"; $lang["reports_zero_and_less"] = "Zero e menor"; $lang["reports_more_than_zero"] = "Maior do que zero"; +$lang["reports_no_reports_to_display"] = "Sem itens para mostrar"; diff --git a/application/language/ru/reports_lang.php b/application/language/ru/reports_lang.php index 246603265..bcb331fd2 100644 --- a/application/language/ru/reports_lang.php +++ b/application/language/ru/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "промежуточный итог"; $lang["reports_total_inventory_value"] = "Total Inventory Value"; $lang["reports_zero_and_less"] = "Zero and less"; $lang["reports_more_than_zero"] = "More than zero"; +$lang["reports_no_reports_to_display"] = "Нет товаров для отображения"; diff --git a/application/language/th/reports_lang.php b/application/language/th/reports_lang.php index 8522caaff..cf5e344a0 100644 --- a/application/language/th/reports_lang.php +++ b/application/language/th/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "ยอดรวมหักภาษี "; $lang["reports_total_inventory_value"] = "Total Inventory Value"; $lang["reports_zero_and_less"] = "Zero and less"; $lang["reports_more_than_zero"] = "More than zero"; +$lang["reports_no_reports_to_display"] = "ไม่มีสินค้าแสดง"; diff --git a/application/language/tr/reports_lang.php b/application/language/tr/reports_lang.php index 803a00be6..cf4c98a45 100644 --- a/application/language/tr/reports_lang.php +++ b/application/language/tr/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "Ara Toplam"; $lang["reports_total_inventory_value"] = "Total Inventory Value"; $lang["reports_zero_and_less"] = "Zero and less"; $lang["reports_more_than_zero"] = "More than zero"; +$lang["reports_no_reports_to_display"] = "Gösterecek Ürün Yok"; diff --git a/application/language/zh/reports_lang.php b/application/language/zh/reports_lang.php index 3ac2bcbde..9e387e9b2 100755 --- a/application/language/zh/reports_lang.php +++ b/application/language/zh/reports_lang.php @@ -94,3 +94,4 @@ $lang["reports_sub_total_value"] = "小計"; $lang["reports_total_inventory_value"] = "Total Inventory Value"; $lang["reports_zero_and_less"] = "Zero and less"; $lang["reports_more_than_zero"] = "More than zero"; +$lang["reports_no_reports_to_display"] = "沒有產品可以顯示"; diff --git a/application/models/Item.php b/application/models/Item.php index 99c9b0fdc..c4303d4ba 100644 --- a/application/models/Item.php +++ b/application/models/Item.php @@ -247,11 +247,9 @@ class Item extends CI_Model */ public function delete($item_id) { - $this->db->where('item_id', $item_id); - // set to 0 quantities $this->Item_quantity->reset_quantity($item_id); - + $this->db->where('item_id', $item_id); return $this->db->update('items', array('deleted'=>1)); } diff --git a/application/models/reports/Detailed_receivings.php b/application/models/reports/Detailed_receivings.php index 20e35085b..9cf249b8c 100644 --- a/application/models/reports/Detailed_receivings.php +++ b/application/models/reports/Detailed_receivings.php @@ -9,18 +9,32 @@ class Detailed_receivings extends Report public function getDataColumns() { - if(get_instance()->config->item('invoice_enable') == TRUE) + $columns = array( + 'summary' => array( + 'id' => $this->lang->line('reports_receiving_id'), + 'receiving_date' => $this->lang->line('reports_date'), + 'quantity' => $this->lang->line('reports_quantity'), + 'employee' => $this->lang->line('reports_received_by'), + 'supplier' => $this->lang->line('reports_supplied_by'), + 'total' => $this->lang->line('reports_total'), + 'payment_type' => $this->lang->line('reports_payment_type'), + 'invoice_number' => $this->lang->line('recvs_invoice_number'), + 'comments' => $this->lang->line('reports_comments'), + 'edit' => ''), + 'details' => array( + $this->lang->line('reports_item_number'), + $this->lang->line('reports_name'), + $this->lang->line('reports_category'), + $this->lang->line('reports_quantity'), + $this->lang->line('reports_total'), + $this->lang->line('reports_discount')) + ); + + if (get_instance()->config->item('invoice_enable') == TRUE) { - return array('summary' => array($this->lang->line('reports_receiving_id'), $this->lang->line('reports_date'), $this->lang->line('reports_quantity'), $this->lang->line('reports_received_by'), $this->lang->line('reports_supplied_by'), $this->lang->line('reports_total'), $this->lang->line('reports_payment_type'), $this->lang->line('recvs_invoice_number'), $this->lang->line('reports_comments')), - 'details' => array($this->lang->line('reports_item_number'), $this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_quantity'), $this->lang->line('reports_total'), $this->lang->line('reports_discount')) - ); - } - else - { - return array('summary' => array($this->lang->line('reports_receiving_id'), $this->lang->line('reports_date'), $this->lang->line('reports_quantity'), $this->lang->line('reports_received_by'), $this->lang->line('reports_supplied_by'), $this->lang->line('reports_total'), $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')), - 'details' => array($this->lang->line('reports_item_number'), $this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_quantity'), $this->lang->line('reports_total'), $this->lang->line('reports_discount')) - ); + unset($columns['summary']['invoice_number']); } + return $columns; } public function getDataByReceivingId($receiving_id) diff --git a/application/models/reports/Detailed_sales.php b/application/models/reports/Detailed_sales.php index bf1ef3d37..b219f7176 100644 --- a/application/models/reports/Detailed_sales.php +++ b/application/models/reports/Detailed_sales.php @@ -9,8 +9,33 @@ class Detailed_sales extends Report public function getDataColumns() { - return array('summary' => array($this->lang->line('reports_sale_id'), $this->lang->line('reports_date'), $this->lang->line('reports_quantity'), $this->lang->line('reports_sold_by'), $this->lang->line('reports_sold_to'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')), - 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_serial_number'), $this->lang->line('reports_description'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_discount')) + return array( + 'summary' => array( + 'id' => $this->lang->line('reports_sale_id'), + 'sale_date' => $this->lang->line('reports_date'), + 'quantity' => $this->lang->line('reports_quantity'), + 'employee' => $this->lang->line('reports_sold_by'), + 'customer' => $this->lang->line('reports_sold_to'), + 'subtotal' => $this->lang->line('reports_subtotal'), + 'total' => $this->lang->line('reports_total'), + 'tax' => $this->lang->line('reports_tax'), + 'cost' => $this->lang->line('reports_cost'), + 'profit' => $this->lang->line('reports_profit'), + 'payment_type' => $this->lang->line('reports_payment_type'), + 'comment' => $this->lang->line('reports_comments'), + 'edit' => ''), + 'details' => array( + $this->lang->line('reports_name'), + $this->lang->line('reports_category'), + $this->lang->line('reports_serial_number'), + $this->lang->line('reports_description'), + $this->lang->line('reports_quantity'), + $this->lang->line('reports_subtotal'), + $this->lang->line('reports_total'), + $this->lang->line('reports_tax'), + $this->lang->line('reports_cost'), + $this->lang->line('reports_profit'), + $this->lang->line('reports_discount')) ); } diff --git a/application/views/partial/header.php b/application/views/partial/header.php index a9eb8a198..179289b74 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -64,7 +64,7 @@ - + diff --git a/application/views/receivings/form.php b/application/views/receivings/form.php index c191076f5..22ea57690 100755 --- a/application/views/receivings/form.php +++ b/application/views/receivings/form.php @@ -115,11 +115,8 @@ $(document).ready(function() success:function(response) { dialog_support.hide(); - post_form_submit(response); - }, - error: function(jqXHR, textStatus, errorThrown) { - post_form_submit({message: errorThrown}); - }, + table_support.handle_submit('', response); + } dataType:'json' }); }; diff --git a/application/views/reports/tabular.php b/application/views/reports/tabular.php index f39f3f01b..9b6f4012d 100644 --- a/application/views/reports/tabular.php +++ b/application/views/reports/tabular.php @@ -16,39 +16,7 @@
- - - - - - - - - - - - - - - - - -
+
@@ -79,22 +47,28 @@ if($export_excel == 1) } else { + ?> + + load->view("partial/footer"); ?> - - \ No newline at end of file diff --git a/application/views/reports/tabular_details.php b/application/views/reports/tabular_details.php index 1c22affca..b04c6c3ad 100644 --- a/application/views/reports/tabular_details.php +++ b/application/views/reports/tabular_details.php @@ -16,79 +16,7 @@
- - - - - - - - - - - $row) - { - ?> - - - - - - - - - - - -
+
+
- - - - - - - - - - - - - - - - - - -
-
+
@@ -118,78 +46,45 @@ if($export_excel == 1) } else { - $this->load->view("partial/footer"); -?> + ?> -load->view("partial/footer"); ?> + \ No newline at end of file diff --git a/dist/opensourcepos.js b/dist/opensourcepos.js index 35ae774c1..ad4b84bb6 100644 --- a/dist/opensourcepos.js +++ b/dist/opensourcepos.js @@ -49471,7 +49471,7 @@ $.tablesorter.addWidget({ pageSize: options.pageSize, striped: true, pagination: true, - search: true, + search: options.resource || false, showColumns: true, clickToSelect: true, toolbar: '#toolbar', @@ -49500,46 +49500,54 @@ $.tablesorter.addWidget({ table().refresh(); } - var handle_submit = function (resource, response) { - var id = response.id; + var submit_handler = function(url) { + return function (resource, response) { + var id = response.id; - if (!response.success) { - set_feedback(response.message, 'alert alert-dismissible alert-danger', true); - } else { - var message = response.message; - var selector = rows_selector(response.id); - if ($(selector.join(",")).length > 0) { - $.each(selector, function(index, element) { - var id = $(element).data('uniqueid'); - $.get({ - url: resource + '/get_row/' + id, - success: function (response) { - table().updateByUniqueId({id: id, row: response}); - dialog_support.init("a.modal-dlg"); - enable_actions(); - highlight_row(id); - }, - dataType: 'json' - }); - }); + if (!response.success) { + set_feedback(response.message, 'alert alert-dismissible alert-danger', true); } else { - // call hightlight function once after refresh - options.load_callback = function() { - enable_actions(); - highlight_row(id); - }; - refresh(); + var message = response.message; + var selector = rows_selector(response.id); + if ($(selector.join(",")).length > 0) { + $.each(selector, function (index, element) { + var id = $(element).data('uniqueid'); + $.get({ + url: url + id || resource + '/get_row/' + id, + success: function (response) { + table().updateByUniqueId({id: id, row: response}); + // TODO make selector more specific? + dialog_support.init("a.modal-dlg"); + enable_actions(); + highlight_row(id); + }, + dataType: 'json' + }); + }); + } else { + // call hightlight function once after refresh + options.load_callback = function () { + enable_actions(); + highlight_row(id); + }; + refresh(); + } + set_feedback(message, 'alert alert-dismissible alert-success', false); } - set_feedback(message, 'alert alert-dismissible alert-success', false); - } + }; }; + var handle_submit = submit_handler(); + $.extend(table_support, { + submit_handler: function(url) { + handle_submit = submit_handler(url); + }, handle_submit: handle_submit, init: init, do_delete: do_delete, refresh : refresh, - selected_ids : selected_ids + selected_ids : selected_ids, }); })(window.table_support = window.table_support || {}, jQuery);;(function($) { diff --git a/dist/opensourcepos.min.js b/dist/opensourcepos.min.js index 0a4cd7112..6bcc426da 100644 --- a/dist/opensourcepos.min.js +++ b/dist/opensourcepos.min.js @@ -1,4 +1,4 @@ -/*! opensourcepos 03-05-2016 */ +/*! opensourcepos 06-05-2016 */ function set_feedback(a,b,c){a?($("#feedback_bar").removeClass().addClass(b).html(a).css("opacity","1"),c||$("#feedback_bar").fadeTo(5e3,1).fadeTo("fast",0)):$("#feedback_bar").css("opacity","0")}function phpjsDate(a,b){var c,d,e=this,f=["Sun","Mon","Tues","Wednes","Thurs","Fri","Satur","January","February","March","April","May","June","July","August","September","October","November","December"],g=/\\?(.?)/gi,h=function(a,b){return d[a]?d[a]():b},i=function(a,b){for(a=String(a);a.length=b&&1==parseInt(a%100/10,10)&&(b=0),["st","nd","rd"][b-1]||"th"},w:function(){return c.getDay()},z:function(){var a=new Date(d.Y(),d.n()-1,d.j()),b=new Date(d.Y(),0,1);return Math.round((a-b)/864e5)},W:function(){var a=new Date(d.Y(),d.n()-1,d.j()-d.N()+3),b=new Date(a.getFullYear(),0,4);return i(1+Math.round((a-b)/864e5/7),2)},F:function(){return f[6+d.n()]},m:function(){return i(d.n(),2)},M:function(){return d.F().slice(0,3)},n:function(){return c.getMonth()+1},t:function(){return new Date(d.Y(),d.n(),0).getDate()},L:function(){var a=d.Y();return a%4===0&a%100!==0|a%400===0},o:function(){var a=d.n(),b=d.W(),c=d.Y();return c+(12===a&&9>b?1:1===a&&b>9?-1:0)},Y:function(){return c.getFullYear()},y:function(){return d.Y().toString().slice(-2)},a:function(){return c.getHours()>11?"pm":"am"},A:function(){return d.a().toUpperCase()},B:function(){var a=3600*c.getUTCHours(),b=60*c.getUTCMinutes(),d=c.getUTCSeconds();return i(Math.floor((a+b+d+3600)/86.4)%1e3,3)},g:function(){return d.G()%12||12},G:function(){return c.getHours()},h:function(){return i(d.g(),2)},H:function(){return i(d.G(),2)},i:function(){return i(c.getMinutes(),2)},s:function(){return i(c.getSeconds(),2)},u:function(){return i(1e3*c.getMilliseconds(),6)},e:function(){throw"Not supported (see source code of date() for timezone on how to add support)"},I:function(){var a=new Date(d.Y(),0),b=Date.UTC(d.Y(),0),c=new Date(d.Y(),6),e=Date.UTC(d.Y(),6);return a-b!==c-e?1:0},O:function(){var a=c.getTimezoneOffset(),b=Math.abs(a);return(a>0?"-":"+")+i(100*Math.floor(b/60)+b%60,4)},P:function(){var a=d.O();return a.substr(0,3)+":"+a.substr(3,2)},T:function(){return"UTC"},Z:function(){return 60*-c.getTimezoneOffset()},c:function(){return"Y-m-d\\TH:i:sP".replace(g,h)},r:function(){return"D, d M Y H:i:s O".replace(g,h)},U:function(){return c/1e3|0}},this.date=function(a,b){return e=this,c=void 0===b?new Date:new Date(b instanceof Date?b:1e3*b),a.replace(g,h)},this.date(a,b)}if(function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){function c(a){var b=!!a&&"length"in a&&a.length,c=na.type(a);return"function"===c||na.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}function d(a,b,c){if(na.isFunction(b))return na.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return na.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(xa.test(b))return na.filter(b,a,c);b=na.filter(b,a)}return na.grep(a,function(a){return na.inArray(a,b)>-1!==c})}function e(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}function f(a){var b={};return na.each(a.match(Da)||[],function(a,c){b[c]=!0}),b}function g(){da.addEventListener?(da.removeEventListener("DOMContentLoaded",h),a.removeEventListener("load",h)):(da.detachEvent("onreadystatechange",h),a.detachEvent("onload",h))}function h(){(da.addEventListener||"load"===a.event.type||"complete"===da.readyState)&&(g(),na.ready())}function i(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(Ia,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:Ha.test(c)?na.parseJSON(c):c}catch(e){}na.data(a,b,c)}else c=void 0}return c}function j(a){var b;for(b in a)if(("data"!==b||!na.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function k(a,b,c,d){if(Ga(a)){var e,f,g=na.expando,h=a.nodeType,i=h?na.cache:a,j=h?a[g]:a[g]&&g;if(j&&i[j]&&(d||i[j].data)||void 0!==c||"string"!=typeof b)return j||(j=h?a[g]=ca.pop()||na.guid++:g),i[j]||(i[j]=h?{}:{toJSON:na.noop}),("object"==typeof b||"function"==typeof b)&&(d?i[j]=na.extend(i[j],b):i[j].data=na.extend(i[j].data,b)),f=i[j],d||(f.data||(f.data={}),f=f.data),void 0!==c&&(f[na.camelCase(b)]=c),"string"==typeof b?(e=f[b],null==e&&(e=f[na.camelCase(b)])):e=f,e}}function l(a,b,c){if(Ga(a)){var d,e,f=a.nodeType,g=f?na.cache:a,h=f?a[na.expando]:na.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){na.isArray(b)?b=b.concat(na.map(b,na.camelCase)):b in d?b=[b]:(b=na.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;for(;e--;)delete d[b[e]];if(c?!j(d):!na.isEmptyObject(d))return}(c||(delete g[h].data,j(g[h])))&&(f?na.cleanData([a],!0):la.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}function m(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return na.css(a,b,"")},i=h(),j=c&&c[3]||(na.cssNumber[b]?"":"px"),k=(na.cssNumber[b]||"px"!==j&&+i)&&Ka.exec(na.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,na.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}function n(a){var b=Sa.split("|"),c=a.createDocumentFragment();if(c.createElement)for(;b.length;)c.createElement(b.pop());return c}function o(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||na.nodeName(d,b)?f.push(d):na.merge(f,o(d,b));return void 0===b||b&&na.nodeName(a,b)?na.merge([a],f):f}function p(a,b){for(var c,d=0;null!=(c=a[d]);d++)na._data(c,"globalEval",!b||na._data(b[d],"globalEval"))}function q(a){Oa.test(a.type)&&(a.defaultChecked=a.checked)}function r(a,b,c,d,e){for(var f,g,h,i,j,k,l,m=a.length,r=n(b),s=[],t=0;m>t;t++)if(g=a[t],g||0===g)if("object"===na.type(g))na.merge(s,g.nodeType?[g]:g);else if(Ua.test(g)){for(i=i||r.appendChild(b.createElement("div")),j=(Pa.exec(g)||["",""])[1].toLowerCase(),l=Ta[j]||Ta._default,i.innerHTML=l[1]+na.htmlPrefilter(g)+l[2],f=l[0];f--;)i=i.lastChild;if(!la.leadingWhitespace&&Ra.test(g)&&s.push(b.createTextNode(Ra.exec(g)[0])),!la.tbody)for(g="table"!==j||Va.test(g)?""!==l[1]||Va.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;f--;)na.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k);for(na.merge(s,i.childNodes),i.textContent="";i.firstChild;)i.removeChild(i.firstChild);i=r.lastChild}else s.push(b.createTextNode(g));for(i&&r.removeChild(i),la.appendChecked||na.grep(o(s,"input"),q),t=0;g=s[t++];)if(d&&na.inArray(g,d)>-1)e&&e.push(g);else if(h=na.contains(g.ownerDocument,g),i=o(r.appendChild(g),"script"),h&&p(i),c)for(f=0;g=i[f++];)Qa.test(g.type||"")&&c.push(g);return i=null,r}function s(){return!0}function t(){return!1}function u(){try{return da.activeElement}catch(a){}}function v(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)v(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=t;else if(!e)return a;return 1===f&&(g=e,e=function(a){return na().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=na.guid++)),a.each(function(){na.event.add(this,b,e,d,c)})}function w(a,b){return na.nodeName(a,"table")&&na.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function x(a){return a.type=(null!==na.find.attr(a,"type"))+"/"+a.type,a}function y(a){var b=eb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function z(a,b){if(1===b.nodeType&&na.hasData(a)){var c,d,e,f=na._data(a),g=na._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)na.event.add(b,c,h[c][d])}g.data&&(g.data=na.extend({},g.data))}}function A(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!la.noCloneEvent&&b[na.expando]){e=na._data(b);for(d in e.events)na.removeEvent(b,d,e.handle);b.removeAttribute(na.expando)}"script"===c&&b.text!==a.text?(x(b).text=a.text,y(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),la.html5Clone&&a.innerHTML&&!na.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Oa.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}function B(a,b,c,d){b=fa.apply([],b);var e,f,g,h,i,j,k=0,l=a.length,m=l-1,n=b[0],p=na.isFunction(n);if(p||l>1&&"string"==typeof n&&!la.checkClone&&db.test(n))return a.each(function(e){var f=a.eq(e);p&&(b[0]=n.call(this,e,f.html())),B(f,b,c,d)});if(l&&(j=r(b,a[0].ownerDocument,!1,a,d),e=j.firstChild,1===j.childNodes.length&&(j=e),e||d)){for(h=na.map(o(j,"script"),x),g=h.length;l>k;k++)f=j,k!==m&&(f=na.clone(f,!0,!0),g&&na.merge(h,o(f,"script"))),c.call(a[k],f,k);if(g)for(i=h[h.length-1].ownerDocument,na.map(h,y),k=0;g>k;k++)f=h[k],Qa.test(f.type||"")&&!na._data(f,"globalEval")&&na.contains(i,f)&&(f.src?na._evalUrl&&na._evalUrl(f.src):na.globalEval((f.text||f.textContent||f.innerHTML||"").replace(fb,"")));j=e=null}return a}function C(a,b,c){for(var d,e=b?na.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||na.cleanData(o(d)),d.parentNode&&(c&&na.contains(d.ownerDocument,d)&&p(o(d,"script")),d.parentNode.removeChild(d));return a}function D(a,b){var c=na(b.createElement(a)).appendTo(b.body),d=na.css(c[0],"display");return c.detach(),d}function E(a){var b=da,c=jb[a];return c||(c=D(a,b),"none"!==c&&c||(ib=(ib||na("