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

Auto commit for release 'develop' on 2025-01-19

Browse Source
This commit is contained in:
github-actions
2025-01-19 11:46:08 +01:00
parent 9d2f57e40a
commit 04d1e8fd59
64 changed files with 3222 additions and 2932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Transformers/BudgetTransformer.php
View File

@@ -70,23 +70,23 @@ class BudgetTransformer extends AbstractTransformer
}
// info for auto budget.
$abType = null;
$abAmount = null;
$abNative = null;
$abPeriod = null;
$notes = $this->repository->getNoteText($budget);
$abType = null;
$abAmount = null;
$abNative = null;
$abPeriod = null;
$notes = $this->repository->getNoteText($budget);
$types = [
$types = [
AutoBudgetType::AUTO_BUDGET_RESET->value => 'reset',
AutoBudgetType::AUTO_BUDGET_ROLLOVER->value => 'rollover',
AutoBudgetType::AUTO_BUDGET_ADJUSTED->value => 'adjusted',
];
$currency = $autoBudget?->transactionCurrency;
$default = $this->default;
$currency = $autoBudget?->transactionCurrency;
$default = $this->default;
if (!$this->convertToNative) {
$default = null;
}
if(null === $autoBudget) {
if (null === $autoBudget) {
$currency = $default;
}
if (null !== $autoBudget) {
@@ -97,15 +97,15 @@ class BudgetTransformer extends AbstractTransformer
}
return [
'id' => (string) $budget->id,
'created_at' => $budget->created_at->toAtomString(),
'updated_at' => $budget->updated_at->toAtomString(),
'active' => $budget->active,
'name' => $budget->name,
'order' => $budget->order,
'notes' => $notes,
'auto_budget_type' => $abType,
'auto_budget_period' => $abPeriod,
'id' => (string) $budget->id,
'created_at' => $budget->created_at->toAtomString(),
'updated_at' => $budget->updated_at->toAtomString(),
'active' => $budget->active,
'name' => $budget->name,
'order' => $budget->order,
'notes' => $notes,
'auto_budget_type' => $abType,
'auto_budget_period' => $abPeriod,
'currency_id' => null === $autoBudget ? null : (string) $autoBudget->transactionCurrency->id,
'currency_code' => $autoBudget?->transactionCurrency->code,
@@ -125,7 +125,7 @@ class BudgetTransformer extends AbstractTransformer
'links' => [
[
'rel' => 'self',
'uri' => '/budgets/' . $budget->id,
'uri' => '/budgets/'.$budget->id,
],
],
];