IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3598 from maroux/fix_recurring_create

Browse Source 
Fix recurring transactions create and fix cache access
This commit is contained in:
James Cole
2020-07-28 04:26:55 +00:00
committed by GitHub
parent d49743031f 9d409a7412
commit 3cda3b27e2
3 changed files with 76 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Support/Steam.php
View File

@@ -40,12 +40,14 @@ class Steam
{
/**
* Gets balance at the end of current month by default
*
* @param \FireflyIII\Models\Account $account
* @param \Carbon\Carbon $date
*
* @return string
*/
public function balance(Account $account, Carbon $date, ?TransactionCurrency $currency = null): string
public function balance(Account $account, Carbon $date = null, ?TransactionCurrency $currency = null): string
{
if ('testing' === config('app.env')) {
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
@@ -58,6 +60,9 @@ class Steam
if ($cache->has()) {
return $cache->get(); // @codeCoverageIgnore
}
if (null === $date) {
$date = Carbon::now()->endOfMonth();
}
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
if (null === $currency) {
@@ -255,12 +260,14 @@ class Steam
}
/**
* Gets balance at the end of current month by default
*
* @param \FireflyIII\Models\Account $account
* @param \Carbon\Carbon $date
*
* @return array
*/
public function balancePerCurrency(Account $account, Carbon $date): array
public function balancePerCurrency(Account $account, Carbon $date = null): array
{
if ('testing' === config('app.env')) {
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
@@ -273,6 +280,9 @@ class Steam
if ($cache->has()) {
return $cache->get(); // @codeCoverageIgnore
}
if (null === $date) {
$date = Carbon::now()->endOfMonth();
}
$query = $account->transactions()
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
@@ -289,14 +299,14 @@ class Steam
}
/**
* This method always ignores the virtual balance.
* This method always ignores the virtual balance. Gets balance at the end of current month by default
*
* @param \Illuminate\Support\Collection $accounts
* @param \Carbon\Carbon $date
*
* @return array
*/
public function balancesByAccounts(Collection $accounts, Carbon $date): array
public function balancesByAccounts(Collection $accounts, Carbon $date = null): array
{
if ('testing' === config('app.env')) {
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
@@ -324,14 +334,14 @@ class Steam
}
/**
* Same as above, but also groups per currency.
* Same as above, but also groups per currency. Gets balance at the end of current month by default
*
* @param \Illuminate\Support\Collection $accounts
* @param \Carbon\Carbon $date
*
* @return array
*/
public function balancesPerCurrencyByAccounts(Collection $accounts, Carbon $date): array
public function balancesPerCurrencyByAccounts(Collection $accounts, Carbon $date = null): array
{
if ('testing' === config('app.env')) {
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));