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

Restore previous stuff

Browse Source
This commit is contained in:
James Cole
2024-05-10 12:51:02 +02:00
parent aa5c4c20e9
commit c6c8f282e2
9 changed files with 96 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/JsonApi/V3/Accounts/AccountRepository.php
View File

@@ -40,17 +40,6 @@ class AccountRepository extends AbstractRepository implements QueriesAll
*/
public function __construct() {}
/**
* Get the tags relationship
*
* @param Account $account
* @return iterable
*/
public function getBalances(Account $account): iterable
{
die('here we are');
}
/**
* @inheritDoc
*/

16
app/JsonApi/V3/Accounts/AccountResource.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\JsonApi\V3\Accounts;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use LaravelJsonApi\Core\Resources\JsonApiResource;
class AccountResource extends JsonApiResource
@@ -54,11 +55,17 @@ class AccountResource extends JsonApiResource
'name' => $this->resource->name,
'iban' => '' === $this->resource->iban ? null : $this->resource->iban,
'active' => $this->resource->active,
// 'virtual_balance' => $this->resource->virtual_balance,
'last_activity' => $this->resource->last_activity,
// 'native_balance' => $this->resource->native_balance,
'type' => $this->resource->type,
'account_role' => $this->resource->account_role,
// 'virtual_balance' => $this->resource->virtual_balance,
// 'native_balance' => $this->resource->native_balance,
//'user' => $this->resource->user_array,
// 'balances' => []
//
@@ -152,9 +159,8 @@ class AccountResource extends JsonApiResource
public function relationships($request): iterable
{
return [
$this->relation('user')->withData($this->resource->user_array),
$this->relation('balances')->withData([]),
//$this->relation('tags')->withData($this->resource->getTags()),
$this->relation('user')->withData($this->resource->user),
$this->relation('balances')->withData($this->resource->balances),
];
}
}

2
app/JsonApi/V3/Accounts/Capabilities/AccountQuery.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\JsonApi\V3\Accounts\Capabilities;
use FireflyIII\Models\Account;
use FireflyIII\Support\JsonApi\Concerns\UsergroupAware;
use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
use FireflyIII\Support\JsonApi\ExpandsQuery;
@@ -48,6 +47,7 @@ class AccountQuery extends QueryAll implements HasPagination
*/
#[\Override] public function get(): iterable
{
$filters = $this->queryParameters->filter();
$sort = $this->queryParameters->sortFields();
$pagination = $this->filtersPagination($this->queryParameters->page());