diff --git a/app/Endpoint/Api/Http/Controllers/Account/WalletController.php b/app/Endpoint/Api/Http/Controllers/Account/WalletController.php index ec18965c..58ba48bf 100644 --- a/app/Endpoint/Api/Http/Controllers/Account/WalletController.php +++ b/app/Endpoint/Api/Http/Controllers/Account/WalletController.php @@ -54,9 +54,11 @@ class WalletController extends Controller public function distributionLogs(Request $request) { $perPage = PaginatorHelper::resolvePerPage('per_page', 20, 50); + // $sort = $request- $distributionLogs = $request->user()->distributionPreIncomes() ->with('logs') - ->unsettlement() + ->where('created_at', '>', now()->subDays(30)) + // ->unsettlement() ->latest('id') ->simplePaginate($perPage); diff --git a/app/Endpoint/Api/Http/Resources/DistributionPreIncomeResource.php b/app/Endpoint/Api/Http/Resources/DistributionPreIncomeResource.php index 562a3a18..1445fb90 100644 --- a/app/Endpoint/Api/Http/Resources/DistributionPreIncomeResource.php +++ b/app/Endpoint/Api/Http/Resources/DistributionPreIncomeResource.php @@ -2,6 +2,7 @@ namespace App\Endpoint\Api\Http\Resources; +use App\Models\DistributionPreIncome; use Illuminate\Http\Resources\Json\JsonResource; class DistributionPreIncomeResource extends JsonResource @@ -19,6 +20,7 @@ class DistributionPreIncomeResource extends JsonResource 'logs' => DistributionPreIncomeLogResource::collection($this->whenLoaded('logs')), 'created_at'=> $this->created_at->format('y-m-d H:i'), 'total_revenue' => $this->total_revenue, + 'status' => DistributionPreIncome::$statusTexts[$this->status], ]; } }