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 https://huntr.dev/bounties/ea181323-51f8-46a2-a60f-6a401907feb7/

Browse Source
This commit is contained in:
James Cole 2021-08-20 10:05:18 +02:00
parent 06d319cd71
commit f80178b1b2
No known key found for this signature in database
GPG Key ID: BDE6667570EADBD5
7 changed files with 43 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,10 +137,16 @@ class AvailableBudgetController extends Controller
*
* @return RedirectResponse|Redirector
*/
public function delete(AvailableBudget $availableBudget)
public function delete(Request $request)
{
$this->abRepository->destroyAvailableBudget($availableBudget);
session()->flash('success', trans('firefly.deleted_ab'));
$id = (int)$request->get('id');
if (0 !== $id) {
$availableBudget = $this->abRepository->findById($id);
if (null !== $availableBudget) {
$this->abRepository->destroyAvailableBudget($availableBudget);
session()->flash('success', trans('firefly.deleted_ab'));
}
}
return redirect(route('budgets.index'));
}

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

@ -79,6 +79,14 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
}
/**
* @inheritDoc
*/
public function findById(int $id): ?AvailableBudget
{
return $this->user->availableBudgets->find($id);
}
/**
* Return a list of all available budgets (in all currencies) (for the selected period).
*

7
app/Repositories/Budget/AvailableBudgetRepositoryInterface.php
View File

@ -56,6 +56,13 @@ interface AvailableBudgetRepositoryInterface
*/
public function find(TransactionCurrency $currency, Carbon $start, Carbon $end): ?AvailableBudget;
/**
* @param int $id
*
* @return AvailableBudget|null
*/
public function findById(int $id): ?AvailableBudget;
/**
* Return a list of all available budgets (in all currencies) (for the selected period).
*

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

@ -22,6 +22,7 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Budget;
use Carbon\Carbon;
use Exception;
use FireflyIII\Exceptions\FireflyException;
@ -425,6 +426,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
} catch (Exception $e) { // @phpstan-ignore-line
// @ignoreException
}
return null;
}
// update if exists:

143
public/v1/js/ff/budgets/index.js vendored
View File

@ -30,6 +30,7 @@ $(function () {
drawBudgetedBars();
$('.update_ab').on('click', updateAvailableBudget);
$('.delete_ab').on('click', deleteAvailableBudget);
$('.create_ab_alt').on('click', createAltAvailableBudget);
$('.budget_amount').on('change', updateBudgetedAmount);
@ -241,7 +242,17 @@ function updateAvailableBudget(e) {
}
return false;
}
function deleteAvailableBudget(e) {
//
e.preventDefault();
var button = $(e.currentTarget);
var abId = button.data('id');
$.post(deleteABUrl, {_token: token, id: abId}).then(function () {
// lame but it works.
location.reload();
});
return false;
}
function drawBudgetedBars() {
"use strict";
@ -288,133 +299,3 @@ function drawSpentBars() {
}
});
}
//
//
// function drawSpentBar() {
// "use strict";
// if ($('.spentBar').length > 0) {
// var overspent = spent > budgeted;
// var pct;
//
// if (overspent) {
// // draw overspent bar
// pct = (budgeted / spent) * 100;
// $('.spentBar .progress-bar-warning').css('width', pct + '%');
// $('.spentBar .progress-bar-danger').css('width', (100 - pct) + '%');
// } else {
// // draw normal bar:
// pct = (spent / budgeted) * 100;
// $('.spentBar .progress-bar-info').css('width', pct + '%');
// }
// }
// }
//
// function drawBudgetedBar() {
// "use strict";
//
// if ($('.budgetedBar').length > 0) {
// var budgetedMuch = budgeted > available;
//
// // recalculate percentage:
//
// var pct;
// if (budgetedMuch) {
// // budgeted too much.
// pct = (available / budgeted) * 100;
// $('.budgetedBar .progress-bar-warning').css('width', pct + '%');
// $('.budgetedBar .progress-bar-danger').css('width', (100 - pct) + '%');
// $('.budgetedBar .progress-bar-info').css('width', 0);
// } else {
// pct = (budgeted / available) * 100;
// $('.budgetedBar .progress-bar-warning').css('width', 0);
// $('.budgetedBar .progress-bar-danger').css('width', 0);
// $('.budgetedBar .progress-bar-info').css('width', pct + '%');
// }
//
// $('#budgetedAmount').html(currencySymbol + ' ' + budgeted.toFixed(2));
// }
// }
// /**
// *
// * @param e
// */
// function updateBudgetedAmounts(e) {
// "use strict";
// var target = $(e.target);
// var id = target.data('id');
// var leftCell = $('td[class$="left"][data-id="' + id + '"]');
// var link = $('a[data-id="' + id + '"][class="budget-link"]');
// var value = target.val();
// var original = target.data('original');
//
// // disable input
// target.prop('disabled', true);
//
// // replace link (for now)
// link.attr('href', '#');
//
// // replace "left" with spinner.
// leftCell.empty().html('<i class="fa fa-fw fa-spin fa-spinner"></i>');
//
// // send a post to Firefly to update the amount:
// var newUri = budgetAmountUri.replace("REPLACE", id);
//
// $.post(newUri, {amount: value, start: periodStart, end: periodEnd, _token: token}).done(function (data) {
//
// // difference between new value and original value
// var difference = value - original;
//
// // update budgeted value
// budgeted = budgeted + difference;
//
// // fill in "left" value:
//
//
// if (data.left_per_day !== null) {
// leftCell.html(data.left + ' (' + data.left_per_day + ')');
// } else {
// leftCell.html(data.left);
// }
//
// // update "budgeted" input:
// target.val(data.amount);
//
// // enable thing again
// target.prop('disabled', false);
//
// // set new original value:
// target.data('original', data.amount);
//
// // run drawBudgetedBar() again:
// drawBudgetedBar();
//
// // update the link if relevant:
// link.attr('href', 'budgets/show/' + id);
// if (data.limit > 0) {
// link.attr('href', 'budgets/show/' + id + '/' + data.limit);
// }
//
// // update the warning if relevant:
// if (data.large_diff === true) {
// $('span[class$="budget_warning"][data-id="' + id + '"]').html(data.warn_text).show();
// console.log('Show warning for budget');
// } else {
// $('span[class$="budget_warning"][data-id="' + id + '"]').empty().hide();
// }
// });
// }
// /**
// *
// * @returns {boolean}
// */
// function updateIncome() {
// "use strict";
// $('#defaultModal').empty().load(updateIncomeUri, function () {
// $('#defaultModal').modal('show');
// });
//
// return false;
// }

