mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-06-05 22:24:24 -04:00
Merge branch 'master' into fix/security-vulnerabilities
This commit is contained in:
@@ -237,6 +237,9 @@ class Sale extends Model
|
||||
$builder->orLike('customer_p.first_name', $search); // Customer first name
|
||||
$builder->orLike('CONCAT(customer_p.first_name, " ", customer_p.last_name)', $search); // Customer first and last name
|
||||
$builder->orLike('customer.company_name', $search); // Customer company name
|
||||
if (ctype_digit($search)) {
|
||||
$builder->orWhere('sales.sale_id', $search); // Sale ID
|
||||
}
|
||||
$builder->groupEnd();
|
||||
}
|
||||
}
|
||||
@@ -1477,6 +1480,9 @@ class Sale extends Model
|
||||
$builder->orLike('CONCAT(customer_p.first_name, " ", customer_p.last_name)', $search);
|
||||
// Customer company name
|
||||
$builder->orLike('customer.company_name', $search);
|
||||
if (ctype_digit($search)) {
|
||||
$builder->orWhere('sales.sale_id', $search); // Sale ID
|
||||
}
|
||||
$builder->groupEnd();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user