kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Remove deprecated method.

Browse Source
This commit is contained in:
James Cole
2020-08-02 11:59:43 +02:00
parent fb0d31226a
commit e29b2066c2
3 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,8 +245,7 @@ class BudgetLimitController extends Controller
public function update(BudgetLimitRequest $request, BudgetLimit $budgetLimit): JsonResponse public function update(BudgetLimitRequest $request, BudgetLimit $budgetLimit): JsonResponse
{ {
$data = $request->getAll(); $data = $request->getAll();
$data['budget'] = $budgetLimit->budget; $budgetLimit = $this->blRepository->update($budgetLimit, $data);
$budgetLimit = $this->blRepository->updateBudgetLimit($budgetLimit, $data);
$manager = $this->getManager(); $manager = $this->getManager();
/** @var BudgetLimitTransformer $transformer */ /** @var BudgetLimitTransformer $transformer */

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

@@ -338,28 +338,10 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
public function update(BudgetLimit $budgetLimit, array $data): BudgetLimit public function update(BudgetLimit $budgetLimit, array $data): BudgetLimit
{ {
$budgetLimit->amount = $data['amount'] ?? $budgetLimit->amount; $budgetLimit->amount = $data['amount'] ?? $budgetLimit->amount;
$budgetLimit->save(); $budgetLimit->budget_id = $data['budget_id'] ?? $budgetLimit->id;
$budgetLimit->budget_id = $data['budget'] ? $data['budget']->id : $budgetLimit->budget_id;
return $budgetLimit; $budgetLimit->start_date = $data['start'] ? $data['start']->format('Y-m-d 00:00:00') : $budgetLimit->start_date;
} $budgetLimit->end_date = $data['end'] ? $data['end']->format('Y-m-d 00:00:00') : $budgetLimit->end_date;
/**
* @param BudgetLimit $budgetLimit
* @param array $data
*
* @return BudgetLimit
* @throws Exception
* @deprecated
*/
public function updateBudgetLimit(BudgetLimit $budgetLimit, array $data): BudgetLimit
{
/** @var Budget $budget */
$budget = $data['budget'];
$budgetLimit->budget()->associate($budget);
$budgetLimit->start_date = $data['start']->format('Y-m-d 00:00:00');
$budgetLimit->end_date = $data['end']->format('Y-m-d 00:00:00');
$budgetLimit->amount = $data['amount'];
// if no currency has been provided, use the user's default currency: // if no currency has been provided, use the user's default currency:
/** @var TransactionCurrencyFactory $factory */ /** @var TransactionCurrencyFactory $factory */
@@ -370,9 +352,10 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
} }
$currency->enabled = true; $currency->enabled = true;
$currency->save(); $currency->save();
$budgetLimit->transaction_currency_id = $currency->id;
$budgetLimit->transaction_currency_id = $currency->id;
$budgetLimit->save(); $budgetLimit->save();
Log::debug(sprintf('Updated budget limit with ID #%d and amount %s', $budgetLimit->id, $data['amount'])); Log::debug(sprintf('Updated budget limit with ID #%d and amount %s', $budgetLimit->id, $data['amount']));
return $budgetLimit; return $budgetLimit;

9
app/Repositories/Budget/BudgetLimitRepositoryInterface.php
View File

@@ -119,15 +119,6 @@ interface BudgetLimitRepositoryInterface
*/ */
public function update(BudgetLimit $budgetLimit, array $data): BudgetLimit; public function update(BudgetLimit $budgetLimit, array $data): BudgetLimit;
/**
* @param BudgetLimit $budgetLimit
* @param array $data
*
* @return BudgetLimit
* @deprecated
*/
public function updateBudgetLimit(BudgetLimit $budgetLimit, array $data): BudgetLimit;
/** /**
* @param Budget $budget * @param Budget $budget
* @param Carbon $start * @param Carbon $start