4
resources/views/v1/budgets/index.twig
View File

@ -137,8 +137,7 @@
<span class="available_amount" data-id="{{ budget.id }}"
data-value="{{ budget.amount }}">{{ formatAmountBySymbol(budget.amount, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places, true) }}</span>
<a href="#" data-id="{{ budget.id }}" class="update_ab btn btn-default btn-xs"><span class="fa fa-pencil"></span></a>
<a href="{{ route('available-budgets.delete', [budget.id]) }}" data-id="{{ budget.id }}"
class="delete_ab btn btn-danger btn-xs"><span class="fa fa-trash"></span></a>
<a href="#" data-id="{{ budget.id }}" class="delete_ab btn btn-danger btn-xs"><span class="fa fa-trash"></span></a>
</small>
</div>
</div>
@ -465,6 +464,7 @@
var createAvailableBudgetUri = "{{ route('available-budgets.create', [start.format('Y-m-d'), end.format('Y-m-d')]) }}";
var createAltAvailableBudgetUri = "{{ route('available-budgets.create-alternative', [start.format('Y-m-d'), end.format('Y-m-d')]) }}";
var editAvailableBudgetUri = "{{ route('available-budgets.edit', ['REPLACEME', start.format('Y-m-d'), end.format('Y-m-d')]) }}";
var deleteABUrl = "{{ route('available-budgets.delete') }}";
// budget limit create form.
var createBudgetLimitUri = "{{ route('budget-limits.create', ['REPLACEME', start.format('Y-m-d'), end.format('Y-m-d')]) }}";

2
routes/web.php
View File

@ -269,7 +269,7 @@ Route::group(
Route::get('edit/{availableBudget}/{start_date}/{end_date}', ['uses' => 'Budget\AvailableBudgetController@edit', 'as' => 'edit']);
Route::post('update/{availableBudget}/{start_date}/{end_date}', ['uses' => 'Budget\AvailableBudgetController@update', 'as' => 'update']);
Route::get('delete/{availableBudget}', ['uses' => 'Budget\AvailableBudgetController@delete', 'as' => 'delete']);
Route::post('delete', ['uses' => 'Budget\AvailableBudgetController@delete', 'as' => 'delete']);
}
);