Auto commit for release 'develop' on 2024-10-07

.ci/php-cs-fixer/composer.lock

@@ -2541,10 +2541,10 @@
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
+    "platform": {},
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }

.env.example

@@ -176,6 +176,7 @@ MAILGUN_ENDPOINT=api.mailgun.net
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
+MAILERSEND_API_KEY=
 
 # Firefly III can send you the following messages.
 SEND_ERROR_MESSAGE=true

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -79,12 +79,12 @@ class StoreRequest extends FormRequest
             'currency_id'    => 'numeric|exists:transaction_currencies,id',
             'currency_code'  => 'min:3|max:51|exists:transaction_currencies,code',
             'date'           => 'date|required',
-            'end_date'       => 'date|after:date',
-            'extension_date' => 'date|after:date',
+            'end_date'       => 'nullable|date|after:date',
+            'extension_date' => 'nullable|date|after:date',
             'repeat_freq'    => 'in:weekly,monthly,quarterly,half-year,yearly|required',
             'skip'           => 'min:0|max:31|numeric',
             'active'         => [new IsBoolean()],
-            'notes'          => 'min:1|max:32768',
+            'notes'          => 'nullable|min:1|max:32768',
         ];
     }
 

app/Api/V2/Controllers/Chart/BalanceController.php

@@ -84,10 +84,6 @@ class BalanceController extends Controller
         $queryParameters = $request->getParameters();
         $accounts        = $this->getAccountList($queryParameters);
 
-        // move date to end of day
-        $queryParameters['start']->startOfDay();
-        $queryParameters['end']->endOfDay();
-
         // prepare for currency conversion and data collection:
         /** @var TransactionCurrency $default */
         $default         = app('amount')->getDefaultCurrency();

app/Api/V2/Request/Chart/ChartRequest.php

