Merge branch 'develop' into 5.8-dev

# Conflicts:
#	app/Models/AvailableBudget.php
This commit is contained in:
James Cole 2023-01-02 06:46:05 +01:00
commit e5d5e774dc
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
3 changed files with 50 additions and 0 deletions

View File

@ -25,6 +25,7 @@ namespace FireflyIII\Models;
use Eloquent;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes;
@ -126,4 +127,11 @@ class AvailableBudget extends Model
{
return $this->belongsTo(TransactionCurrency::class);
}
protected function amount(): Attribute
{
return Attribute::make(
get: fn ($value) => (string)$value,
);
}
}

View File

@ -26,6 +26,7 @@ namespace FireflyIII\Models;
use Eloquent;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;
@ -103,4 +104,24 @@ class CurrencyExchangeRate extends Model
{
return $this->belongsTo(User::class);
}
/**
* @return Attribute
*/
protected function rate(): Attribute
{
return Attribute::make(
get: fn($value) => (string) $value,
);
}
/**
* @return Attribute
*/
protected function userRate(): Attribute
{
return Attribute::make(
get: fn($value) => (string) $value,
);
}
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Models;
use Eloquent;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
@ -172,4 +173,24 @@ class RecurrenceTransaction extends Model
{
return $this->belongsTo(TransactionType::class);
}
/**
* @return Attribute
*/
protected function amount(): Attribute
{
return Attribute::make(
get: fn($value) => (string) $value,
);
}
/**
* @return Attribute
*/
protected function foreignAmount(): Attribute
{
return Attribute::make(
get: fn($value) => (string) $value,
);
}
}