https://github.com/jekkos/opensourcepos/issues/339

We should also rollout the fixes to  develop/2.4 if necessary. This fix
was adapted from BootstrapUI which fixed the PHP 7 error regarding
classes.
This commit is contained in:
Aaron Gong committed 2016-03-07 22:26:07 +08:00
1 parent f0af6f8927
commit ff63adecdc
6 files changed
+7 -7

No files matched your search

+2 -2
View File
@@ -75,7 +75,7 @@ class Customers extends Person_controller
'company_name'=>$this->input->post('company_name')=='' ? null:$this->input->post('company_name'),
'taxable'=>$this->input->post('taxable')=='' ? 0:1,
);
if($this->Customer->save($person_data,$customer_data,$customer_id))
if($this->Customer->save_customer($person_data,$customer_data,$customer_id))
{
//New customer
if($customer_id==-1)
@@ -179,7 +179,7 @@ class Customers extends Person_controller
$invalidated = $this->Customer->account_number_exists($account_number);
}
if($invalidated || !$this->Customer->save($person_data,$customer_data))
if($invalidated || !$this->Customer->save_customer($person_data,$customer_data))
{
$failCodes[] = $i;
}
+1 -1
View File
@@ -87,7 +87,7 @@ class Employees extends Person_controller
$employee_data=array('username'=>$this->input->post('username'));
}
if($this->Employee->save($person_data,$employee_data,$grants_data,$employee_id))
if($this->Employee->save_employee($person_data,$employee_data,$grants_data,$employee_id))
{
//New employee
if($employee_id==-1)
+1 -1
View File
@@ -76,7 +76,7 @@ class Suppliers extends Person_controller
'agency_name'=>$this->input->post('agency_name'),
'account_number'=>$this->input->post('account_number')=='' ? null:$this->input->post('account_number'),
);
if($this->Supplier->save($person_data,$supplier_data,$supplier_id))
if($this->Supplier->save_supplier($person_data,$supplier_data,$supplier_id))
{
//New supplier
if($supplier_id==-1)
+1 -1
View File
@@ -95,7 +95,7 @@ class Customer extends Person
/*
Inserts or updates a customer
*/
function save(&$person_data, &$customer_data,$customer_id=false)
function save_customer(&$person_data, &$customer_data,$customer_id=false)
{
$success=false;
//Run these queries as a transaction, we want to make sure we do all or nothing
+1 -1
View File
@@ -81,7 +81,7 @@ class Employee extends Person
/*
Inserts or updates an employee
*/
function save(&$person_data, &$employee_data,&$grants_data,$employee_id=false)
function save_employee(&$person_data, &$employee_data,&$grants_data,$employee_id=false)
{
$success=false;
+1 -1
View File
@@ -90,7 +90,7 @@ class Supplier extends Person
/*
Inserts or updates a suppliers
*/
function save(&$person_data, &$supplier_data,$supplier_id=false)
function save_supplier(&$person_data, &$supplier_data,$supplier_id=false)
{
$success=false;
//Run these queries as a transaction, we want to make sure we do all or nothing