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

Improve sale status reporting

Browse Source
This commit is contained in:
Steve Ireland
2017-07-04 11:19:54 -04:00
parent bb762efac7
commit 4448348f7c
10 changed files with 125 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/language/en/reports_lang.php
View File

@@ -52,6 +52,7 @@ $lang["reports_payments_summary_report"] = "Payments Summary Report";
$lang["reports_profit"] = "Profit";
$lang["reports_quantity"] = "Quantity";
$lang["reports_quantity_purchased"] = "Quantity Purchased";
$lang["reports_quotes"] = "Quotes";
$lang["reports_received_by"] = "Received By";
$lang["reports_receiving_id"] = "Receiving ID";
$lang["reports_receiving_type"] = "Receiving Type";

27
application/models/Sale.php
View File

@@ -120,11 +120,11 @@ class Sale extends CI_Model
if(empty($this->config->item('date_or_time_format')))
{
$where .= 'DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']) . ' AND sales.sale_status = 0 ';
$where .= 'DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']) . ' ';
}
else
{
$where .= 'sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])) . ' AND sales.sale_status = 0 ';
$where .= 'sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])) . ' ';
}
// NOTE: temporary tables are created to speed up searches due to the fact that they are ortogonal to the main query
@@ -240,11 +240,15 @@ class Sale extends CI_Model
if($filters['sale_type'] == 'sales')
{
$this->db->where('sales_items.quantity_purchased > 0');
$this->db->where('sales.sale_status = 0 and sales_items.quantity_purchased > 0');
}
elseif($filters['sale_type'] == 'quotes')
{
$this->db->where('sales.sale_status = 1 and sales.quote_number IS NOT NULL');
}
elseif($filters['sale_type'] == 'returns')
{
$this->db->where('sales_items.quantity_purchased < 0');
$this->db->where('sales.sale_status = 0 and sales_items.quantity_purchased < 0');
}
if($filters['only_invoices'] != FALSE)
@@ -321,11 +325,15 @@ class Sale extends CI_Model
if($filters['sale_type'] == 'sales')
{
$this->db->where('payment_amount > 0');
$this->db->where('sales.sale_status = 0 and payment_amount > 0');
}
elseif($filters['sale_type'] == 'quotes')
{
$this->db->where('sales.sale_status = 1 and sales.quote_number IS NOT NULL');
}
elseif($filters['sale_type'] == 'returns')
{
$this->db->where('payment_amount < 0');
$this->db->where('sales.sale_status = 0 and payment_amount < 0');
}
if($filters['only_invoices'] != FALSE)
@@ -1111,7 +1119,7 @@ class Sale extends CI_Model
ON sales.sale_id = sales_items_taxes.sale_id
INNER JOIN ' . $this->db->dbprefix('sales_items') . ' AS sales_items
ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.line = sales_items_taxes.line
WHERE sales.sale_status = 0 AND ' . $where . '
WHERE ' . $where . '
GROUP BY sale_id, item_id, line
)'
);
@@ -1126,7 +1134,7 @@ class Sale extends CI_Model
FROM ' . $this->db->dbprefix('sales_payments') . ' AS payments
INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
ON sales.sale_id = payments.sale_id
WHERE sales.sale_status = 0 AND ' . $where . '
WHERE ' . $where . '
GROUP BY payments.sale_id
)'
);
@@ -1138,6 +1146,7 @@ class Sale extends CI_Model
MAX(DATE(sales.sale_time)) AS sale_date,
MAX(sales.sale_time) AS sale_time,
sales.sale_id AS sale_id,
MAX(sales.sale_status) AS sale_status,
MAX(sales.comment) AS comment,
MAX(sales.invoice_number) AS invoice_number,
MAX(sales.quote_number) AS quote_number,
@@ -1188,7 +1197,7 @@ class Sale extends CI_Model
ON sales.employee_id = employee.person_id
LEFT OUTER JOIN ' . $this->db->dbprefix('sales_items_taxes_temp') . ' AS sales_items_taxes
ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line
WHERE sales.sale_status = 0 AND ' . $where . '
WHERE ' . $where . '
GROUP BY sale_id, item_id, line
)'
);

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

