kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into feat/expression-engine

Browse Source
This commit is contained in:
Michael Thomas
2024-03-07 13:09:43 -05:00
parent bee219ebf7 429e72e681
commit 41fc1e8f82
79 changed files with 1463 additions and 1777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routes/api.php
View File

@@ -104,6 +104,7 @@ Route::group(
'as' => 'api.v2.accounts.',
],
static function (): void {
Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
Route::get('{account}', ['uses' => 'ShowController@show', 'as' => 'show']);
}
);
@@ -173,7 +174,6 @@ Route::group(
);
// V2 API route for budgets and budget limits:
// TODO Validate from here down.
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Model',

4
routes/web.php
View File

@@ -1204,11 +1204,11 @@ Route::group(
// show groups:
// TODO improve these routes
Route::get('{what}/all', ['uses' => 'Transaction\IndexController@indexAll', 'as' => 'index.all'])->where(
['what' => 'withdrawal|deposit|transfers|transfer']
['what' => 'withdrawal|deposit|transfers|transfer|all']
);
Route::get('{what}/{start_date?}/{end_date?}', ['uses' => 'Transaction\IndexController@index', 'as' => 'index'])->where(
['what' => 'withdrawal|deposit|transfers|transfer']
['what' => 'withdrawal|deposit|transfers|transfer|all']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;