|
|
@@ -93,17 +93,17 @@ class UserService extends BaseService
|
|
|
* @param array $search
|
|
|
* @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
|
|
|
*/
|
|
|
- public static function paginate(array $search = [], $order = 'created_at', $by = 'desc')
|
|
|
+ public static function paginate(array $search = [], $order = 'desc', $by = 'created_at')
|
|
|
{
|
|
|
$limit = isset($search['limit']) ? $search['limit'] : 15;
|
|
|
$query = static::$MODEL::with(['wallet'])
|
|
|
->join('wallets', 'users.member_id', '=', 'wallets.member_id')
|
|
|
->where(self::getWhere($search));
|
|
|
- if ($order == 'available_balance') $order = "wallets.{$order}";
|
|
|
+ if ($by 'available_balance') $order = "wallets.{$by}";
|
|
|
else {
|
|
|
- $order = "users.{$order}";
|
|
|
+ $by = "users.{$by}";
|
|
|
}
|
|
|
- $paginator = $query->orderBy($order, $by)
|
|
|
+ $paginator = $query->orderBy($by,$order)
|
|
|
->select("users.*")
|
|
|
->paginate($limit);
|
|
|
return ['total' => $paginator->total(), 'data' => $paginator->items()];
|