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

Fix #3790

Browse Source
This commit is contained in:
James Cole 2020-09-18 16:14:17 +02:00
parent f3eaf1dd4c
commit 7a80caf26b
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
5 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Api/V1/Controllers/AvailableBudgetController.php
View File

@ -145,6 +145,9 @@ class AvailableBudgetController extends Controller
public function store(AvailableBudgetRequest $request): JsonResponse
{
$data = $request->getAll();
$data['start']->startOfDay();
$data['end']->endOfDay();
/** @var TransactionCurrencyFactory $factory */
$factory = app(TransactionCurrencyFactory::class);
$currency = $factory->find($data['currency_id'], $data['currency_code']);

3
app/Http/Controllers/Budget/AvailableBudgetController.php
View File

@ -198,7 +198,8 @@ class AvailableBudgetController extends Controller
return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
}
$start->startOfDay();
$end->endOfDay();
// find existing AB
$existing = $this->abRepository->find($currency, $start, $end);
if (null === $existing) {

16
app/Repositories/Budget/AvailableBudgetRepository.php
View File

@ -39,19 +39,7 @@ use Log;
*/
class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
{
/** @var User */
private $user;
/**
* Constructor.
*/
public function __construct()
{
if ('testing' === config('app.env')) {
Log::warning(sprintf('%s should not be instantiated in the TEST environment!', get_class($this)));
die(get_class($this));
}
}
private User $user;
/**
* @param AvailableBudget $availableBudget
@ -99,7 +87,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
$query->where(
static function (Builder $q1) use ($start, $end) {
$q1->where('start_date', '=', $start->format('Y-m-d 00:00:00'));
$q1->where('end_date', '=', $end->format('Y-m-d 00:00:00'));
$q1->where('end_date', '=', $end->format('Y-m-d 23:59:59'));
}
);
}

11
app/Repositories/Budget/BudgetLimitRepository.php
View File

@ -44,17 +44,6 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
{
private User $user;
/**
* Constructor.
*/
public function __construct()
{
if ('testing' === config('app.env')) {
Log::warning(sprintf('%s should not be instantiated in the TEST environment!', get_class($this)));
die(get_class($this));
}
}
/**
* Tells you which amount has been budgeted (for the given budgets)
* in the selected query. Returns a positive amount as a string.

14
app/Repositories/Budget/OperationsRepository.php
View File

@ -41,19 +41,7 @@ use Log;
*/
class OperationsRepository implements OperationsRepositoryInterface
{
/** @var User */
private $user;
/**
* Constructor.
*/
public function __construct()
{
if ('testing' === config('app.env')) {
Log::warning(sprintf('%s should not be instantiated in the TEST environment!', get_class($this)));
die(get_class($this));
}
}
private User $user;
/**
* A method that returns the amount of money budgeted per day for this budget,