@@ -344,9 +344,10 @@ |
||
344 | 344 | } |
345 | 345 | |
346 | 346 | if ($entity) { |
347 | - if($appendEntity) |
|
348 | - return response()->json( ['status' => true, 'message' => __('messages.success'), 'data' => $entity], |
|
347 | + if($appendEntity) { |
|
348 | + return response()->json( ['status' => true, 'message' => __('messages.success'), 'data' => $entity], |
|
349 | 349 | JsonResponse::HTTP_OK); |
350 | + } |
|
350 | 351 | return response()->json(null, JsonResponse::HTTP_NO_CONTENT); |
351 | 352 | } |
352 | 353 |
@@ -100,9 +100,9 @@ |
||
100 | 100 | } |
101 | 101 | }); |
102 | 102 | }); |
103 | + } else { |
|
104 | + $latest->where($columns, 'like', "%" . $criteria['search'] . "%", 'or'); |
|
103 | 105 | } |
104 | - else |
|
105 | - $latest->where($columns, 'like', "%" . $criteria['search'] . "%", 'or'); |
|
106 | 106 | } |
107 | 107 | } |
108 | 108 | unset($criteria['search']); |