Skip to content

Fixed: Administrator profile on ecommerce shows FTL error (OFBIZ-13475) #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vyasdevanshu wants to merge 1 commit into
base: trunk
Choose a base branch
from
+9 −8
Open

Fixed: Administrator profile on ecommerce shows FTL error (OFBIZ-13475) #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ecommerce/minilang/customer/CustomerEvents.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ under the License.
<process field="gender"><copy/></process>

<process field="residenceStatusEnumId"><copy/></process>
<process field="maritalStatusEnumId"><copy/></process>
<process field="maritalStatusTypeId"><copy/></process>
<process field="employmentStatusEnumId"><copy/></process>
<process field="occupation"><copy/></process>
<process field="yearsWithEmployer"><convert type="Long"><fail-property resource="EcommerceUiLabels" property="EcommerceYearsWithEmployeeNotValid"/></convert></process>
Expand Down
9 changes: 5 additions & 4 deletions ecommerce/template/customer/EditPerson.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,11 @@ under the License.
</div>
<div class="col-sm-6">
<label>${uiLabelMap.PartyMaritalStatus}</label>
<#assign maritalStatusEnums = EntityQuery.use(delegator).from("Enumeration").where("enumTypeId", "MARITAL_STATUS").cache().orderBy("sequenceId").queryList()!>
<select name="maritalStatusEnumId" class="form-control custom-select">
<#list maritalStatusEnums as maritalStatus>
<option <#if maritalStatus.enumId == personData.maritalStatusEnumId!>selected="selected"</#if> value="${maritalStatus.enumId!}">${maritalStatus.description!}</option>
<#assign maritalStatusTypes = EntityQuery.use(delegator).from("MaritalStatusType").cache().queryList()!>
<select name="maritalStatusTypeId" class="form-control custom-select">
<option value="">${uiLabelMap.CommonSelectOne}</option>
<#list maritalStatusTypes as maritalStatusType>
<option <#if maritalStatusType.maritalStatusTypeId == personData.maritalStatusTypeId!>selected="selected"</#if> value="${maritalStatusType.maritalStatusTypeId!}">${maritalStatusType.description!}</option>
</#list>
</select>
</div>
Expand Down
6 changes: 3 additions & 3 deletions ecommerce/template/customer/ViewProfile.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ under the License.
<dt class="col-lg-2">${uiLabelMap.PartyWeight}</dt>
<dd class="col-lg-10">${person.weight}</dd>
</#if>
<#if person.maritalStatusEnumId?has_content>
<#assign maritalStatus = EntityQuery.use(delegator).from("Enumeration").where("enumId", person.maritalStatusEnumId!).cache().queryOne()!>
<#if person.maritalStatusTypeId?has_content>
<#assign maritalStatus = EntityQuery.use(delegator).from("MaritalStatusType").where("maritalStatusTypeId", person.maritalStatusTypeId!).cache().queryOne()!>
<dt class="col-lg-2">${uiLabelMap.PartyMaritalStatus}</dt>
<dd class="col-lg-10">${maritalStatus.description!person.maritalStatusEnumId}</dd>
<dd class="col-lg-10">${maritalStatus.description!person.maritalStatusTypeId}</dd>
</#if>
</dl>
</div>
Expand Down