@@ -67,6 +67,7 @@ class Detailed_sales extends Report
public function getData(array $inputs)
{
$this->db->select('sale_id,
MAX(sale_status) as sale_status,
MAX(sale_date) AS sale_date,
SUM(quantity_purchased) AS items_purchased,
MAX(employee_name) AS employee_name,
@@ -87,11 +88,19 @@ class Detailed_sales extends Report
if($inputs['sale_type'] == 'sales')
{
$this->db->where('quantity_purchased > 0');
$this->db->where('sale_status = 0 and quantity_purchased > 0');
}
elseif($inputs['sale_type'] == 'all')
{
$this->db->where('sale_status = 0');
}
elseif($inputs['sale_type'] == 'quotes')
{
$this->db->where('sale_status = 1 and quote_number IS NOT NULL');
}
elseif($inputs['sale_type'] == 'returns')
{
$this->db->where('quantity_purchased < 0');
$this->db->where('sale_status = 0 and quantity_purchased < 0');
}
$this->db->group_by('sale_id');
@@ -104,7 +113,7 @@ class Detailed_sales extends Report
foreach($data['summary'] as $key=>$value)
{
$this->db->select('name, category, quantity_purchased, item_location, serialnumber, description, subtotal, tax, total, cost, profit, discount_percent');
$this->db->select('name, category, quantity_purchased, item_location, serialnumber, description, subtotal, tax, total, cost, profit, discount_percent, sale_status');
$this->db->from('sales_items_temp');
$this->db->where('sale_id', $value['sale_id']);
$data['details'][$key] = $this->db->get()->result_array();
@@ -129,11 +138,19 @@ class Detailed_sales extends Report
if($inputs['sale_type'] == 'sales')
{
$this->db->where('quantity_purchased > 0');
$this->db->where('sale_status = 0 and quantity_purchased > 0');
}
elseif($inputs['sale_type'] == 'all')
{
$this->db->where('sale_status = 0');
}
elseif($inputs['sale_type'] == 'quotes')
{
$this->db->where('sale_status = 1 and quote_number IS NOT NULL');
}
elseif($inputs['sale_type'] == 'returns')
{
$this->db->where('quantity_purchased < 0');
$this->db->where('sale_status = 0 and quantity_purchased < 0');
}
return $this->db->get()->row_array();

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

@@ -61,11 +61,19 @@ class Specific_customer extends Report
if($inputs['sale_type'] == 'sales')
{
$this->db->where('quantity_purchased > 0');
$this->db->where('sale_status = 0 and quantity_purchased > 0');
}
elseif($inputs['sale_type'] == 'all')
{
$this->db->where('sale_status = 0');
}
elseif($inputs['sale_type'] == 'quotes')
{
$this->db->where('sale_status = 1 and quote_number IS NOT NULL');
}
elseif($inputs['sale_type'] == 'returns')
{
$this->db->where('quantity_purchased < 0');
$this->db->where('sale_status = 0 and quantity_purchased < 0');
}
$this->db->group_by('sale_id');
@@ -99,11 +107,19 @@ class Specific_customer extends Report
if($inputs['sale_type'] == 'sales')
{
$this->db->where('quantity_purchased > 0');
$this->db->where('sale_status = 0 and quantity_purchased > 0');
}
elseif($inputs['sale_type'] == 'all')
{
$this->db->where('sale_status = 0');
}
elseif($inputs['sale_type'] == 'quotes')
{
$this->db->where('sale_status = 1 and quote_number IS NOT NULL');
}
elseif($inputs['sale_type'] == 'returns')
{
$this->db->where('quantity_purchased < 0');
$this->db->where('sale_status = 0 and quantity_purchased < 0');
}
return $this->db->get()->row_array();

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

@@ -59,11 +59,19 @@ class Specific_discount extends Report
if($inputs['sale_type'] == 'sales')
{
$this->db->where('quantity_purchased > 0');
$this->db->where('sale_status = 0 and quantity_purchased > 0');
}
elseif($inputs['sale_type'] == 'all')
{
$this->db->where('sale_status = 0');
}
elseif($inputs['sale_type'] == 'quotes')
{
$this->db->where('sale_status = 1 and quote_number IS NOT NULL');
}
elseif($inputs['sale_type'] == 'returns')
{
$this->db->where('quantity_purchased < 0');
$this->db->where('sale_status = 0 and quantity_purchased < 0');
}
$this->db->group_by('sale_id');
@@ -97,11 +105,19 @@ class Specific_discount extends Report
if($inputs['sale_type'] == 'sales')
{
$this->db->where('quantity_purchased > 0');
$this->db->where('sale_status = 0 and quantity_purchased > 0');
}
elseif($inputs['sale_type'] == 'all')
{
$this->db->where('sale_status = 0');
}
elseif($inputs['sale_type'] == 'quotes')
{
$this->db->where('sale_status = 1 and quote_number IS NOT NULL');
}
elseif($inputs['sale_type'] == 'returns')
{
$this->db->where('quantity_purchased < 0');
$this->db->where('sale_status = 0 and quantity_purchased < 0');
}
return $this->db->get()->row_array();

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

@@ -60,13 +60,21 @@ class Specific_employee extends Report
$this->db->where('employee_id', $inputs['employee_id']);
if($inputs['sale_type'] == 'sales')
{
$this->db->where('quantity_purchased > 0');
}
elseif($inputs['sale_type'] == 'returns')
{
$this->db->where('quantity_purchased < 0');
}
{
$this->db->where('sale_status = 0 and quantity_purchased > 0');
}
elseif($inputs['sale_type'] == 'all')
{
$this->db->where('sale_status = 0');
}
elseif($inputs['sale_type'] == 'quotes')
{
$this->db->where('sale_status = 1 and quote_number IS NOT NULL');
}
elseif($inputs['sale_type'] == 'returns')
{
$this->db->where('sale_status = 0 and quantity_purchased < 0');
}
$this->db->group_by('sale_id');
$this->db->order_by('MAX(sale_date)');
@@ -99,11 +107,19 @@ class Specific_employee extends Report
if($inputs['sale_type'] == 'sales')
{
$this->db->where('quantity_purchased > 0');
$this->db->where('sale_status = 0 and quantity_purchased > 0');
}
elseif($inputs['sale_type'] == 'all')
{
$this->db->where('sale_status = 0');
}
elseif($inputs['sale_type'] == 'quotes')
{
$this->db->where('sale_status = 1 and quote_number IS NOT NULL');
}
elseif($inputs['sale_type'] == 'returns')
{
$this->db->where('quantity_purchased < 0');
$this->db->where('sale_status = 0 and quantity_purchased < 0');
}
return $this->db->get()->row_array();

16
application/models/reports/Summary_report.php
View File

@@ -51,7 +51,7 @@ abstract class Summary_report extends Report
ON sales.sale_id = sales_items_taxes.sale_id
INNER JOIN ' . $this->db->dbprefix('sales_items') . ' AS sales_items
ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.line = sales_items_taxes.line
WHERE sales.sale_status = 0 AND ' . $where . '
WHERE ' . $where . '
GROUP BY sale_id, item_id, line
)'
);
@@ -92,12 +92,22 @@ abstract class Summary_report extends Report
if($inputs['sale_type'] == 'sales')
{
$this->db->where('sales_items.quantity_purchased >= 0');
$this->db->where('sale_status = 0 and quantity_purchased > 0');
}
elseif($inputs['sale_type'] == 'all')
{
$this->db->where('sale_status = 0');
}
elseif($inputs['sale_type'] == 'quotes')
{
$this->db->where('sale_status = 1 and quote_number IS NOT NULL');
}
elseif($inputs['sale_type'] == 'returns')
{
$this->db->where('sales_items.quantity_purchased < 0');
$this->db->where('sale_status = 0 and quantity_purchased < 0');
}
}
/**

8
application/models/reports/Summary_taxes.php
View File

@@ -18,11 +18,11 @@ class Summary_taxes extends Summary_report
{
if(empty($this->config->item('date_or_time_format')))
{
$this->db->where('sale_status = 0 AND DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
}
else
{
$this->db->where('sale_status = 0 AND sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
$this->db->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
}
}
@@ -32,11 +32,11 @@ class Summary_taxes extends Summary_report
if(empty($this->config->item('date_or_time_format')))
{
$where .= 'WHERE sale_status = 0 AND DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
$where .= 'WHERE DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
}
else
{
$where .= 'WHERE sale_status = 0 AND sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']));
$where .= 'WHERE sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']));
}
if($this->config->item('tax_included'))

1
application/views/reports/date_input.php
View File

@@ -31,6 +31,7 @@ if(isset($error))
<div id='report_sale_type' class="col-xs-3">
<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'),
'sales' => $this->lang->line('reports_sales'),
'quotes' => $this->lang->line('reports_quotes'),
'returns' => $this->lang->line('reports_returns')), 'all', array('id'=>'input_type', 'class'=>'form-control')); ?>
</div>
<?php

1
application/views/reports/specific_input.php
View File

@@ -34,6 +34,7 @@ if(isset($error))
<div id='report_sale_type' class="col-xs-3">
<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'),
'sales' => $this->lang->line('reports_sales'),
'quotes' => $this->lang->line('reports_quotes'),
'returns' => $this->lang->line('reports_returns')), 'all', 'id="input_type" class="form-control"'); ?>
</div>
</div>