mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-14 16:13:54 +00:00
Can now create auto budget over API
This commit is contained in:
@@ -25,7 +25,8 @@ namespace FireflyIII\Api\V1\Controllers;
|
||||
|
||||
use Exception;
|
||||
use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
|
||||
use FireflyIII\Api\V1\Requests\BudgetRequest;
|
||||
use FireflyIII\Api\V1\Requests\BudgetStoreRequest;
|
||||
use FireflyIII\Api\V1\Requests\BudgetUpdateRequest;
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
|
||||
use FireflyIII\Models\Budget;
|
||||
@@ -179,13 +180,13 @@ class BudgetController extends Controller
|
||||
/**
|
||||
* Store a budget.
|
||||
*
|
||||
* @param BudgetRequest $request
|
||||
* @param BudgetStoreRequest $request
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
*
|
||||
*/
|
||||
public function store(BudgetRequest $request): JsonResponse
|
||||
public function store(BudgetStoreRequest $request): JsonResponse
|
||||
{
|
||||
$budget = $this->repository->store($request->getAll());
|
||||
$manager = $this->getManager();
|
||||
@@ -291,12 +292,12 @@ class BudgetController extends Controller
|
||||
/**
|
||||
* Update a budget.
|
||||
*
|
||||
* @param BudgetRequest $request
|
||||
* @param BudgetUpdateRequest $request
|
||||
* @param Budget $budget
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function update(BudgetRequest $request, Budget $budget): JsonResponse
|
||||
public function update(BudgetUpdateRequest $request, Budget $budget): JsonResponse
|
||||
{
|
||||
$data = $request->getAll();
|
||||
$budget = $this->repository->update($budget, $data);
|
||||
|
@@ -85,7 +85,7 @@ class AvailableBudgetController extends Controller
|
||||
}
|
||||
$left = bcadd($availableBudget->amount, (string)$spent);
|
||||
// left less than zero? Set to zero.
|
||||
if (bccomp($left, '0') === -1) {
|
||||
if (-1 === bccomp($left, '0')) {
|
||||
$left = '0';
|
||||
}
|
||||
|
||||
|
@@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
/**
|
||||
* AccountController.php
|
||||
* Copyright (c) 2019 james@firefly-iii.org
|
||||
|
@@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
/**
|
||||
* TransactionController.php
|
||||
* Copyright (c) 2019 james@firefly-iii.org
|
||||
@@ -23,8 +24,6 @@ namespace FireflyIII\Api\V1\Controllers\Search;
|
||||
|
||||
|
||||
use FireflyIII\Api\V1\Controllers\Controller;
|
||||
use FireflyIII\Support\Search\SearchInterface;
|
||||
use FireflyIII\Support\Search\TransactionSearch;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
@@ -35,13 +34,13 @@ use Illuminate\Http\Response;
|
||||
class TransactionController extends Controller
|
||||
{
|
||||
/** @var string */
|
||||
const SEARCH_ALL = 'all';
|
||||
public const SEARCH_ALL = 'all';
|
||||
/** @var string */
|
||||
const SEARCH_DESCRIPTION = 'description';
|
||||
public const SEARCH_DESCRIPTION = 'description';
|
||||
/** @var string */
|
||||
const SEARCH_NOTES = 'notes';
|
||||
public const SEARCH_NOTES = 'notes';
|
||||
/** @var string */
|
||||
const SEARCH_ACCOUNTS = 'accounts';
|
||||
public const SEARCH_ACCOUNTS = 'accounts';
|
||||
/** @var array */
|
||||
private $validFields;
|
||||
|
||||
@@ -59,7 +58,7 @@ class TransactionController extends Controller
|
||||
/**
|
||||
* @param Request $request
|
||||
*
|
||||
* @return JsonResponse|Response
|
||||
* @return void
|
||||
*/
|
||||
public function search(Request $request)
|
||||
{
|
||||
|
@@ -1,4 +1,5 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
/**
|
||||
* TransferController.php
|
||||
* Copyright (c) 2019 james@firefly-iii.org
|
||||
@@ -41,10 +42,9 @@ use League\Fractal\Resource\Collection as FractalCollection;
|
||||
class TransferController extends Controller
|
||||
{
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param TransferRequest $request
|
||||
*
|
||||
* @return JsonResponse|Response
|
||||
* @throws FireflyException
|
||||
*/
|
||||
public function search(TransferRequest $request)
|
||||
{
|
||||
|
@@ -42,7 +42,6 @@ use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
|
||||
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
|
||||
use FireflyIII\User;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
/**
|
||||
* Class SummaryController
|
||||
|
Reference in New Issue
Block a user