Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Partner productchange done

Browse Source
This commit is contained in:
Frank Schubert
2024-07-30 20:01:29 +02:00
parent 48f3866bc7
commit a0cd6847b7
9 changed files with 147 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/Order/OrderController.php
View File

@@ -479,13 +479,14 @@ class OrderController extends mfBaseController {
$pagination['start'] = intval($this->request->s);
}
$upgrade_search = [
"type" => "upgrade",
"contract_creator_address_id" => $this->me->address_id,
"finish_date_null_or_gte" => date("U"),
"price>=" => 0
];
unset($filter["finish_date"]);
$upgrade_search = $filter;
$upgrade_search["type"] = "upgrade";
$upgrade_search["contract_creator_address_id"] = $this->me->address_id;
$upgrade_search["finish_date_null_or_gte"] = date("U");
$upgrade_search["price>="] = 0;
$pagination["maxItems"] = ContractLinkModel::countWithContracts($upgrade_search);

2
application/Order/OrderModel.php
View File

@@ -244,7 +244,7 @@ class OrderModel {
if(array_key_exists("owner", $filter)) {
$owner = FronkDB::singleton()->escape($filter['owner']);
if($owner) {
$where .= " AND (Address.company like '%$owner%' OR Address.firstname like '%$owner%' OR Address.lastname like '%$owner%' OR Address.customer_number like '%$owner%')";
$where .= " AND (Address.customer_number like '$owner' OR Address.company like '%$owner%' OR Address.firstname like '%$owner%' OR Address.lastname like '%$owner%' OR Address.customer_number like '%$owner%')";
}
}