diff --git a/public/v1/js/ff/budgets/index.js b/public/v1/js/ff/budgets/index.js index fcccb5cbece..0e8ab6f0719 100644 --- a/public/v1/js/ff/budgets/index.js +++ b/public/v1/js/ff/budgets/index.js @@ -133,7 +133,7 @@ function updateTotalBudgetedAmount(currencyId) { }); // get new amount: - $.get(totalBudgetedUri.replace('REPLACEME',currencyId)).done(function (data) { + $.get(totalBudgetedUri.replace('REPLACEME', currencyId)).done(function (data) { // set thing: $('span.budgeted_amount[data-currency="' + currencyId + '"]') .html(data.budgeted_formatted) @@ -207,9 +207,14 @@ function createBudgetLimit(e) { } function deleteBudgetLimit(e) { + e.preventDefault(); var button = $(e.currentTarget); var budgetLimitId = button.data('budget-limit-id'); - var url = deleteBudgetLimitUrl.replace('REPLACEME', budgetId.toString(); + var url = deleteBudgetLimitUrl.replace('REPLACEME', budgetLimitId.toString()); + $.post(url, {_token: token}).then(function () { + $('.bl_entry[data-budget-limit-id="' + budgetLimitId + '"]').remove(); + + }); return false; } diff --git a/resources/views/v1/budgets/index.twig b/resources/views/v1/budgets/index.twig index 763525300f9..43a63e8974e 100644 --- a/resources/views/v1/budgets/index.twig +++ b/resources/views/v1/budgets/index.twig @@ -285,7 +285,7 @@ {{ trans('firefly.budget_limit_not_in_range', {start: budgetLimit.start_date, end: budgetLimit.end_date}) }}
{% endif %} -
+
{{ budgetLimit.currency_symbol }}
@@ -468,6 +470,7 @@ var createBudgetLimitUri = "{{ route('budget-limits.create', ['REPLACEME', start.format('Y-m-d'), end.format('Y-m-d')]) }}"; var storeBudgetLimitUri = "{{ route('budget-limits.store') }}"; var updateBudgetLimitUri = "{{ route('budget-limits.update', ['REPLACEME']) }}"; + var deleteBudgetLimitUrl = "{{ route('budget-limits.delete', ['REPLACEME']) }}"; var totalBudgetedUri = "{{ route('json.budget.total-budgeted', ['REPLACEME', start.format('Y-m-d'), end.format('Y-m-d')]) }}"; // period thing: diff --git a/routes/web.php b/routes/web.php index 790cbc94edc..7982d04aaa2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -282,7 +282,7 @@ static function () { Route::get('create/{budget}/{start_date}/{end_date}', ['uses' => 'Budget\BudgetLimitController@create', 'as' => 'create']); Route::post('store', ['uses' => 'Budget\BudgetLimitController@store', 'as' => 'store']); - Route::get('delete/{budgetLimit}', ['uses' => 'Budget\BudgetLimitController@delete', 'as' => 'delete']); + Route::post('delete/{budgetLimit}', ['uses' => 'Budget\BudgetLimitController@delete', 'as' => 'delete']); Route::post('update/{budgetLimit}', ['uses' => 'Budget\BudgetLimitController@update', 'as' => 'update']); }