mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-17 20:08:52 +00:00
Compare commits
12 Commits
v6.4.13
...
develop-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2bf841627a | ||
|
|
012df6bb24 | ||
|
|
486e0d5ed5 | ||
|
|
e8fe9db181 | ||
|
|
05f0cb26f8 | ||
|
|
bdaed65207 | ||
|
|
62a9195acc | ||
|
|
40d1e36ba8 | ||
|
|
61a8525d26 | ||
|
|
ef01fbe5f4 | ||
|
|
9413f49c84 | ||
|
|
8781e2a870 |
12
.ci/php-cs-fixer/composer.lock
generated
12
.ci/php-cs-fixer/composer.lock
generated
@@ -402,16 +402,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "friendsofphp/php-cs-fixer",
|
"name": "friendsofphp/php-cs-fixer",
|
||||||
"version": "v3.92.1",
|
"version": "v3.92.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
|
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
|
||||||
"reference": "ed33ad03313a019533ba065eba6c86af0a382873"
|
"reference": "64fab3553dce507ce247f7d1a7d65f74ef658c3f"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/ed33ad03313a019533ba065eba6c86af0a382873",
|
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/64fab3553dce507ce247f7d1a7d65f74ef658c3f",
|
||||||
"reference": "ed33ad03313a019533ba065eba6c86af0a382873",
|
"reference": "64fab3553dce507ce247f7d1a7d65f74ef658c3f",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -494,7 +494,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
|
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
|
||||||
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.1"
|
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.2"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -502,7 +502,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2025-12-15T23:09:01+00:00"
|
"time": "2025-12-17T00:04:16+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "psr/container",
|
"name": "psr/container",
|
||||||
|
|||||||
10
.env.example
10
.env.example
@@ -275,16 +275,6 @@ DISABLE_CSP_HEADER=false
|
|||||||
TRACKER_SITE_ID=
|
TRACKER_SITE_ID=
|
||||||
TRACKER_URL=
|
TRACKER_URL=
|
||||||
|
|
||||||
#
|
|
||||||
# You can automatically submit errors to the Firefly III developer using sentry.io
|
|
||||||
#
|
|
||||||
# This is entirely optional of course. If you run into errors, I will gladly accept GitHub
|
|
||||||
# issues or a forwared email message.
|
|
||||||
#
|
|
||||||
# If you set this to true, your installation will try to contact sentry.io when it runs into errors.
|
|
||||||
#
|
|
||||||
REPORT_ERRORS_ONLINE=false
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Firefly III supports webhooks. These are security sensitive and must be enabled manually first.
|
# Firefly III supports webhooks. These are security sensitive and must be enabled manually first.
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
|
|||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class BudgetController
|
* Class BudgetController
|
||||||
@@ -286,7 +287,7 @@ class BudgetController extends Controller
|
|||||||
}
|
}
|
||||||
if (null !== $limit && $this->convertToPrimary) {
|
if (null !== $limit && $this->convertToPrimary) {
|
||||||
// convert and add all amounts.
|
// convert and add all amounts.
|
||||||
$limit->amount = app('steam')->positive($amount);
|
$limit->amount = Steam::positive($amount);
|
||||||
Log::debug(sprintf('Final amount in limit with converted amount %s', $limit->amount));
|
Log::debug(sprintf('Final amount in limit with converted amount %s', $limit->amount));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ use Illuminate\Console\Command;
|
|||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use ValueError;
|
use ValueError;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
class CorrectsAmounts extends Command
|
class CorrectsAmounts extends Command
|
||||||
{
|
{
|
||||||
@@ -244,7 +245,7 @@ class CorrectsAmounts extends Command
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (-1 === $check) {
|
if (-1 === $check) {
|
||||||
$item->trigger_value = app('steam')->positive($item->trigger_value);
|
$item->trigger_value = Steam::positive($item->trigger_value);
|
||||||
$item->save();
|
$item->save();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ use FireflyIII\Enums\AccountTypeEnum;
|
|||||||
use FireflyIII\Models\Account;
|
use FireflyIII\Models\Account;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
class CorrectsIbans extends Command
|
class CorrectsIbans extends Command
|
||||||
{
|
{
|
||||||
@@ -55,7 +56,7 @@ class CorrectsIbans extends Command
|
|||||||
/** @var Account $account */
|
/** @var Account $account */
|
||||||
foreach ($accounts as $account) {
|
foreach ($accounts as $account) {
|
||||||
$iban = (string) $account->iban;
|
$iban = (string) $account->iban;
|
||||||
$newIban = app('steam')->filterSpaces($iban);
|
$newIban = Steam::filterSpaces($iban);
|
||||||
if ('' !== $iban && $iban !== $newIban) {
|
if ('' !== $iban && $iban !== $newIban) {
|
||||||
$account->iban = $newIban;
|
$account->iban = $newIban;
|
||||||
$account->save();
|
$account->save();
|
||||||
@@ -66,7 +67,7 @@ class CorrectsIbans extends Command
|
|||||||
$accountNumber = $account->accountMeta->where('name', 'account_number')->first();
|
$accountNumber = $account->accountMeta->where('name', 'account_number')->first();
|
||||||
if (null !== $accountNumber) {
|
if (null !== $accountNumber) {
|
||||||
$number = (string) $accountNumber->value;
|
$number = (string) $accountNumber->value;
|
||||||
$newNumber = app('steam')->filterSpaces($number);
|
$newNumber = Steam::filterSpaces($number);
|
||||||
if ('' !== $number && $number !== $newNumber) {
|
if ('' !== $number && $number !== $newNumber) {
|
||||||
$accountNumber->value = $newNumber;
|
$accountNumber->value = $newNumber;
|
||||||
$accountNumber->save();
|
$accountNumber->save();
|
||||||
|
|||||||
@@ -112,9 +112,9 @@ class CorrectsUnevenAmount extends Command
|
|||||||
if ($source->transaction_currency_id === $destination->transaction_currency_id) {
|
if ($source->transaction_currency_id === $destination->transaction_currency_id) {
|
||||||
Log::debug('Ready to swap data between transactions.');
|
Log::debug('Ready to swap data between transactions.');
|
||||||
$destination->foreign_currency_id = $source->transaction_currency_id;
|
$destination->foreign_currency_id = $source->transaction_currency_id;
|
||||||
$destination->foreign_amount = app('steam')->positive($source->amount);
|
$destination->foreign_amount = Steam::positive($source->amount);
|
||||||
$destination->transaction_currency_id = $source->foreign_currency_id;
|
$destination->transaction_currency_id = $source->foreign_currency_id;
|
||||||
$destination->amount = app('steam')->positive($source->foreign_amount);
|
$destination->amount = Steam::positive($source->foreign_amount);
|
||||||
$destination->balance_dirty = true;
|
$destination->balance_dirty = true;
|
||||||
$source->balance_dirty = true;
|
$source->balance_dirty = true;
|
||||||
$destination->save();
|
$destination->save();
|
||||||
@@ -257,8 +257,8 @@ class CorrectsUnevenAmount extends Command
|
|||||||
// source currency = dest foreign currency
|
// source currency = dest foreign currency
|
||||||
// dest amount = source foreign currency
|
// dest amount = source foreign currency
|
||||||
// dest currency = source foreign currency
|
// dest currency = source foreign currency
|
||||||
// Log::debug(sprintf('[a] %s', bccomp(app('steam')->positive($source->amount), app('steam')->positive($destination->foreign_amount))));
|
// Log::debug(sprintf('[a] %s', bccomp(\FireflyIII\Support\Facades\Steam::positive($source->amount), \FireflyIII\Support\Facades\Steam::positive($destination->foreign_amount))));
|
||||||
// Log::debug(sprintf('[b] %s', bccomp(app('steam')->positive($destination->amount), app('steam')->positive($source->foreign_amount))));
|
// Log::debug(sprintf('[b] %s', bccomp(\FireflyIII\Support\Facades\Steam::positive($destination->amount), \FireflyIII\Support\Facades\Steam::positive($source->foreign_amount))));
|
||||||
// Log::debug(sprintf('[c] %s', var_export($source->transaction_currency_id === $destination->foreign_currency_id,true)));
|
// Log::debug(sprintf('[c] %s', var_export($source->transaction_currency_id === $destination->foreign_currency_id,true)));
|
||||||
// Log::debug(sprintf('[d] %s', var_export((int) $destination->transaction_currency_id ===(int) $source->foreign_currency_id, true)));
|
// Log::debug(sprintf('[d] %s', var_export((int) $destination->transaction_currency_id ===(int) $source->foreign_currency_id, true)));
|
||||||
return 0 === bccomp(Steam::positive($source->amount), Steam::positive($destination->foreign_amount))
|
return 0 === bccomp(Steam::positive($source->amount), Steam::positive($destination->foreign_amount))
|
||||||
@@ -428,9 +428,9 @@ class CorrectsUnevenAmount extends Command
|
|||||||
|
|
||||||
// // only fix the destination transaction
|
// // only fix the destination transaction
|
||||||
// $destination->foreign_currency_id = $source->transaction_currency_id;
|
// $destination->foreign_currency_id = $source->transaction_currency_id;
|
||||||
// $destination->foreign_amount = app('steam')->positive($source->amount);
|
// $destination->foreign_amount = \FireflyIII\Support\Facades\Steam::positive($source->amount);
|
||||||
// $destination->transaction_currency_id = $source->foreign_currency_id;
|
// $destination->transaction_currency_id = $source->foreign_currency_id;
|
||||||
// $destination->amount = app('steam')->positive($source->foreign_amount);
|
// $destination->amount = \FireflyIII\Support\Facades\Steam::positive($source->foreign_amount);
|
||||||
// $destination->balance_dirty = true;
|
// $destination->balance_dirty = true;
|
||||||
// $source->balance_dirty = true;
|
// $source->balance_dirty = true;
|
||||||
// $destination->save();
|
// $destination->save();
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ use Illuminate\Validation\ValidationException as LaravelValidationException;
|
|||||||
use Laravel\Passport\Exceptions\OAuthServerException as LaravelOAuthException;
|
use Laravel\Passport\Exceptions\OAuthServerException as LaravelOAuthException;
|
||||||
use League\OAuth2\Server\Exception\OAuthServerException;
|
use League\OAuth2\Server\Exception\OAuthServerException;
|
||||||
use Override;
|
use Override;
|
||||||
use Sentry\Laravel\Integration;
|
|
||||||
use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
|
use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
||||||
@@ -50,6 +49,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
|
|||||||
use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
|
use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
|
||||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
use Throwable;
|
use Throwable;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
use function Safe\json_encode;
|
use function Safe\json_encode;
|
||||||
use function Safe\parse_url;
|
use function Safe\parse_url;
|
||||||
@@ -83,14 +83,7 @@ class Handler extends ExceptionHandler
|
|||||||
* Register the exception handling callbacks for the application.
|
* Register the exception handling callbacks for the application.
|
||||||
*/
|
*/
|
||||||
#[Override]
|
#[Override]
|
||||||
public function register(): void
|
public function register(): void {}
|
||||||
{
|
|
||||||
if (true === config('firefly.report_errors_online')) {
|
|
||||||
$this->reportable(function (Throwable $e): void {
|
|
||||||
Integration::captureUnhandledException($e);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Render an exception into an HTTP response. It's complex but lucky for us, we never use it because
|
* Render an exception into an HTTP response. It's complex but lucky for us, we never use it because
|
||||||
@@ -287,7 +280,7 @@ class Handler extends ExceptionHandler
|
|||||||
protected function invalid($request, LaravelValidationException $exception): \Illuminate\Http\Response|JsonResponse|RedirectResponse
|
protected function invalid($request, LaravelValidationException $exception): \Illuminate\Http\Response|JsonResponse|RedirectResponse
|
||||||
{
|
{
|
||||||
// protect against open redirect when submitting invalid forms.
|
// protect against open redirect when submitting invalid forms.
|
||||||
$previous = app('steam')->getSafePreviousUrl();
|
$previous = Steam::getSafePreviousUrl();
|
||||||
$redirect = $this->getRedirectUrl($exception);
|
$redirect = $this->getRedirectUrl($exception);
|
||||||
|
|
||||||
return redirect($redirect ?? $previous)
|
return redirect($redirect ?? $previous)
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ use FireflyIII\Services\Internal\Update\AccountUpdateService;
|
|||||||
use Illuminate\Database\QueryException;
|
use Illuminate\Database\QueryException;
|
||||||
use Illuminate\Support\Facades\Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class TransactionFactory
|
* Class TransactionFactory
|
||||||
@@ -58,10 +59,10 @@ class TransactionFactory
|
|||||||
$foreignAmount = null;
|
$foreignAmount = null;
|
||||||
}
|
}
|
||||||
if (null !== $foreignAmount) {
|
if (null !== $foreignAmount) {
|
||||||
$foreignAmount = app('steam')->negative($foreignAmount);
|
$foreignAmount = Steam::negative($foreignAmount);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->create(app('steam')->negative($amount), $foreignAmount);
|
return $this->create(Steam::negative($amount), $foreignAmount);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -170,10 +171,10 @@ class TransactionFactory
|
|||||||
$foreignAmount = null;
|
$foreignAmount = null;
|
||||||
}
|
}
|
||||||
if (null !== $foreignAmount) {
|
if (null !== $foreignAmount) {
|
||||||
$foreignAmount = app('steam')->positive($foreignAmount);
|
$foreignAmount = Steam::positive($foreignAmount);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->create(app('steam')->positive($amount), $foreignAmount);
|
return $this->create(Steam::positive($amount), $foreignAmount);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setAccount(Account $account): void
|
public function setAccount(Account $account): void
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ declare(strict_types=1);
|
|||||||
namespace FireflyIII\Generator\Chart\Basic;
|
namespace FireflyIII\Generator\Chart\Basic;
|
||||||
|
|
||||||
use FireflyIII\Support\ChartColour;
|
use FireflyIII\Support\ChartColour;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class ChartJsGenerator.
|
* Class ChartJsGenerator.
|
||||||
@@ -56,7 +57,7 @@ class ChartJsGenerator implements GeneratorInterface
|
|||||||
$index = 0;
|
$index = 0;
|
||||||
foreach ($data as $key => $valueArray) {
|
foreach ($data as $key => $valueArray) {
|
||||||
// make larger than 0
|
// make larger than 0
|
||||||
$chartData['datasets'][0]['data'][] = app('steam')->positive((string) $valueArray['amount']);
|
$chartData['datasets'][0]['data'][] = Steam::positive((string) $valueArray['amount']);
|
||||||
$chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
|
$chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
|
||||||
$chartData['datasets'][0]['currency_symbol'][] = $valueArray['currency_symbol'];
|
$chartData['datasets'][0]['currency_symbol'][] = $valueArray['currency_symbol'];
|
||||||
$chartData['labels'][] = $key;
|
$chartData['labels'][] = $key;
|
||||||
@@ -163,7 +164,7 @@ class ChartJsGenerator implements GeneratorInterface
|
|||||||
$index = 0;
|
$index = 0;
|
||||||
foreach ($data as $key => $value) {
|
foreach ($data as $key => $value) {
|
||||||
// make larger than 0
|
// make larger than 0
|
||||||
$chartData['datasets'][0]['data'][] = app('steam')->positive((string) $value);
|
$chartData['datasets'][0]['data'][] = Steam::positive((string) $value);
|
||||||
$chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
|
$chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
|
||||||
|
|
||||||
$chartData['labels'][] = $key;
|
$chartData['labels'][] = $key;
|
||||||
|
|||||||
@@ -153,13 +153,13 @@ class MonthReportGenerator implements ReportGeneratorInterface
|
|||||||
|
|
||||||
// make sure amount is in the right "direction".
|
// make sure amount is in the right "direction".
|
||||||
if ($account->id === $journal['destination_account_id']) {
|
if ($account->id === $journal['destination_account_id']) {
|
||||||
$transactionAmount = app('steam')->positive($journal['amount']);
|
$transactionAmount = Steam::positive($journal['amount']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($currency->id === $journal['foreign_currency_id']) {
|
if ($currency->id === $journal['foreign_currency_id']) {
|
||||||
$transactionAmount = $journal['foreign_amount'];
|
$transactionAmount = $journal['foreign_amount'];
|
||||||
if ($account->id === $journal['destination_account_id']) {
|
if ($account->id === $journal['destination_account_id']) {
|
||||||
$transactionAmount = app('steam')->positive($journal['foreign_amount']);
|
$transactionAmount = Steam::positive($journal['foreign_amount']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,7 +175,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
|
|||||||
$journals[$index]['payment_date'] = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'payment_date');
|
$journals[$index]['payment_date'] = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'payment_date');
|
||||||
$journals[$index]['invoice_date'] = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'invoice_date');
|
$journals[$index]['invoice_date'] = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'invoice_date');
|
||||||
}
|
}
|
||||||
$locale = app('steam')->getLocale();
|
$locale = Steam::getLocale();
|
||||||
// call is correct.
|
// call is correct.
|
||||||
Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String()));
|
Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String()));
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ namespace FireflyIII\Helpers\Collector\Extensions;
|
|||||||
|
|
||||||
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
|
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
|
||||||
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
|
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Trait AmountCollection
|
* Trait AmountCollection
|
||||||
@@ -39,7 +40,7 @@ trait AmountCollection
|
|||||||
{
|
{
|
||||||
$this->query->where(
|
$this->query->where(
|
||||||
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
||||||
$q->where('source.amount', app('steam')->negative($amount));
|
$q->where('source.amount', Steam::negative($amount));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -50,7 +51,7 @@ trait AmountCollection
|
|||||||
{
|
{
|
||||||
$this->query->where(
|
$this->query->where(
|
||||||
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
||||||
$q->where('source.amount', '!=', app('steam')->negative($amount));
|
$q->where('source.amount', '!=', Steam::negative($amount));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -64,7 +65,7 @@ trait AmountCollection
|
|||||||
{
|
{
|
||||||
$this->query->where(
|
$this->query->where(
|
||||||
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
||||||
$q->where('destination.amount', '<=', app('steam')->positive($amount));
|
$q->where('destination.amount', '<=', Steam::positive($amount));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -78,7 +79,7 @@ trait AmountCollection
|
|||||||
{
|
{
|
||||||
$this->query->where(
|
$this->query->where(
|
||||||
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
||||||
$q->where('destination.amount', '>=', app('steam')->positive($amount));
|
$q->where('destination.amount', '>=', Steam::positive($amount));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -93,7 +94,7 @@ trait AmountCollection
|
|||||||
$this->query->where(
|
$this->query->where(
|
||||||
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
||||||
$q->whereNotNull('source.foreign_amount');
|
$q->whereNotNull('source.foreign_amount');
|
||||||
$q->where('source.foreign_amount', app('steam')->negative($amount));
|
$q->where('source.foreign_amount', Steam::negative($amount));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -108,7 +109,7 @@ trait AmountCollection
|
|||||||
$this->query->where(
|
$this->query->where(
|
||||||
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
||||||
$q->whereNull('source.foreign_amount');
|
$q->whereNull('source.foreign_amount');
|
||||||
$q->orWhere('source.foreign_amount', '!=', app('steam')->negative($amount));
|
$q->orWhere('source.foreign_amount', '!=', Steam::negative($amount));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -123,7 +124,7 @@ trait AmountCollection
|
|||||||
$this->query->where(
|
$this->query->where(
|
||||||
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
||||||
$q->whereNotNull('destination.foreign_amount');
|
$q->whereNotNull('destination.foreign_amount');
|
||||||
$q->where('destination.foreign_amount', '<=', app('steam')->positive($amount));
|
$q->where('destination.foreign_amount', '<=', Steam::positive($amount));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -138,7 +139,7 @@ trait AmountCollection
|
|||||||
$this->query->where(
|
$this->query->where(
|
||||||
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
|
||||||
$q->whereNotNull('destination.foreign_amount');
|
$q->whereNotNull('destination.foreign_amount');
|
||||||
$q->where('destination.foreign_amount', '>=', app('steam')->positive($amount));
|
$q->where('destination.foreign_amount', '>=', Steam::positive($amount));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ use Illuminate\Http\Request;
|
|||||||
use Illuminate\Routing\Redirector;
|
use Illuminate\Routing\Redirector;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class EditController
|
* Class EditController
|
||||||
@@ -148,9 +149,9 @@ class EditController extends Controller
|
|||||||
'BIC' => $repository->getMetaValue($account, 'BIC'),
|
'BIC' => $repository->getMetaValue($account, 'BIC'),
|
||||||
'opening_balance_date' => substr((string) $openingBalanceDate, 0, 10),
|
'opening_balance_date' => substr((string) $openingBalanceDate, 0, 10),
|
||||||
'liability_type_id' => $account->account_type_id,
|
'liability_type_id' => $account->account_type_id,
|
||||||
'opening_balance' => app('steam')->bcround($openingBalanceAmount, $currency->decimal_places),
|
'opening_balance' => Steam::bcround($openingBalanceAmount, $currency->decimal_places),
|
||||||
'liability_direction' => $this->repository->getMetaValue($account, 'liability_direction'),
|
'liability_direction' => $this->repository->getMetaValue($account, 'liability_direction'),
|
||||||
'virtual_balance' => app('steam')->bcround($virtualBalance, $currency->decimal_places),
|
'virtual_balance' => Steam::bcround($virtualBalance, $currency->decimal_places),
|
||||||
'currency_id' => $currency->id,
|
'currency_id' => $currency->id,
|
||||||
'include_net_worth' => $hasOldInput ? (bool) $request->old('include_net_worth') : $includeNetWorth,
|
'include_net_worth' => $hasOldInput ? (bool) $request->old('include_net_worth') : $includeNetWorth,
|
||||||
'interest' => $repository->getMetaValue($account, 'interest'),
|
'interest' => $repository->getMetaValue($account, 'interest'),
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ use Illuminate\Contracts\View\View;
|
|||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class EditController
|
* Class EditController
|
||||||
@@ -84,8 +85,8 @@ class EditController extends Controller
|
|||||||
$this->rememberPreviousUrl('bills.edit.url');
|
$this->rememberPreviousUrl('bills.edit.url');
|
||||||
}
|
}
|
||||||
|
|
||||||
$bill->amount_min = app('steam')->bcround($bill->amount_min, $bill->transactionCurrency->decimal_places);
|
$bill->amount_min = Steam::bcround($bill->amount_min, $bill->transactionCurrency->decimal_places);
|
||||||
$bill->amount_max = app('steam')->bcround($bill->amount_max, $bill->transactionCurrency->decimal_places);
|
$bill->amount_max = Steam::bcround($bill->amount_max, $bill->transactionCurrency->decimal_places);
|
||||||
$rules = $this->repository->getRulesForBill($bill);
|
$rules = $this->repository->getRulesForBill($bill);
|
||||||
|
|
||||||
// code to handle active-checkboxes
|
// code to handle active-checkboxes
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ use Illuminate\Http\Request;
|
|||||||
use Illuminate\Routing\Redirector;
|
use Illuminate\Routing\Redirector;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class BudgetLimitController
|
* Class BudgetLimitController
|
||||||
@@ -274,7 +275,7 @@ class BudgetLimitController extends Controller
|
|||||||
$array['left_per_day'] = 0 === $daysLeft ? bcadd((string) $array['spent'], (string) $array['amount']) : bcdiv(bcadd((string) $array['spent'], (string) $array['amount']), $array['days_left']);
|
$array['left_per_day'] = 0 === $daysLeft ? bcadd((string) $array['spent'], (string) $array['amount']) : bcdiv(bcadd((string) $array['spent'], (string) $array['amount']), $array['days_left']);
|
||||||
|
|
||||||
// left per day formatted.
|
// left per day formatted.
|
||||||
$array['amount'] = app('steam')->bcround($limit['amount'], $limit->transactionCurrency->decimal_places);
|
$array['amount'] = Steam::bcround($limit['amount'], $limit->transactionCurrency->decimal_places);
|
||||||
$array['left_per_day_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $array['left_per_day']);
|
$array['left_per_day_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $array['left_per_day']);
|
||||||
if ('true' === $request->get('redirect')) {
|
if ('true' === $request->get('redirect')) {
|
||||||
return redirect(route('budgets.index'));
|
return redirect(route('budgets.index'));
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ use Illuminate\Http\RedirectResponse;
|
|||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class EditController
|
* Class EditController
|
||||||
@@ -104,7 +105,7 @@ class EditController extends Controller
|
|||||||
$amount = '0';
|
$amount = '0';
|
||||||
}
|
}
|
||||||
$amount = (string) $amount;
|
$amount = (string) $amount;
|
||||||
$preFilled['auto_budget_amount'] = app('steam')->bcround($amount, $autoBudget->transactionCurrency->decimal_places);
|
$preFilled['auto_budget_amount'] = Steam::bcround($amount, $autoBudget->transactionCurrency->decimal_places);
|
||||||
}
|
}
|
||||||
|
|
||||||
// put previous url in session if not redirect from store (not "return_to_edit").
|
// put previous url in session if not redirect from store (not "return_to_edit").
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ use Illuminate\Http\Request;
|
|||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class IndexController
|
* Class IndexController
|
||||||
@@ -203,7 +204,7 @@ class IndexController extends Controller
|
|||||||
foreach ($budgetLimits as $limit) {
|
foreach ($budgetLimits as $limit) {
|
||||||
Log::debug(sprintf('Working on budget limit #%d', $limit->id));
|
Log::debug(sprintf('Working on budget limit #%d', $limit->id));
|
||||||
$currency = $limit->transactionCurrency ?? $primaryCurrency;
|
$currency = $limit->transactionCurrency ?? $primaryCurrency;
|
||||||
$amount = app('steam')->bcround($limit->amount, $currency->decimal_places);
|
$amount = Steam::bcround($limit->amount, $currency->decimal_places);
|
||||||
$array['budgeted'][] = [
|
$array['budgeted'][] = [
|
||||||
'id' => $limit->id,
|
'id' => $limit->id,
|
||||||
'amount' => $amount,
|
'amount' => $amount,
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ use FireflyIII\Models\Bill;
|
|||||||
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
|
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
|
||||||
use FireflyIII\Support\CacheProperties;
|
use FireflyIII\Support\CacheProperties;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class BillController.
|
* Class BillController.
|
||||||
@@ -113,7 +114,7 @@ class BillController extends Controller
|
|||||||
if ($cache->has()) {
|
if ($cache->has()) {
|
||||||
return response()->json($cache->get());
|
return response()->json($cache->get());
|
||||||
}
|
}
|
||||||
$locale = app('steam')->getLocale();
|
$locale = Steam::getLocale();
|
||||||
|
|
||||||
/** @var GroupCollectorInterface $collector */
|
/** @var GroupCollectorInterface $collector */
|
||||||
$collector = app(GroupCollectorInterface::class);
|
$collector = app(GroupCollectorInterface::class);
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ use FireflyIII\Support\Http\Controllers\DateCalculation;
|
|||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class BudgetController.
|
* Class BudgetController.
|
||||||
@@ -166,7 +167,7 @@ class BudgetController extends Controller
|
|||||||
if ($cache->has()) {
|
if ($cache->has()) {
|
||||||
return response()->json($cache->get());
|
return response()->json($cache->get());
|
||||||
}
|
}
|
||||||
$locale = app('steam')->getLocale();
|
$locale = Steam::getLocale();
|
||||||
$entries = [];
|
$entries = [];
|
||||||
$amount = $budgetLimit->amount ?? '0';
|
$amount = $budgetLimit->amount ?? '0';
|
||||||
$budgetCollection = new Collection()->push($budget);
|
$budgetCollection = new Collection()->push($budget);
|
||||||
@@ -531,13 +532,13 @@ class BudgetController extends Controller
|
|||||||
// get budget limit in this period for this currency.
|
// get budget limit in this period for this currency.
|
||||||
$limit = $this->blRepository->find($budget, $currency, $currentStart, $currentEnd);
|
$limit = $this->blRepository->find($budget, $currency, $currentStart, $currentEnd);
|
||||||
if ($limit instanceof BudgetLimit) {
|
if ($limit instanceof BudgetLimit) {
|
||||||
$chartData[1]['entries'][$title] = app('steam')->bcround($limit->amount, $currency->decimal_places);
|
$chartData[1]['entries'][$title] = Steam::bcround($limit->amount, $currency->decimal_places);
|
||||||
}
|
}
|
||||||
|
|
||||||
// get spent amount in this period for this currency.
|
// get spent amount in this period for this currency.
|
||||||
$sum = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);
|
$sum = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);
|
||||||
$amount = app('steam')->positive($sum[$currency->id]['sum'] ?? '0');
|
$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');
|
||||||
$chartData[0]['entries'][$title] = app('steam')->bcround($amount, $currency->decimal_places);
|
$chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);
|
||||||
|
|
||||||
$currentStart = clone $currentEnd;
|
$currentStart = clone $currentEnd;
|
||||||
$currentStart->addDay()->startOfDay();
|
$currentStart->addDay()->startOfDay();
|
||||||
@@ -574,8 +575,8 @@ class BudgetController extends Controller
|
|||||||
$currentEnd = Navigation::endOfPeriod($currentStart, $preferredRange);
|
$currentEnd = Navigation::endOfPeriod($currentStart, $preferredRange);
|
||||||
$title = $currentStart->isoFormat($titleFormat);
|
$title = $currentStart->isoFormat($titleFormat);
|
||||||
$sum = $this->nbRepository->sumExpenses($currentStart, $currentEnd, $accounts, $currency);
|
$sum = $this->nbRepository->sumExpenses($currentStart, $currentEnd, $accounts, $currency);
|
||||||
$amount = app('steam')->positive($sum[$currency->id]['sum'] ?? '0');
|
$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');
|
||||||
$chartData[$title] = app('steam')->bcround($amount, $currency->decimal_places);
|
$chartData[$title] = Steam::bcround($amount, $currency->decimal_places);
|
||||||
$currentStart = Navigation::addPeriod($currentStart, $preferredRange, 0);
|
$currentStart = Navigation::addPeriod($currentStart, $preferredRange, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
|
|||||||
use FireflyIII\Support\CacheProperties;
|
use FireflyIII\Support\CacheProperties;
|
||||||
use FireflyIII\Support\Http\Controllers\DateCalculation;
|
use FireflyIII\Support\Http\Controllers\DateCalculation;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class PiggyBankController.
|
* Class PiggyBankController.
|
||||||
@@ -70,7 +71,7 @@ class PiggyBankController extends Controller
|
|||||||
}
|
}
|
||||||
$set = $repository->getEvents($piggyBank);
|
$set = $repository->getEvents($piggyBank);
|
||||||
$set = $set->reverse();
|
$set = $set->reverse();
|
||||||
$locale = app('steam')->getLocale();
|
$locale = Steam::getLocale();
|
||||||
|
|
||||||
// get first event or start date of piggy bank or today
|
// get first event or start date of piggy bank or today
|
||||||
$startDate = $piggyBank->start_date ?? today(config('app.timezone'));
|
$startDate = $piggyBank->start_date ?? today(config('app.timezone'));
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ class JavascriptController extends Controller
|
|||||||
if ($account instanceof Account) {
|
if ($account instanceof Account) {
|
||||||
$currency = $repository->getAccountCurrency($account) ?? $this->primaryCurrency;
|
$currency = $repository->getAccountCurrency($account) ?? $this->primaryCurrency;
|
||||||
}
|
}
|
||||||
$locale = app('steam')->getLocale();
|
$locale = Steam::getLocale();
|
||||||
$accounting = app('amount')->getJsConfig();
|
$accounting = app('amount')->getJsConfig();
|
||||||
$accounting['frac_digits'] = $currency->decimal_places;
|
$accounting['frac_digits'] = $currency->decimal_places;
|
||||||
$pref = Preferences::get('language', config('firefly.default_language', 'en_US'));
|
$pref = Preferences::get('language', config('firefly.default_language', 'en_US'));
|
||||||
|
|||||||
@@ -278,9 +278,9 @@ class ReconcileController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($inverse) {
|
if ($inverse) {
|
||||||
$journal['amount'] = app('steam')->positive($journal['amount']);
|
$journal['amount'] = Steam::positive($journal['amount']);
|
||||||
if (null !== $journal['foreign_amount']) {
|
if (null !== $journal['foreign_amount']) {
|
||||||
$journal['foreign_amount'] = app('steam')->positive($journal['foreign_amount']);
|
$journal['foreign_amount'] = Steam::positive($journal['foreign_amount']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ use FireflyIII\Models\RecurrenceRepetition;
|
|||||||
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
|
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class RecurrenceController
|
* Class RecurrenceController
|
||||||
@@ -167,7 +168,7 @@ class RecurrenceController extends Controller
|
|||||||
}
|
}
|
||||||
$date->startOfDay();
|
$date->startOfDay();
|
||||||
$preSelected = (string) $request->get('pre_select');
|
$preSelected = (string) $request->get('pre_select');
|
||||||
$locale = app('steam')->getLocale();
|
$locale = Steam::getLocale();
|
||||||
|
|
||||||
Log::debug(sprintf('date = %s, today = %s. date > today? %s', $date->toAtomString(), $today->toAtomString(), var_export($date > $today, true)));
|
Log::debug(sprintf('date = %s, today = %s. date > today? %s', $date->toAtomString(), $today->toAtomString(), var_export($date > $today, true)));
|
||||||
Log::debug(sprintf('past = true? %s', var_export('true' === (string) $request->get('past'), true)));
|
Log::debug(sprintf('past = true? %s', var_export('true' === (string) $request->get('past'), true)));
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ use Illuminate\Http\RedirectResponse;
|
|||||||
use Illuminate\Routing\Redirector;
|
use Illuminate\Routing\Redirector;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class EditController
|
* Class EditController
|
||||||
@@ -89,7 +90,7 @@ class EditController extends Controller
|
|||||||
$preFilled = [
|
$preFilled = [
|
||||||
'name' => $piggyBank->name,
|
'name' => $piggyBank->name,
|
||||||
'transaction_currency_id' => (int) $piggyBank->transaction_currency_id,
|
'transaction_currency_id' => (int) $piggyBank->transaction_currency_id,
|
||||||
'target_amount' => app('steam')->bcround($piggyBank->target_amount, $piggyBank->transactionCurrency->decimal_places),
|
'target_amount' => Steam::bcround($piggyBank->target_amount, $piggyBank->transactionCurrency->decimal_places),
|
||||||
'target_date' => $targetDate,
|
'target_date' => $targetDate,
|
||||||
'start_date' => $startDate,
|
'start_date' => $startDate,
|
||||||
'accounts' => [],
|
'accounts' => [],
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ use Illuminate\Support\Facades\Log;
|
|||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
use JsonException;
|
use JsonException;
|
||||||
use Safe\Exceptions\FilesystemException;
|
use Safe\Exceptions\FilesystemException;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
use function Safe\file_get_contents;
|
use function Safe\file_get_contents;
|
||||||
use function Safe\json_decode;
|
use function Safe\json_decode;
|
||||||
@@ -108,7 +109,7 @@ class PreferencesController extends Controller
|
|||||||
if (!is_array($frontpageAccounts)) {
|
if (!is_array($frontpageAccounts)) {
|
||||||
$frontpageAccounts = $accountIds;
|
$frontpageAccounts = $accountIds;
|
||||||
}
|
}
|
||||||
$language = app('steam')->getLanguage();
|
$language = Steam::getLanguage();
|
||||||
$languages = config('firefly.languages');
|
$languages = config('firefly.languages');
|
||||||
$locale = Preferences::get('locale', config('firefly.default_locale', 'equal'))->data;
|
$locale = Preferences::get('locale', config('firefly.default_locale', 'equal'))->data;
|
||||||
$listPageSize = Preferences::get('listPageSize', 50)->data;
|
$listPageSize = Preferences::get('listPageSize', 50)->data;
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ use Illuminate\Contracts\View\View;
|
|||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
use Illuminate\Routing\Redirector;
|
use Illuminate\Routing\Redirector;
|
||||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class DeleteController
|
* Class DeleteController
|
||||||
@@ -83,7 +84,7 @@ class DeleteController extends Controller
|
|||||||
}
|
}
|
||||||
$objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
|
$objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
|
||||||
$subTitle = (string) trans('firefly.delete_'.$objectType, ['description' => $group->title ?? $journal->description]);
|
$subTitle = (string) trans('firefly.delete_'.$objectType, ['description' => $group->title ?? $journal->description]);
|
||||||
$previous = app('steam')->getSafePreviousUrl();
|
$previous = Steam::getSafePreviousUrl();
|
||||||
// put previous url in session
|
// put previous url in session
|
||||||
Log::debug('Will try to remember previous URL');
|
Log::debug('Will try to remember previous URL');
|
||||||
$this->rememberPreviousUrl('transactions.delete.url');
|
$this->rememberPreviousUrl('transactions.delete.url');
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ use Illuminate\Http\RedirectResponse;
|
|||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Routing\Redirector;
|
use Illuminate\Routing\Redirector;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class LinkController.
|
* Class LinkController.
|
||||||
@@ -145,6 +146,6 @@ class LinkController extends Controller
|
|||||||
$linkId = (int) $request->get('id');
|
$linkId = (int) $request->get('id');
|
||||||
$this->repository->switchLinkById($linkId);
|
$this->repository->switchLinkById($linkId);
|
||||||
|
|
||||||
return redirect(app('steam')->getSafePreviousUrl());
|
return redirect(Steam::getSafePreviousUrl());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ use Illuminate\Routing\Redirector;
|
|||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\View\View as IlluminateView;
|
use Illuminate\View\View as IlluminateView;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class MassController.
|
* Class MassController.
|
||||||
@@ -142,9 +143,9 @@ class MassController extends Controller
|
|||||||
|
|
||||||
// reverse amounts
|
// reverse amounts
|
||||||
foreach ($journals as $index => $journal) {
|
foreach ($journals as $index => $journal) {
|
||||||
$journals[$index]['amount'] = app('steam')->bcround(app('steam')->positive($journal['amount']), $journal['currency_decimal_places']);
|
$journals[$index]['amount'] = Steam::bcround(Steam::positive($journal['amount']), $journal['currency_decimal_places']);
|
||||||
$journals[$index]['foreign_amount'] = null === $journal['foreign_amount']
|
$journals[$index]['foreign_amount'] = null === $journal['foreign_amount']
|
||||||
? null : app('steam')->positive($journal['foreign_amount']);
|
? null : Steam::positive($journal['foreign_amount']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->rememberPreviousUrl('transactions.mass-edit.url');
|
$this->rememberPreviousUrl('transactions.mass-edit.url');
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ use Illuminate\Contracts\Session\Session;
|
|||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Session\Middleware\StartSession;
|
use Illuminate\Session\Middleware\StartSession;
|
||||||
use Override;
|
use Override;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class StartFireflySession.
|
* Class StartFireflySession.
|
||||||
@@ -42,7 +43,7 @@ class StartFireflySession extends StartSession
|
|||||||
protected function storeCurrentUrl(Request $request, $session): void
|
protected function storeCurrentUrl(Request $request, $session): void
|
||||||
{
|
{
|
||||||
$url = $request->fullUrl();
|
$url = $request->fullUrl();
|
||||||
$safeUrl = app('steam')->getSafeUrl($url, route('index'));
|
$safeUrl = Steam::getSafeUrl($url, route('index'));
|
||||||
|
|
||||||
if ($url !== $safeUrl) {
|
if ($url !== $safeUrl) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ use FireflyIII\Support\Request\ChecksLogin;
|
|||||||
use FireflyIII\Support\Request\ConvertsDataTypes;
|
use FireflyIII\Support\Request\ConvertsDataTypes;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class AccountFormRequest.
|
* Class AccountFormRequest.
|
||||||
@@ -87,7 +88,7 @@ class AccountFormRequest extends FormRequest
|
|||||||
$data['account_type_id'] = $this->convertInteger('liability_type_id');
|
$data['account_type_id'] = $this->convertInteger('liability_type_id');
|
||||||
if ('' !== $data['opening_balance']) {
|
if ('' !== $data['opening_balance']) {
|
||||||
// opening balance is always positive for liabilities
|
// opening balance is always positive for liabilities
|
||||||
$data['opening_balance'] = app('steam')->positive($data['opening_balance']);
|
$data['opening_balance'] = Steam::positive($data['opening_balance']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ use FireflyIII\Exceptions\FireflyException;
|
|||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Mail\Mailable;
|
use Illuminate\Mail\Mailable;
|
||||||
use Illuminate\Queue\SerializesModels;
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class NewIPAddressWarningMail
|
* Class NewIPAddressWarningMail
|
||||||
@@ -57,7 +58,7 @@ class NewIPAddressWarningMail extends Mailable
|
|||||||
$this->host = '';
|
$this->host = '';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$hostName = app('steam')->getHostName($this->ipAddress);
|
$hostName = Steam::getHostName($this->ipAddress);
|
||||||
} catch (FireflyException $e) {
|
} catch (FireflyException $e) {
|
||||||
Log::error($e->getMessage());
|
Log::error($e->getMessage());
|
||||||
$hostName = $this->ipAddress;
|
$hostName = $this->ipAddress;
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
|
|||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Override;
|
use Override;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class OperationsRepository
|
* Class OperationsRepository
|
||||||
@@ -157,7 +158,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
|
|||||||
];
|
];
|
||||||
|
|
||||||
foreach ($journals as $journal) {
|
foreach ($journals as $journal) {
|
||||||
$amount = app('steam')->negative($journal['amount']);
|
$amount = Steam::negative($journal['amount']);
|
||||||
$journalCurrencyId = (int) $journal['currency_id'];
|
$journalCurrencyId = (int) $journal['currency_id'];
|
||||||
if (false === $convertToPrimary) {
|
if (false === $convertToPrimary) {
|
||||||
$currencyId = $journalCurrencyId;
|
$currencyId = $journalCurrencyId;
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface, UserGroupIn
|
|||||||
$journalId = (int) $journal['transaction_journal_id'];
|
$journalId = (int) $journal['transaction_journal_id'];
|
||||||
$array[$currencyId]['categories'][0]['transaction_journals'][$journalId]
|
$array[$currencyId]['categories'][0]['transaction_journals'][$journalId]
|
||||||
= [
|
= [
|
||||||
'amount' => app('steam')->negative($journal['amount']),
|
'amount' => Steam::negative($journal['amount']),
|
||||||
'date' => $journal['date'],
|
'date' => $journal['date'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -124,7 +124,7 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface, UserGroupIn
|
|||||||
$journalId = (int) $journal['transaction_journal_id'];
|
$journalId = (int) $journal['transaction_journal_id'];
|
||||||
$array[$currencyId]['categories'][0]['transaction_journals'][$journalId]
|
$array[$currencyId]['categories'][0]['transaction_journals'][$journalId]
|
||||||
= [
|
= [
|
||||||
'amount' => app('steam')->positive($journal['amount']),
|
'amount' => Steam::positive($journal['amount']),
|
||||||
'date' => $journal['date'],
|
'date' => $journal['date'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
|
|||||||
// only a subset of the fields.
|
// only a subset of the fields.
|
||||||
$journalId = (int) $journal['transaction_journal_id'];
|
$journalId = (int) $journal['transaction_journal_id'];
|
||||||
$array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [
|
$array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [
|
||||||
'amount' => app('steam')->negative($journal['amount']),
|
'amount' => Steam::negative($journal['amount']),
|
||||||
'date' => $journal['date'],
|
'date' => $journal['date'],
|
||||||
'source_account_id' => (string) $journal['source_account_id'],
|
'source_account_id' => (string) $journal['source_account_id'],
|
||||||
'budget_name' => $journal['budget_name'],
|
'budget_name' => $journal['budget_name'],
|
||||||
@@ -178,7 +178,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
|
|||||||
// only a subset of the fields.
|
// only a subset of the fields.
|
||||||
$journalId = (int) $journal['transaction_journal_id'];
|
$journalId = (int) $journal['transaction_journal_id'];
|
||||||
$array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [
|
$array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [
|
||||||
'amount' => app('steam')->positive($journal['amount']),
|
'amount' => Steam::positive($journal['amount']),
|
||||||
'date' => $journal['date'],
|
'date' => $journal['date'],
|
||||||
'source_account_id' => (string) $journal['source_account_id'],
|
'source_account_id' => (string) $journal['source_account_id'],
|
||||||
'destination_account_id' => (string) $journal['destination_account_id'],
|
'destination_account_id' => (string) $journal['destination_account_id'],
|
||||||
@@ -240,7 +240,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
|
|||||||
// only a subset of the fields.
|
// only a subset of the fields.
|
||||||
$journalId = (int) $journal['transaction_journal_id'];
|
$journalId = (int) $journal['transaction_journal_id'];
|
||||||
$array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [
|
$array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [
|
||||||
'amount' => app('steam')->positive($journal['amount']),
|
'amount' => Steam::positive($journal['amount']),
|
||||||
'date' => $journal['date'],
|
'date' => $journal['date'],
|
||||||
'source_account_id' => (string) $journal['source_account_id'],
|
'source_account_id' => (string) $journal['source_account_id'],
|
||||||
'category_name' => $journal['category_name'],
|
'category_name' => $journal['category_name'],
|
||||||
@@ -303,7 +303,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
|
|||||||
// only a subset of the fields.
|
// only a subset of the fields.
|
||||||
$journalId = (int) $journal['transaction_journal_id'];
|
$journalId = (int) $journal['transaction_journal_id'];
|
||||||
$array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [
|
$array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [
|
||||||
'amount' => app('steam')->negative($journal['amount']),
|
'amount' => Steam::negative($journal['amount']),
|
||||||
'date' => $journal['date'],
|
'date' => $journal['date'],
|
||||||
'source_account_id' => (string) $journal['source_account_id'],
|
'source_account_id' => (string) $journal['source_account_id'],
|
||||||
'category_name' => $journal['category_name'],
|
'category_name' => $journal['category_name'],
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
|
|||||||
use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
|
use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
|
||||||
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
|
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class OperationsRepository
|
* Class OperationsRepository
|
||||||
@@ -97,7 +98,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
|
|||||||
];
|
];
|
||||||
|
|
||||||
$array[$currencyId]['tags'][$tagId]['transaction_journals'][$journalId] = [
|
$array[$currencyId]['tags'][$tagId]['transaction_journals'][$journalId] = [
|
||||||
'amount' => app('steam')->negative($journal['amount']),
|
'amount' => Steam::negative($journal['amount']),
|
||||||
'date' => $journal['date'],
|
'date' => $journal['date'],
|
||||||
'source_account_id' => $journal['source_account_id'],
|
'source_account_id' => $journal['source_account_id'],
|
||||||
'budget_name' => $journal['budget_name'],
|
'budget_name' => $journal['budget_name'],
|
||||||
@@ -182,7 +183,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
|
|||||||
];
|
];
|
||||||
$journalId = (int) $journal['transaction_journal_id'];
|
$journalId = (int) $journal['transaction_journal_id'];
|
||||||
$array[$currencyId]['tags'][$tagId]['transaction_journals'][$journalId] = [
|
$array[$currencyId]['tags'][$tagId]['transaction_journals'][$journalId] = [
|
||||||
'amount' => app('steam')->positive($journal['amount']),
|
'amount' => Steam::positive($journal['amount']),
|
||||||
'date' => $journal['date'],
|
'date' => $journal['date'],
|
||||||
'source_account_id' => $journal['source_account_id'],
|
'source_account_id' => $journal['source_account_id'],
|
||||||
'budget_name' => $journal['budget_name'],
|
'budget_name' => $journal['budget_name'],
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
|
|||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
use function Safe\json_decode;
|
use function Safe\json_decode;
|
||||||
|
|
||||||
@@ -245,9 +246,9 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
|
|||||||
$transaction = $journal->transactions->first();
|
$transaction = $journal->transactions->first();
|
||||||
$currency = $transaction->transactionCurrency;
|
$currency = $transaction->transactionCurrency;
|
||||||
$type = $journal->transactionType->type;
|
$type = $journal->transactionType->type;
|
||||||
$amount = app('steam')->positive($transaction->amount);
|
$amount = Steam::positive($transaction->amount);
|
||||||
if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
|
if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
|
||||||
return Amount::formatAnything($currency, app('steam')->negative($amount));
|
return Amount::formatAnything($currency, Steam::negative($amount));
|
||||||
}
|
}
|
||||||
|
|
||||||
return Amount::formatAnything($currency, $amount);
|
return Amount::formatAnything($currency, $amount);
|
||||||
@@ -267,9 +268,9 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
|
|||||||
|
|
||||||
$currency = $transaction->foreignCurrency;
|
$currency = $transaction->foreignCurrency;
|
||||||
$type = $journal->transactionType->type;
|
$type = $journal->transactionType->type;
|
||||||
$amount = app('steam')->positive($transaction->foreign_amount);
|
$amount = Steam::positive($transaction->foreign_amount);
|
||||||
if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
|
if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
|
||||||
return Amount::formatAnything($currency, app('steam')->negative($amount));
|
return Amount::formatAnything($currency, Steam::negative($amount));
|
||||||
}
|
}
|
||||||
|
|
||||||
return Amount::formatAnything($currency, $amount);
|
return Amount::formatAnything($currency, $amount);
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ use FireflyIII\Models\TransactionJournal;
|
|||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||||
use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService;
|
use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService;
|
||||||
use Illuminate\Support\Facades\Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Trait AccountServiceTrait
|
* Trait AccountServiceTrait
|
||||||
@@ -65,7 +66,7 @@ trait AccountServiceTrait
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return app('steam')->filterSpaces($iban);
|
return Steam::filterSpaces($iban);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -225,7 +226,7 @@ trait AccountServiceTrait
|
|||||||
}
|
}
|
||||||
|
|
||||||
// make amount positive, regardless:
|
// make amount positive, regardless:
|
||||||
$amount = app('steam')->positive($amount);
|
$amount = Steam::positive($amount);
|
||||||
|
|
||||||
// get or grab currency:
|
// get or grab currency:
|
||||||
$currency = $this->accountRepository->getAccountCurrency($account);
|
$currency = $this->accountRepository->getAccountCurrency($account);
|
||||||
@@ -371,12 +372,12 @@ trait AccountServiceTrait
|
|||||||
}
|
}
|
||||||
// if direction is "debit" (I owe this debt), amount is negative.
|
// if direction is "debit" (I owe this debt), amount is negative.
|
||||||
// which means the liability will have a negative balance which the user must fill.
|
// which means the liability will have a negative balance which the user must fill.
|
||||||
$openingBalance = app('steam')->negative($openingBalance);
|
$openingBalance = Steam::negative($openingBalance);
|
||||||
|
|
||||||
// if direction is "credit" (I am owed this debt), amount is positive.
|
// if direction is "credit" (I am owed this debt), amount is positive.
|
||||||
// which means the liability will have a positive balance which is drained when its paid back into any asset.
|
// which means the liability will have a positive balance which is drained when its paid back into any asset.
|
||||||
if ('credit' === $direction) {
|
if ('credit' === $direction) {
|
||||||
$openingBalance = app('steam')->positive($openingBalance);
|
$openingBalance = Steam::positive($openingBalance);
|
||||||
}
|
}
|
||||||
|
|
||||||
// create if not exists:
|
// create if not exists:
|
||||||
@@ -398,11 +399,11 @@ trait AccountServiceTrait
|
|||||||
$journal->transactionCurrency()->associate($currency);
|
$journal->transactionCurrency()->associate($currency);
|
||||||
|
|
||||||
// account always gains money:
|
// account always gains money:
|
||||||
$accountTransaction->amount = app('steam')->positive($openingBalance);
|
$accountTransaction->amount = Steam::positive($openingBalance);
|
||||||
$accountTransaction->transaction_currency_id = $currency->id;
|
$accountTransaction->transaction_currency_id = $currency->id;
|
||||||
|
|
||||||
// CL account always loses money:
|
// CL account always loses money:
|
||||||
$clTransaction->amount = app('steam')->negative($openingBalance);
|
$clTransaction->amount = Steam::negative($openingBalance);
|
||||||
$clTransaction->transaction_currency_id = $currency->id;
|
$clTransaction->transaction_currency_id = $currency->id;
|
||||||
// save both
|
// save both
|
||||||
$accountTransaction->save();
|
$accountTransaction->save();
|
||||||
@@ -448,7 +449,7 @@ trait AccountServiceTrait
|
|||||||
}
|
}
|
||||||
|
|
||||||
// amount must be positive for the transaction to work.
|
// amount must be positive for the transaction to work.
|
||||||
$amount = app('steam')->positive($openingBalance);
|
$amount = Steam::positive($openingBalance);
|
||||||
|
|
||||||
// get or grab currency:
|
// get or grab currency:
|
||||||
$currency = $this->accountRepository->getAccountCurrency($account);
|
$currency = $this->accountRepository->getAccountCurrency($account);
|
||||||
@@ -584,21 +585,21 @@ trait AccountServiceTrait
|
|||||||
if (1 === bccomp('0', $openingBalance)) {
|
if (1 === bccomp('0', $openingBalance)) {
|
||||||
Log::debug('Amount is negative.');
|
Log::debug('Amount is negative.');
|
||||||
// account transaction loses money:
|
// account transaction loses money:
|
||||||
$accountTransaction->amount = app('steam')->negative($openingBalance);
|
$accountTransaction->amount = Steam::negative($openingBalance);
|
||||||
$accountTransaction->transaction_currency_id = $currency->id;
|
$accountTransaction->transaction_currency_id = $currency->id;
|
||||||
|
|
||||||
// OB account transaction gains money
|
// OB account transaction gains money
|
||||||
$obTransaction->amount = app('steam')->positive($openingBalance);
|
$obTransaction->amount = Steam::positive($openingBalance);
|
||||||
$obTransaction->transaction_currency_id = $currency->id;
|
$obTransaction->transaction_currency_id = $currency->id;
|
||||||
}
|
}
|
||||||
if (-1 === bccomp('0', $openingBalance)) {
|
if (-1 === bccomp('0', $openingBalance)) {
|
||||||
Log::debug('Amount is positive.');
|
Log::debug('Amount is positive.');
|
||||||
// account gains money:
|
// account gains money:
|
||||||
$accountTransaction->amount = app('steam')->positive($openingBalance);
|
$accountTransaction->amount = Steam::positive($openingBalance);
|
||||||
$accountTransaction->transaction_currency_id = $currency->id;
|
$accountTransaction->transaction_currency_id = $currency->id;
|
||||||
|
|
||||||
// OB account loses money:
|
// OB account loses money:
|
||||||
$obTransaction->amount = app('steam')->negative($openingBalance);
|
$obTransaction->amount = Steam::negative($openingBalance);
|
||||||
$obTransaction->transaction_currency_id = $currency->id;
|
$obTransaction->transaction_currency_id = $currency->id;
|
||||||
}
|
}
|
||||||
// save both
|
// save both
|
||||||
@@ -646,7 +647,7 @@ trait AccountServiceTrait
|
|||||||
}
|
}
|
||||||
|
|
||||||
// make amount positive, regardless:
|
// make amount positive, regardless:
|
||||||
$amount = app('steam')->positive($openingBalance);
|
$amount = Steam::positive($openingBalance);
|
||||||
|
|
||||||
// get or grab currency:
|
// get or grab currency:
|
||||||
$currency = $this->accountRepository->getAccountCurrency($account);
|
$currency = $this->accountRepository->getAccountCurrency($account);
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ use FireflyIII\Models\TransactionGroup;
|
|||||||
use FireflyIII\Models\TransactionJournal;
|
use FireflyIII\Models\TransactionJournal;
|
||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class CreditRecalculateService
|
* Class CreditRecalculateService
|
||||||
@@ -159,8 +160,8 @@ class CreditRecalculateService
|
|||||||
$this->validateOpeningBalance($account, $openingBalance);
|
$this->validateOpeningBalance($account, $openingBalance);
|
||||||
}
|
}
|
||||||
$startOfDebt = $this->repository->getOpeningBalanceAmount($account, false) ?? '0';
|
$startOfDebt = $this->repository->getOpeningBalanceAmount($account, false) ?? '0';
|
||||||
$leftOfDebt = app('steam')->positive($startOfDebt);
|
$leftOfDebt = Steam::positive($startOfDebt);
|
||||||
// Log::debug(sprintf('Start of debt is "%s", so initial left of debt is "%s"', app('steam')->bcround($startOfDebt, 2), app('steam')->bcround($leftOfDebt, 2)));
|
// Log::debug(sprintf('Start of debt is "%s", so initial left of debt is "%s"', \FireflyIII\Support\Facades\Steam::bcround($startOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2)));
|
||||||
|
|
||||||
/** @var AccountMetaFactory $factory */
|
/** @var AccountMetaFactory $factory */
|
||||||
$factory = app(AccountMetaFactory::class);
|
$factory = app(AccountMetaFactory::class);
|
||||||
@@ -200,17 +201,17 @@ class CreditRecalculateService
|
|||||||
$dest = $openingBalance->transactions()->where('amount', '>', 0)->first();
|
$dest = $openingBalance->transactions()->where('amount', '>', 0)->first();
|
||||||
if ($source->account_id !== $account->id) {
|
if ($source->account_id !== $account->id) {
|
||||||
Log::info(sprintf('Liability #%d has a reversed opening balance. Will fix this now.', $account->id));
|
Log::info(sprintf('Liability #%d has a reversed opening balance. Will fix this now.', $account->id));
|
||||||
Log::debug(sprintf('Source amount "%s" is now "%s"', $source->amount, app('steam')->positive($source->amount)));
|
Log::debug(sprintf('Source amount "%s" is now "%s"', $source->amount, Steam::positive($source->amount)));
|
||||||
Log::debug(sprintf('Destination amount "%s" is now "%s"', $dest->amount, app('steam')->negative($dest->amount)));
|
Log::debug(sprintf('Destination amount "%s" is now "%s"', $dest->amount, Steam::negative($dest->amount)));
|
||||||
$source->amount = app('steam')->positive($source->amount);
|
$source->amount = Steam::positive($source->amount);
|
||||||
$dest->amount = app('steam')->negative($source->amount);
|
$dest->amount = Steam::negative($source->amount);
|
||||||
if (null !== $source->foreign_amount && '' !== $source->foreign_amount) {
|
if (null !== $source->foreign_amount && '' !== $source->foreign_amount) {
|
||||||
$source->foreign_amount = app('steam')->positive($source->foreign_amount);
|
$source->foreign_amount = Steam::positive($source->foreign_amount);
|
||||||
Log::debug(sprintf('Source foreign amount "%s" is now "%s"', $source->foreign_amount, app('steam')->positive($source->foreign_amount)));
|
Log::debug(sprintf('Source foreign amount "%s" is now "%s"', $source->foreign_amount, Steam::positive($source->foreign_amount)));
|
||||||
}
|
}
|
||||||
if (null !== $dest->foreign_amount && '' !== $dest->foreign_amount) {
|
if (null !== $dest->foreign_amount && '' !== $dest->foreign_amount) {
|
||||||
$dest->foreign_amount = app('steam')->negative($dest->foreign_amount);
|
$dest->foreign_amount = Steam::negative($dest->foreign_amount);
|
||||||
Log::debug(sprintf('Destination amount "%s" is now "%s"', $dest->foreign_amount, app('steam')->negative($dest->foreign_amount)));
|
Log::debug(sprintf('Destination amount "%s" is now "%s"', $dest->foreign_amount, Steam::negative($dest->foreign_amount)));
|
||||||
}
|
}
|
||||||
$source->save();
|
$source->save();
|
||||||
$dest->save();
|
$dest->save();
|
||||||
@@ -241,7 +242,7 @@ class CreditRecalculateService
|
|||||||
$foreignCurrency = $transaction->foreignCurrency;
|
$foreignCurrency = $transaction->foreignCurrency;
|
||||||
$accountCurrency = $this->repository->getAccountCurrency($account);
|
$accountCurrency = $this->repository->getAccountCurrency($account);
|
||||||
$type = $journal->transactionType->type;
|
$type = $journal->transactionType->type;
|
||||||
// Log::debug(sprintf('Left of debt is: %s', app('steam')->bcround($leftOfDebt, 2)));
|
// Log::debug(sprintf('Left of debt is: %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2)));
|
||||||
|
|
||||||
if ('' === $direction) {
|
if ('' === $direction) {
|
||||||
// Log::warning('Direction is empty, so do nothing.');
|
// Log::warning('Direction is empty, so do nothing.');
|
||||||
@@ -262,81 +263,81 @@ class CreditRecalculateService
|
|||||||
$isCredit = 'credit' === $direction;
|
$isCredit = 'credit' === $direction;
|
||||||
|
|
||||||
if ($isSameAccount && $isCredit && $this->isWithdrawalIn($usedAmount, $type)) { // case 1
|
if ($isSameAccount && $isCredit && $this->isWithdrawalIn($usedAmount, $type)) { // case 1
|
||||||
$usedAmount = app('steam')->positive($usedAmount);
|
$usedAmount = Steam::positive($usedAmount);
|
||||||
|
|
||||||
return bcadd($leftOfDebt, (string) $usedAmount);
|
return bcadd($leftOfDebt, (string) $usedAmount);
|
||||||
// Log::debug(sprintf('Case 1 (withdrawal into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case 1 (withdrawal into credit liability): %s + %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($isSameAccount && $isCredit && $this->isWithdrawalOut($usedAmount, $type)) { // case 2
|
if ($isSameAccount && $isCredit && $this->isWithdrawalOut($usedAmount, $type)) { // case 2
|
||||||
$usedAmount = app('steam')->positive($usedAmount);
|
$usedAmount = Steam::positive($usedAmount);
|
||||||
|
|
||||||
return bcsub($leftOfDebt, (string) $usedAmount);
|
return bcsub($leftOfDebt, (string) $usedAmount);
|
||||||
// Log::debug(sprintf('Case 2 (withdrawal away from liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case 2 (withdrawal away from liability): %s - %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($isSameAccount && $isCredit && $this->isDepositOut($usedAmount, $type)) { // case 3
|
if ($isSameAccount && $isCredit && $this->isDepositOut($usedAmount, $type)) { // case 3
|
||||||
$usedAmount = app('steam')->positive($usedAmount);
|
$usedAmount = Steam::positive($usedAmount);
|
||||||
|
|
||||||
return bcsub($leftOfDebt, (string) $usedAmount);
|
return bcsub($leftOfDebt, (string) $usedAmount);
|
||||||
// Log::debug(sprintf('Case 3 (deposit away from liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case 3 (deposit away from liability): %s - %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($isSameAccount && $isCredit && $this->isDepositIn($usedAmount, $type)) { // case 4
|
if ($isSameAccount && $isCredit && $this->isDepositIn($usedAmount, $type)) { // case 4
|
||||||
$usedAmount = app('steam')->positive($usedAmount);
|
$usedAmount = Steam::positive($usedAmount);
|
||||||
|
|
||||||
return bcadd($leftOfDebt, (string) $usedAmount);
|
return bcadd($leftOfDebt, (string) $usedAmount);
|
||||||
// Log::debug(sprintf('Case 4 (deposit into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case 4 (deposit into credit liability): %s + %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
if ($isSameAccount && $isCredit && $this->isTransferIn($usedAmount, $type)) { // case 5
|
if ($isSameAccount && $isCredit && $this->isTransferIn($usedAmount, $type)) { // case 5
|
||||||
$usedAmount = app('steam')->positive($usedAmount);
|
$usedAmount = Steam::positive($usedAmount);
|
||||||
|
|
||||||
return bcadd($leftOfDebt, (string) $usedAmount);
|
return bcadd($leftOfDebt, (string) $usedAmount);
|
||||||
// Log::debug(sprintf('Case 5 (transfer into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case 5 (transfer into credit liability): %s + %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
if ($isSameAccount && $isDebit && $this->isWithdrawalIn($usedAmount, $type)) { // case 6
|
if ($isSameAccount && $isDebit && $this->isWithdrawalIn($usedAmount, $type)) { // case 6
|
||||||
$usedAmount = app('steam')->positive($usedAmount);
|
$usedAmount = Steam::positive($usedAmount);
|
||||||
|
|
||||||
return bcsub($leftOfDebt, (string) $usedAmount);
|
return bcsub($leftOfDebt, (string) $usedAmount);
|
||||||
// Log::debug(sprintf('Case 6 (withdrawal into debit liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case 6 (withdrawal into debit liability): %s - %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
if ($isSameAccount && $isDebit && $this->isDepositOut($usedAmount, $type)) { // case 7
|
if ($isSameAccount && $isDebit && $this->isDepositOut($usedAmount, $type)) { // case 7
|
||||||
$usedAmount = app('steam')->positive($usedAmount);
|
$usedAmount = Steam::positive($usedAmount);
|
||||||
|
|
||||||
return bcadd($leftOfDebt, (string) $usedAmount);
|
return bcadd($leftOfDebt, (string) $usedAmount);
|
||||||
// Log::debug(sprintf('Case 7 (deposit away from liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case 7 (deposit away from liability): %s + %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
if ($isSameAccount && $isDebit && $this->isWithdrawalOut($usedAmount, $type)) { // case 8
|
if ($isSameAccount && $isDebit && $this->isWithdrawalOut($usedAmount, $type)) { // case 8
|
||||||
$usedAmount = app('steam')->positive($usedAmount);
|
$usedAmount = Steam::positive($usedAmount);
|
||||||
|
|
||||||
return bcadd($leftOfDebt, (string) $usedAmount);
|
return bcadd($leftOfDebt, (string) $usedAmount);
|
||||||
// Log::debug(sprintf('Case 8 (withdrawal away from liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case 8 (withdrawal away from liability): %s + %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($isSameAccount && $isDebit && $this->isTransferIn($usedAmount, $type)) { // case 9
|
if ($isSameAccount && $isDebit && $this->isTransferIn($usedAmount, $type)) { // case 9
|
||||||
$usedAmount = app('steam')->positive($usedAmount);
|
$usedAmount = Steam::positive($usedAmount);
|
||||||
|
|
||||||
return bcsub($leftOfDebt, (string) $usedAmount);
|
return bcsub($leftOfDebt, (string) $usedAmount);
|
||||||
// 2024-10-05, #9225 this used to say you would owe more, but a transfer INTO a debit from wherever means you owe LESS.
|
// 2024-10-05, #9225 this used to say you would owe more, but a transfer INTO a debit from wherever means you owe LESS.
|
||||||
// Log::debug(sprintf('Case 9 (transfer into debit liability, means you owe LESS): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case 9 (transfer into debit liability, means you owe LESS): %s - %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
if ($isSameAccount && $isDebit && $this->isTransferOut($usedAmount, $type)) { // case 10
|
if ($isSameAccount && $isDebit && $this->isTransferOut($usedAmount, $type)) { // case 10
|
||||||
$usedAmount = app('steam')->positive($usedAmount);
|
$usedAmount = Steam::positive($usedAmount);
|
||||||
|
|
||||||
return bcadd($leftOfDebt, (string) $usedAmount);
|
return bcadd($leftOfDebt, (string) $usedAmount);
|
||||||
// 2024-10-05, #9225 this used to say you would owe less, but a transfer OUT OF a debit from wherever means you owe MORE.
|
// 2024-10-05, #9225 this used to say you would owe less, but a transfer OUT OF a debit from wherever means you owe MORE.
|
||||||
// Log::debug(sprintf('Case 10 (transfer out of debit liability, means you owe MORE): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case 10 (transfer out of debit liability, means you owe MORE): %s + %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
|
|
||||||
// in any other case, remove amount from left of debt.
|
// in any other case, remove amount from left of debt.
|
||||||
if (in_array($type, [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value], true)) {
|
if (in_array($type, [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value], true)) {
|
||||||
$usedAmount = app('steam')->negative($usedAmount);
|
$usedAmount = Steam::negative($usedAmount);
|
||||||
|
|
||||||
return bcadd($leftOfDebt, (string) $usedAmount);
|
return bcadd($leftOfDebt, (string) $usedAmount);
|
||||||
// Log::debug(sprintf('Case X (all other cases): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
|
// Log::debug(sprintf('Case X (all other cases): %s + %s = %s', \FireflyIII\Support\Facades\Steam::bcround($leftOfDebt, 2), \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2), \FireflyIII\Support\Facades\Steam::bcround($result, 2)));
|
||||||
}
|
}
|
||||||
|
|
||||||
Log::warning(sprintf('[-1] Catch-all, should not happen. Left of debt = %s', app('steam')->bcround($leftOfDebt, 2)));
|
Log::warning(sprintf('[-1] Catch-all, should not happen. Left of debt = %s', Steam::bcround($leftOfDebt, 2)));
|
||||||
|
|
||||||
return $leftOfDebt;
|
return $leftOfDebt;
|
||||||
}
|
}
|
||||||
@@ -344,10 +345,10 @@ class CreditRecalculateService
|
|||||||
private function getAmountToUse(Transaction $transaction, TransactionCurrency $accountCurrency, ?TransactionCurrency $foreignCurrency): string
|
private function getAmountToUse(Transaction $transaction, TransactionCurrency $accountCurrency, ?TransactionCurrency $foreignCurrency): string
|
||||||
{
|
{
|
||||||
$usedAmount = $transaction->amount;
|
$usedAmount = $transaction->amount;
|
||||||
// Log::debug(sprintf('Amount of transaction is %s', app('steam')->bcround($usedAmount, 2)));
|
// Log::debug(sprintf('Amount of transaction is %s', \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2)));
|
||||||
if ($foreignCurrency instanceof TransactionCurrency && $foreignCurrency->id === $accountCurrency->id) {
|
if ($foreignCurrency instanceof TransactionCurrency && $foreignCurrency->id === $accountCurrency->id) {
|
||||||
$usedAmount = $transaction->foreign_amount;
|
$usedAmount = $transaction->foreign_amount;
|
||||||
// Log::debug(sprintf('Overruled by foreign amount. Amount of transaction is now %s', app('steam')->bcround($usedAmount, 2)));
|
// Log::debug(sprintf('Overruled by foreign amount. Amount of transaction is now %s', \FireflyIII\Support\Facades\Steam::bcround($usedAmount, 2)));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $usedAmount;
|
return $usedAmount;
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ use FireflyIII\Models\Location;
|
|||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||||
use FireflyIII\Services\Internal\Support\AccountServiceTrait;
|
use FireflyIII\Services\Internal\Support\AccountServiceTrait;
|
||||||
use FireflyIII\User;
|
use FireflyIII\User;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class AccountUpdateService
|
* Class AccountUpdateService
|
||||||
@@ -123,7 +124,7 @@ class AccountUpdateService
|
|||||||
$account->active = $data['active'];
|
$account->active = $data['active'];
|
||||||
}
|
}
|
||||||
if (array_key_exists('iban', $data)) {
|
if (array_key_exists('iban', $data)) {
|
||||||
$account->iban = app('steam')->filterSpaces((string) $data['iban']);
|
$account->iban = Steam::filterSpaces((string) $data['iban']);
|
||||||
}
|
}
|
||||||
|
|
||||||
// set liability, but account must already be a liability.
|
// set liability, but account must already be a liability.
|
||||||
@@ -269,7 +270,7 @@ class AccountUpdateService
|
|||||||
|
|
||||||
// if liability, make sure the amount is positive for a credit, and negative for a debit.
|
// if liability, make sure the amount is positive for a credit, and negative for a debit.
|
||||||
if ($this->isLiability($account)) {
|
if ($this->isLiability($account)) {
|
||||||
$openingBalance = 'credit' === $data['liability_direction'] ? app('steam')->positive($openingBalance) : app('steam')->negative(
|
$openingBalance = 'credit' === $data['liability_direction'] ? Steam::positive($openingBalance) : Steam::negative(
|
||||||
$openingBalance
|
$openingBalance
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface
|
|||||||
use FireflyIII\Services\Internal\Support\JournalServiceTrait;
|
use FireflyIII\Services\Internal\Support\JournalServiceTrait;
|
||||||
use FireflyIII\Support\Facades\FireflyConfig;
|
use FireflyIII\Support\Facades\FireflyConfig;
|
||||||
use FireflyIII\Support\Facades\Preferences;
|
use FireflyIII\Support\Facades\Preferences;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
use FireflyIII\Support\NullArrayObject;
|
use FireflyIII\Support\NullArrayObject;
|
||||||
use FireflyIII\Validation\AccountValidator;
|
use FireflyIII\Validation\AccountValidator;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
@@ -661,12 +662,12 @@ class JournalUpdateService
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$origSourceTransaction = $this->getSourceTransaction();
|
$origSourceTransaction = $this->getSourceTransaction();
|
||||||
$origSourceTransaction->amount = app('steam')->negative($amount);
|
$origSourceTransaction->amount = Steam::negative($amount);
|
||||||
$origSourceTransaction->balance_dirty = true;
|
$origSourceTransaction->balance_dirty = true;
|
||||||
$origSourceTransaction->save();
|
$origSourceTransaction->save();
|
||||||
$destTransaction = $this->getDestinationTransaction();
|
$destTransaction = $this->getDestinationTransaction();
|
||||||
$originalAmount = $destTransaction->amount;
|
$originalAmount = $destTransaction->amount;
|
||||||
$destTransaction->amount = app('steam')->positive($amount);
|
$destTransaction->amount = Steam::positive($amount);
|
||||||
$destTransaction->balance_dirty = true;
|
$destTransaction->balance_dirty = true;
|
||||||
$destTransaction->save();
|
$destTransaction->save();
|
||||||
// refresh transactions.
|
// refresh transactions.
|
||||||
@@ -682,9 +683,10 @@ class JournalUpdateService
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// should not return in NULL but seems to do.
|
||||||
event(new TriggeredAuditLog(
|
event(new TriggeredAuditLog(
|
||||||
$this->transactionGroup->user,
|
$group->user,
|
||||||
$this->transactionGroup,
|
$group,
|
||||||
'update_amount',
|
'update_amount',
|
||||||
[
|
[
|
||||||
'currency_symbol' => $destTransaction->transactionCurrency->symbol,
|
'currency_symbol' => $destTransaction->transactionCurrency->symbol,
|
||||||
@@ -729,7 +731,7 @@ class JournalUpdateService
|
|||||||
// add foreign currency info to source and destination if possible.
|
// add foreign currency info to source and destination if possible.
|
||||||
if (null !== $foreignCurrency && null !== $foreignAmount) {
|
if (null !== $foreignCurrency && null !== $foreignAmount) {
|
||||||
$source->foreign_currency_id = $foreignCurrency->id;
|
$source->foreign_currency_id = $foreignCurrency->id;
|
||||||
$source->foreign_amount = app('steam')->negative($foreignAmount);
|
$source->foreign_amount = Steam::negative($foreignAmount);
|
||||||
$source->save();
|
$source->save();
|
||||||
|
|
||||||
// if the transaction is a TRANSFER, and the foreign amount and currency are set (like they seem to be)
|
// if the transaction is a TRANSFER, and the foreign amount and currency are set (like they seem to be)
|
||||||
@@ -742,13 +744,13 @@ class JournalUpdateService
|
|||||||
if ($isTransfer || $isBetween) {
|
if ($isTransfer || $isBetween) {
|
||||||
Log::debug('Switch amounts, store in amount and not foreign_amount');
|
Log::debug('Switch amounts, store in amount and not foreign_amount');
|
||||||
$dest->transaction_currency_id = $foreignCurrency->id;
|
$dest->transaction_currency_id = $foreignCurrency->id;
|
||||||
$dest->amount = app('steam')->positive($foreignAmount);
|
$dest->amount = Steam::positive($foreignAmount);
|
||||||
$dest->foreign_amount = app('steam')->positive($source->amount);
|
$dest->foreign_amount = Steam::positive($source->amount);
|
||||||
$dest->foreign_currency_id = $source->transaction_currency_id;
|
$dest->foreign_currency_id = $source->transaction_currency_id;
|
||||||
}
|
}
|
||||||
if (!$isTransfer && !$isBetween) {
|
if (!$isTransfer && !$isBetween) {
|
||||||
$dest->foreign_currency_id = $foreignCurrency->id;
|
$dest->foreign_currency_id = $foreignCurrency->id;
|
||||||
$dest->foreign_amount = app('steam')->positive($foreignAmount);
|
$dest->foreign_amount = Steam::positive($foreignAmount);
|
||||||
}
|
}
|
||||||
|
|
||||||
$dest->save();
|
$dest->save();
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
|
|||||||
use FireflyIII\User;
|
use FireflyIII\User;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class FrontpageChartGenerator
|
* Class FrontpageChartGenerator
|
||||||
@@ -102,7 +103,7 @@ class FrontpageChartGenerator
|
|||||||
$this->blRepository->setUser($user);
|
$this->blRepository->setUser($user);
|
||||||
$this->opsRepository->setUser($user);
|
$this->opsRepository->setUser($user);
|
||||||
|
|
||||||
$locale = app('steam')->getLocale();
|
$locale = Steam::getLocale();
|
||||||
$this->monthAndDayFormat = (string)trans('config.month_and_day_js', [], $locale);
|
$this->monthAndDayFormat = (string)trans('config.month_and_day_js', [], $locale);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ use FireflyIII\Models\Category;
|
|||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||||
use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
|
use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class WholePeriodChartGenerator
|
* Class WholePeriodChartGenerator
|
||||||
@@ -102,8 +103,8 @@ class WholePeriodChartGenerator
|
|||||||
$earnedInfoKey = sprintf('earned-in-%s', $code);
|
$earnedInfoKey = sprintf('earned-in-%s', $code);
|
||||||
$spentAmount = $spent[$key][$currencyId]['sum'] ?? '0';
|
$spentAmount = $spent[$key][$currencyId]['sum'] ?? '0';
|
||||||
$earnedAmount = $earned[$key][$currencyId]['sum'] ?? '0';
|
$earnedAmount = $earned[$key][$currencyId]['sum'] ?? '0';
|
||||||
$chartData[$spentInfoKey]['entries'][$label] = app('steam')->bcround($spentAmount, $currency['currency_decimal_places']);
|
$chartData[$spentInfoKey]['entries'][$label] = Steam::bcround($spentAmount, $currency['currency_decimal_places']);
|
||||||
$chartData[$earnedInfoKey]['entries'][$label] = app('steam')->bcround($earnedAmount, $currency['currency_decimal_places']);
|
$chartData[$earnedInfoKey]['entries'][$label] = Steam::bcround($earnedAmount, $currency['currency_decimal_places']);
|
||||||
}
|
}
|
||||||
$current = Navigation::addPeriod($current, $step);
|
$current = Navigation::addPeriod($current, $step);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ use FireflyIII\Models\TransactionCurrency;
|
|||||||
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
|
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Throwable;
|
use Throwable;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class CurrencyForm
|
* Class CurrencyForm
|
||||||
@@ -150,7 +151,7 @@ class CurrencyForm
|
|||||||
|
|
||||||
// make sure value is formatted nicely:
|
// make sure value is formatted nicely:
|
||||||
if (null !== $value && '' !== $value) {
|
if (null !== $value && '' !== $value) {
|
||||||
$value = app('steam')->bcround($value, $primaryCurrency->decimal_places);
|
$value = Steam::bcround($value, $primaryCurrency->decimal_places);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -202,7 +203,7 @@ class CurrencyForm
|
|||||||
|
|
||||||
// make sure value is formatted nicely:
|
// make sure value is formatted nicely:
|
||||||
if (null !== $value && '' !== $value) {
|
if (null !== $value && '' !== $value) {
|
||||||
$value = app('steam')->bcround($value, $primaryCurrency->decimal_places);
|
$value = Steam::bcround($value, $primaryCurrency->decimal_places);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ trait ChartGeneration
|
|||||||
return $cache->get();
|
return $cache->get();
|
||||||
}
|
}
|
||||||
Log::debug('Regenerate chart.account.account-balance-chart from scratch.');
|
Log::debug('Regenerate chart.account.account-balance-chart from scratch.');
|
||||||
$locale = app('steam')->getLocale();
|
$locale = Steam::getLocale();
|
||||||
|
|
||||||
/** @var GeneratorInterface $generator */
|
/** @var GeneratorInterface $generator */
|
||||||
$generator = app(GeneratorInterface::class);
|
$generator = app(GeneratorInterface::class);
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ use FireflyIII\Models\TransactionGroup;
|
|||||||
use FireflyIII\Models\TransactionJournal;
|
use FireflyIII\Models\TransactionJournal;
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
use Illuminate\Routing\Redirector;
|
use Illuminate\Routing\Redirector;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Trait UserNavigation
|
* Trait UserNavigation
|
||||||
@@ -53,7 +54,7 @@ trait UserNavigation
|
|||||||
$url = (string)session($identifier);
|
$url = (string)session($identifier);
|
||||||
Log::debug(sprintf('The URL is %s', $url));
|
Log::debug(sprintf('The URL is %s', $url));
|
||||||
|
|
||||||
return app('steam')->getSafeUrl($url, route('index'));
|
return Steam::getSafeUrl($url, route('index'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -137,7 +138,7 @@ trait UserNavigation
|
|||||||
|
|
||||||
final protected function rememberPreviousUrl(string $identifier): ?string
|
final protected function rememberPreviousUrl(string $identifier): ?string
|
||||||
{
|
{
|
||||||
$return = app('steam')->getSafePreviousUrl();
|
$return = Steam::getSafePreviousUrl();
|
||||||
session()->put($identifier, $return);
|
session()->put($identifier, $return);
|
||||||
|
|
||||||
Log::debug(sprintf('rememberPreviousUrl: %s: "%s"', $identifier, $return));
|
Log::debug(sprintf('rememberPreviousUrl: %s: "%s"', $identifier, $return));
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ use FireflyIII\Support\Calendar\Calculator;
|
|||||||
use FireflyIII\Support\Calendar\Periodicity;
|
use FireflyIII\Support\Calendar\Periodicity;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Throwable;
|
use Throwable;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Navigation.
|
* Class Navigation.
|
||||||
@@ -404,7 +405,7 @@ class Navigation
|
|||||||
*/
|
*/
|
||||||
public function listOfPeriods(Carbon $start, Carbon $end): array
|
public function listOfPeriods(Carbon $start, Carbon $end): array
|
||||||
{
|
{
|
||||||
$locale = app('steam')->getLocale();
|
$locale = Steam::getLocale();
|
||||||
// define period to increment
|
// define period to increment
|
||||||
$increment = 'addDay';
|
$increment = 'addDay';
|
||||||
$format = $this->preferredCarbonFormat($start, $end);
|
$format = $this->preferredCarbonFormat($start, $end);
|
||||||
@@ -536,7 +537,7 @@ class Navigation
|
|||||||
*/
|
*/
|
||||||
public function preferredCarbonLocalizedFormat(Carbon $start, Carbon $end): string
|
public function preferredCarbonLocalizedFormat(Carbon $start, Carbon $end): string
|
||||||
{
|
{
|
||||||
$locale = app('steam')->getLocale();
|
$locale = Steam::getLocale();
|
||||||
$diff = $start->diffInMonths($end, true);
|
$diff = $start->diffInMonths($end, true);
|
||||||
if ($diff >= 1.001 && $diff < 12.001) {
|
if ($diff >= 1.001 && $diff < 12.001) {
|
||||||
return (string)trans('config.month_js', [], $locale);
|
return (string)trans('config.month_js', [], $locale);
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ use Psr\Container\NotFoundExceptionInterface;
|
|||||||
use Spatie\Period\Boundaries;
|
use Spatie\Period\Boundaries;
|
||||||
use Spatie\Period\Period;
|
use Spatie\Period\Period;
|
||||||
use Spatie\Period\Precision;
|
use Spatie\Period\Precision;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
trait RecalculatesAvailableBudgetsTrait
|
trait RecalculatesAvailableBudgetsTrait
|
||||||
{
|
{
|
||||||
@@ -103,7 +104,7 @@ trait RecalculatesAvailableBudgetsTrait
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Log::debug(sprintf('Concluded new amount for this AB must be %s', $newAmount));
|
Log::debug(sprintf('Concluded new amount for this AB must be %s', $newAmount));
|
||||||
$availableBudget->amount = app('steam')->bcround($newAmount, $availableBudget->transactionCurrency->decimal_places);
|
$availableBudget->amount = Steam::bcround($newAmount, $availableBudget->transactionCurrency->decimal_places);
|
||||||
$availableBudget->save();
|
$availableBudget->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ class TransactionSummarizer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->{$method}($amount));
|
// $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], \FireflyIII\Support\Facades\Steam::{$method}($amount));
|
||||||
// Log::debug(sprintf('Journal #%d adds amount %s %s', $journal['transaction_journal_id'], $currencyCode, $amount));
|
// Log::debug(sprintf('Journal #%d adds amount %s %s', $journal['transaction_journal_id'], $currencyCode, $amount));
|
||||||
}
|
}
|
||||||
Log::debug('End of sumExpenses.', $array);
|
Log::debug('End of sumExpenses.', $array);
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ use Illuminate\Support\Collection;
|
|||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use LogicException;
|
use LogicException;
|
||||||
use TypeError;
|
use TypeError;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class OperatorQuerySearch
|
* Class OperatorQuerySearch
|
||||||
@@ -2287,7 +2288,7 @@ class OperatorQuerySearch implements SearchInterface
|
|||||||
// strip comma's, make dots.
|
// strip comma's, make dots.
|
||||||
Log::debug(sprintf('Original value "%s"', $value));
|
Log::debug(sprintf('Original value "%s"', $value));
|
||||||
$value = str_replace(',', '.', $value);
|
$value = str_replace(',', '.', $value);
|
||||||
$amount = app('steam')->positive($value);
|
$amount = Steam::positive($value);
|
||||||
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
||||||
$this->collector->amountIs($amount);
|
$this->collector->amountIs($amount);
|
||||||
|
|
||||||
@@ -2297,7 +2298,7 @@ class OperatorQuerySearch implements SearchInterface
|
|||||||
// strip comma's, make dots.
|
// strip comma's, make dots.
|
||||||
Log::debug(sprintf('Original value "%s"', $value));
|
Log::debug(sprintf('Original value "%s"', $value));
|
||||||
$value = str_replace(',', '.', $value);
|
$value = str_replace(',', '.', $value);
|
||||||
$amount = app('steam')->positive($value);
|
$amount = Steam::positive($value);
|
||||||
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
||||||
$this->collector->amountIsNot($amount);
|
$this->collector->amountIsNot($amount);
|
||||||
|
|
||||||
@@ -2307,7 +2308,7 @@ class OperatorQuerySearch implements SearchInterface
|
|||||||
// strip comma's, make dots.
|
// strip comma's, make dots.
|
||||||
$value = str_replace(',', '.', $value);
|
$value = str_replace(',', '.', $value);
|
||||||
|
|
||||||
$amount = app('steam')->positive($value);
|
$amount = Steam::positive($value);
|
||||||
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
||||||
$this->collector->foreignAmountIs($amount);
|
$this->collector->foreignAmountIs($amount);
|
||||||
|
|
||||||
@@ -2317,7 +2318,7 @@ class OperatorQuerySearch implements SearchInterface
|
|||||||
// strip comma's, make dots.
|
// strip comma's, make dots.
|
||||||
$value = str_replace(',', '.', $value);
|
$value = str_replace(',', '.', $value);
|
||||||
|
|
||||||
$amount = app('steam')->positive($value);
|
$amount = Steam::positive($value);
|
||||||
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
||||||
$this->collector->foreignAmountIsNot($amount);
|
$this->collector->foreignAmountIsNot($amount);
|
||||||
|
|
||||||
@@ -2328,7 +2329,7 @@ class OperatorQuerySearch implements SearchInterface
|
|||||||
// strip comma's, make dots.
|
// strip comma's, make dots.
|
||||||
$value = str_replace(',', '.', $value);
|
$value = str_replace(',', '.', $value);
|
||||||
|
|
||||||
$amount = app('steam')->positive($value);
|
$amount = Steam::positive($value);
|
||||||
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
||||||
$this->collector->amountLess($amount);
|
$this->collector->amountLess($amount);
|
||||||
|
|
||||||
@@ -2339,7 +2340,7 @@ class OperatorQuerySearch implements SearchInterface
|
|||||||
// strip comma's, make dots.
|
// strip comma's, make dots.
|
||||||
$value = str_replace(',', '.', $value);
|
$value = str_replace(',', '.', $value);
|
||||||
|
|
||||||
$amount = app('steam')->positive($value);
|
$amount = Steam::positive($value);
|
||||||
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
||||||
$this->collector->foreignAmountLess($amount);
|
$this->collector->foreignAmountLess($amount);
|
||||||
|
|
||||||
@@ -2350,7 +2351,7 @@ class OperatorQuerySearch implements SearchInterface
|
|||||||
Log::debug(sprintf('Now handling operator "%s"', $operator));
|
Log::debug(sprintf('Now handling operator "%s"', $operator));
|
||||||
// strip comma's, make dots.
|
// strip comma's, make dots.
|
||||||
$value = str_replace(',', '.', $value);
|
$value = str_replace(',', '.', $value);
|
||||||
$amount = app('steam')->positive($value);
|
$amount = Steam::positive($value);
|
||||||
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
||||||
$this->collector->amountMore($amount);
|
$this->collector->amountMore($amount);
|
||||||
|
|
||||||
@@ -2361,7 +2362,7 @@ class OperatorQuerySearch implements SearchInterface
|
|||||||
Log::debug(sprintf('Now handling operator "%s"', $operator));
|
Log::debug(sprintf('Now handling operator "%s"', $operator));
|
||||||
// strip comma's, make dots.
|
// strip comma's, make dots.
|
||||||
$value = str_replace(',', '.', $value);
|
$value = str_replace(',', '.', $value);
|
||||||
$amount = app('steam')->positive($value);
|
$amount = Steam::positive($value);
|
||||||
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
|
||||||
$this->collector->foreignAmountMore($amount);
|
$this->collector->foreignAmountMore($amount);
|
||||||
|
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ class General extends AbstractExtension
|
|||||||
}
|
}
|
||||||
|
|
||||||
return implode(', ', $strings);
|
return implode(', ', $strings);
|
||||||
// return app('steam')->balance($account, $date);
|
// return \FireflyIII\Support\Facades\Steam::balance($account, $date);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ use FireflyIII\Models\RuleAction;
|
|||||||
use FireflyIII\Models\Transaction;
|
use FireflyIII\Models\Transaction;
|
||||||
use FireflyIII\Models\TransactionJournal;
|
use FireflyIII\Models\TransactionJournal;
|
||||||
use FireflyIII\TransactionRules\Traits\RefreshNotesTrait;
|
use FireflyIII\TransactionRules\Traits\RefreshNotesTrait;
|
||||||
|
use FireflyIII\Support\Facades\Steam;
|
||||||
|
|
||||||
class SetAmount implements ActionInterface
|
class SetAmount implements ActionInterface
|
||||||
{
|
{
|
||||||
@@ -66,8 +67,8 @@ class SetAmount implements ActionInterface
|
|||||||
/** @var TransactionJournal $object */
|
/** @var TransactionJournal $object */
|
||||||
$object = TransactionJournal::where('user_id', $journal['user_id'])->find($journal['transaction_journal_id']);
|
$object = TransactionJournal::where('user_id', $journal['user_id'])->find($journal['transaction_journal_id']);
|
||||||
|
|
||||||
$positive = app('steam')->positive($value);
|
$positive = Steam::positive($value);
|
||||||
$negative = app('steam')->negative($value);
|
$negative = Steam::negative($value);
|
||||||
|
|
||||||
$this->updatePositive($object, $positive);
|
$this->updatePositive($object, $positive);
|
||||||
$this->updateNegative($object, $negative);
|
$this->updateNegative($object, $negative);
|
||||||
|
|||||||
12
changelog.md
12
changelog.md
@@ -3,6 +3,18 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
This project adheres to [Semantic Versioning](http://semver.org/).
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
|
|
||||||
|
## v6.4.14 - 2025-12-17
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- [Issue 11368](https://github.com/firefly-iii/firefly-iii/issues/11368) (Attempt to read property "user" on null) reported by @simonwiles
|
||||||
|
|
||||||
|
## v6.4.13 - 2025-12-17
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- [Issue 11368](https://github.com/firefly-iii/firefly-iii/issues/11368) (Attempt to read property "user" on null) reported by @simonwiles
|
||||||
|
|
||||||
## v6.4.12 - 2025-12-17
|
## v6.4.12 - 2025-12-17
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
@@ -103,7 +103,6 @@
|
|||||||
"psr/log": "<4",
|
"psr/log": "<4",
|
||||||
"ramsey/uuid": "^4.7",
|
"ramsey/uuid": "^4.7",
|
||||||
"rcrowe/twigbridge": "^0.14",
|
"rcrowe/twigbridge": "^0.14",
|
||||||
"sentry/sentry-laravel": "^4.18",
|
|
||||||
"spatie/laravel-html": "^3.2",
|
"spatie/laravel-html": "^3.2",
|
||||||
"spatie/laravel-ignition": "^2",
|
"spatie/laravel-ignition": "^2",
|
||||||
"spatie/period": "^2.4",
|
"spatie/period": "^2.4",
|
||||||
|
|||||||
276
composer.lock
generated
276
composer.lock
generated
@@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "8317b89f4d014debebcd301fde669321",
|
"content-hash": "8fff223d32252d22c0e6028d19a76756",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "bacon/bacon-qr-code",
|
"name": "bacon/bacon-qr-code",
|
||||||
@@ -1809,66 +1809,6 @@
|
|||||||
},
|
},
|
||||||
"time": "2022-03-31T05:55:34+00:00"
|
"time": "2022-03-31T05:55:34+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "jean85/pretty-package-versions",
|
|
||||||
"version": "2.1.1",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/Jean85/pretty-package-versions.git",
|
|
||||||
"reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/4d7aa5dab42e2a76d99559706022885de0e18e1a",
|
|
||||||
"reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"composer-runtime-api": "^2.1.0",
|
|
||||||
"php": "^7.4|^8.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"friendsofphp/php-cs-fixer": "^3.2",
|
|
||||||
"jean85/composer-provided-replaced-stub-package": "^1.0",
|
|
||||||
"phpstan/phpstan": "^2.0",
|
|
||||||
"phpunit/phpunit": "^7.5|^8.5|^9.6",
|
|
||||||
"rector/rector": "^2.0",
|
|
||||||
"vimeo/psalm": "^4.3 || ^5.0"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "1.x-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Jean85\\": "src/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Alessandro Lai",
|
|
||||||
"email": "alessandro.lai85@gmail.com"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "A library to get pretty versions strings of installed dependencies",
|
|
||||||
"keywords": [
|
|
||||||
"composer",
|
|
||||||
"package",
|
|
||||||
"release",
|
|
||||||
"versions"
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"issues": "https://github.com/Jean85/pretty-package-versions/issues",
|
|
||||||
"source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.1"
|
|
||||||
},
|
|
||||||
"time": "2025-03-19T14:43:43+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "laravel-notification-channels/pushover",
|
"name": "laravel-notification-channels/pushover",
|
||||||
"version": "4.1.2",
|
"version": "4.1.2",
|
||||||
@@ -1938,16 +1878,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/framework",
|
"name": "laravel/framework",
|
||||||
"version": "v12.42.0",
|
"version": "v12.43.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "509b33095564c5165366d81bbaa0afaac28abe75"
|
"reference": "195b893593a9298edee177c0844132ebaa02102f"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/509b33095564c5165366d81bbaa0afaac28abe75",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/195b893593a9298edee177c0844132ebaa02102f",
|
||||||
"reference": "509b33095564c5165366d81bbaa0afaac28abe75",
|
"reference": "195b893593a9298edee177c0844132ebaa02102f",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -2156,7 +2096,7 @@
|
|||||||
"issues": "https://github.com/laravel/framework/issues",
|
"issues": "https://github.com/laravel/framework/issues",
|
||||||
"source": "https://github.com/laravel/framework"
|
"source": "https://github.com/laravel/framework"
|
||||||
},
|
},
|
||||||
"time": "2025-12-09T15:51:23+00:00"
|
"time": "2025-12-16T18:53:08+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/passport",
|
"name": "laravel/passport",
|
||||||
@@ -3150,16 +3090,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/fractal",
|
"name": "league/fractal",
|
||||||
"version": "0.20.2",
|
"version": "0.21",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/fractal.git",
|
"url": "https://github.com/thephpleague/fractal.git",
|
||||||
"reference": "573ca2e0e348a7fe573a3e8fbc29a6588ece8c4e"
|
"reference": "9e817358dc451dfdcf656d6757f0c04e92dea0e8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/fractal/zipball/573ca2e0e348a7fe573a3e8fbc29a6588ece8c4e",
|
"url": "https://api.github.com/repos/thephpleague/fractal/zipball/9e817358dc451dfdcf656d6757f0c04e92dea0e8",
|
||||||
"reference": "573ca2e0e348a7fe573a3e8fbc29a6588ece8c4e",
|
"reference": "9e817358dc451dfdcf656d6757f0c04e92dea0e8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -3167,13 +3107,13 @@
|
|||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/orm": "^2.5",
|
"doctrine/orm": "^2.5",
|
||||||
|
"friendsofphp/php-cs-fixer": "^3.91",
|
||||||
"illuminate/contracts": "~5.0",
|
"illuminate/contracts": "~5.0",
|
||||||
"laminas/laminas-paginator": "~2.12",
|
"laminas/laminas-paginator": "~2.12",
|
||||||
"mockery/mockery": "^1.3",
|
"mockery/mockery": "^1.3",
|
||||||
"pagerfanta/pagerfanta": "~1.0.0|~4.0.0",
|
"pagerfanta/pagerfanta": "~1.0.0|~4.0.0",
|
||||||
"phpstan/phpstan": "^1.4",
|
"phpstan/phpstan": "^1.4",
|
||||||
"phpunit/phpunit": "^9.5",
|
"phpunit/phpunit": "^9.5",
|
||||||
"squizlabs/php_codesniffer": "~3.4",
|
|
||||||
"vimeo/psalm": "^4.30"
|
"vimeo/psalm": "^4.30"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
@@ -3214,9 +3154,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/thephpleague/fractal/issues",
|
"issues": "https://github.com/thephpleague/fractal/issues",
|
||||||
"source": "https://github.com/thephpleague/fractal/tree/0.20.2"
|
"source": "https://github.com/thephpleague/fractal/tree/0.21"
|
||||||
},
|
},
|
||||||
"time": "2025-02-14T21:33:14+00:00"
|
"time": "2025-12-08T21:14:52+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/mime-type-detection",
|
"name": "league/mime-type-detection",
|
||||||
@@ -5972,184 +5912,6 @@
|
|||||||
},
|
},
|
||||||
"time": "2025-08-20T11:25:49+00:00"
|
"time": "2025-08-20T11:25:49+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "sentry/sentry",
|
|
||||||
"version": "4.19.1",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/getsentry/sentry-php.git",
|
|
||||||
"reference": "1c21d60bebe67c0122335bd3fe977990435af0a3"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/1c21d60bebe67c0122335bd3fe977990435af0a3",
|
|
||||||
"reference": "1c21d60bebe67c0122335bd3fe977990435af0a3",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"ext-curl": "*",
|
|
||||||
"ext-json": "*",
|
|
||||||
"ext-mbstring": "*",
|
|
||||||
"guzzlehttp/psr7": "^1.8.4|^2.1.1",
|
|
||||||
"jean85/pretty-package-versions": "^1.5|^2.0.4",
|
|
||||||
"php": "^7.2|^8.0",
|
|
||||||
"psr/log": "^1.0|^2.0|^3.0",
|
|
||||||
"symfony/options-resolver": "^4.4.30|^5.0.11|^6.0|^7.0|^8.0"
|
|
||||||
},
|
|
||||||
"conflict": {
|
|
||||||
"raven/raven": "*"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"friendsofphp/php-cs-fixer": "^3.4",
|
|
||||||
"guzzlehttp/promises": "^2.0.3",
|
|
||||||
"guzzlehttp/psr7": "^1.8.4|^2.1.1",
|
|
||||||
"monolog/monolog": "^1.6|^2.0|^3.0",
|
|
||||||
"phpbench/phpbench": "^1.0",
|
|
||||||
"phpstan/phpstan": "^1.3",
|
|
||||||
"phpunit/phpunit": "^8.5|^9.6",
|
|
||||||
"vimeo/psalm": "^4.17"
|
|
||||||
},
|
|
||||||
"suggest": {
|
|
||||||
"monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler."
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"autoload": {
|
|
||||||
"files": [
|
|
||||||
"src/functions.php"
|
|
||||||
],
|
|
||||||
"psr-4": {
|
|
||||||
"Sentry\\": "src/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Sentry",
|
|
||||||
"email": "accounts@sentry.io"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "PHP SDK for Sentry (http://sentry.io)",
|
|
||||||
"homepage": "http://sentry.io",
|
|
||||||
"keywords": [
|
|
||||||
"crash-reporting",
|
|
||||||
"crash-reports",
|
|
||||||
"error-handler",
|
|
||||||
"error-monitoring",
|
|
||||||
"log",
|
|
||||||
"logging",
|
|
||||||
"profiling",
|
|
||||||
"sentry",
|
|
||||||
"tracing"
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"issues": "https://github.com/getsentry/sentry-php/issues",
|
|
||||||
"source": "https://github.com/getsentry/sentry-php/tree/4.19.1"
|
|
||||||
},
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"url": "https://sentry.io/",
|
|
||||||
"type": "custom"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"url": "https://sentry.io/pricing/",
|
|
||||||
"type": "custom"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"time": "2025-12-02T15:57:41+00:00"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sentry/sentry-laravel",
|
|
||||||
"version": "4.20.0",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/getsentry/sentry-laravel.git",
|
|
||||||
"reference": "95f2542ee1ebc993529b63f5c8543184abd00650"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/95f2542ee1ebc993529b63f5c8543184abd00650",
|
|
||||||
"reference": "95f2542ee1ebc993529b63f5c8543184abd00650",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"illuminate/support": "^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0 | ^11.0 | ^12.0",
|
|
||||||
"nyholm/psr7": "^1.0",
|
|
||||||
"php": "^7.2 | ^8.0",
|
|
||||||
"sentry/sentry": "^4.19.0",
|
|
||||||
"symfony/psr-http-message-bridge": "^1.0 | ^2.0 | ^6.0 | ^7.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"friendsofphp/php-cs-fixer": "^3.11",
|
|
||||||
"guzzlehttp/guzzle": "^7.2",
|
|
||||||
"laravel/folio": "^1.1",
|
|
||||||
"laravel/framework": "^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0 | ^11.0 | ^12.0",
|
|
||||||
"laravel/pennant": "^1.0",
|
|
||||||
"livewire/livewire": "^2.0 | ^3.0",
|
|
||||||
"mockery/mockery": "^1.3",
|
|
||||||
"orchestra/testbench": "^4.7 | ^5.1 | ^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0",
|
|
||||||
"phpstan/phpstan": "^1.10",
|
|
||||||
"phpunit/phpunit": "^8.4 | ^9.3 | ^10.4 | ^11.5"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"laravel": {
|
|
||||||
"aliases": {
|
|
||||||
"Sentry": "Sentry\\Laravel\\Facade"
|
|
||||||
},
|
|
||||||
"providers": [
|
|
||||||
"Sentry\\Laravel\\ServiceProvider",
|
|
||||||
"Sentry\\Laravel\\Tracing\\ServiceProvider"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"psr-0": {
|
|
||||||
"Sentry\\Laravel\\": "src/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Sentry",
|
|
||||||
"email": "accounts@sentry.io"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "Laravel SDK for Sentry (https://sentry.io)",
|
|
||||||
"homepage": "https://sentry.io",
|
|
||||||
"keywords": [
|
|
||||||
"crash-reporting",
|
|
||||||
"crash-reports",
|
|
||||||
"error-handler",
|
|
||||||
"error-monitoring",
|
|
||||||
"laravel",
|
|
||||||
"log",
|
|
||||||
"logging",
|
|
||||||
"profiling",
|
|
||||||
"sentry",
|
|
||||||
"tracing"
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"issues": "https://github.com/getsentry/sentry-laravel/issues",
|
|
||||||
"source": "https://github.com/getsentry/sentry-laravel/tree/4.20.0"
|
|
||||||
},
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"url": "https://sentry.io/",
|
|
||||||
"type": "custom"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"url": "https://sentry.io/pricing/",
|
|
||||||
"type": "custom"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"time": "2025-12-02T10:37:40+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "spatie/backtrace",
|
"name": "spatie/backtrace",
|
||||||
"version": "1.8.1",
|
"version": "1.8.1",
|
||||||
@@ -10316,16 +10078,16 @@
|
|||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
{
|
{
|
||||||
"name": "barryvdh/laravel-debugbar",
|
"name": "barryvdh/laravel-debugbar",
|
||||||
"version": "v3.16.1",
|
"version": "v3.16.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/barryvdh/laravel-debugbar.git",
|
"url": "https://github.com/barryvdh/laravel-debugbar.git",
|
||||||
"reference": "21b2c6fce05453efd4bceb34f9fddaa1cdb44090"
|
"reference": "730dbf8bf41f5691e026dd771e64dd54ad1b10b3"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/21b2c6fce05453efd4bceb34f9fddaa1cdb44090",
|
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/730dbf8bf41f5691e026dd771e64dd54ad1b10b3",
|
||||||
"reference": "21b2c6fce05453efd4bceb34f9fddaa1cdb44090",
|
"reference": "730dbf8bf41f5691e026dd771e64dd54ad1b10b3",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -10385,7 +10147,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/barryvdh/laravel-debugbar/issues",
|
"issues": "https://github.com/barryvdh/laravel-debugbar/issues",
|
||||||
"source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.16.1"
|
"source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.16.2"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -10397,7 +10159,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2025-11-19T08:31:25+00:00"
|
"time": "2025-12-03T14:52:46+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "barryvdh/laravel-ide-helper",
|
"name": "barryvdh/laravel-ide-helper",
|
||||||
|
|||||||
@@ -78,8 +78,8 @@ return [
|
|||||||
'running_balance_column' => env('USE_RUNNING_BALANCE', false),
|
'running_balance_column' => env('USE_RUNNING_BALANCE', false),
|
||||||
// see cer.php for exchange rates feature flag.
|
// see cer.php for exchange rates feature flag.
|
||||||
],
|
],
|
||||||
'version' => '6.4.13',
|
'version' => 'develop/2025-12-17',
|
||||||
'build_time' => 1765863208,
|
'build_time' => 1765957552,
|
||||||
'api_version' => '2.1.0', // field is no longer used.
|
'api_version' => '2.1.0', // field is no longer used.
|
||||||
'db_version' => 28, // field is no longer used.
|
'db_version' => 28, // field is no longer used.
|
||||||
|
|
||||||
@@ -107,7 +107,6 @@ return [
|
|||||||
'demo_password' => env('DEMO_PASSWORD', ''),
|
'demo_password' => env('DEMO_PASSWORD', ''),
|
||||||
'tracker_site_id' => env('TRACKER_SITE_ID', ''),
|
'tracker_site_id' => env('TRACKER_SITE_ID', ''),
|
||||||
'tracker_url' => env('TRACKER_URL', ''),
|
'tracker_url' => env('TRACKER_URL', ''),
|
||||||
'report_errors_online' => env('REPORT_ERRORS_ONLINE', false),
|
|
||||||
|
|
||||||
// authentication settings
|
// authentication settings
|
||||||
'authentication_guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
|
'authentication_guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
|
||||||
|
|||||||
452
package-lock.json
generated
452
package-lock.json
generated
@@ -1696,9 +1696,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/aix-ppc64": {
|
"node_modules/@esbuild/aix-ppc64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz",
|
||||||
"integrity": "sha512-HHB50pdsBX6k47S4u5g/CaLjqS3qwaOVE5ILsq64jyzgMhLuCuZ8rGzM9yhsAjfjkbgUPMzZEPa7DAp7yz6vuA==",
|
"integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ppc64"
|
"ppc64"
|
||||||
],
|
],
|
||||||
@@ -1713,9 +1713,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/android-arm": {
|
"node_modules/@esbuild/android-arm": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz",
|
||||||
"integrity": "sha512-kFqa6/UcaTbGm/NncN9kzVOODjhZW8e+FRdSeypWe6j33gzclHtwlANs26JrupOntlcWmB0u8+8HZo8s7thHvg==",
|
"integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
@@ -1730,9 +1730,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/android-arm64": {
|
"node_modules/@esbuild/android-arm64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz",
|
||||||
"integrity": "sha512-45fuKmAJpxnQWixOGCrS+ro4Uvb4Re9+UTieUY2f8AEc+t7d4AaZ6eUJ3Hva7dtrxAAWHtlEFsXFMAgNnGU9uQ==",
|
"integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -1747,9 +1747,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/android-x64": {
|
"node_modules/@esbuild/android-x64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz",
|
||||||
"integrity": "sha512-LBEpOz0BsgMEeHgenf5aqmn/lLNTFXVfoWMUox8CtWWYK9X4jmQzWjoGoNb8lmAYml/tQ/Ysvm8q7szu7BoxRQ==",
|
"integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -1764,9 +1764,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/darwin-arm64": {
|
"node_modules/@esbuild/darwin-arm64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz",
|
||||||
"integrity": "sha512-veg7fL8eMSCVKL7IW4pxb54QERtedFDfY/ASrumK/SbFsXnRazxY4YykN/THYqFnFwJ0aVjiUrVG2PwcdAEqQQ==",
|
"integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -1781,9 +1781,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/darwin-x64": {
|
"node_modules/@esbuild/darwin-x64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz",
|
||||||
"integrity": "sha512-+3ELd+nTzhfWb07Vol7EZ+5PTbJ/u74nC6iv4/lwIU99Ip5uuY6QoIf0Hn4m2HoV0qcnRivN3KSqc+FyCHjoVQ==",
|
"integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -1798,9 +1798,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/freebsd-arm64": {
|
"node_modules/@esbuild/freebsd-arm64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz",
|
||||||
"integrity": "sha512-/8Rfgns4XD9XOSXlzUDepG8PX+AVWHliYlUkFI3K3GB6tqbdjYqdhcb4BKRd7C0BhZSoaCxhv8kTcBrcZWP+xg==",
|
"integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -1815,9 +1815,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/freebsd-x64": {
|
"node_modules/@esbuild/freebsd-x64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz",
|
||||||
"integrity": "sha512-GITpD8dK9C+r+5yRT/UKVT36h/DQLOHdwGVwwoHidlnA168oD3uxA878XloXebK4Ul3gDBBIvEdL7go9gCUFzQ==",
|
"integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -1832,9 +1832,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-arm": {
|
"node_modules/@esbuild/linux-arm": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz",
|
||||||
"integrity": "sha512-ieMID0JRZY/ZeCrsFQ3Y3NlHNCqIhTprJfDgSB3/lv5jJZ8FX3hqPyXWhe+gvS5ARMBJ242PM+VNz/ctNj//eA==",
|
"integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
@@ -1849,9 +1849,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-arm64": {
|
"node_modules/@esbuild/linux-arm64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz",
|
||||||
"integrity": "sha512-W9//kCrh/6in9rWIBdKaMtuTTzNj6jSeG/haWBADqLLa9P8O5YSRDzgD5y9QBok4AYlzS6ARHifAb75V6G670Q==",
|
"integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -1866,9 +1866,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-ia32": {
|
"node_modules/@esbuild/linux-ia32": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz",
|
||||||
"integrity": "sha512-VIUV4z8GD8rtSVMfAj1aXFahsi/+tcoXXNYmXgzISL+KB381vbSTNdeZHHHIYqFyXcoEhu9n5cT+05tRv13rlw==",
|
"integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ia32"
|
"ia32"
|
||||||
],
|
],
|
||||||
@@ -1883,9 +1883,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-loong64": {
|
"node_modules/@esbuild/linux-loong64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz",
|
||||||
"integrity": "sha512-l4rfiiJRN7sTNI//ff65zJ9z8U+k6zcCg0LALU5iEWzY+a1mVZ8iWC1k5EsNKThZ7XCQ6YWtsZ8EWYm7r1UEsg==",
|
"integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"loong64"
|
"loong64"
|
||||||
],
|
],
|
||||||
@@ -1900,9 +1900,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-mips64el": {
|
"node_modules/@esbuild/linux-mips64el": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz",
|
||||||
"integrity": "sha512-U0bEuAOLvO/DWFdygTHWY8C067FXz+UbzKgxYhXC0fDieFa0kDIra1FAhsAARRJbvEyso8aAqvPdNxzWuStBnA==",
|
"integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"mips64el"
|
"mips64el"
|
||||||
],
|
],
|
||||||
@@ -1917,9 +1917,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-ppc64": {
|
"node_modules/@esbuild/linux-ppc64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz",
|
||||||
"integrity": "sha512-NzdQ/Xwu6vPSf/GkdmRNsOfIeSGnh7muundsWItmBsVpMoNPVpM61qNzAVY3pZ1glzzAxLR40UyYM23eaDDbYQ==",
|
"integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ppc64"
|
"ppc64"
|
||||||
],
|
],
|
||||||
@@ -1934,9 +1934,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-riscv64": {
|
"node_modules/@esbuild/linux-riscv64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz",
|
||||||
"integrity": "sha512-7zlw8p3IApcsN7mFw0O1Z1PyEk6PlKMu18roImfl3iQHTnr/yAfYv6s4hXPidbDoI2Q0pW+5xeoM4eTCC0UdrQ==",
|
"integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"riscv64"
|
"riscv64"
|
||||||
],
|
],
|
||||||
@@ -1951,9 +1951,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-s390x": {
|
"node_modules/@esbuild/linux-s390x": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz",
|
||||||
"integrity": "sha512-cGj5wli+G+nkVQdZo3+7FDKC25Uh4ZVwOAK6A06Hsvgr8WqBBuOy/1s+PUEd/6Je+vjfm6stX0kmib5b/O2Ykw==",
|
"integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"s390x"
|
"s390x"
|
||||||
],
|
],
|
||||||
@@ -1968,9 +1968,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/linux-x64": {
|
"node_modules/@esbuild/linux-x64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz",
|
||||||
"integrity": "sha512-z3H/HYI9MM0HTv3hQZ81f+AKb+yEoCRlUby1F80vbQ5XdzEMyY/9iNlAmhqiBKw4MJXwfgsh7ERGEOhrM1niMA==",
|
"integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -1985,9 +1985,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/netbsd-arm64": {
|
"node_modules/@esbuild/netbsd-arm64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz",
|
||||||
"integrity": "sha512-wzC24DxAvk8Em01YmVXyjl96Mr+ecTPyOuADAvjGg+fyBpGmxmcr2E5ttf7Im8D0sXZihpxzO1isus8MdjMCXQ==",
|
"integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2002,9 +2002,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/netbsd-x64": {
|
"node_modules/@esbuild/netbsd-x64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz",
|
||||||
"integrity": "sha512-1YQ8ybGi2yIXswu6eNzJsrYIGFpnlzEWRl6iR5gMgmsrR0FcNoV1m9k9sc3PuP5rUBLshOZylc9nqSgymI+TYg==",
|
"integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -2019,9 +2019,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/openbsd-arm64": {
|
"node_modules/@esbuild/openbsd-arm64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz",
|
||||||
"integrity": "sha512-5Z+DzLCrq5wmU7RDaMDe2DVXMRm2tTDvX2KU14JJVBN2CT/qov7XVix85QoJqHltpvAOZUAc3ndU56HSMWrv8g==",
|
"integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2036,9 +2036,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/openbsd-x64": {
|
"node_modules/@esbuild/openbsd-x64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz",
|
||||||
"integrity": "sha512-Q73ENzIdPF5jap4wqLtsfh8YbYSZ8Q0wnxplOlZUOyZy7B4ZKW8DXGWgTCZmF8VWD7Tciwv5F4NsRf6vYlZtqg==",
|
"integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -2053,9 +2053,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/openharmony-arm64": {
|
"node_modules/@esbuild/openharmony-arm64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz",
|
||||||
"integrity": "sha512-ajbHrGM/XiK+sXM0JzEbJAen+0E+JMQZ2l4RR4VFwvV9JEERx+oxtgkpoKv1SevhjavK2z2ReHk32pjzktWbGg==",
|
"integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2070,9 +2070,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/sunos-x64": {
|
"node_modules/@esbuild/sunos-x64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz",
|
||||||
"integrity": "sha512-IPUW+y4VIjuDVn+OMzHc5FV4GubIwPnsz6ubkvN8cuhEqH81NovB53IUlrlBkPMEPxvNnf79MGBoz8rZ2iW8HA==",
|
"integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -2087,9 +2087,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/win32-arm64": {
|
"node_modules/@esbuild/win32-arm64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz",
|
||||||
"integrity": "sha512-RIVRWiljWA6CdVu8zkWcRmGP7iRRIIwvhDKem8UMBjPql2TXM5PkDVvvrzMtj1V+WFPB4K7zkIGM7VzRtFkjdg==",
|
"integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2104,9 +2104,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/win32-ia32": {
|
"node_modules/@esbuild/win32-ia32": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz",
|
||||||
"integrity": "sha512-2BR5M8CPbptC1AK5JbJT1fWrHLvejwZidKx3UMSF0ecHMa+smhi16drIrCEggkgviBwLYd5nwrFLSl5Kho96RQ==",
|
"integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ia32"
|
"ia32"
|
||||||
],
|
],
|
||||||
@@ -2121,9 +2121,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@esbuild/win32-x64": {
|
"node_modules/@esbuild/win32-x64": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz",
|
||||||
"integrity": "sha512-d5X6RMYv6taIymSk8JBP+nxv8DQAMY6A51GPgusqLdK9wBz5wWIXy1KjTck6HnjE9hqJzJRdk+1p/t5soSbCtw==",
|
"integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -2592,9 +2592,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-android-arm-eabi": {
|
"node_modules/@rollup/rollup-android-arm-eabi": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.5.tgz",
|
||||||
"integrity": "sha512-PWU3Y92H4DD0bOqorEPp1Y0tbzwAurFmIYpjcObv5axGVOtcTlB0b2UKMd2echo08MgN7jO8WQZSSysvfisFSQ==",
|
"integrity": "sha512-iDGS/h7D8t7tvZ1t6+WPK04KD0MwzLZrG0se1hzBjSi5fyxlsiggoJHwh18PCFNn7tG43OWb6pdZ6Y+rMlmyNQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
@@ -2606,9 +2606,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-android-arm64": {
|
"node_modules/@rollup/rollup-android-arm64": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.5.tgz",
|
||||||
"integrity": "sha512-Gw0/DuVm3rGsqhMGYkSOXXIx20cC3kTlivZeuaGt4gEgILivykNyBWxeUV5Cf2tDA2nPLah26vq3emlRrWVbng==",
|
"integrity": "sha512-wrSAViWvZHBMMlWk6EJhvg8/rjxzyEhEdgfMMjREHEq11EtJ6IP6yfcCH57YAEca2Oe3FNCE9DSTgU70EIGmVw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2620,9 +2620,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-darwin-arm64": {
|
"node_modules/@rollup/rollup-darwin-arm64": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.5.tgz",
|
||||||
"integrity": "sha512-+w06QvXsgzKwdVg5qRLZpTHh1bigHZIqoIUPtiqh05ZiJVUQ6ymOxaPkXTvRPRLH88575ZCRSRM3PwIoNma01Q==",
|
"integrity": "sha512-S87zZPBmRO6u1YXQLwpveZm4JfPpAa6oHBX7/ghSiGH3rz/KDgAu1rKdGutV+WUI6tKDMbaBJomhnT30Y2t4VQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2634,9 +2634,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-darwin-x64": {
|
"node_modules/@rollup/rollup-darwin-x64": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.5.tgz",
|
||||||
"integrity": "sha512-EB4Na9G2GsrRNRNFPuxfwvDRDUwQEzJPpiK1vo2zMVhEeufZ1k7J1bKnT0JYDfnPC7RNZ2H5YNQhW6/p2QKATw==",
|
"integrity": "sha512-YTbnsAaHo6VrAczISxgpTva8EkfQus0VPEVJCEaboHtZRIb6h6j0BNxRBOwnDciFTZLDPW5r+ZBmhL/+YpTZgA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -2648,9 +2648,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-freebsd-arm64": {
|
"node_modules/@rollup/rollup-freebsd-arm64": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.5.tgz",
|
||||||
"integrity": "sha512-bldA8XEqPcs6OYdknoTMaGhjytnwQ0NClSPpWpmufOuGPN5dDmvIa32FygC2gneKK4A1oSx86V1l55hyUWUYFQ==",
|
"integrity": "sha512-1T8eY2J8rKJWzaznV7zedfdhD1BqVs1iqILhmHDq/bqCUZsrMt+j8VCTHhP0vdfbHK3e1IQ7VYx3jlKqwlf+vw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2662,9 +2662,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-freebsd-x64": {
|
"node_modules/@rollup/rollup-freebsd-x64": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.5.tgz",
|
||||||
"integrity": "sha512-3T8GPjH6mixCd0YPn0bXtcuSXi1Lj+15Ujw2CEb7dd24j9thcKscCf88IV7n76WaAdorOzAgSSbuVRg4C8V8Qw==",
|
"integrity": "sha512-sHTiuXyBJApxRn+VFMaw1U+Qsz4kcNlxQ742snICYPrY+DDL8/ZbaC4DVIB7vgZmp3jiDaKA0WpBdP0aqPJoBQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -2676,9 +2676,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
|
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.5.tgz",
|
||||||
"integrity": "sha512-UPMMNeC4LXW7ZSHxeP3Edv09aLsFUMaD1TSVW6n1CWMECnUIJMFFB7+XC2lZTdPtvB36tYC0cJWc86mzSsaviw==",
|
"integrity": "sha512-dV3T9MyAf0w8zPVLVBptVlzaXxka6xg1f16VAQmjg+4KMSTWDvhimI/Y6mp8oHwNrmnmVl9XxJ/w/mO4uIQONA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
@@ -2690,9 +2690,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
|
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.5.tgz",
|
||||||
"integrity": "sha512-H8uwlV0otHs5Q7WAMSoyvjV9DJPiy5nJ/xnHolY0QptLPjaSsuX7tw+SPIfiYH6cnVx3fe4EWFafo6gH6ekZKA==",
|
"integrity": "sha512-wIGYC1x/hyjP+KAu9+ewDI+fi5XSNiUi9Bvg6KGAh2TsNMA3tSEs+Sh6jJ/r4BV/bx/CyWu2ue9kDnIdRyafcQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
@@ -2704,9 +2704,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-arm64-gnu": {
|
"node_modules/@rollup/rollup-linux-arm64-gnu": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.5.tgz",
|
||||||
"integrity": "sha512-BLRwSRwICXz0TXkbIbqJ1ibK+/dSBpTJqDClF61GWIrxTXZWQE78ROeIhgl5MjVs4B4gSLPCFeD4xML9vbzvCQ==",
|
"integrity": "sha512-Y+qVA0D9d0y2FRNiG9oM3Hut/DgODZbU9I8pLLPwAsU0tUKZ49cyV1tzmB/qRbSzGvY8lpgGkJuMyuhH7Ma+Vg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2718,9 +2718,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-arm64-musl": {
|
"node_modules/@rollup/rollup-linux-arm64-musl": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.5.tgz",
|
||||||
"integrity": "sha512-6bySEjOTbmVcPJAywjpGLckK793A0TJWSbIa0sVwtVGfe/Nz6gOWHOwkshUIAp9j7wg2WKcA4Snu7Y1nUZyQew==",
|
"integrity": "sha512-juaC4bEgJsyFVfqhtGLz8mbopaWD+WeSOYr5E16y+1of6KQjc0BpwZLuxkClqY1i8sco+MdyoXPNiCkQou09+g==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2732,9 +2732,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-loong64-gnu": {
|
"node_modules/@rollup/rollup-linux-loong64-gnu": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.5.tgz",
|
||||||
"integrity": "sha512-U0ow3bXYJZ5MIbchVusxEycBw7bO6C2u5UvD31i5IMTrnt2p4Fh4ZbHSdc/31TScIJQYHwxbj05BpevB3201ug==",
|
"integrity": "sha512-rIEC0hZ17A42iXtHX+EPJVL/CakHo+tT7W0pbzdAGuWOt2jxDFh7A/lRhsNHBcqL4T36+UiAgwO8pbmn3dE8wA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"loong64"
|
"loong64"
|
||||||
],
|
],
|
||||||
@@ -2746,9 +2746,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-ppc64-gnu": {
|
"node_modules/@rollup/rollup-linux-ppc64-gnu": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.5.tgz",
|
||||||
"integrity": "sha512-iujDk07ZNwGLVn0YIWM80SFN039bHZHCdCCuX9nyx3Jsa2d9V/0Y32F+YadzwbvDxhSeVo9zefkoPnXEImnM5w==",
|
"integrity": "sha512-T7l409NhUE552RcAOcmJHj3xyZ2h7vMWzcwQI0hvn5tqHh3oSoclf9WgTl+0QqffWFG8MEVZZP1/OBglKZx52Q==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ppc64"
|
"ppc64"
|
||||||
],
|
],
|
||||||
@@ -2760,9 +2760,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
|
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.5.tgz",
|
||||||
"integrity": "sha512-MUtAktiOUSu+AXBpx1fkuG/Bi5rhlorGs3lw5QeJ2X3ziEGAq7vFNdWVde6XGaVqi0LGSvugwjoxSNJfHFTC0g==",
|
"integrity": "sha512-7OK5/GhxbnrMcxIFoYfhV/TkknarkYC1hqUw1wU2xUN3TVRLNT5FmBv4KkheSG2xZ6IEbRAhTooTV2+R5Tk0lQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"riscv64"
|
"riscv64"
|
||||||
],
|
],
|
||||||
@@ -2774,9 +2774,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-riscv64-musl": {
|
"node_modules/@rollup/rollup-linux-riscv64-musl": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.5.tgz",
|
||||||
"integrity": "sha512-btm35eAbDfPtcFEgaXCI5l3c2WXyzwiE8pArhd66SDtoLWmgK5/M7CUxmUglkwtniPzwvWioBKKl6IXLbPf2sQ==",
|
"integrity": "sha512-GwuDBE/PsXaTa76lO5eLJTyr2k8QkPipAyOrs4V/KJufHCZBJ495VCGJol35grx9xryk4V+2zd3Ri+3v7NPh+w==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"riscv64"
|
"riscv64"
|
||||||
],
|
],
|
||||||
@@ -2788,9 +2788,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-s390x-gnu": {
|
"node_modules/@rollup/rollup-linux-s390x-gnu": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.5.tgz",
|
||||||
"integrity": "sha512-uJlhKE9ccUTCUlK+HUz/80cVtx2RayadC5ldDrrDUFaJK0SNb8/cCmC9RhBhIWuZ71Nqj4Uoa9+xljKWRogdhA==",
|
"integrity": "sha512-IAE1Ziyr1qNfnmiQLHBURAD+eh/zH1pIeJjeShleII7Vj8kyEm2PF77o+lf3WTHDpNJcu4IXJxNO0Zluro8bOw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"s390x"
|
"s390x"
|
||||||
],
|
],
|
||||||
@@ -2802,9 +2802,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-x64-gnu": {
|
"node_modules/@rollup/rollup-linux-x64-gnu": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.5.tgz",
|
||||||
"integrity": "sha512-jjEMkzvASQBbzzlzf4os7nzSBd/cvPrpqXCUOqoeCh1dQ4BP3RZCJk8XBeik4MUln3m+8LeTJcY54C/u8wb3DQ==",
|
"integrity": "sha512-Pg6E+oP7GvZ4XwgRJBuSXZjcqpIW3yCBhK4BcsANvb47qMvAbCjR6E+1a/U2WXz1JJxp9/4Dno3/iSJLcm5auw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -2816,9 +2816,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-linux-x64-musl": {
|
"node_modules/@rollup/rollup-linux-x64-musl": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.5.tgz",
|
||||||
"integrity": "sha512-lu90KG06NNH19shC5rBPkrh6mrTpq5kviFylPBXQVpdEu0yzb0mDgyxLr6XdcGdBIQTH/UAhDJnL+APZTBu1aQ==",
|
"integrity": "sha512-txGtluxDKTxaMDzUduGP0wdfng24y1rygUMnmlUJ88fzCCULCLn7oE5kb2+tRB+MWq1QDZT6ObT5RrR8HFRKqg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -2830,9 +2830,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-openharmony-arm64": {
|
"node_modules/@rollup/rollup-openharmony-arm64": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.5.tgz",
|
||||||
"integrity": "sha512-dFDcmLwsUzhAm/dn0+dMOQZoONVYBtgik0VuY/d5IJUUb787L3Ko/ibvTvddqhb3RaB7vFEozYevHN4ox22R/w==",
|
"integrity": "sha512-3DFiLPnTxiOQV993fMc+KO8zXHTcIjgaInrqlG8zDp1TlhYl6WgrOHuJkJQ6M8zHEcntSJsUp1XFZSY8C1DYbg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2844,9 +2844,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-win32-arm64-msvc": {
|
"node_modules/@rollup/rollup-win32-arm64-msvc": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.5.tgz",
|
||||||
"integrity": "sha512-WvUpUAWmUxZKtRnQWpRKnLW2DEO8HB/l8z6oFFMNuHndMzFTJEXzaYJ5ZAmzNw0L21QQJZsUQFt2oPf3ykAD/w==",
|
"integrity": "sha512-nggc/wPpNTgjGg75hu+Q/3i32R00Lq1B6N1DO7MCU340MRKL3WZJMjA9U4K4gzy3dkZPXm9E1Nc81FItBVGRlA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -2858,9 +2858,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-win32-ia32-msvc": {
|
"node_modules/@rollup/rollup-win32-ia32-msvc": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.5.tgz",
|
||||||
"integrity": "sha512-JGbeF2/FDU0x2OLySw/jgvkwWUo05BSiJK0dtuI4LyuXbz3wKiC1xHhLB1Tqm5VU6ZZDmAorj45r/IgWNWku5g==",
|
"integrity": "sha512-U/54pTbdQpPLBdEzCT6NBCFAfSZMvmjr0twhnD9f4EIvlm9wy3jjQ38yQj1AGznrNO65EWQMgm/QUjuIVrYF9w==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ia32"
|
"ia32"
|
||||||
],
|
],
|
||||||
@@ -2872,9 +2872,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-win32-x64-gnu": {
|
"node_modules/@rollup/rollup-win32-x64-gnu": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.5.tgz",
|
||||||
"integrity": "sha512-zuuC7AyxLWLubP+mlUwEyR8M1ixW1ERNPHJfXm8x7eQNP4Pzkd7hS3qBuKBR70VRiQ04Kw8FNfRMF5TNxuZq2g==",
|
"integrity": "sha512-2NqKgZSuLH9SXBBV2dWNRCZmocgSOx8OJSdpRaEcRlIfX8YrKxUT6z0F1NpvDVhOsl190UFTRh2F2WDWWCYp3A==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -2886,9 +2886,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/rollup-win32-x64-msvc": {
|
"node_modules/@rollup/rollup-win32-x64-msvc": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.5.tgz",
|
||||||
"integrity": "sha512-Sbx45u/Lbb5RyptSbX7/3deP+/lzEmZ0BTSHxwxN/IMOZDZf8S0AGo0hJD5n/LQssxb5Z3B4og4P2X6Dd8acCA==",
|
"integrity": "sha512-JRpZUhCfhZ4keB5v0fe02gQJy05GqboPOaxvjugW04RLSYYoB/9t2lx2u/tMs/Na/1NXfY8QYjgRljRpN+MjTQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -3176,9 +3176,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "25.0.2",
|
"version": "25.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
|
||||||
"integrity": "sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==",
|
"integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -3778,9 +3778,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/alpinejs": {
|
"node_modules/alpinejs": {
|
||||||
"version": "3.15.2",
|
"version": "3.15.3",
|
||||||
"resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.15.2.tgz",
|
"resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.15.3.tgz",
|
||||||
"integrity": "sha512-2kYF2aG+DTFkE6p0rHG5XmN4VEb6sO9b02aOdU4+i8QN6rL0DbRZQiypDE1gBcGO65yDcqMz5KKYUYgMUxgNkw==",
|
"integrity": "sha512-fSI6F5213FdpMC4IWaup92KhuH3jBX0VVqajRJ6cOTCy1cL6888KyXdGO+seAAkn+g6fnrxBqQEx6gRpQ5EZoQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/reactivity": "~3.1.1"
|
"@vue/reactivity": "~3.1.1"
|
||||||
@@ -4075,9 +4075,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/baseline-browser-mapping": {
|
"node_modules/baseline-browser-mapping": {
|
||||||
"version": "2.9.7",
|
"version": "2.9.8",
|
||||||
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.7.tgz",
|
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.8.tgz",
|
||||||
"integrity": "sha512-k9xFKplee6KIio3IDbwj+uaCLpqzOwakOgmqzPezM0sFJlFKcg30vk2wOiAJtkTSfx0SSQDSe8q+mWA/fSH5Zg==",
|
"integrity": "sha512-Y1fOuNDowLfgKOypdc9SPABfoWXuZHBOyCS4cD52IeZBhr4Md6CLLs6atcxVrzRmQ06E7hSlm5bHHApPKR/byA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -4215,9 +4215,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/bootstrap5-autocomplete": {
|
"node_modules/bootstrap5-autocomplete": {
|
||||||
"version": "1.1.40",
|
"version": "1.1.41",
|
||||||
"resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.40.tgz",
|
"resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.41.tgz",
|
||||||
"integrity": "sha512-fp2HDZule/qwC/hEftIO2gCcqsuBOH0Hv1KgoyiqI6Ny5s0THZYjQyqAE1RnN8qnR0mQXc/cEJTd7EKbqpoj0g==",
|
"integrity": "sha512-GnjG9/oNOzDPdNumGeWyUhLct6q2y+HrYsznEbmNVhS51IEa6kls9txnogFZLxAXhH93F1RRt4BQMyTBMu5DDg==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/bootstrap5-tags": {
|
"node_modules/bootstrap5-tags": {
|
||||||
@@ -5841,9 +5841,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/es-module-lexer": {
|
"node_modules/es-module-lexer": {
|
||||||
"version": "1.7.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
|
||||||
"integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
|
"integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
@@ -5876,9 +5876,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/esbuild": {
|
"node_modules/esbuild": {
|
||||||
"version": "0.27.1",
|
"version": "0.27.2",
|
||||||
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz",
|
||||||
"integrity": "sha512-yY35KZckJJuVVPXpvjgxiCuVEJT67F6zDeVTv4rizyPrfGBUpZQsvmxnN+C371c2esD/hNMjj4tpBhuueLN7aA==",
|
"integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -5889,32 +5889,32 @@
|
|||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@esbuild/aix-ppc64": "0.27.1",
|
"@esbuild/aix-ppc64": "0.27.2",
|
||||||
"@esbuild/android-arm": "0.27.1",
|
"@esbuild/android-arm": "0.27.2",
|
||||||
"@esbuild/android-arm64": "0.27.1",
|
"@esbuild/android-arm64": "0.27.2",
|
||||||
"@esbuild/android-x64": "0.27.1",
|
"@esbuild/android-x64": "0.27.2",
|
||||||
"@esbuild/darwin-arm64": "0.27.1",
|
"@esbuild/darwin-arm64": "0.27.2",
|
||||||
"@esbuild/darwin-x64": "0.27.1",
|
"@esbuild/darwin-x64": "0.27.2",
|
||||||
"@esbuild/freebsd-arm64": "0.27.1",
|
"@esbuild/freebsd-arm64": "0.27.2",
|
||||||
"@esbuild/freebsd-x64": "0.27.1",
|
"@esbuild/freebsd-x64": "0.27.2",
|
||||||
"@esbuild/linux-arm": "0.27.1",
|
"@esbuild/linux-arm": "0.27.2",
|
||||||
"@esbuild/linux-arm64": "0.27.1",
|
"@esbuild/linux-arm64": "0.27.2",
|
||||||
"@esbuild/linux-ia32": "0.27.1",
|
"@esbuild/linux-ia32": "0.27.2",
|
||||||
"@esbuild/linux-loong64": "0.27.1",
|
"@esbuild/linux-loong64": "0.27.2",
|
||||||
"@esbuild/linux-mips64el": "0.27.1",
|
"@esbuild/linux-mips64el": "0.27.2",
|
||||||
"@esbuild/linux-ppc64": "0.27.1",
|
"@esbuild/linux-ppc64": "0.27.2",
|
||||||
"@esbuild/linux-riscv64": "0.27.1",
|
"@esbuild/linux-riscv64": "0.27.2",
|
||||||
"@esbuild/linux-s390x": "0.27.1",
|
"@esbuild/linux-s390x": "0.27.2",
|
||||||
"@esbuild/linux-x64": "0.27.1",
|
"@esbuild/linux-x64": "0.27.2",
|
||||||
"@esbuild/netbsd-arm64": "0.27.1",
|
"@esbuild/netbsd-arm64": "0.27.2",
|
||||||
"@esbuild/netbsd-x64": "0.27.1",
|
"@esbuild/netbsd-x64": "0.27.2",
|
||||||
"@esbuild/openbsd-arm64": "0.27.1",
|
"@esbuild/openbsd-arm64": "0.27.2",
|
||||||
"@esbuild/openbsd-x64": "0.27.1",
|
"@esbuild/openbsd-x64": "0.27.2",
|
||||||
"@esbuild/openharmony-arm64": "0.27.1",
|
"@esbuild/openharmony-arm64": "0.27.2",
|
||||||
"@esbuild/sunos-x64": "0.27.1",
|
"@esbuild/sunos-x64": "0.27.2",
|
||||||
"@esbuild/win32-arm64": "0.27.1",
|
"@esbuild/win32-arm64": "0.27.2",
|
||||||
"@esbuild/win32-ia32": "0.27.1",
|
"@esbuild/win32-ia32": "0.27.2",
|
||||||
"@esbuild/win32-x64": "0.27.1"
|
"@esbuild/win32-x64": "0.27.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/escalade": {
|
"node_modules/escalade": {
|
||||||
@@ -10036,9 +10036,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/rollup": {
|
"node_modules/rollup": {
|
||||||
"version": "4.53.4",
|
"version": "4.53.5",
|
||||||
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.4.tgz",
|
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.5.tgz",
|
||||||
"integrity": "sha512-YpXaaArg0MvrnJpvduEDYIp7uGOqKXbH9NsHGQ6SxKCOsNAjZF018MmxefFUulVP2KLtiGw1UvZbr+/ekjvlDg==",
|
"integrity": "sha512-iTNAbFSlRpcHeeWu73ywU/8KuU/LZmNCSxp6fjQkJBD3ivUb8tpDrXhIxEzA05HlYMEwmtaUnb3RP+YNv162OQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -10052,28 +10052,28 @@
|
|||||||
"npm": ">=8.0.0"
|
"npm": ">=8.0.0"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@rollup/rollup-android-arm-eabi": "4.53.4",
|
"@rollup/rollup-android-arm-eabi": "4.53.5",
|
||||||
"@rollup/rollup-android-arm64": "4.53.4",
|
"@rollup/rollup-android-arm64": "4.53.5",
|
||||||
"@rollup/rollup-darwin-arm64": "4.53.4",
|
"@rollup/rollup-darwin-arm64": "4.53.5",
|
||||||
"@rollup/rollup-darwin-x64": "4.53.4",
|
"@rollup/rollup-darwin-x64": "4.53.5",
|
||||||
"@rollup/rollup-freebsd-arm64": "4.53.4",
|
"@rollup/rollup-freebsd-arm64": "4.53.5",
|
||||||
"@rollup/rollup-freebsd-x64": "4.53.4",
|
"@rollup/rollup-freebsd-x64": "4.53.5",
|
||||||
"@rollup/rollup-linux-arm-gnueabihf": "4.53.4",
|
"@rollup/rollup-linux-arm-gnueabihf": "4.53.5",
|
||||||
"@rollup/rollup-linux-arm-musleabihf": "4.53.4",
|
"@rollup/rollup-linux-arm-musleabihf": "4.53.5",
|
||||||
"@rollup/rollup-linux-arm64-gnu": "4.53.4",
|
"@rollup/rollup-linux-arm64-gnu": "4.53.5",
|
||||||
"@rollup/rollup-linux-arm64-musl": "4.53.4",
|
"@rollup/rollup-linux-arm64-musl": "4.53.5",
|
||||||
"@rollup/rollup-linux-loong64-gnu": "4.53.4",
|
"@rollup/rollup-linux-loong64-gnu": "4.53.5",
|
||||||
"@rollup/rollup-linux-ppc64-gnu": "4.53.4",
|
"@rollup/rollup-linux-ppc64-gnu": "4.53.5",
|
||||||
"@rollup/rollup-linux-riscv64-gnu": "4.53.4",
|
"@rollup/rollup-linux-riscv64-gnu": "4.53.5",
|
||||||
"@rollup/rollup-linux-riscv64-musl": "4.53.4",
|
"@rollup/rollup-linux-riscv64-musl": "4.53.5",
|
||||||
"@rollup/rollup-linux-s390x-gnu": "4.53.4",
|
"@rollup/rollup-linux-s390x-gnu": "4.53.5",
|
||||||
"@rollup/rollup-linux-x64-gnu": "4.53.4",
|
"@rollup/rollup-linux-x64-gnu": "4.53.5",
|
||||||
"@rollup/rollup-linux-x64-musl": "4.53.4",
|
"@rollup/rollup-linux-x64-musl": "4.53.5",
|
||||||
"@rollup/rollup-openharmony-arm64": "4.53.4",
|
"@rollup/rollup-openharmony-arm64": "4.53.5",
|
||||||
"@rollup/rollup-win32-arm64-msvc": "4.53.4",
|
"@rollup/rollup-win32-arm64-msvc": "4.53.5",
|
||||||
"@rollup/rollup-win32-ia32-msvc": "4.53.4",
|
"@rollup/rollup-win32-ia32-msvc": "4.53.5",
|
||||||
"@rollup/rollup-win32-x64-gnu": "4.53.4",
|
"@rollup/rollup-win32-x64-gnu": "4.53.5",
|
||||||
"@rollup/rollup-win32-x64-msvc": "4.53.4",
|
"@rollup/rollup-win32-x64-msvc": "4.53.5",
|
||||||
"fsevents": "~2.3.2"
|
"fsevents": "~2.3.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -10129,9 +10129,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/sass": {
|
"node_modules/sass": {
|
||||||
"version": "1.96.0",
|
"version": "1.97.0",
|
||||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.96.0.tgz",
|
"resolved": "https://registry.npmjs.org/sass/-/sass-1.97.0.tgz",
|
||||||
"integrity": "sha512-8u4xqqUeugGNCYwr9ARNtQKTOj4KmYiJAVKXf2CTIivTCR51j96htbMKWDru8H5SaQWpyVgTfOF8Ylyf5pun1Q==",
|
"integrity": "sha512-KR0igP1z4avUJetEuIeOdDlwaUDvkH8wSx7FdSjyYBS3dpyX3TzHfAMO0G1Q4/3cdjcmi3r7idh+KCmKqS+KeQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -11291,9 +11291,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/update-browserslist-db": {
|
"node_modules/update-browserslist-db": {
|
||||||
"version": "1.2.2",
|
"version": "1.2.3",
|
||||||
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
|
||||||
"integrity": "sha512-E85pfNzMQ9jpKkA7+TJAi4TJN+tBCuWh5rUcS/sv6cFi+1q9LYDwDI5dpUL0u/73EElyQ8d3TEaeW4sPedBqYA==",
|
"integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -11740,9 +11740,9 @@
|
|||||||
"license": "BSD-2-Clause"
|
"license": "BSD-2-Clause"
|
||||||
},
|
},
|
||||||
"node_modules/webpack": {
|
"node_modules/webpack": {
|
||||||
"version": "5.103.0",
|
"version": "5.104.0",
|
||||||
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.103.0.tgz",
|
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.104.0.tgz",
|
||||||
"integrity": "sha512-HU1JOuV1OavsZ+mfigY0j8d1TgQgbZ6M+J75zDkpEAwYeXjWSqrGJtgnPblJjd/mAyTNQ7ygw0MiKOn6etz8yw==",
|
"integrity": "sha512-5DeICTX8BVgNp6afSPYXAFjskIgWGlygQH58bcozPOXgo2r/6xx39Y1+cULZ3gTxUYQP88jmwLj2anu4Xaq84g==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -11754,10 +11754,10 @@
|
|||||||
"@webassemblyjs/wasm-parser": "^1.14.1",
|
"@webassemblyjs/wasm-parser": "^1.14.1",
|
||||||
"acorn": "^8.15.0",
|
"acorn": "^8.15.0",
|
||||||
"acorn-import-phases": "^1.0.3",
|
"acorn-import-phases": "^1.0.3",
|
||||||
"browserslist": "^4.26.3",
|
"browserslist": "^4.28.1",
|
||||||
"chrome-trace-event": "^1.0.2",
|
"chrome-trace-event": "^1.0.2",
|
||||||
"enhanced-resolve": "^5.17.3",
|
"enhanced-resolve": "^5.17.4",
|
||||||
"es-module-lexer": "^1.2.1",
|
"es-module-lexer": "^2.0.0",
|
||||||
"eslint-scope": "5.1.1",
|
"eslint-scope": "5.1.1",
|
||||||
"events": "^3.2.0",
|
"events": "^3.2.0",
|
||||||
"glob-to-regexp": "^0.4.1",
|
"glob-to-regexp": "^0.4.1",
|
||||||
@@ -11768,7 +11768,7 @@
|
|||||||
"neo-async": "^2.6.2",
|
"neo-async": "^2.6.2",
|
||||||
"schema-utils": "^4.3.3",
|
"schema-utils": "^4.3.3",
|
||||||
"tapable": "^2.3.0",
|
"tapable": "^2.3.0",
|
||||||
"terser-webpack-plugin": "^5.3.11",
|
"terser-webpack-plugin": "^5.3.16",
|
||||||
"watchpack": "^2.4.4",
|
"watchpack": "^2.4.4",
|
||||||
"webpack-sources": "^3.3.3"
|
"webpack-sources": "^3.3.3"
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user