|  | @@ -25,22 +25,22 @@ class SignupManagementService
 | 
	
		
			
			| 25 | 25 |          $res = $this->signupDb
 | 
	
		
			
			| 26 | 26 |              ->select('*')
 | 
	
		
			
			| 27 | 27 |                  
 | 
	
		
			
			| 28 |  | -                ->where('trackNo','LIKE', $trackNo.'%')
 | 
	
		
			
			| 29 |  | -                ->where(function($query)
 | 
	
		
			
			| 30 |  | -                    {
 | 
	
		
			
			| 31 |  | -                        $query->where('createDate', '>', $createDateStart)
 | 
	
		
			
			| 32 |  | -                            ->where('createDate', '<', $createDateFinal);
 | 
	
		
			
			| 33 |  | -                    })
 | 
	
		
			
			| 34 |  | -                ->where(function($query)
 | 
	
		
			
			| 35 |  | -                    {
 | 
	
		
			
			| 36 |  | -                        $query->where('firstName', $keyword)
 | 
	
		
			
			| 37 |  | -                        ->orWhere('lastName', $keyword)
 | 
	
		
			
			| 38 |  | -                        ->orWhere('companyName', $keyword)
 | 
	
		
			
			| 39 |  | -                        ->orWhere('companyEmail', $keyword)
 | 
	
		
			
			| 40 |  | -                        ->orWhere('backupEmail', $keyword)
 | 
	
		
			
			| 41 |  | -                        ->orWhere('phoneNumber', $keyword);
 | 
	
		
			
			| 42 |  | -                    }
 | 
	
		
			
			| 43 |  | -                );
 | 
	
		
			
			|  | 28 | +                ->where('trackNo','LIKE', $trackNo.'%');
 | 
	
		
			
			|  | 29 | +
 | 
	
		
			
			|  | 30 | +                // $res->where(function($query)
 | 
	
		
			
			|  | 31 | +                //     {
 | 
	
		
			
			|  | 32 | +                //         $query->where('createDate', '>', $createDateStart)
 | 
	
		
			
			|  | 33 | +                //             ->where('createDate', '<', $createDateFinal);
 | 
	
		
			
			|  | 34 | +                //     });
 | 
	
		
			
			|  | 35 | +                // $res->where(function($query)
 | 
	
		
			
			|  | 36 | +                //     {
 | 
	
		
			
			|  | 37 | +                //         $query->where('firstName', $keyword)
 | 
	
		
			
			|  | 38 | +                //         ->orWhere('lastName', $keyword)
 | 
	
		
			
			|  | 39 | +                //         ->orWhere('companyName', $keyword)
 | 
	
		
			
			|  | 40 | +                //         ->orWhere('companyEmail', $keyword)
 | 
	
		
			
			|  | 41 | +                //         ->orWhere('backupEmail', $keyword)
 | 
	
		
			
			|  | 42 | +                //         ->orWhere('phoneNumber', $keyword);
 | 
	
		
			
			|  | 43 | +                //     });
 | 
	
		
			
			| 44 | 44 |              
 | 
	
		
			
			| 45 | 45 |              
 | 
	
		
			
			| 46 | 46 |              // ->where('trackNo','LIKE', $trackNo.'%')
 |