diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php index 038c24a46c..501d680599 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php @@ -172,7 +172,6 @@ class ShowController extends Controller /** @var BudgetLimitTransformer $transformer */ $transformer = app(BudgetLimitTransformer::class); - $transformer->setParameters($this->parameters); $resource = new Item($budgetLimit, $transformer, 'budget_limits'); diff --git a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php index e1a6be6a94..8306274b4d 100644 --- a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php +++ b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php @@ -154,6 +154,9 @@ class BudgetLimitEnrichment implements EnrichmentInterface $this->start = $this->collection->min('start_date') ?? Carbon::now()->startOfMonth(); $this->end = $this->collection->max('end_date') ?? Carbon::now()->endOfMonth(); + // #11096 make sure that the max end date is also at the end of the day, + $this->end->endOfDay(); + /** @var BudgetLimit $limit */ foreach ($this->collection as $limit) { $id = (int)$limit->id;