kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-21 00:50:07 +00:00
Code Issues Projects Releases Wiki Activity

Code for 4.8.0

Browse Source
This commit is contained in:
James Cole
2019-03-05 17:26:49 +01:00
parent 6e12f434ad
commit e4fb223f77
45 changed files with 1416 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
app/Services/Internal/Support/TransactionServiceTrait.php
View File

@@ -93,8 +93,6 @@ trait TransactionServiceTrait
$repository = app(AccountRepositoryInterface::class);
$repository->setUser($this->user);
Log::debug(sprintf('Going to find account #%d ("%s")', $accountId, $accountName));
if (null === $expectedType) {
return $repository->findNull($accountId);
}
@@ -118,37 +116,6 @@ trait TransactionServiceTrait
return $repository->getCashAccount();
}
/**
* @param int|null $budgetId
* @param null|string $budgetName
*
* @return Budget|null
*/
protected function findBudget(?int $budgetId, ?string $budgetName): ?Budget
{
/** @var BudgetFactory $factory */
$factory = app(BudgetFactory::class);
$factory->setUser($this->user);
return $factory->find($budgetId, $budgetName);
}
/**
* @param int|null $categoryId
* @param null|string $categoryName
*
* @return Category|null
*/
protected function findCategory(?int $categoryId, ?string $categoryName): ?Category
{
Log::debug(sprintf('Going to find or create category #%d, with name "%s"', $categoryId, $categoryName));
/** @var CategoryFactory $factory */
$factory = app(CategoryFactory::class);
$factory->setUser($this->user);
return $factory->findOrCreate($categoryId, $categoryName);
}
/**
* @param int|null $currencyId
* @param null|string $currencyCode
@@ -162,38 +129,6 @@ trait TransactionServiceTrait
return $factory->find($currencyId, $currencyCode);
}
/**
* @param Transaction $transaction
* @param Budget|null $budget
*/
protected function setBudget(Transaction $transaction, ?Budget $budget): void
{
if (null === $budget) {
$transaction->budgets()->sync([]);
return;
}
$transaction->budgets()->sync([$budget->id]);
}
/**
* @param Transaction $transaction
* @param Category|null $category
*/
protected function setCategory(Transaction $transaction, ?Category $category): void
{
if (null === $category) {
$transaction->categories()->sync([]);
return;
}
$transaction->categories()->sync([$category->id]);
}
/**
* @param Transaction $transaction
* @param string|null $amount