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 branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2

Browse Source 
# Conflicts:
#	app/Api/V2/Controllers/Model/ExchangeRate/ShowController.php
#	app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php
#	routes/api.php
This commit is contained in:
James Cole
2024-12-22 08:28:44 +01:00
parent f5a755d4fc a500de8ab1
commit 5751f7e5a3
66 changed files with 234 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
routes/api.php
View File

@@ -96,8 +96,8 @@ Route::group(
static function (): void {
Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
Route::get('{currency_code}', ['uses' => 'ShowController@show', 'as' => 'show']);
// Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
//
// Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
//
// Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']);
// Route::post('{userGroup}/use', ['uses' => 'UpdateController@useUserGroup', 'as' => 'use']);
// Route::put('{userGroup}/update-membership', ['uses' => 'UpdateController@updateMembership', 'as' => 'updateMembership']);
@@ -127,7 +127,7 @@ Route::group(
// V2 API route for Summary boxes
// BASIC
//Route::group(
// Route::group(
// [
// 'namespace' => 'FireflyIII\Api\V2\Controllers\Summary',
// 'prefix' => 'v2/summary',
@@ -136,11 +136,11 @@ Route::group(
// static function (): void {
// // Route::get('basic', ['uses' => 'BasicController@basic', 'as' => 'basic']);
// }
//);
//// V2 API route for all kinds of Transaction lists.
//// A lot of endpoints involve transactions. So any time Firefly III needs to list transactions
//// it's coming from these endpoints.
//Route::group(
// );
// // V2 API route for all kinds of Transaction lists.
// // A lot of endpoints involve transactions. So any time Firefly III needs to list transactions
// // it's coming from these endpoints.
// Route::group(
// [
// 'namespace' => 'FireflyIII\Api\V2\Controllers\Transaction\List',
// 'prefix' => 'v2',
@@ -154,12 +154,12 @@ Route::group(
// // note how the check is done on the user group, not the user itself.
// // Route::get('accounts/{userGroupAccount}/transactions', ['uses' => 'AccountController@list', 'as' => 'accounts.transactions']);
// }
//);
// );
// V2 API routes for auto complete
//
//// V2 API route for net worth endpoint(s);
//Route::group(
// // V2 API route for net worth endpoint(s);
// Route::group(
// [
// 'namespace' => 'FireflyIII\Api\V2\Controllers\Summary',
// 'prefix' => 'v2/net-worth',
@@ -168,24 +168,24 @@ Route::group(
// static function (): void {
// // Route::get('', ['uses' => 'NetWorthController@get', 'as' => 'index']);
// }
//);
// );
//
//// // V2 API route for accounts.
//// Route::group(
//// [
//// 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Account',
//// 'prefix' => 'v2/accounts',
//// 'as' => 'api.v2.accounts.',
//// ],
//// static function (): void {
//// Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
//// Route::get('{account}', ['uses' => 'ShowController@show', 'as' => 'show']);
//// Route::put('{account}', ['uses' => 'UpdateController@update', 'as' => 'update']);
//// }
//// );
// // // V2 API route for accounts.
// // Route::group(
// // [
// // 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Account',
// // 'prefix' => 'v2/accounts',
// // 'as' => 'api.v2.accounts.',
// // ],
// // static function (): void {
// // Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
// // Route::get('{account}', ['uses' => 'ShowController@show', 'as' => 'show']);
// // Route::put('{account}', ['uses' => 'UpdateController@update', 'as' => 'update']);
// // }
// // );
//
//// V2 API route for subscriptions.
//Route::group(
// // V2 API route for subscriptions.
// Route::group(
// [
// 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Bill',
// 'prefix' => 'v2/subscriptions',
@@ -197,10 +197,10 @@ Route::group(
// // Route::get('sum/paid', ['uses' => 'SumController@paid', 'as' => 'sum.paid']);
// // Route::get('sum/unpaid', ['uses' => 'SumController@unpaid', 'as' => 'sum.unpaid']);
// }
//);
// );
//
//// V2 API route for piggy banks.
//Route::group(
// // V2 API route for piggy banks.
// Route::group(
// [
// 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\PiggyBank',
// 'prefix' => 'v2/piggy-banks',
@@ -209,10 +209,10 @@ Route::group(
// static function (): void {
// // Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
// }
//);
// );
//
//// V2 API route for transaction currencies
//Route::group(
// // V2 API route for transaction currencies
// Route::group(
// [
// 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Currency',
// 'prefix' => 'v2/currencies',
@@ -221,10 +221,10 @@ Route::group(
// static function (): void {
// // Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
// }
//);
// );
//
//// V2 API route for transactions
//Route::group(
// // V2 API route for transactions
// Route::group(
// [
// 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Transaction',
// 'prefix' => 'v2/transactions',
@@ -235,9 +235,9 @@ Route::group(
// // Route::get('{userGroupTransaction}', ['uses' => 'ShowController@show', 'as' => 'show']);
// // Route::put('{userGroupTransaction}', ['uses' => 'UpdateController@update', 'as' => 'update']);
// }
//);
//// infinite (transactions) list:
//Route::group(
// );
// // infinite (transactions) list:
// Route::group(
// [
// 'namespace' => 'FireflyIII\Api\V2\Controllers\Transaction\List',
// 'prefix' => 'v2/infinite/transactions',
@@ -246,10 +246,10 @@ Route::group(
// static function (): void {
// // Route::get('', ['uses' => 'TransactionController@infiniteList', 'as' => 'list']);
// }
//);
// );
//
//// V2 API route for budgets and budget limits:
//Route::group(
// // V2 API route for budgets and budget limits:
// Route::group(
// [
// 'namespace' => 'FireflyIII\Api\V2\Controllers\Model',
// 'prefix' => 'v2/budgets',
@@ -264,10 +264,10 @@ Route::group(
// // Route::get('{budget}/budgeted', ['uses' => 'Budget\ShowController@budgeted', 'as' => 'budget.budgeted']);
// // Route::get('{budget}/spent', ['uses' => 'Budget\ShowController@spent', 'as' => 'budget.spent']);
// }
//);
// );
//
//// V2 API route for system
//Route::group(
// // V2 API route for system
// Route::group(
// [
// 'namespace' => 'FireflyIII\Api\V2\Controllers\System',
// 'prefix' => 'v2',
@@ -276,7 +276,7 @@ Route::group(
// static function (): void {
// // Route::get('preferences/{preference}', ['uses' => 'PreferencesController@get', 'as' => 'preferences.get']);
// }
//);
// );
//

12
routes/web.php
View File

@@ -366,12 +366,12 @@ Route::group(
static function (): void {
Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
Route::get('{fromCurrencyCode}/{toCurrencyCode}', ['uses' => 'IndexController@rates', 'as' => 'rates']);
// Route::get('create', ['uses' => 'CreateController@create', 'as' => 'create']);
// Route::get('edit/{currency}', ['uses' => 'EditController@edit', 'as' => 'edit']);
// Route::get('delete/{currency}', ['uses' => 'DeleteController@delete', 'as' => 'delete']);
// Route::post('store', ['uses' => 'CreateController@store', 'as' => 'store']);
// Route::post('update/{currency}', ['uses' => 'EditController@update', 'as' => 'update']);
// Route::post('destroy/{currency}', ['uses' => 'DeleteController@destroy', 'as' => 'destroy']);
// Route::get('create', ['uses' => 'CreateController@create', 'as' => 'create']);
// Route::get('edit/{currency}', ['uses' => 'EditController@edit', 'as' => 'edit']);
// Route::get('delete/{currency}', ['uses' => 'DeleteController@delete', 'as' => 'delete']);
// Route::post('store', ['uses' => 'CreateController@store', 'as' => 'store']);
// Route::post('update/{currency}', ['uses' => 'EditController@update', 'as' => 'update']);
// Route::post('destroy/{currency}', ['uses' => 'DeleteController@destroy', 'as' => 'destroy']);
}
);