Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

app/Api/V1/Requests/AccountUpdateRequest.php

@@ -76,7 +76,7 @@ class AccountUpdateRequest extends Request
             'opening_balance_date'    => $this->date('opening_balance_date'),
             'cc_type'                 => $this->nullableString('credit_card_type'),
             'cc_Monthly_payment_date' => $this->nullableString('monthly_payment_date'),
-            'notes'                   => $this->nullableString('notes'),
+            'notes'                   => $this->nullableNlString('notes'),
             'interest'                => $this->nullableString('interest'),
             'interest_period'         => $this->nullableString('interest_period'),
         ];

app/Api/V1/Requests/AttachmentStoreRequest.php

@@ -56,7 +56,7 @@ class AttachmentStoreRequest extends Request
         return [
             'filename' => $this->string('filename'),
             'title'    => $this->string('title'),
-            'notes'    => $this->string('notes'),
+            'notes'    => $this->nlString('notes'),
             'model'    => $this->string('model'),
             'model_id' => $this->integer('model_id'),
         ];

app/Api/V1/Requests/AttachmentUpdateRequest.php

@@ -51,7 +51,7 @@ class AttachmentUpdateRequest extends Request
         return [
             'filename' => $this->string('filename'),
             'title'    => $this->string('title'),
-            'notes'    => $this->string('notes'),
+            'notes'    => $this->nlString('notes'),
             'model'    => $this->string('model'),
             'model_id' => $this->integer('model_id'),
         ];

app/Api/V1/Requests/BillRequest.php

@@ -70,7 +70,7 @@ class BillRequest extends Request
             'repeat_freq'   => $this->string('repeat_freq'),
             'skip'          => $this->integer('skip'),
             'active'        => $active,
-            'notes'         => $this->string('notes'),
+            'notes'         => $this->nlString('notes'),
         ];
 
         return $data;

app/Api/V1/Requests/PiggyBankRequest.php

@@ -62,7 +62,7 @@ class PiggyBankRequest extends Request
             'current_amount' => $this->string('current_amount'),
             'startdate'      => $this->date('start_date'),
             'targetdate'     => $this->date('target_date'),
-            'notes'          => $this->string('notes'),
+            'notes'          => $this->nlString('notes'),
         ];
     }
 

app/Api/V1/Requests/RecurrenceUpdateRequest.php

@@ -69,7 +69,7 @@ class RecurrenceUpdateRequest extends Request
                 'title'             => $this->nullableString('title'),
                 'description'       => $this->nullableString('description'),
                 'first_date'        => $this->date('first_date'),
-                'notes'             => $this->nullableString('notes'),
+                'notes'             => $this->nullableNlString('notes'),
                 'repeat_until'      => $this->date('repeat_until'),
                 'nr_of_repetitions' => $this->nullableInteger('nr_of_repetitions'),
                 'apply_rules'       => $applyRules,

app/Api/V1/Requests/Request.php

@@ -65,7 +65,7 @@ class Request extends FireflyIIIRequest
             'opening_balance_date'    => $this->date('opening_balance_date'),
             'cc_type'                 => $this->string('credit_card_type'),
             'cc_Monthly_payment_date' => $this->string('monthly_payment_date'),
-            'notes'                   => $this->string('notes'),
+            'notes'                   => $this->nlString('notes'),
             'interest'                => $this->string('interest'),
             'interest_period'         => $this->string('interest_period'),
         ];

app/Api/V1/Requests/TransactionLinkRequest.php

@@ -57,7 +57,7 @@ class TransactionLinkRequest extends Request
             'link_type_name' => $this->string('link_type_name'),
             'inward_id'      => $this->integer('inward_id'),
             'outward_id'     => $this->integer('outward_id'),
-            'notes'          => $this->string('notes'),
+            'notes'          => $this->nlString('notes'),
         ];
     }
 

app/Api/V1/Requests/TransactionStoreRequest.php

@@ -242,7 +242,7 @@ class TransactionStoreRequest extends Request
 
                 // some other interesting properties
                 'reconciled'            => $this->convertBoolean((string)$object['reconciled']),
-                'notes'                 => $this->stringFromValue($object['notes']),
+                'notes'                 => $this->nlStringFromValue($object['notes']),
                 'tags'                  => $this->arrayFromValue($object['tags']),
 
                 // all custom fields:

app/Http/Requests/AccountFormRequest.php

@@ -63,7 +63,7 @@ class AccountFormRequest extends Request
             'opening_balance_date'    => $this->date('opening_balance_date'),
             'cc_type'                 => $this->string('cc_type'),
             'cc_monthly_payment_date' => $this->string('cc_monthly_payment_date'),
-            'notes'                   => $this->string('notes'),
+            'notes'                   => $this->nlString('notes'),
             'interest'                => $this->string('interest'),
             'interest_period'         => $this->string('interest_period'),
             'include_net_worth'       => '1',

app/Http/Requests/Request.php

@@ -237,6 +237,21 @@ class Request extends FormRequest
     }
 
 
+    /**
+     * Return string value, but keep newlines, or NULL if empty.
+     *
+     * @param string $field
+     *
+     * @return string
+     */
+    public function nullableNlString(string $field): string
+    {
+        if (!$this->has($field)) {
+            return null;
+        }
+        return app('steam')->nlCleanString((string)($this->get($field) ?? ''));
+    }
+
     /**
      * Parse and clean a string.
      *