diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index ae9f639afb..1870a74e2f 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -17,11 +17,13 @@ use Carbon\Carbon; use ExpandedForm; use FireflyIII\Http\Requests\PiggyBankFormRequest; use FireflyIII\Models\AccountType; +use FireflyIII\Models\Note; use FireflyIII\Models\PiggyBank; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Support\Collection; use Input; +use League\CommonMark\CommonMarkConverter; use Log; use Preferences; use Session; @@ -347,7 +349,11 @@ class PiggyBankController extends Controller */ public function show(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) { - $note = $piggyBank->notes()->first(); + /** @var Note $note */ + $note = $piggyBank->notes()->first(); + $converter = new CommonMarkConverter; + $note->text = $converter->convertToHtml($note->text); + $events = $repository->getEvents($piggyBank); $subTitle = e($piggyBank->name); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 773bef3979..768413e3fd 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -70,6 +70,7 @@ return [ 'source_accounts' => 'Source account(s)', 'destination_accounts' => 'Destination account(s)', 'user_id_is' => 'Your user id is :user', + 'field_supports_markdown' => 'This field supports Markdown.', // repeat frequencies: 'repeat_freq_monthly' => 'monthly', diff --git a/resources/views/form/textarea.twig b/resources/views/form/textarea.twig index 0e534179e0..9bed7883e2 100644 --- a/resources/views/form/textarea.twig +++ b/resources/views/form/textarea.twig @@ -3,6 +3,7 @@
- {{ note.text|nl2br }} -
-