Merge pull request 'fix creditcard num not being set leading to crash' (#82) from feature/80_fix_creditcardnum_null_usersettings into master

2020-06-16 23:51:25 +02:00
parent 396d3fda14 486f237135
commit e037b75f7c
1 changed files with 5 additions and 1 deletions
--- a/prototype/src/main/resources/templates/user/settings.html
+++ b/prototype/src/main/resources/templates/user/settings.html
@ -91,7 +91,11 @@
            </div>
            <div>
                <div class="input-icon">
-                    <input class="full-width" type="text" name="creditCardNumber" th:value="${user.defaultPayment.creditCardNumber}"/>
+                    <input class="full-width"
+                           type="text"
+                           name="creditCardNumber"
+                           th:value="${user.defaultPayment != null && user.defaultPayment.creditCardNumber != null ? user.defaultPayment.creditCardNumber : ''}"
+                           placeholder="Jetzt Kreditkartennummer hinterlegen."/>
                    <button> Kreditkartennummer ändern</button>
                </div>
            </div>