@@ -249,28 +249,32 @@ public function getTotalDonationsCount(): int
249
249
*/
250
250
protected function getWhereConditions (QueryBuilder $ query ): array
251
251
{
252
- $ search = $ this ->request ->get_param ('search ' );
253
252
$ dependencies = [];
253
+ list ($ query , $ dependencies ) = $ this ->getSearchWhereCondition ($ query , $ dependencies );
254
254
list ($ query , $ dependencies ) = $ this ->getDonorWhereCondition ($ query , $ dependencies );
255
255
list ($ query , $ dependencies ) = $ this ->getFormWhereCondition ($ query , $ dependencies );
256
256
list ($ query , $ dependencies ) = $ this ->getDateWhereCondition ($ query , $ dependencies );
257
257
list ($ query , $ dependencies ) = $ this ->getModeWhereCondition ($ query , $ dependencies );
258
258
259
+ return [$ query , $ dependencies ];
260
+ }
259
261
260
- if ($ search ) {
261
- if (ctype_digit ($ search )) {
262
- $ query ->where ('id ' , $ search );
263
- } elseif (strpos ($ search , '@ ' ) !== false ) {
264
- $ query
265
- ->whereLike ('give_donationmeta_attach_meta_email.meta_value ' , $ search );
266
- $ dependencies [] = DonationMetaKeys::EMAIL ();
267
- } else {
268
- $ query
269
- ->whereLike ('give_donationmeta_attach_meta_firstName.meta_value ' , $ search )
270
- ->orWhereLike ('give_donationmeta_attach_meta_lastName.meta_value ' , $ search );
271
- $ dependencies [] = DonationMetaKeys::FIRST_NAME ();
272
- $ dependencies [] = DonationMetaKeys::LAST_NAME ();
273
- }
262
+ private function getSearchWhereCondition (QueryBuilder $ query , array $ dependencies )
263
+ {
264
+ $ search = $ this ->request ->get_param ('search ' );
265
+ if (!$ search ) return [$ query , $ dependencies ];
266
+ if (ctype_digit ($ search )) {
267
+ $ query ->where ('id ' , $ search );
268
+ } elseif (strpos ($ search , '@ ' ) !== false ) {
269
+ $ query
270
+ ->whereLike ('give_donationmeta_attach_meta_email.meta_value ' , $ search );
271
+ $ dependencies [] = DonationMetaKeys::EMAIL ();
272
+ } else {
273
+ $ query
274
+ ->whereLike ('give_donationmeta_attach_meta_firstName.meta_value ' , $ search )
275
+ ->orWhereLike ('give_donationmeta_attach_meta_lastName.meta_value ' , $ search );
276
+ $ dependencies [] = DonationMetaKeys::FIRST_NAME ();
277
+ $ dependencies [] = DonationMetaKeys::LAST_NAME ();
274
278
}
275
279
return [$ query , $ dependencies ];
276
280
}
0 commit comments