svn commit: r1618313 [5/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
Locked
svn commit: r1618313 [5/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
 
|
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Sat Aug 16 08:40:28 2014 @@ -20,9 +20,9 @@ under the License. <h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3> <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonBack}</a> <#else> - <#if !contactMech?exists> + <#if !contactMech??> <#-- When creating a new contact mech, first select the type, then actually create --> - <#if !requestParameters.preContactMechTypeId?exists && !preContactMechTypeId?exists> + <#if !requestParameters.preContactMechTypeId?? && !preContactMechTypeId??> <h2>${uiLabelMap.PartyCreateNewContactInfo}</h2> <form method="post" action='<@ofbizUrl>editcontactmechnosave</@ofbizUrl>' name="createcontactmechform"> <div> @@ -44,8 +44,8 @@ under the License. </#if> </#if> - <#if contactMechTypeId?exists> - <#if !contactMech?exists> + <#if contactMechTypeId??> + <#if !contactMech??> <h2>${uiLabelMap.PartyCreateNewContactInfo}</h2> <a href='<@ofbizUrl>${donePage}</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a> <a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a> @@ -53,8 +53,8 @@ under the License. <form method="post" action='<@ofbizUrl>${reqName}</@ofbizUrl>' name="editcontactmechform" id="editcontactmechform"> <div> <input type='hidden' name='contactMechTypeId' value='${contactMechTypeId}' /> - <#if contactMechPurposeType?exists> - <div>(${uiLabelMap.PartyNewContactHavePurpose} "${contactMechPurposeType.get("description",locale)?if_exists}")</div> + <#if contactMechPurposeType??> + <div>(${uiLabelMap.PartyNewContactHavePurpose} "${contactMechPurposeType.get("description",locale)!}")</div> </#if> <#if cmNewPurposeTypeId?has_content><input type='hidden' name='contactMechPurposeTypeId' value='${cmNewPurposeTypeId}' /></#if> <#if preContactMechTypeId?has_content><input type='hidden' name='preContactMechTypeId' value='${preContactMechTypeId}' /></#if> @@ -69,17 +69,17 @@ under the License. <td> </td> <td> <table border="0" cellspacing="1"> - <#list partyContactMechPurposes?if_exists as partyContactMechPurpose> + <#list partyContactMechPurposes! as partyContactMechPurpose> <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) /> <tr> <td> - <#if contactMechPurposeType?exists> + <#if contactMechPurposeType??> ${contactMechPurposeType.get("description",locale)} <#else> ${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}" </#if> (${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()}) - <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpires}:${partyContactMechPurpose.thruDate.toString()})</#if> + <#if partyContactMechPurpose.thruDate??>(${uiLabelMap.CommonExpires}:${partyContactMechPurpose.thruDate.toString()})</#if> </td> <td> <form name="deletePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}" method="post" action="<@ofbizUrl>deletePartyContactMechPurpose</@ofbizUrl>"> @@ -127,35 +127,35 @@ under the License. <td align="right" valign="top">${uiLabelMap.PartyToName}</td> <td> </td> <td> - <input type="text" class='inputBox' size="30" maxlength="60" name="toName" value="${postalAddressData.toName?if_exists}" /> + <input type="text" class='inputBox' size="30" maxlength="60" name="toName" value="${postalAddressData.toName!}" /> </td> </tr> <tr> <td align="right" valign="top">${uiLabelMap.PartyAttentionName}</td> <td> </td> <td> - <input type="text" class='inputBox' size="30" maxlength="60" name="attnName" value="${postalAddressData.attnName?if_exists}" /> + <input type="text" class='inputBox' size="30" maxlength="60" name="attnName" value="${postalAddressData.attnName!}" /> </td> </tr> <tr> <td align="right" valign="top">${uiLabelMap.PartyAddressLine1}</td> <td> </td> <td> - <input type="text" class='inputBox' size="30" maxlength="30" name="address1" value="${postalAddressData.address1?if_exists}" /> + <input type="text" class='inputBox' size="30" maxlength="30" name="address1" value="${postalAddressData.address1!}" /> *</td> </tr> <tr> <td align="right" valign="top">${uiLabelMap.PartyAddressLine2}</td> <td> </td> <td> - <input type="text" class='inputBox' size="30" maxlength="30" name="address2" value="${postalAddressData.address2?if_exists}" /> + <input type="text" class='inputBox' size="30" maxlength="30" name="address2" value="${postalAddressData.address2!}" /> </td> </tr> <tr> <td align="right" valign="top">${uiLabelMap.PartyCity}</td> <td> </td> <td> - <input type="text" class='inputBox' size="30" maxlength="30" name="city" value="${postalAddressData.city?if_exists}" /> + <input type="text" class='inputBox' size="30" maxlength="30" name="city" value="${postalAddressData.city!}" /> *</td> </tr> <tr> @@ -170,7 +170,7 @@ under the License. <td align="right" valign="top">${uiLabelMap.PartyZipCode}</td> <td > </td> <td> - <input type="text" class='inputBox' size="12" maxlength="10" name="postalCode" value="${postalAddressData.postalCode?if_exists}" /> + <input type="text" class='inputBox' size="12" maxlength="10" name="postalCode" value="${postalAddressData.postalCode!}" /> *</td> </tr> <tr> @@ -179,7 +179,7 @@ under the License. <td> <select name="countryGeoId" id="editcontactmechform_countryGeoId"> ${screens.render("component://common/widget/CommonScreens.xml#countries")} - <#if (postalAddress?exists) && (postalAddress.countryGeoId?exists)> + <#if (postalAddress??) && (postalAddress.countryGeoId??)> <#assign defaultCountryGeoId = postalAddress.countryGeoId> <#else> <#assign defaultCountryGeoId = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "country.geo.id.default")> @@ -196,10 +196,10 @@ under the License. <td align="right" valign="top">${uiLabelMap.PartyPhoneNumber}</td> <td> </td> <td> - <input type="text" class='inputBox' size="4" maxlength="10" name="countryCode" value="${telecomNumberData.countryCode?if_exists}" /> - - <input type="text" class='inputBox' size="4" maxlength="10" name="areaCode" value="${telecomNumberData.areaCode?if_exists}" /> - - <input type="text" class='inputBox' size="15" maxlength="15" name="contactNumber" value="${telecomNumberData.contactNumber?if_exists}" /> - ${uiLabelMap.PartyExtension} <input type="text" class='inputBox' size="6" maxlength="10" name="extension" value="${partyContactMechData.extension?if_exists}" /> + <input type="text" class='inputBox' size="4" maxlength="10" name="countryCode" value="${telecomNumberData.countryCode!}" /> + - <input type="text" class='inputBox' size="4" maxlength="10" name="areaCode" value="${telecomNumberData.areaCode!}" /> + - <input type="text" class='inputBox' size="15" maxlength="15" name="contactNumber" value="${telecomNumberData.contactNumber!}" /> + ${uiLabelMap.PartyExtension} <input type="text" class='inputBox' size="6" maxlength="10" name="extension" value="${partyContactMechData.extension!}" /> </td> </tr> <tr> @@ -212,15 +212,15 @@ under the License. <td align="right" valign="top">${uiLabelMap.PartyEmailAddress}</td> <td> </td> <td> - <input type="text" class='inputBox' size="60" maxlength="255" name="emailAddress" value="<#if tryEntity>${contactMech.infoString?if_exists}<#else>${requestParameters.emailAddress?if_exists}</#if>" /> + <input type="text" class='inputBox' size="60" maxlength="255" name="emailAddress" value="<#if tryEntity>${contactMech.infoString!}<#else>${requestParameters.emailAddress!}</#if>" /> *</td> </tr> <#else> <tr> - <td align="right" valign="top">${contactMechType.get("description",locale)?if_exists}</td> + <td align="right" valign="top">${contactMechType.get("description",locale)!}</td> <td> </td> <td> - <input type="text" class='inputBox' size="60" maxlength="255" name="infoString" value="${contactMechData.infoString?if_exists}" /> + <input type="text" class='inputBox' size="60" maxlength="255" name="infoString" value="${contactMechData.infoString!}" /> *</td> </tr> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl Sat Aug 16 08:40:28 2014 @@ -21,7 +21,7 @@ under the License. <h3>${uiLabelMap.AccountingCardInfoNotBelongToYou}.</h3> <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> <#else> - <#if !creditCard?exists> + <#if !creditCard??> <h2>${uiLabelMap.AccountingAddNewCreditCard}</h2> <form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform"> <div> @@ -57,21 +57,21 @@ under the License. <#list curPartyContactMechPurposes as curPartyContactMechPurpose> <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) /> <div> - ${curContactMechPurposeType.get("description",locale)?if_exists} - <#if curPartyContactMechPurpose.thruDate?exists> + ${curContactMechPurposeType.get("description",locale)!} + <#if curPartyContactMechPurpose.thruDate??> ((${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()}) </#if> </div> </#list> <div> - <#if curPostalAddress.toName?exists>${uiLabelMap.CommonTo}: ${curPostalAddress.toName}<br /></#if> - <#if curPostalAddress.attnName?exists>${uiLabelMap.PartyAddrAttnName}: ${curPostalAddress.attnName}<br /></#if> - ${curPostalAddress.address1?if_exists}<br /> - <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br /></#if> + <#if curPostalAddress.toName??>${uiLabelMap.CommonTo}: ${curPostalAddress.toName}<br /></#if> + <#if curPostalAddress.attnName??>${uiLabelMap.PartyAddrAttnName}: ${curPostalAddress.attnName}<br /></#if> + ${curPostalAddress.address1!}<br /> + <#if curPostalAddress.address2??>${curPostalAddress.address2}<br /></#if> ${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode} - <#if curPostalAddress.countryGeoId?exists><br />${curPostalAddress.countryGeoId}</#if> - <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div> - <#if curPartyContactMech.thruDate?exists><div>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</#if> + <#if curPostalAddress.countryGeoId??><br />${curPostalAddress.countryGeoId}</#if> + <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())!})</div> + <#if curPartyContactMech.thruDate??><div>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</#if> </div> </td> </tr> @@ -102,24 +102,24 @@ under the License. <#list partyContactMechPurposes as partyContactMechPurpose> <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) /> <div> - ${contactMechPurposeType.get("description",locale)?if_exists} - <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> + ${contactMechPurposeType.get("description",locale)!} + <#if partyContactMechPurpose.thruDate??>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> </div> </#list> <div> - <#if postalAddress.toName?exists>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br /></#if> - <#if postalAddress.attnName?exists>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br /></#if> - ${postalAddress.address1?if_exists}<br /> - <#if postalAddress.address2?exists>${postalAddress.address2}<br /></#if> + <#if postalAddress.toName??>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br /></#if> + <#if postalAddress.attnName??>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br /></#if> + ${postalAddress.address1!}<br /> + <#if postalAddress.address2??>${postalAddress.address2}<br /></#if> ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode} - <#if postalAddress.countryGeoId?exists><br />${postalAddress.countryGeoId}</#if> + <#if postalAddress.countryGeoId??><br />${postalAddress.countryGeoId}</#if> </div> - <div>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div> - <#if partyContactMech.thruDate?exists><div>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if> + <div>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())!})</div> + <#if partyContactMech.thruDate??><div>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if> </td> </tr> </#list> - <#if !postalAddressInfos?has_content && !curContactMech?exists> + <#if !postalAddressInfos?has_content && !curContactMech??> <tr><td colspan="2"><div>${uiLabelMap.PartyNoContactInformation}.</div></td></tr> </#if> <tr> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl Sat Aug 16 08:40:28 2014 @@ -21,7 +21,7 @@ under the License. <p><h3>${uiLabelMap.AccountingEFTNotBelongToYou}.</h3></p> <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> <#else> - <#if !eftAccount?exists> + <#if !eftAccount??> <h1>${uiLabelMap.AccountingAddNewEftAccount}</h1> <form method="post" action="<@ofbizUrl>createEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>" name="editeftaccountform" style="margin: 0;"> <#else> @@ -37,28 +37,28 @@ under the License. <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingNameOnAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}" /> + <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount!}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCompanyNameOnAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}" /> + <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount!}" /> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingBankName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}" /> + <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName!}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingRoutingNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}" /> + <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber!}" /> *</td> </tr> <tr> @@ -66,7 +66,7 @@ under the License. <td width="5"> </td> <td width="74%"> <select name="accountType" class="selectBox"> - <option>${eftAccountData.accountType?if_exists}</option> + <option>${eftAccountData.accountType!}</option> <option></option> <option>${uiLabelMap.CommonChecking}</option> <option>${uiLabelMap.CommonSavings}</option> @@ -77,14 +77,14 @@ under the License. <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}" /> + <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber!}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" /> + <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description!}" /> </td> </tr> @@ -97,7 +97,7 @@ under the License. [Create New Address]</a> --> <table width="100%" border="0" cellpadding="1"> - <#if curPostalAddress?exists> + <#if curPostalAddress??> <tr> <td align="right" valign="top" width="1%"> <input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked" /> @@ -107,22 +107,22 @@ under the License. <#list curPartyContactMechPurposes as curPartyContactMechPurpose> <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)> <div> - <b>${curContactMechPurposeType.get("description",locale)?if_exists}</b> - <#if curPartyContactMechPurpose.thruDate?exists> + <b>${curContactMechPurposeType.get("description",locale)!}</b> + <#if curPartyContactMechPurpose.thruDate??> (${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()}) </#if> </div> </#list> <div> - <#if curPostalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}<br /></#if> - <#if curPostalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}<br /></#if> - ${curPostalAddress.address1?if_exists}<br /> - <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br /></#if> + <#if curPostalAddress.toName??><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}<br /></#if> + <#if curPostalAddress.attnName??><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}<br /></#if> + ${curPostalAddress.address1!}<br /> + <#if curPostalAddress.address2??>${curPostalAddress.address2}<br /></#if> ${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode} - <#if curPostalAddress.countryGeoId?exists><br />${curPostalAddress.countryGeoId}</#if> + <#if curPostalAddress.countryGeoId??><br />${curPostalAddress.countryGeoId}</#if> </div> - <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div> - <#if curPartyContactMech.thruDate?exists><div><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if> + <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())!})</div> + <#if curPartyContactMech.thruDate??><div><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if> </td> </tr> <#else> @@ -152,24 +152,24 @@ under the License. <#list partyContactMechPurposes as partyContactMechPurpose> <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)> <div> - <b>${contactMechPurposeType.get("description",locale)?if_exists}</b> - <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> + <b>${contactMechPurposeType.get("description",locale)!}</b> + <#if partyContactMechPurpose.thruDate??>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> </div> </#list> <div> - <#if postalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br /></#if> - <#if postalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if> - ${postalAddress.address1?if_exists}<br /> - <#if postalAddress.address2?exists>${postalAddress.address2}<br /></#if> + <#if postalAddress.toName??><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br /></#if> + <#if postalAddress.attnName??><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if> + ${postalAddress.address1!}<br /> + <#if postalAddress.address2??>${postalAddress.address2}<br /></#if> ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode} - <#if postalAddress.countryGeoId?exists><br />${postalAddress.countryGeoId}</#if> + <#if postalAddress.countryGeoId??><br />${postalAddress.countryGeoId}</#if> </div> - <div>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div> - <#if partyContactMech.thruDate?exists><div><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div></#if> + <div>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())!})</div> + <#if partyContactMech.thruDate??><div><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div></#if> </td> </tr> </#list> - <#if !postalAddressInfos?has_content && !curContactMech?exists> + <#if !postalAddressInfos?has_content && !curContactMech??> <tr><td colspan="2"><div>${uiLabelMap.PartyNoContactInformation}.</div></td></tr> </#if> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl Sat Aug 16 08:40:28 2014 @@ -21,7 +21,7 @@ under the License. <p><h3>${uiLabelMap.AccountingCardInfoNotBelongToYou}.</h3></p> <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a> <#else> - <#if !giftCard?exists> + <#if !giftCard??> <h1>${uiLabelMap.AccountingAddNewGiftCard}</h1> <form method="post" action="<@ofbizUrl>createGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;"> <#else> @@ -39,7 +39,7 @@ under the License. <td width="74%"> <#if giftCardData?has_content && giftCardData.cardNumber?has_content> <#assign pcardNumberDisplay = ""> - <#assign pcardNumber = giftCardData.cardNumber?if_exists> + <#assign pcardNumber = giftCardData.cardNumber!> <#if pcardNumber?has_content> <#assign psize = pcardNumber?length - 4> <#if 0 < psize> @@ -52,14 +52,14 @@ under the License. </#if> </#if> </#if> - <input type="text" class="inputBox" size="20" maxlength="60" name="cardNumber" value="${pcardNumberDisplay?if_exists}" /> + <input type="text" class="inputBox" size="20" maxlength="60" name="cardNumber" value="${pcardNumberDisplay!}" /> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingPINNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="password" class="inputBox" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}" /> + <input type="password" class="inputBox" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber!}" /> </td> </tr> <tr> @@ -68,9 +68,9 @@ under the License. <td width="74%"> <#assign expMonth = ""> <#assign expYear = ""> - <#if giftCardData?exists && giftCardData.expireDate?exists> + <#if giftCardData?? && giftCardData.expireDate??> <#assign expDate = giftCard.expireDate> - <#if (expDate?exists && expDate.indexOf("/") > 0)> + <#if (expDate?? && expDate.indexOf("/") > 0)> <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))> <#assign expYear = expDate.substring(expDate.indexOf("/")+1)> </#if> @@ -79,10 +79,10 @@ under the License. <#if giftCardData?has_content && expMonth?has_content> <#assign ccExprMonth = expMonth> <#else> - <#assign ccExprMonth = requestParameters.expMonth?if_exists> + <#assign ccExprMonth = requestParameters.expMonth!> </#if> <#if ccExprMonth?has_content> - <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option> + <option value="${ccExprMonth!}">${ccExprMonth!}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")} </select> @@ -90,10 +90,10 @@ under the License. <#if giftCard?has_content && expYear?has_content> <#assign ccExprYear = expYear> <#else> - <#assign ccExprYear = requestParameters.expYear?if_exists> + <#assign ccExprYear = requestParameters.expYear!> </#if> <#if ccExprYear?has_content> - <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option> + <option value="${ccExprYear!}">${ccExprYear!}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#ccyears")} </select> @@ -103,7 +103,7 @@ under the License. <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" /> + <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description!}" /> </td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl Sat Aug 16 08:40:28 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if person?exists> +<#if person??> <h2>${uiLabelMap.PartyEditPersonalInformation}</h2> <form id="editpersonform1" method="post" action="<@ofbizUrl>updatePerson</@ofbizUrl>" name="editpersonform"> <#else> @@ -27,7 +27,7 @@ under the License. <a href='<@ofbizUrl>${donePage}</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a> <a href="javascript:document.editpersonform.submit()" class="button">${uiLabelMap.CommonSave}</a> <p/> - <input type="hidden" name="partyId" value="${person.partyId?if_exists}" /> + <input type="hidden" name="partyId" value="${person.partyId!}" /> <table width="90%" border="0" cellpadding="2" cellspacing="0"> <tr> <td align="right">${uiLabelMap.CommonTitle}</td> @@ -49,31 +49,31 @@ under the License. <tr> <td align="right">${uiLabelMap.PartyFirstName}</td> <td> - <input type="text" class='inputBox' size="30" maxlength="30" name="firstName" value="${personData.firstName?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="30" name="firstName" value="${personData.firstName!}"/> *</td> </tr> <tr> <td align="right">${uiLabelMap.PartyMiddleInitial}</td> <td> - <input type="text" class='inputBox' size="4" maxlength="4" name="middleName" value="${personData.middleName?if_exists}"/> + <input type="text" class='inputBox' size="4" maxlength="4" name="middleName" value="${personData.middleName!}"/> </td> </tr> <tr> <td align="right">${uiLabelMap.PartyLastName}</td> <td> - <input type="text" class='inputBox' size="30" maxlength="30" name="lastName" value="${personData.lastName?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="30" name="lastName" value="${personData.lastName!}"/> *</td> </tr> <tr> <td align="right">${uiLabelMap.PartySuffix}</td> <td> - <input type="text" class='inputBox' size="10" maxlength="30" name="suffix" value="${personData.suffix?if_exists}"/> + <input type="text" class='inputBox' size="10" maxlength="30" name="suffix" value="${personData.suffix!}"/> </td> </tr> <tr> <td align="right">${uiLabelMap.PartyNickName}</td> <td> - <input type="text" class='inputBox' size="30" maxlength="60" name="nickname" value="${personData.nickname?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="60" name="nickname" value="${personData.nickname!}"/> </td> </tr> <tr> @@ -97,27 +97,27 @@ under the License. <tr> <td align="right">${uiLabelMap.PartyBirthDate}</td> <td> - <input type="text" class='inputBox' size="11" maxlength="20" name="birthDate" value="${(personData.birthDate.toString())?if_exists}"/> + <input type="text" class='inputBox' size="11" maxlength="20" name="birthDate" value="${(personData.birthDate.toString())!}"/> <div>${uiLabelMap.CommonFormatDate}</div> </td> </tr> <tr> <td align="right">${uiLabelMap.PartyHeight}</td> <td> - <input type="text" class='inputBox' size="30" maxlength="60" name="height" value="${personData.height?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="60" name="height" value="${personData.height!}"/> </td> </tr> <tr> <td align="right">${uiLabelMap.PartyWeight}</td> <td> - <input type="text" class='inputBox' size="30" maxlength="60" name="weight" value="${personData.weight?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="60" name="weight" value="${personData.weight!}"/> </td> </tr> <tr> <td align="right">${uiLabelMap.PartyMaidenName}</td> <td> - <input type="text" class='inputBox' size="30" maxlength="60" name="mothersMaidenName" value="${personData.mothersMaidenName?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="60" name="mothersMaidenName" value="${personData.mothersMaidenName!}"/> </td> </tr> <tr> @@ -143,32 +143,32 @@ under the License. <tr> <td align="right">${uiLabelMap.PartySocialSecurityNumber}</td> <td> - <input type="text" class='inputBox' size="30" maxlength="60" name="socialSecurityNumber" value="${personData.socialSecurityNumber?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="60" name="socialSecurityNumber" value="${personData.socialSecurityNumber!}"/> </td> </tr> <tr> <td align="right">${uiLabelMap.PartyPassportNumber}</td> <td> - <input type="text" class='inputBox' size="30" maxlength="60" name="passportNumber" value="${personData.passportNumber?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="60" name="passportNumber" value="${personData.passportNumber!}"/> </td> </tr> <tr> <td align="right">${uiLabelMap.PartyPassportExpireDate}</td> <td> - <input type="text" class='inputBox' size="11" maxlength="20" name="passportExpireDate" value="${personData.passportExpireDate?if_exists}"/> + <input type="text" class='inputBox' size="11" maxlength="20" name="passportExpireDate" value="${personData.passportExpireDate!}"/> <div>${uiLabelMap.CommonFormatDate}</div> </td> </tr> <tr> <td align="right">${uiLabelMap.PartyTotalYearsWorkExperience}</td> <td> - <input type="text" class='inputBox' size="30" maxlength="60" name="totalYearsWorkExperience" value="${personData.totalYearsWorkExperience?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="60" name="totalYearsWorkExperience" value="${personData.totalYearsWorkExperience!}"/> </td> </tr> <tr> <td align="right">${uiLabelMap.CommonComment}</td> <td> - <input type="text" class='inputBox' size="30" maxlength="60" name="comments" value="${personData.comments?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="60" name="comments" value="${personData.comments!}"/> </td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl Sat Aug 16 08:40:28 2014 @@ -24,7 +24,7 @@ under the License. <br /> <table align="center"> - <#if requestAttributes.processResult?exists> + <#if requestAttributes.processResult??> <tr> <td colspan="2"> <div align="center"> @@ -50,11 +50,11 @@ under the License. <input type="hidden" name="paymentConfig" value="${paymentProperties?default("payment.properties")}" /> <tr> <td><div class="tableheadtext">${uiLabelMap.AccountingCardNumber}</div></td> - <td><input type="text" class="inputBox" name="cardNumber" size="20" value="${(requestParameters.cardNumber)?if_exists}" /></td> + <td><input type="text" class="inputBox" name="cardNumber" size="20" value="${(requestParameters.cardNumber)!}" /></td> </tr> <tr> <td><div class="tableheadtext">${uiLabelMap.AccountingPINNumber}</div></td> - <td><input type="text" class="inputBox" name="pin" size="15" value="${(requestParameters.pin)?if_exists}" /></td> + <td><input type="text" class="inputBox" name="pin" size="15" value="${(requestParameters.pin)!}" /></td> </tr> <tr><td colspan="2"> </td></tr> <tr> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl Sat Aug 16 08:40:28 2014 @@ -18,17 +18,17 @@ under the License. --> <#assign delegator = requestAttributes.delegator> -<#if communicationEvent.partyIdFrom?exists> +<#if communicationEvent.partyIdFrom??> <#assign fromName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, communicationEvent.partyIdFrom, true)> </#if> -<#if communicationEvent.partyIdTo?exists> +<#if communicationEvent.partyIdTo??> <#assign toName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, communicationEvent.partyIdTo, true)> </#if> <div class="screenlet"> <div class="screenlet-title-bar"> <div class="boxlink"> - <#if (communicationEvent.partyIdFrom?if_exists != (userLogin.partyId)?if_exists)> + <#if (communicationEvent.partyIdFrom! != (userLogin.partyId)!)> <a href="<@ofbizUrl>newmessage?communicationEventId=${communicationEvent.communicationEventId}</@ofbizUrl>" class="submenutext">${uiLabelMap.PartyReply}</a> </#if> <a href="<@ofbizUrl>messagelist</@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceViewList}</a> @@ -40,11 +40,11 @@ under the License. <tr><td> </td></tr> <tr> <td align="right"><div class="tableheadtext">${uiLabelMap.CommonFrom}:</div></td> - <td><div>${fromName?if_exists}</div></td> + <td><div>${fromName!}</div></td> </tr> <tr> <td align="right"><div class="tableheadtext">${uiLabelMap.CommonTo}:</div></td> - <td><div>${toName?if_exists}</div></td> + <td><div>${toName!}</div></td> </tr> <tr> <td align="right"><div class="tableheadtext">${uiLabelMap.CommonDate}:</div></td> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl Sat Aug 16 08:40:28 2014 @@ -52,7 +52,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <div class="boxlink"> - <#if parameters.showSent?if_exists == "true"> + <#if parameters.showSent! == "true"> <a href="<@ofbizUrl>messagelist</@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceViewReceivedOnly}</a> <#else> <a href="<@ofbizUrl>messagelist?showSent=true</@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceViewSent}</a> @@ -73,10 +73,10 @@ under the License. <td> </td> </tr> <tr><td colspan="5"><hr /></td></tr> - <#list receivedCommunicationEvents?if_exists as receivedCommunicationEvent> + <#list receivedCommunicationEvents! as receivedCommunicationEvent> <@showMessage communicationEvent=receivedCommunicationEvent isSentMessage=false index=receivedCommunicationEvent_index/> </#list> - <#list sentCommunicationEvents?if_exists as sentCommunicationEvent> + <#list sentCommunicationEvents! as sentCommunicationEvent> <@showMessage communicationEvent=sentCommunicationEvent isSentMessage=true index=sentCommunicationEvent_index/> </#list> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Sat Aug 16 08:40:28 2014 @@ -21,8 +21,8 @@ under the License. <#macro contactList publicEmailContactLists> <select name="contactListId" class="selectBox" style="width:134px"> <#list publicEmailContactLists as publicEmailContactList> - <#assign publicContactMechType = publicEmailContactList.contactList.getRelatedOne("ContactMechType", true)?if_exists> - <option value="${publicEmailContactList.contactList.contactListId}">${publicEmailContactList.contactListType.description?if_exists} - ${publicEmailContactList.contactList.contactListName?if_exists}</option> + <#assign publicContactMechType = publicEmailContactList.contactList.getRelatedOne("ContactMechType", true)!> + <option value="${publicEmailContactList.contactList.contactListId}">${publicEmailContactList.contactListType.description!} - ${publicEmailContactList.contactList.contactListName!}</option> </#list> </select> </#macro> @@ -67,7 +67,7 @@ under the License. <div> <select name="preferredContactMechId" class="selectBox"> <#list partyAndContactMechList as partyAndContactMech> - <option value="${partyAndContactMech.contactMechId}"><#if partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode?if_exists}-${partyAndContactMech.tnAreaCode?if_exists}-${partyAndContactMech.tnContactNumber}<#elseif partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, ${partyAndContactMech.paAddress2?if_exists}, ${partyAndContactMech.paCity?if_exists}, ${partyAndContactMech.paStateProvinceGeoId?if_exists}, ${partyAndContactMech.paPostalCode?if_exists}, ${partyAndContactMech.paPostalCodeExt?if_exists} ${partyAndContactMech.paCountryGeoId?if_exists}</#if></option> + <option value="${partyAndContactMech.contactMechId}"><#if partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode!}-${partyAndContactMech.tnAreaCode!}-${partyAndContactMech.tnContactNumber}<#elseif partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, ${partyAndContactMech.paAddress2!}, ${partyAndContactMech.paCity!}, ${partyAndContactMech.paStateProvinceGeoId!}, ${partyAndContactMech.paPostalCode!}, ${partyAndContactMech.paPostalCodeExt!} ${partyAndContactMech.paCountryGeoId!}</#if></option> </#list> </select> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Sat Aug 16 08:40:28 2014 @@ -158,25 +158,25 @@ will generally always be reserved for th <div> <label for="USER_FIRST_NAME">${uiLabelMap.PartyFirstName}*</label> <@fieldErrors fieldName="USER_FIRST_NAME"/> - <input type="text" name="USER_FIRST_NAME" id="USER_FIRST_NAME" value="${requestParameters.USER_FIRST_NAME?if_exists}" /> + <input type="text" name="USER_FIRST_NAME" id="USER_FIRST_NAME" value="${requestParameters.USER_FIRST_NAME!}" /> </div> <div> <label for="USER_MIDDLE_NAME">${uiLabelMap.PartyMiddleInitial}</label> <@fieldErrors fieldName="USER_MIDDLE_NAME"/> - <input type="text" name="USER_MIDDLE_NAME" id="USER_MIDDLE_NAME" value="${requestParameters.USER_MIDDLE_NAME?if_exists}" /> + <input type="text" name="USER_MIDDLE_NAME" id="USER_MIDDLE_NAME" value="${requestParameters.USER_MIDDLE_NAME!}" /> </div> <div> <label for="USER_LAST_NAME">${uiLabelMap.PartyLastName}*</label> <@fieldErrors fieldName="USER_LAST_NAME"/> - <input type="text" name="USER_LAST_NAME" id="USER_LAST_NAME" value="${requestParameters.USER_LAST_NAME?if_exists}" /> + <input type="text" name="USER_LAST_NAME" id="USER_LAST_NAME" value="${requestParameters.USER_LAST_NAME!}" /> </div> <div> <label for="USER_SUFFIX">${uiLabelMap.PartySuffix}</label> <@fieldErrors fieldName="USER_SUFFIX"/> - <input type="text" class='inputBox' name="USER_SUFFIX" id="USER_SUFFIX" value="${requestParameters.USER_SUFFIX?if_exists}" /> + <input type="text" class='inputBox' name="USER_SUFFIX" id="USER_SUFFIX" value="${requestParameters.USER_SUFFIX!}" /> </div> </fieldset> @@ -186,25 +186,25 @@ will generally always be reserved for th <div> <label for="CUSTOMER_ADDRESS1">${uiLabelMap.PartyAddressLine1}*</label> <@fieldErrors fieldName="CUSTOMER_ADDRESS1"/> - <input type="text" name="CUSTOMER_ADDRESS1" id="CUSTOMER_ADDRESS1" value="${requestParameters.CUSTOMER_ADDRESS1?if_exists}" /> + <input type="text" name="CUSTOMER_ADDRESS1" id="CUSTOMER_ADDRESS1" value="${requestParameters.CUSTOMER_ADDRESS1!}" /> </div> <div> <label for="CUSTOMER_ADDRESS2">${uiLabelMap.PartyAddressLine2}</label> <@fieldErrors fieldName="CUSTOMER_ADDRESS2"/> - <input type="text" name="CUSTOMER_ADDRESS2" id="CUSTOMER_ADDRESS2" value="${requestParameters.CUSTOMER_ADDRESS2?if_exists}" /> + <input type="text" name="CUSTOMER_ADDRESS2" id="CUSTOMER_ADDRESS2" value="${requestParameters.CUSTOMER_ADDRESS2!}" /> </div> <div> <label for="CUSTOMER_CITY">${uiLabelMap.PartyCity}*</label> <@fieldErrors fieldName="CUSTOMER_CITY"/> - <input type="text" name="CUSTOMER_CITY" id="CUSTOMER_CITY" value="${requestParameters.CUSTOMER_CITY?if_exists}" /> + <input type="text" name="CUSTOMER_CITY" id="CUSTOMER_CITY" value="${requestParameters.CUSTOMER_CITY!}" /> </div> <div> <label for="CUSTOMER_POSTAL_CODE">${uiLabelMap.PartyZipCode}*</label> <@fieldErrors fieldName="CUSTOMER_POSTAL_CODE"/> - <input type="text" name="CUSTOMER_POSTAL_CODE" id="CUSTOMER_POSTAL_CODE" value="${requestParameters.CUSTOMER_POSTAL_CODE?if_exists}" /> + <input type="text" name="CUSTOMER_POSTAL_CODE" id="CUSTOMER_POSTAL_CODE" value="${requestParameters.CUSTOMER_POSTAL_CODE!}" /> </div> <div> @@ -256,10 +256,10 @@ will generally always be reserved for th <tbody> <tr> <th scope="row">${uiLabelMap.PartyHomePhone}</th> - <td><input type="text" name="CUSTOMER_HOME_COUNTRY" size="5" value="${requestParameters.CUSTOMER_HOME_COUNTRY?if_exists}" /></td> - <td><input type="text" name="CUSTOMER_HOME_AREA" size="5" value="${requestParameters.CUSTOMER_HOME_AREA?if_exists}" /></td> - <td><input type="text" name="CUSTOMER_HOME_CONTACT" value="${requestParameters.CUSTOMER_HOME_CONTACT?if_exists}" /></td> - <td><input type="text" name="CUSTOMER_HOME_EXT" size="6" value="${requestParameters.CUSTOMER_HOME_EXT?if_exists}"/></td> + <td><input type="text" name="CUSTOMER_HOME_COUNTRY" size="5" value="${requestParameters.CUSTOMER_HOME_COUNTRY!}" /></td> + <td><input type="text" name="CUSTOMER_HOME_AREA" size="5" value="${requestParameters.CUSTOMER_HOME_AREA!}" /></td> + <td><input type="text" name="CUSTOMER_HOME_CONTACT" value="${requestParameters.CUSTOMER_HOME_CONTACT!}" /></td> + <td><input type="text" name="CUSTOMER_HOME_EXT" size="6" value="${requestParameters.CUSTOMER_HOME_EXT!}"/></td> <td> <select name="CUSTOMER_HOME_ALLOW_SOL"> <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -272,10 +272,10 @@ will generally always be reserved for th </tr> <tr> <th scope="row">${uiLabelMap.PartyBusinessPhone}</th> - <td><input type="text" name="CUSTOMER_WORK_COUNTRY" size="5" value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" /></td> - <td><input type="text" name="CUSTOMER_WORK_AREA" size="5" value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}" /></td> - <td><input type="text" name="CUSTOMER_WORK_CONTACT" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}" /></td> - <td><input type="text" name="CUSTOMER_WORK_EXT" size="6" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_WORK_COUNTRY" size="5" value="${requestParameters.CUSTOMER_WORK_COUNTRY!}" /></td> + <td><input type="text" name="CUSTOMER_WORK_AREA" size="5" value="${requestParameters.CUSTOMER_WORK_AREA!}" /></td> + <td><input type="text" name="CUSTOMER_WORK_CONTACT" value="${requestParameters.CUSTOMER_WORK_CONTACT!}" /></td> + <td><input type="text" name="CUSTOMER_WORK_EXT" size="6" value="${requestParameters.CUSTOMER_WORK_EXT!}" /></td> <td> <select name="CUSTOMER_WORK_ALLOW_SOL"> <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -288,9 +288,9 @@ will generally always be reserved for th </tr> <tr> <th scope="row">${uiLabelMap.PartyFaxNumber}</th> - <td><input type="text" name="CUSTOMER_FAX_COUNTRY" size="5" value="${requestParameters.CUSTOMER_FAX_COUNTRY?if_exists}" /></td> - <td><input type="text" name="CUSTOMER_FAX_AREA" size="5" value="${requestParameters.CUSTOMER_FAX_AREA?if_exists}" /></td> - <td><input type="text" name="CUSTOMER_FAX_CONTACT" value="${requestParameters.CUSTOMER_FAX_CONTACT?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_FAX_COUNTRY" size="5" value="${requestParameters.CUSTOMER_FAX_COUNTRY!}" /></td> + <td><input type="text" name="CUSTOMER_FAX_AREA" size="5" value="${requestParameters.CUSTOMER_FAX_AREA!}" /></td> + <td><input type="text" name="CUSTOMER_FAX_CONTACT" value="${requestParameters.CUSTOMER_FAX_CONTACT!}" /></td> <td></td> <td> <select name="CUSTOMER_FAX_ALLOW_SOL"> @@ -304,9 +304,9 @@ will generally always be reserved for th </tr> <tr> <th scope="row">${uiLabelMap.PartyMobilePhone}</th> - <td><input type="text" name="CUSTOMER_MOBILE_COUNTRY" size="5" value="${requestParameters.CUSTOMER_MOBILE_COUNTRY?if_exists}" /></td> - <td><input type="text" name="CUSTOMER_MOBILE_AREA" size="5" value="${requestParameters.CUSTOMER_MOBILE_AREA?if_exists}" /></td> - <td><input type="text" name="CUSTOMER_MOBILE_CONTACT" value="${requestParameters.CUSTOMER_MOBILE_CONTACT?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_MOBILE_COUNTRY" size="5" value="${requestParameters.CUSTOMER_MOBILE_COUNTRY!}" /></td> + <td><input type="text" name="CUSTOMER_MOBILE_AREA" size="5" value="${requestParameters.CUSTOMER_MOBILE_AREA!}" /></td> + <td><input type="text" name="CUSTOMER_MOBILE_CONTACT" value="${requestParameters.CUSTOMER_MOBILE_CONTACT!}" /></td> <td></td> <td> <select name="CUSTOMER_MOBILE_ALLOW_SOL"> @@ -327,7 +327,7 @@ will generally always be reserved for th <div> <label for= "CUSTOMER_EMAIL">${uiLabelMap.PartyEmailAddress}*</label> <@fieldErrors fieldName="CUSTOMER_EMAIL"/> - <input type="text" name="CUSTOMER_EMAIL" id="CUSTOMER_EMAIL" value="${requestParameters.CUSTOMER_EMAIL?if_exists}" onchange="changeEmail()" onkeyup="changeEmail()" /> + <input type="text" name="CUSTOMER_EMAIL" id="CUSTOMER_EMAIL" value="${requestParameters.CUSTOMER_EMAIL!}" onchange="changeEmail()" onkeyup="changeEmail()" /> </div> <div> <label for="CUSTOMER_EMAIL_ALLOW_SOL">${uiLabelMap.PartyAllowSolicitation}</label> @@ -356,10 +356,10 @@ will generally always be reserved for th <div> <label for="USERNAME">${uiLabelMap.CommonUsername}*</label> <#if requestParameters.preferredUsername?has_content> - <input type="text" name="showUserName" id="showUserName" value="${requestParameters.USERNAME?if_exists}" disabled="disabled"/> - <input type="hidden" name="USERNAME" id="USERNAME" value="${requestParameters.USERNAME?if_exists}"/> + <input type="text" name="showUserName" id="showUserName" value="${requestParameters.USERNAME!}" disabled="disabled"/> + <input type="hidden" name="USERNAME" id="USERNAME" value="${requestParameters.USERNAME!}"/> <#else> - <input type="text" name="USERNAME" id="USERNAME" value="${requestParameters.USERNAME?if_exists}" onfocus="clickUsername();" onchange="changeEmail();"/> + <input type="text" name="USERNAME" id="USERNAME" value="${requestParameters.USERNAME!}" onfocus="clickUsername();" onchange="changeEmail();"/> </#if> </div> </#if> @@ -383,7 +383,7 @@ will generally always be reserved for th <div> <label for="PASSWORD_HINT">${uiLabelMap.PartyPasswordHint}</label> <@fieldErrors fieldName="PASSWORD_HINT"/> - <input type="text" class='inputBox' name="PASSWORD_HINT" id="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT?if_exists}" maxlength="100"/> + <input type="text" class='inputBox' name="PASSWORD_HINT" id="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT!}" maxlength="100"/> </div> <#else/> <div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl Sat Aug 16 08:40:28 2014 @@ -32,12 +32,12 @@ under the License. <input type="hidden" name="contactMechTypeId" value="WEB_ADDRESS"/> <input type="hidden" name="communicationEventTypeId" value="WEB_SITE_COMMUNICATI"/> <#if productStore?has_content> - <input type="hidden" name="partyIdTo" value="${productStore.payToPartyId?if_exists}"/> + <input type="hidden" name="partyIdTo" value="${productStore.payToPartyId!}"/> </#if> <input type="hidden" name="note" value="${Static["org.ofbiz.base.util.UtilHttp"].getFullRequestUrl(request)}"/> <#if message?has_content> <input type="hidden" name="parentCommEventId" value="${communicationEvent.communicationEventId}"/> - <#if (communicationEvent.origCommEventId?exists && communicationEvent.origCommEventId?length > 0)> + <#if (communicationEvent.origCommEventId?? && communicationEvent.origCommEventId?length > 0)> <#assign orgComm = communicationEvent.origCommEventId> <#else> <#assign orgComm = communicationEvent.communicationEventId> @@ -51,7 +51,7 @@ under the License. <tr> <td width="5"> </td> <td align="right"><div class="tableheadtext">${uiLabelMap.CommonFrom}:</div></td> - <td><div> ${sessionAttributes.autoName?if_exists} [${userLogin.partyId}] (${uiLabelMap.CommonNotYou}? <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)</div></td> + <td><div> ${sessionAttributes.autoName!} [${userLogin.partyId}] (${uiLabelMap.CommonNotYou}? <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)</div></td> </tr> <#if partyIdTo?has_content> <#assign partyToName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, partyIdTo, true)> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl Sat Aug 16 08:40:28 2014 @@ -21,26 +21,26 @@ under the License. <form id="editBillToPostalAddress" method="post" action=""> <fieldset> <input type="hidden" name="setBillingPurpose" value="Y" /> - <input type="hidden" name="contactMechId" value="${billToContactMechId?if_exists}" /> + <input type="hidden" name="contactMechId" value="${billToContactMechId!}" /> <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${productStoreId!}" /> <div> <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}*</label> - <input type="text" class="required" name="address1" id="billToAddress1" value="${billToAddress1?if_exists}" maxlength="30" /> + <input type="text" class="required" name="address1" id="billToAddress1" value="${billToAddress1!}" maxlength="30" /> <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </div> <div> <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label> - <input type="text" name="address2" id="billToAddress2" value="${billToAddress2?if_exists}" maxlength="30" /> + <input type="text" name="address2" id="billToAddress2" value="${billToAddress2!}" maxlength="30" /> </div> <div> <label for="billToCity">${uiLabelMap.PartyCity}*</label> - <input type="text" class="required" name="city" id="billToCity" value="${billToCity?if_exists}" maxlength="30" /> + <input type="text" class="required" name="city" id="billToCity" value="${billToCity!}" maxlength="30" /> <span id="advice-required-billToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </div> <div> <label for="billToPostalCode">${uiLabelMap.PartyZipCode}*</label> - <input type="text" class="required" name="postalCode" id="billToPostalCode" value="${billToPostalCode?if_exists}" maxlength="10" /> + <input type="text" class="required" name="postalCode" id="billToPostalCode" value="${billToPostalCode!}" maxlength="10" /> <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </div> <div> @@ -70,16 +70,16 @@ under the License. <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"></span> <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"></span> <span id="billToPhoneRequired" style="display: none;" class="errorMessage">(${uiLabelMap.CommonRequired})</span> - <input type="hidden" name="phoneContactMechId" value="${billToTelecomNumber.contactMechId?if_exists}" /> - <input type="text" name="countryCode" id="billToCountryCode" class="required" value="${billToTelecomNumber.countryCode?if_exists}" size="3" maxlength="3" /> - - <input type="text" name="areaCode" id="billToAreaCode" class="required" value="${billToTelecomNumber.areaCode?if_exists}" size="3" maxlength="3" /> - - <input type="text" name="contactNumber" id="billToContactNumber" class="required" value="${contactNumber?default("${billToTelecomNumber.contactNumber?if_exists}")}" size="6" maxlength="7" /> - - <input type="text" name="extension" value="${extension?default("${billToExtension?if_exists}")}" size="3" maxlength="3" /> + <input type="hidden" name="phoneContactMechId" value="${billToTelecomNumber.contactMechId!}" /> + <input type="text" name="countryCode" id="billToCountryCode" class="required" value="${billToTelecomNumber.countryCode!}" size="3" maxlength="3" /> + - <input type="text" name="areaCode" id="billToAreaCode" class="required" value="${billToTelecomNumber.areaCode!}" size="3" maxlength="3" /> + - <input type="text" name="contactNumber" id="billToContactNumber" class="required" value="${contactNumber?default("${billToTelecomNumber.contactNumber!}")}" size="6" maxlength="7" /> + - <input type="text" name="extension" value="${extension?default("${billToExtension!}")}" size="3" maxlength="3" /> </div> </#if> <div class="inline"> <label for="setShippingPurposeForBilling">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label> - <input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForBilling" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> /> + <input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForBilling" value="Y" <#if setShippingPurpose??>checked="checked"</#if> /> </div> <#-- <div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl Sat Aug 16 08:40:28 2014 @@ -22,26 +22,26 @@ under the License. <form id="editPostalAddress_${contactMech.contactMechId}" method="post" action=""> <fieldset> - <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}" /> + <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId!}" /> <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${productStoreId!}" /> <div> <label for="address1_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine1}*</label> - <input type="text" class="required" name="address1" id="address1_${contactMech.contactMechId}" value="${postalAddress.address1?if_exists}" maxlength="30" /> + <input type="text" class="required" name="address1" id="address1_${contactMech.contactMechId}" value="${postalAddress.address1!}" maxlength="30" /> <span id="advice-required-address1_${contactMech.contactMechId}" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </div> <div> <label for="additionalAddress2_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine2}</label> - <input type="text" name="address2" id="additionalAddress2_${contactMech.contactMechId}" value="${postalAddress.address2?if_exists}" maxlength="30" /> + <input type="text" name="address2" id="additionalAddress2_${contactMech.contactMechId}" value="${postalAddress.address2!}" maxlength="30" /> </div> <div> <label for="city_${contactMech.contactMechId}">${uiLabelMap.PartyCity}*</label> - <input type="text" class="required" name="city" id="city_${contactMech.contactMechId}" value="${postalAddress.city?if_exists}" maxlength="30" /> + <input type="text" class="required" name="city" id="city_${contactMech.contactMechId}" value="${postalAddress.city!}" maxlength="30" /> <span id="advice-required-city_${contactMech.contactMechId}" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </div> <div> <label for="postalCode_${contactMech.contactMechId}">${uiLabelMap.PartyZipCode}*</label> - <input type="text" class="required" name="postalCode" id="postalCode_${contactMech.contactMechId}" value="${postalAddress.postalCode?if_exists}" maxlength="10" /> + <input type="text" class="required" name="postalCode" id="postalCode_${contactMech.contactMechId}" value="${postalAddress.postalCode!}" maxlength="10" /> <span id="advice-required-postalCode_${contactMech.contactMechId}" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </div> <div> @@ -69,11 +69,11 @@ under the License. </div> <div class="inline"> <label for="setBillingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label> - <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForPostalAddress" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if> /> + <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForPostalAddress" value="Y" <#if setBillingPurpose??>checked="checked"</#if> /> </div> <div class="inline"> <label for="setShippingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label> - <input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForPostalAddress" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> /> + <input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForPostalAddress" value="Y" <#if setShippingPurpose??>checked="checked"</#if> /> </div> <#-- <div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl Sat Aug 16 08:40:28 2014 @@ -22,22 +22,22 @@ under the License. <form id="editUserForm" method="post" action="<@ofbizUrl>updateCustomerProfile</@ofbizUrl>"> <fieldset class="left center"> <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL" /> - <input type="hidden" name="emailContactMechId" value="${emailContactMechId?if_exists}" /> + <input type="hidden" name="emailContactMechId" value="${emailContactMechId!}" /> <h3>${uiLabelMap.PartyContactInformation}</h3> <div> <label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="firstName" id="firstName" class="required" value="${firstName?if_exists}" maxlength="30" /> + <input type="text" name="firstName" id="firstName" class="required" value="${firstName!}" maxlength="30" /> </div> <div> <label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="lastName" id="lastName" class="required" value="${lastName?if_exists}" maxlength="30" /> + <input type="text" name="lastName" id="lastName" class="required" value="${lastName!}" maxlength="30" /> </div> <div> <label for="emailAddress">${uiLabelMap.CommonEmail}* <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span> </label> - <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${emailAddress?if_exists}" maxlength="255" /> + <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${emailAddress!}" maxlength="255" /> </div> </fieldset> @@ -45,7 +45,7 @@ under the License. <h3>${uiLabelMap.EcommerceAccountInformation}</h3> <div> <label for="userLoginId">${uiLabelMap.CommonUsername}*</label> - <input type="text" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId?if_exists}" maxlength="255" <#if userLogin.userLoginId?exists>disabled="disabled"</#if> /> + <input type="text" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId!}" maxlength="255" <#if userLogin.userLoginId??>disabled="disabled"</#if> /> </div> <div> <label for="currentPassword">${uiLabelMap.CommonCurrentPassword}*</label> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl Sat Aug 16 08:40:28 2014 @@ -21,26 +21,26 @@ under the License. <form id="editShipToPostalAddress" method="post" action=""> <fieldset> <input type="hidden" name="setShippingPurpose" value="Y" /> - <input type="hidden" name="contactMechId" value="${shipToContactMechId?if_exists}" /> + <input type="hidden" name="contactMechId" value="${shipToContactMechId!}" /> <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${productStoreId!}" /> <div> <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}*</label> - <input type="text" class="required" name="address1" id="shipToAddress1" value="${shipToAddress1?if_exists}" maxlength="30" /> + <input type="text" class="required" name="address1" id="shipToAddress1" value="${shipToAddress1!}" maxlength="30" /> <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </div> <div> <label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label> - <input type="text" name="address2" id="shipToAddress2" value="${shipToAddress2?if_exists}" maxlength="30" /> + <input type="text" name="address2" id="shipToAddress2" value="${shipToAddress2!}" maxlength="30" /> </div> <div> <label for="shipToCity">${uiLabelMap.PartyCity}*</label> - <input type="text" class="required" name="city" id="shipToCity" value="${shipToCity?if_exists}" maxlength="30" /> + <input type="text" class="required" name="city" id="shipToCity" value="${shipToCity!}" maxlength="30" /> <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </div> <div> <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*</label> - <input type="text" class="required" name="postalCode" id="shipToPostalCode" value="${shipToPostalCode?if_exists}" maxlength="10" /> + <input type="text" class="required" name="postalCode" id="shipToPostalCode" value="${shipToPostalCode!}" maxlength="10" /> <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </div> <div> @@ -70,16 +70,16 @@ under the License. <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"></span> <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"></span> <span id="shipToPhoneRequired" style="display: none;" class="errorMessage">(${uiLabelMap.CommonRequired})</span> - <input type="hidden" name="phoneContactMechId" value="${shipToTelecomNumber.contactMechId?if_exists}" /> - <input type="text" name="countryCode" id="shipToCountryCode" class="required" value="${shipToTelecomNumber.countryCode?if_exists}" size="3" maxlength="3" /> - - <input type="text" name="areaCode" id="shipToAreaCode" class="required" value="${shipToTelecomNumber.areaCode?if_exists}" size="3" maxlength="3" /> - - <input type="text" name="contactNumber" id="shipToContactNumber" class="required" value="${contactNumber?default("${shipToTelecomNumber.contactNumber?if_exists}")}" size="6" maxlength="7" /> - - <input type="text" name="extension" value="${extension?default("${shipToExtension?if_exists}")}" size="3" maxlength="3" /> + <input type="hidden" name="phoneContactMechId" value="${shipToTelecomNumber.contactMechId!}" /> + <input type="text" name="countryCode" id="shipToCountryCode" class="required" value="${shipToTelecomNumber.countryCode!}" size="3" maxlength="3" /> + - <input type="text" name="areaCode" id="shipToAreaCode" class="required" value="${shipToTelecomNumber.areaCode!}" size="3" maxlength="3" /> + - <input type="text" name="contactNumber" id="shipToContactNumber" class="required" value="${contactNumber?default("${shipToTelecomNumber.contactNumber!}")}" size="6" maxlength="7" /> + - <input type="text" name="extension" value="${extension?default("${shipToExtension!}")}" size="3" maxlength="3" /> </div> </#if> <div class="inline"> <label for="setBillingPurposeForShipping">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label> - <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForShipping" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if> /> + <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForShipping" value="Y" <#if setBillingPurpose??>checked="checked"</#if> /> </div> <#-- <div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Sat Aug 16 08:40:28 2014 @@ -31,7 +31,7 @@ under the License. <form id="createPostalAddressForm" method="post" action=""> <fieldset> <input type="hidden" name="roleTypeId" value="CUSTOMER" /> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${productStoreId!}" /> <div> <label for="address1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-address1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> @@ -79,11 +79,11 @@ under the License. </div> <div class="inline"> <label for="setBillingPurpose">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label> - <input type="checkbox" name="setBillingPurpose" id="setBillingPurpose" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if> /> + <input type="checkbox" name="setBillingPurpose" id="setBillingPurpose" value="Y" <#if setBillingPurpose??>checked="checked"</#if> /> </div> <div class="inline"> <label for="setShippingPurpose">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label> - <input type="checkbox" name="setShippingPurpose" id="setShippingPurpose" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> /> + <input type="checkbox" name="setShippingPurpose" id="setShippingPurpose" value="Y" <#if setShippingPurpose??>checked="checked"</#if> /> </div> </fieldset> </form> @@ -114,23 +114,23 @@ under the License. <#--===================================== Billing Address and Telecom number ===========================================--> <h3>${uiLabelMap.EcommercePrimaryBillingAddress}</h3> <ul> - <#if billToContactMechId?exists> - <li>${billToAddress1?if_exists}</li> - <#if billToAddress2?has_content><li>${billToAddress2?if_exists}</li></#if> + <#if billToContactMechId??> + <li>${billToAddress1!}</li> + <#if billToAddress2?has_content><li>${billToAddress2!}</li></#if> <li> <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_"> ${billToStateProvinceGeoId} </#if> - ${billToCity?if_exists}, - ${billToPostalCode?if_exists} + ${billToCity!}, + ${billToPostalCode!} </li> - <li>${billToCountryGeoId?if_exists}</li> + <li>${billToCountryGeoId!}</li> <#if billToTelecomNumber?has_content> <li> - ${billToTelecomNumber.countryCode?if_exists}- - ${billToTelecomNumber.areaCode?if_exists}- - ${billToTelecomNumber.contactNumber?if_exists} - <#if billToExtension?exists>-${billToExtension?if_exists}</#if> + ${billToTelecomNumber.countryCode!}- + ${billToTelecomNumber.areaCode!}- + ${billToTelecomNumber.contactNumber!} + <#if billToExtension??>-${billToExtension!}</#if> </li> </#if> <li><a id="updateBillToPostalAddress" href="javascript:void(0)" class="button popup_link">${uiLabelMap.CommonEdit}</a></li> @@ -162,23 +162,23 @@ under the License. <#--===================================== Shipping Address and Telecom number ===========================================--> <h3>${uiLabelMap.EcommercePrimaryShippingAddress}</h3> <ul> - <#if shipToContactMechId?exists> - <li>${shipToAddress1?if_exists}</li> - <#if shipToAddress2?has_content><li>${shipToAddress2?if_exists}</li></#if> + <#if shipToContactMechId??> + <li>${shipToAddress1!}</li> + <#if shipToAddress2?has_content><li>${shipToAddress2!}</li></#if> <li> <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_"> ${shipToStateProvinceGeoId} </#if> - ${shipToCity?if_exists}, - ${shipToPostalCode?if_exists} + ${shipToCity!}, + ${shipToPostalCode!} </li> - <li>${shipToCountryGeoId?if_exists}</li> + <li>${shipToCountryGeoId!}</li> <#if shipToTelecomNumber?has_content> <li> - ${shipToTelecomNumber.countryCode?if_exists}- - ${shipToTelecomNumber.areaCode?if_exists}- - ${shipToTelecomNumber.contactNumber?if_exists} - <#if shipToExtension?exists>-${shipToExtension?if_exists}</#if> + ${shipToTelecomNumber.countryCode!}- + ${shipToTelecomNumber.areaCode!}- + ${shipToTelecomNumber.contactNumber!} + <#if shipToExtension??>-${shipToExtension!}</#if> </li> </#if> <li><a id="updateShipToPostalAddress" href="javascript:void(0)" class="button popup_link">${uiLabelMap.CommonEdit}</a></li> @@ -216,16 +216,16 @@ under the License. <div class="screenlet-body"> <#assign postalAddressFlag = "N" /> <#list partyContactMechValueMaps as partyContactMechValueMap> - <#assign contactMech = partyContactMechValueMap.contactMech?if_exists /> - <#if contactMech.contactMechTypeId?if_exists = "POSTAL_ADDRESS"> - <#assign partyContactMech = partyContactMechValueMap.partyContactMech?if_exists /> + <#assign contactMech = partyContactMechValueMap.contactMech! /> + <#if contactMech.contactMechTypeId! = "POSTAL_ADDRESS"> + <#assign partyContactMech = partyContactMechValueMap.partyContactMech! /> <#if !(partyContactMechValueMap.partyContactMechPurposes?has_content)> <#assign postalAddressFlag = "Y" /> - <#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists /> + <#assign postalAddress = partyContactMechValueMap.postalAddress! /> <div id="displayEditAddressForm_${contactMech.contactMechId}" style="display: none;"> <#include "EditPostalAddress.ftl" /> </div> - <#if postalAddress?exists> + <#if postalAddress??> <div class="form-field"> <ul> <li>${postalAddress.address1}</li> @@ -235,12 +235,12 @@ under the License. <#if postalAddress.stateProvinceGeoId?has_content && postalAddress.stateProvinceGeoId != "_NA_"> ${postalAddress.stateProvinceGeoId} </#if> - ${postalAddress.postalCode?if_exists} + ${postalAddress.postalCode!} </li> <#if postalAddress.countryGeoId?has_content><li>${postalAddress.countryGeoId}</li></#if> </ul> - <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId?if_exists = "USA")> - <#assign addr1 = postalAddress.address1?if_exists /> + <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId! = "USA")> + <#assign addr1 = postalAddress.address1! /> <#if (addr1.indexOf(" ") > 0)> <#assign addressNum = addr1.substring(0, addr1.indexOf(" ")) /> <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1) /> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |