kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Give bills groups too.

Browse Source
This commit is contained in:
James Cole
2020-06-30 19:06:05 +02:00
parent bb5de8bf7e
commit fad2331d80
17 changed files with 1050 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Services/Internal/Update/BillUpdateService.php
View File

@@ -29,6 +29,7 @@ use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;
use FireflyIII\Services\Internal\Support\BillServiceTrait;
use Illuminate\Support\Collection;
use Log;
@@ -39,7 +40,9 @@ use Log;
*/
class BillUpdateService
{
use BillServiceTrait;
use BillServiceTrait, CreatesObjectGroups;
protected $user;
/**
* Constructor.
@@ -59,6 +62,7 @@ class BillUpdateService
*/
public function update(Bill $bill, array $data): Bill
{
$this->user = $bill->user;
/** @var TransactionCurrencyFactory $factory */
$factory = app(TransactionCurrencyFactory::class);
/** @var TransactionCurrency $currency */
@@ -103,6 +107,25 @@ class BillUpdateService
$this->updateBillActions($bill, $oldData['name'], $data['name']);
$this->updateBillTriggers($bill, $oldData, $data);
// update using name:
$objectGroupTitle = $data['object_group'] ?? '';
if ('' !== $objectGroupTitle) {
$objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);
if (null !== $objectGroup) {
$bill->objectGroups()->sync([$objectGroup->id]);
$bill->save();
}
}
// try also with ID:
$objectGroupId = (int) ($data['object_group_id'] ?? 0);
if (0 !== $objectGroupId) {
$objectGroup = $this->findObjectGroupById($objectGroupId);
if (null !== $objectGroup) {
$bill->objectGroups()->sync([$objectGroup->id]);
$bill->save();
}
}
return $bill;
}