mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
This commit is contained in:
parent
3a27f9d02c
commit
dc1ecf6a42
@ -40,6 +40,7 @@ use FireflyIII\Models\RecurrenceTransaction;
|
|||||||
use FireflyIII\Models\RecurrenceTransactionMeta;
|
use FireflyIII\Models\RecurrenceTransactionMeta;
|
||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||||
use FireflyIII\Validation\AccountValidator;
|
use FireflyIII\Validation\AccountValidator;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Trait RecurringTransactionTrait
|
* Trait RecurringTransactionTrait
|
||||||
@ -212,10 +213,13 @@ trait RecurringTransactionTrait
|
|||||||
|
|
||||||
private function setBudget(RecurrenceTransaction $transaction, int $budgetId): void
|
private function setBudget(RecurrenceTransaction $transaction, int $budgetId): void
|
||||||
{
|
{
|
||||||
|
Log::debug(sprintf('Now in %s', __METHOD__));
|
||||||
$budgetFactory = app(BudgetFactory::class);
|
$budgetFactory = app(BudgetFactory::class);
|
||||||
$budgetFactory->setUser($transaction->recurrence->user);
|
$budgetFactory->setUser($transaction->recurrence->user);
|
||||||
$budget = $budgetFactory->find($budgetId, null);
|
$budget = $budgetFactory->find($budgetId, null);
|
||||||
if (null === $budget) {
|
if (null === $budget) {
|
||||||
|
// remove budget from recurring transaction:
|
||||||
|
$transaction->recurrenceTransactionMeta()->where('name', 'budget_id')->delete();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -235,6 +239,8 @@ trait RecurringTransactionTrait
|
|||||||
$billFactory->setUser($transaction->recurrence->user);
|
$billFactory->setUser($transaction->recurrence->user);
|
||||||
$bill = $billFactory->find($billId, null);
|
$bill = $billFactory->find($billId, null);
|
||||||
if (null === $bill) {
|
if (null === $bill) {
|
||||||
|
// remove bill from recurring transaction:
|
||||||
|
$transaction->recurrenceTransactionMeta()->where('name', 'bill_id')->delete();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user