From 5dc745f3014e23af8a992b50cd4ecee06ec36e97 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Wed, 23 Mar 2022 17:51:05 +0100 Subject: [PATCH] Use the given time when skipping chores via /choretracking (references #1830) --- changelog/67_UNRELEASED_xxxx-xx-xx.md | 1 + services/ChoresService.php | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/changelog/67_UNRELEASED_xxxx-xx-xx.md b/changelog/67_UNRELEASED_xxxx-xx-xx.md index 498796e2..40adea45 100644 --- a/changelog/67_UNRELEASED_xxxx-xx-xx.md +++ b/changelog/67_UNRELEASED_xxxx-xx-xx.md @@ -33,6 +33,7 @@ - The `Daily` period type has been changed to schedule the chore at the _same time_ (based on the start date) each `n` days - This period type scheduled chores `n` days _after the last execution_ before, which is also possible by using the `Hourly` period type and a corresponding period interval; all existing `Daily` schedules will be converted to that on migration +- Optimized that when skipping chores via the chore tracking page, the given time is used as the "skipped time", not the scheduled next estimated tracking time of the corresponding chore (essentially making it possible to skip more then one schedule at once) - Fixed that when consuming a parent product on chore execution (chore option "Consume product on chore execution"), no child products were used if the parent product itself is not in-stock - Fixed that the upgrade to v3.2.0 failed when having any former "Dynamic Regular" chore with a "Period interval" of `0` (which makes absolutely no sense in reality) diff --git a/services/ChoresService.php b/services/ChoresService.php index 58cf0d8f..8829f450 100644 --- a/services/ChoresService.php +++ b/services/ChoresService.php @@ -186,8 +186,6 @@ class ChoresService extends BaseService { throw new \Exception('Chores without a schedule can\'t be skipped'); } - - $trackedTime = $this->getDatabase()->chores_current()->where('chore_id', $choreId)->min('next_estimated_execution_time'); } $logRow = $this->getDatabase()->chores_log()->createRow([