@@ -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 | |
@@ -101,9 +101,9 @@ |
||
| 101 | 101 | } |
| 102 | 102 | }); |
| 103 | 103 | }); |
| 104 | + } else { |
|
| 105 | + $latest->where($columns, 'like', "%" . $criteria['search'] . "%", 'or'); |
|
| 104 | 106 | } |
| 105 | - else |
|
| 106 | - $latest->where($columns, 'like', "%" . $criteria['search'] . "%", 'or'); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | unset($criteria['search']); |