@@ -53,10 +53,10 @@ class ChartRequest extends FormRequest
         $queryParameters = QueryParameters::cast($this->all());
 
         return [
-            'start'       => $this->dateOrToday($queryParameters, 'start'),
-            'end'         => $this->dateOrToday($queryParameters, 'end'),
+            'start'       => $this->dateOrToday($queryParameters, 'start')->startOfDay(),
+            'end'         => $this->dateOrToday($queryParameters, 'end')->endOfDay(),
             'preselected' => $this->stringFromQueryParams($queryParameters, 'preselected', 'empty'),
-            'period'      => $this->stringFromQueryParams($queryParameters, 'period', '1M'),
+            'period'      => $this->stringFromFilterParams($queryParameters, 'period', '1M'),
             'accounts'    => $this->arrayOfStrings($queryParameters, 'accounts'),
             // preselected heeft maar een paar toegestane waardes, dat moet ook goed gaan.
             //            'query'         => $this->arrayOfStrings($queryParameters, 'query'),
@@ -80,12 +80,14 @@ class ChartRequest extends FormRequest
         return [
             'fields'  => JsonApiRule::notSupported(),
             'filter'  => ['nullable', 'array',
-                new IsValidFilter(['start', 'end', 'preselected', 'accounts']),
+                new IsValidFilter(['start', 'end', 'preselected', 'accounts', 'period']),
                 new IsFilterValueIn('preselected', config('firefly.preselected_accounts')),
             ],
             'include' => JsonApiRule::notSupported(),
             'page'    => JsonApiRule::notSupported(),
             'sort'    => JsonApiRule::notSupported(),
+            // 'start'   => 'required|date|after:1900-01-01|before:2099-12-31',
+            // 'end'     => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
         ];
 
         //        return [

app/Jobs/CreateRecurringTransactions.php

@@ -362,11 +362,9 @@ class CreateRecurringTransactions implements ShouldQueue
         $groupTitle              = null;
         $count                   = $recurrence->recurrenceTransactions->count();
         // #8844, if there is one recurrence transaction, use the first title as the title.
-        if (1 === $count) {
-            /** @var RecurrenceTransaction $first */
-            $first      = $recurrence->recurrenceTransactions()->first();
-            $groupTitle = $first->description;
-        }
+        // #9305, if there is one recurrence transaction, group title must be NULL.
+        $groupTitle              = null;
+
         // #8844, if there are more, use the recurrence transaction itself.
         if ($count > 1) {
             $groupTitle = $recurrence->title;

app/Services/Internal/Support/CreditRecalculateService.php

@@ -327,15 +327,17 @@ class CreditRecalculateService
 
         if ($isSameAccount && $isDebit && $this->isTransferIn($usedAmount, $type)) { // case 9
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcadd($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case 9 (transfer into debit liability, means you owe more): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
+            $result     = bcsub($leftOfDebt, $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.
+            app('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)));
 
             return $result;
         }
         if ($isSameAccount && $isDebit && $this->isTransferOut($usedAmount, $type)) { // case 10
             $usedAmount = app('steam')->positive($usedAmount);
-            $result     = bcsub($leftOfDebt, $usedAmount);
-            app('log')->debug(sprintf('Case 5 (transfer out of debit liability, means you owe less): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
+            $result     = bcadd($leftOfDebt, $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.
+            app('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)));
 
             return $result;
         }

app/Support/Http/Api/ParsesQueryFilters.php

@@ -35,6 +35,7 @@ trait ParsesQueryFilters
         $date  = today();
 
         $value = $parameters->filter()?->value($field, date('Y-m-d'));
+
         if (is_array($value)) {
             Log::error(sprintf('Multiple values for date field "%s". Using first value.', $field));
             $value = $value[0];
@@ -65,4 +66,9 @@ trait ParsesQueryFilters
     {
         return (string) ($parameters->page()[$field] ?? $default);
     }
+
+    private function stringFromFilterParams(QueryParameters $parameters, string $field, string $default): string
+    {
+        return (string)$parameters->filter()?->value($field, $default) ?? $default;
+    }
 }

app/Validation/AccountValidator.php

@@ -86,7 +86,7 @@ class AccountValidator
             app('log')->debug('AccountValidator source is set to NULL');
         }
         if (null !== $account) {
-            app('log')->debug(sprintf('AccountValidator source is set to #%d: "%s" (%s)', $account->id, $account->name, $account->accountType->type));
+            app('log')->debug(sprintf('AccountValidator source is set to #%d: "%s" (%s)', $account->id, $account->name, $account->accountType?->type));
         }
         $this->source = $account;
     }

composer.json

@@ -98,6 +98,7 @@
         "league/commonmark": "2.*",
         "league/csv": "^9.10",
         "league/fractal": "0.*",
+        "mailersend/laravel-driver": "^2.7",
         "nunomaduro/collision": "^8",
         "pragmarx/google2fa": "^8.0",
         "predis/predis": "^2.2",
@@ -194,7 +195,8 @@
         "optimize-autoloader": true,
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "php-http/discovery": true
         }
     }
 }

config/firefly.php

@@ -110,7 +110,7 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2024-09-30',
+    'version'                      => 'develop/2024-10-07',
     'api_version'                  => '2.1.0',
     'db_version'                   => 24,
 

config/mail.php

@@ -35,7 +35,7 @@ return [
     'default'  => envNonEmpty('MAIL_MAILER', 'log'),
 
     'mailers'  => [
-        'smtp'     => [
+        'smtp'       => [
             'transport'   => 'smtp',
             'host'        => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'),
             'port'        => (int)env('MAIL_PORT', 2525),
@@ -45,39 +45,41 @@ return [
             'timeout'     => null,
             'verify_peer' => null !== env('MAIL_ENCRYPTION'),
         ],
-
-        'ses'      => [
+        'mailersend' => [
+            'transport' => 'mailersend',
+        ],
+        'ses'        => [
             'transport' => 'ses',
         ],
 
-        'mailgun'  => [
+        'mailgun'    => [
             'transport' => 'mailgun',
         ],
 
-        'mandrill' => [
+        'mandrill'   => [
             'transport' => 'mandrill',
         ],
 
-        'postmark' => [
+        'postmark'   => [
             'transport' => 'postmark',
         ],
 
-        'sendmail' => [
+        'sendmail'   => [
             'transport' => 'sendmail',
             'path'      => envNonEmpty('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'),
         ],
-        'log'      => [
+        'log'        => [
             'transport' => 'log',
             'channel'   => env('MAIL_LOG_CHANNEL', 'stack'),
             'level'     => 'info',
         ],
-        'null'     => [
+        'null'       => [
             'transport' => 'log',
             'channel'   => env('MAIL_LOG_CHANNEL', 'stack'),
             'level'     => 'notice',
         ],
 
-        'array'    => [
+        'array'      => [
             'transport' => 'array',
         ],
     ],

public/v1/js/ff/rules/create-edit.js

@@ -337,6 +337,13 @@ function updateTriggerInput(selectList) {
             console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
             createAutoComplete(inputResult, 'api/v1/autocomplete/tags');
             break;
+        case 'bill_contains':
+        case 'bill_ends':
+        case 'bill_is':
+        case 'bill_starts':
+            console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
+            createAutoComplete(inputResult, 'api/v1/autocomplete/bills');
+            break;
         case 'budget_is':
             console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
             createAutoComplete(inputResult, 'api/v1/autocomplete/budgets');

resources/views/accounts/index.twig

@@ -67,6 +67,18 @@
     {% endif %}
     {% if accounts.count() == 0 and page == 1 %}
         {% include 'partials.empty' with {objectType: objectType, type: 'accounts',route: route('accounts.create', [objectType])} %}
+
+        {% if inactiveCount > 0 %}
+            <p class="text-center"><small>
+                    <em>
+                        <a href="{{ route('accounts.inactive.index', objectType) }}" class="text-muted">
+                            {{ trans_choice('firefly.inactive_account_link', inactiveCount) }}
+                        </a>
+                    </em>
+                </small>
+            </p>
+        {% endif %}
+
     {% endif %}
 {% endblock %}