Skip to content

Commit 75326b9

Browse files
Merge pull request #11 from plorent/jpa-many-to-many
Fixed customer templates to get the correct data from the billing address.
2 parents 40b5c14 + 835a541 commit 75326b9

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/main/resources/templates/customer/customerform.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,31 @@ <h2>Customer Details</h2>
4848
<div class="form-group">
4949
<label class="col-sm-2 control-label">Address Line 1:</label>
5050
<div class="col-sm-10">
51-
<input type="text" class="form-control" th:field="*{addressLine1}"/>
51+
<input type="text" class="form-control" th:field="*{billingAddress.addressLine1}"/>
5252
</div>
5353
</div>
5454
<div class="form-group">
5555
<label class="col-sm-2 control-label">Address Line 2:</label>
5656
<div class="col-sm-10">
57-
<input type="text" class="form-control" th:field="*{addressLine2}"/>
57+
<input type="text" class="form-control" th:field="*{billingAddress.addressLine2}"/>
5858
</div>
5959
</div>
6060
<div class="form-group">
6161
<label class="col-sm-2 control-label">City:</label>
6262
<div class="col-sm-10">
63-
<input type="text" class="form-control" th:field="*{city}"/>
63+
<input type="text" class="form-control" th:field="*{billingAddress.city}"/>
6464
</div>
6565
</div>
6666
<div class="form-group">
6767
<label class="col-sm-2 control-label">State:</label>
6868
<div class="col-sm-10">
69-
<input type="text" class="form-control" th:field="*{state}"/>
69+
<input type="text" class="form-control" th:field="*{billingAddress.state}"/>
7070
</div>
7171
</div>
7272
<div class="form-group">
7373
<label class="col-sm-2 control-label">Zip Code:</label>
7474
<div class="col-sm-10">
75-
<input type="text" class="form-control" th:field="*{zipCode}"/>
75+
<input type="text" class="form-control" th:field="*{billingAddress.zipCode}"/>
7676
</div>
7777
</div>
7878
<div class="row">

src/main/resources/templates/customer/show.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,31 +58,31 @@ <h2>Show Customer</h2>
5858
<div class="form-group">
5959
<label class="col-sm-2 sm-2 control-label">Address Line 1:</label>
6060
<div class="col-sm-10">
61-
<p class="form-control-static" th:text="${customer.addressLine1}">Address Line 1</p>
61+
<p class="form-control-static" th:text="${customer.billingAddress.addressLine1}">Address Line 1</p>
6262
</div>
6363
</div>
6464
<div class="form-group">
6565
<label class="col-sm-2 sm-2 control-label">Address Line 2:</label>
6666
<div class="col-sm-10">
67-
<p class="form-control-static" th:text="${customer.addressLine2}">Address Line 2</p>
67+
<p class="form-control-static" th:text="${customer.billingAddress.addressLine2}">Address Line 2</p>
6868
</div>
6969
</div>
7070
<div class="form-group">
7171
<label class="col-sm-2 sm-2 control-label">City:</label>
7272
<div class="col-sm-10">
73-
<p class="form-control-static" th:text="${customer.city}">City</p>
73+
<p class="form-control-static" th:text="${customer.billingAddress.city}">City</p>
7474
</div>
7575
</div>
7676
<div class="form-group">
7777
<label class="col-sm-2 sm-2 control-label">State:</label>
7878
<div class="col-sm-10">
79-
<p class="form-control-static" th:text="${customer.state}">State</p>
79+
<p class="form-control-static" th:text="${customer.billingAddress.state}">State</p>
8080
</div>
8181
</div>
8282
<div class="form-group">
8383
<label class="col-sm-2 sm-2 control-label">Zip Code:</label>
8484
<div class="col-sm-10">
85-
<p class="form-control-static" th:text="${customer.zipCode}">Zipcode</p>
85+
<p class="form-control-static" th:text="${customer.billingAddress.zipCode}">Zipcode</p>
8686
</div>
8787
</div>
8888
</form>

0 commit comments

Comments
 (0)