kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Push empty object {} and recurrence doesn't change. #2483

Browse Source
This commit is contained in:
James Cole
2019-08-26 19:09:55 +02:00
parent f9dc58c3a8
commit 2b40b60d01
7 changed files with 346 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Services/Internal/Update/RecurrenceUpdateService.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\User;
/**
* Class RecurrenceUpdateService
*
* @codeCoverageIgnore
*/
class RecurrenceUpdateService
@@ -52,7 +53,10 @@ class RecurrenceUpdateService
public function update(Recurrence $recurrence, array $data): Recurrence
{
$this->user = $recurrence->user;
$transactionType = $this->findTransactionType(ucfirst($data['recurrence']['type']));
$transactionType = $recurrence->transactionType;
if (isset($data['recurrence']['type'])) {
$transactionType = $this->findTransactionType(ucfirst($data['recurrence']['type']));
}
// update basic fields first:
$recurrence->transaction_type_id = $transactionType->id;
$recurrence->title = $data['recurrence']['title'] ?? $recurrence->title;
@@ -75,15 +79,19 @@ class RecurrenceUpdateService
$recurrence->save();
// update all meta data:
$this->updateMetaData($recurrence, $data);
//$this->updateMetaData($recurrence, $data);
// update all repetitions
$this->deleteRepetitions($recurrence);
$this->createRepetitions($recurrence, $data['repetitions'] ?? []);
if (null !== $data['repetitions']) {
$this->deleteRepetitions($recurrence);
$this->createRepetitions($recurrence, $data['repetitions'] ?? []);
}
// update all transactions (and associated meta-data);
$this->deleteTransactions($recurrence);
$this->createTransactions($recurrence, $data['transactions'] ?? []);
if (null !== $data['transactions']) {
$this->deleteTransactions($recurrence);
$this->createTransactions($recurrence, $data['transactions'] ?? []);
}
return $recurrence;
}