mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-26 01:53:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove copyright comments and apply suggestions

Browse Source
This commit is contained in:
Jorge Colmenarez
2016-11-04 09:32:41 -04:00
parent 0f95c6c9b5
commit e326c1dfd4
27 changed files with 81 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/Receiving.php
View File

@@ -205,8 +205,6 @@ class Receiving extends CI_Model
*/
public function create_temp_table()
{
// Modify by Jorge Colmenarez 2016-11-01 21:45
// Add Index receiving_time
$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('receivings_items_temp') .
' (INDEX(receiving_date), INDEX(receiving_time), INDEX(receiving_id))
(

8
application/models/Sale.php
View File

@@ -34,13 +34,12 @@ class Sale extends CI_Model
sale_payment_amount AS amount_tendered, SUM(total) AS amount_due, (sale_payment_amount - SUM(total)) AS change_due,
payment_type, invoice_number');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 14:25
// Set DateTime filter field
if(empty($datetime_filter))
$this->db->where('sale_date BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
else
$this->db->where('sale_time BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
// End Jorge Colmenarez
if(!empty($search))
{
if($filters['is_valid_receipt'] != FALSE)
@@ -563,8 +562,7 @@ class Sale extends CI_Model
GROUP BY sale_id
)'
);
// Modify by Jorge Colmenarez 2016-11-01 14:29
// Add Index sale_time
$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_items_temp') .
' (INDEX(sale_date), INDEX(sale_time), INDEX(sale_id))
(

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

@@ -53,8 +53,7 @@ class Detailed_receivings extends Report
$this->db->from('receivings_items_temp');
$this->db->join('people AS employee', 'receivings_items_temp.employee_id = employee.person_id');
$this->db->join('suppliers AS supplier', 'receivings_items_temp.supplier_id = supplier.person_id', 'left');
// Modify by Jorge Colmenarez 2016-11-01 21:47
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("receiving_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
@@ -100,8 +99,7 @@ class Detailed_receivings extends Report
{
$this->db->select('SUM(total) AS total');
$this->db->from('receivings_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 21:47
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("receiving_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else

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

@@ -55,8 +55,7 @@ class Detailed_sales extends Report
{
$this->db->select('sale_id, sale_date, SUM(quantity_purchased) AS items_purchased, employee_name, customer_name, SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit, payment_type, comment');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 21:29
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
@@ -98,8 +97,7 @@ class Detailed_sales extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 21:29
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else

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

@@ -21,13 +21,12 @@ class Specific_customer extends Report
{
$this->db->select('sale_id, sale_date, SUM(quantity_purchased) AS items_purchased, employee_name, SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit, payment_type, comment');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 21:05
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
$this->db->where("sale_time BETWEEN " . $this->db->escape(str_replace("%20"," ", $inputs['start_date'])) . " AND " . $this->db->escape(str_replace("%20"," ", $inputs['end_date'])));
// Support for filter by Specific Customer
$this->db->where("customer_id = ".$inputs['customer_id']);
if ($inputs['sale_type'] == 'sales')
@@ -61,13 +60,12 @@ class Specific_customer extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 21:05
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
$this->db->where("sale_time BETWEEN " . $this->db->escape(str_replace("%20"," ", $inputs['start_date'])) . " AND " . $this->db->escape(str_replace("%20"," ", $inputs['end_date'])));
// Support for filter by Specific Customer
$this->db->where("customer_id = ".$inputs['customer_id']);
if ($inputs['sale_type'] == 'sales')

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

@@ -21,13 +21,12 @@ class Specific_discount extends Report
{
$this->db->select('sale_id, sale_date, SUM(quantity_purchased) AS items_purchased, customer_name, SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit, payment_type, comment');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 21:05
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
$this->db->where("sale_time BETWEEN " . $this->db->escape(str_replace("%20"," ", $inputs['start_date'])) . " AND " . $this->db->escape(str_replace("%20"," ", $inputs['end_date'])));
// Support for filter by Specific Discount
$this->db->where('discount_percent = '.$inputs['discount']);
if ($inputs['sale_type'] == 'sales')

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

@@ -21,13 +21,12 @@ class Specific_employee extends Report
{
$this->db->select('sale_id, sale_date, SUM(quantity_purchased) AS items_purchased, customer_name, SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit, payment_type, comment');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 21:05
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
$this->db->where("sale_time BETWEEN " . $this->db->escape(str_replace("%20"," ", $inputs['start_date'])) . " AND " . $this->db->escape(str_replace("%20"," ", $inputs['end_date'])));
// Support by filter Specific Employee
$this->db->where("employee_id = ".$inputs['employee_id']);
if ($inputs['sale_type'] == 'sales')
@@ -61,13 +60,12 @@ class Specific_employee extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 21:05
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
$this->db->where("sale_time BETWEEN " . $this->db->escape(str_replace("%20"," ", $inputs['start_date'])) . " AND " . $this->db->escape(str_replace("%20"," ", $inputs['end_date'])));
// Support by filter Specific Employee
$this->db->where("employee_id = ".$inputs['employee_id']);
if ($inputs['sale_type'] == 'sales')

6
application/models/reports/Summary_categories.php
View File

@@ -19,8 +19,7 @@ class Summary_categories extends Report
{
$this->db->select('category, SUM(quantity_purchased) AS quantity_purchased, SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 16:47
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
@@ -49,8 +48,7 @@ class Summary_categories extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 16:47
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else

6
application/models/reports/Summary_customers.php
View File

@@ -19,8 +19,7 @@ class Summary_customers extends Report
{
$this->db->select('customer_name AS customer, SUM(quantity_purchased) AS quantity_purchased, SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 20:15
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
@@ -50,8 +49,7 @@ class Summary_customers extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 20:15
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else

6
application/models/reports/Summary_discounts.php
View File

@@ -19,8 +19,7 @@ class Summary_discounts extends Report
{
$this->db->select('CONCAT(discount_percent, "%") AS discount_percent, count(*) AS count');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 20:45
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
@@ -52,8 +51,7 @@ class Summary_discounts extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 20:45
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else

6
application/models/reports/Summary_employees.php
View File

@@ -19,8 +19,7 @@ class Summary_employees extends Report
{
$this->db->select('employee_name AS employee, SUM(quantity_purchased) AS quantity_purchased, SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 20:26
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
@@ -50,8 +49,7 @@ class Summary_employees extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 20:26
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else

6
application/models/reports/Summary_items.php
View File

@@ -19,8 +19,7 @@ class Summary_items extends Report
{
$this->db->select('name, SUM(quantity_purchased) AS quantity_purchased, SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 20:23
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
@@ -50,8 +49,7 @@ class Summary_items extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 20:23
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else

6
application/models/reports/Summary_payments.php
View File

@@ -20,8 +20,7 @@ class Summary_payments extends Report
$this->db->select('sales_payments.payment_type, count(*) AS count, SUM(payment_amount) AS payment_amount');
$this->db->from('sales_payments');
$this->db->join('sales', 'sales.sale_id=sales_payments.sale_id');
// Modify by Jorge Colmenarez 2016-11-01 20:49
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("date(sale_time) BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
@@ -72,8 +71,7 @@ class Summary_payments extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 20:49
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else

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

@@ -19,8 +19,7 @@ class Summary_sales extends Report
{
$this->db->select('sale_date, SUM(quantity_purchased) AS quantity_purchased, SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 19:01
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
@@ -50,8 +49,7 @@ class Summary_sales extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 19:01
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else

6
application/models/reports/Summary_suppliers.php
View File

@@ -21,8 +21,7 @@ class Summary_suppliers extends Report
$this->db->from('sales_items_temp');
$this->db->join('suppliers', 'suppliers.person_id = sales_items_temp.supplier_id');
$this->db->join('people', 'suppliers.person_id = people.person_id');
// Modify by Jorge Colmenarez 2016-11-01 20:18
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else
@@ -54,8 +53,7 @@ class Summary_suppliers extends Report
$this->db->from('sales_items_temp');
$this->db->join('suppliers', 'suppliers.person_id = sales_items_temp.supplier_id');
$this->db->join('people', 'suppliers.person_id = people.person_id');
// Modify by Jorge Colmenarez 2016-11-01 20:18
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else

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

@@ -47,8 +47,6 @@ class Summary_taxes extends Report
$decimals = totals_decimals();
// Modify by Jorge Colmenarez 2016-11-01 20:31
// Set WHERE Clause with support for DateTime filter field
$clauseWhere = "";
if(empty($inputs['datetime_filter']))
$clauseWhere = "WHERE date(sale_time) BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']);
@@ -78,8 +76,7 @@ class Summary_taxes extends Report
{
$this->db->select('SUM(subtotal) AS subtotal, SUM(total) AS total, SUM(tax) AS tax, SUM(cost) AS cost, SUM(profit) AS profit');
$this->db->from('sales_items_temp');
// Modify by Jorge Colmenarez 2016-11-01 20:32
// Set DateTime filter field
if(empty($inputs['datetime_filter']))
$this->db->where("sale_date BETWEEN " . $this->db->escape($inputs['start_date']) . " AND " . $this->db->escape($inputs['end_date']));
else