diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php index 6b082bcd4..c12aa9ac7 100644 --- a/Layout/default/Order/Index.php +++ b/Layout/default/Order/Index.php @@ -66,6 +66,11 @@ +
+ + +
+
diff --git a/application/Order/OrderModel.php b/application/Order/OrderModel.php index 49d351742..cdae31326 100644 --- a/application/Order/OrderModel.php +++ b/application/Order/OrderModel.php @@ -188,6 +188,7 @@ class OrderModel { ORDER BY id ";*/ $sql = "SELECT `Order`.id as order_id, `Order`.* FROM `Order` + LEFT JOIN Address ON (Address.id = `Order`.owner_id) LEFT JOIN OrderProduct ON (OrderProduct.order_id = `Order`.id) LEFT JOIN Product ON (Product.id = OrderProduct.product_id) LEFT JOIN Termination ON (Termination.id = OrderProduct.termination_id) @@ -225,12 +226,20 @@ class OrderModel { //var_dump($filter);exit; if(array_key_exists("owner_id", $filter)) { - $ownerid= $filter['owner_id']; + $ownerid = $filter['owner_id']; if(is_numeric($ownerid)) { $where .= " AND `Order`.owner_id=$ownerid"; } } + 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%')"; + } + + } + if(array_key_exists("create_by", $filter)) { $create_by = $filter['create_by']; if(is_numeric($create_by)) {