mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-23 20:00:33 -04:00
Fixes for list search
This commit is contained in:
parent
fda2b1d4f0
commit
6609f89d94
@ -88,6 +88,11 @@ class CreditFilters extends QueryFilters
|
|||||||
->orWhere('credits.custom_value4', 'like', '%'.$filter.'%')
|
->orWhere('credits.custom_value4', 'like', '%'.$filter.'%')
|
||||||
->orWhereHas('client', function ($q) use ($filter) {
|
->orWhereHas('client', function ($q) use ($filter) {
|
||||||
$q->where('name', 'like', '%'.$filter.'%');
|
$q->where('name', 'like', '%'.$filter.'%');
|
||||||
|
})
|
||||||
|
->orWhereHas('client.contacts', function ($q) use ($filter) {
|
||||||
|
$q->where('first_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('last_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('email', 'like', '%'.$filter.'%');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -116,6 +116,11 @@ class InvoiceFilters extends QueryFilters
|
|||||||
->orWhere('custom_value4', 'like', '%'.$filter.'%')
|
->orWhere('custom_value4', 'like', '%'.$filter.'%')
|
||||||
->orWhereHas('client', function ($q) use ($filter) {
|
->orWhereHas('client', function ($q) use ($filter) {
|
||||||
$q->where('name', 'like', '%'.$filter.'%');
|
$q->where('name', 'like', '%'.$filter.'%');
|
||||||
|
})
|
||||||
|
->orWhereHas('client.contacts', function ($q) use ($filter) {
|
||||||
|
$q->where('first_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('last_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('email', 'like', '%'.$filter.'%');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,12 @@ class PaymentFilters extends QueryFilters
|
|||||||
->orWhere('custom_value4', 'like', '%'.$filter.'%')
|
->orWhere('custom_value4', 'like', '%'.$filter.'%')
|
||||||
->orWhereHas('client', function ($q) use ($filter) {
|
->orWhereHas('client', function ($q) use ($filter) {
|
||||||
$q->where('name', 'like', '%'.$filter.'%');
|
$q->where('name', 'like', '%'.$filter.'%');
|
||||||
});
|
})
|
||||||
|
->orWhereHas('client.contacts', function ($q) use ($filter) {
|
||||||
|
$q->where('first_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('last_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('email', 'like', '%'.$filter.'%');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,7 +40,12 @@ class QuoteFilters extends QueryFilters
|
|||||||
->orWhere('custom_value4', 'like', '%'.$filter.'%')
|
->orWhere('custom_value4', 'like', '%'.$filter.'%')
|
||||||
->orWhereHas('client', function ($q) use ($filter) {
|
->orWhereHas('client', function ($q) use ($filter) {
|
||||||
$q->where('name', 'like', '%'.$filter.'%');
|
$q->where('name', 'like', '%'.$filter.'%');
|
||||||
});
|
})
|
||||||
|
->orWhereHas('client.contacts', function ($q) use ($filter) {
|
||||||
|
$q->where('first_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('last_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('email', 'like', '%'.$filter.'%');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,7 +42,12 @@ class RecurringInvoiceFilters extends QueryFilters
|
|||||||
->orWhere('custom_value4', 'like', '%'.$filter.'%')
|
->orWhere('custom_value4', 'like', '%'.$filter.'%')
|
||||||
->orWhereHas('client', function ($q) use ($filter) {
|
->orWhereHas('client', function ($q) use ($filter) {
|
||||||
$q->where('name', 'like', '%'.$filter.'%');
|
$q->where('name', 'like', '%'.$filter.'%');
|
||||||
});
|
})
|
||||||
|
->orWhereHas('client.contacts', function ($q) use ($filter) {
|
||||||
|
$q->where('first_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('last_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('email', 'like', '%'.$filter.'%');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,7 +45,12 @@ class TaskFilters extends QueryFilters
|
|||||||
})
|
})
|
||||||
->orWhereHas('client', function ($q) use ($filter) {
|
->orWhereHas('client', function ($q) use ($filter) {
|
||||||
$q->where('name', 'like', '%'.$filter.'%');
|
$q->where('name', 'like', '%'.$filter.'%');
|
||||||
});
|
})
|
||||||
|
->orWhereHas('client.contacts', function ($q) use ($filter) {
|
||||||
|
$q->where('first_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('last_name', 'like', '%'.$filter.'%')
|
||||||
|
->orWhere('email', 'like', '%'.$filter.'%');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user