You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by pr...@apache.org on 2016/09/17 07:17:17 UTC
svn commit: r1761135 [7/13] - in /ofbiz/trunk/specialpurpose:
ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/
ecommerce/template/catalog/ ecommerce/template/content/
ecommerce/template/customer/ ecommerce/template/customer/profile...
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditContactMech.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditContactMech.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditContactMech.ftl Sat Sep 17 07:17:15 2016
@@ -17,27 +17,30 @@ specific language governing permissions
under the License.
-->
<#if canNotView>
- <h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonBack}</a>
+<h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3>
+<a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonBack}</a>
<#else>
<#if !contactMech??>
- <#-- When creating a new contact mech, first select the type, then actually create -->
+ <#-- When creating a new contact mech, first select the type, then actually create -->
<#if !requestParameters.preContactMechTypeId?? && !preContactMechTypeId??>
<h2>${uiLabelMap.PartyCreateNewContactInfo}</h2>
<form method="post" action='<@o...@ofbizUrl>' name="createcontactmechform">
<div>
- <table width="90%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <td>${uiLabelMap.PartySelectContactType}:</td>
- <td>
- <select name="preContactMechTypeId" class='selectBox'>
- <#list contactMechTypes as contactMechType>
- <option value='${contactMechType.contactMechTypeId}'>${contactMechType.get("description",locale)}</option>
- </#list>
- </select> <a href="javascript:document.createcontactmechform.submit()" class="button">${uiLabelMap.CommonCreate}</a>
- </td>
- </tr>
- </table>
+ <table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <td>${uiLabelMap.PartySelectContactType}:</td>
+ <td>
+ <select name="preContactMechTypeId" class='selectBox'>
+ <#list contactMechTypes as contactMechType>
+ <option value='${contactMechType.contactMechTypeId}'>
+ ${contactMechType.get("description",locale)}
+ </option>
+ </#list>
+ </select>
+ <a href="javascript:document.createcontactmechform.submit()" class="button">${uiLabelMap.CommonCreate}</a>
+ </td>
+ </tr>
+ </table>
</div>
</form>
<#-- <p><h3>ERROR: Contact information with ID "${contactMechId}" not found!</h3></p> -->
@@ -46,80 +49,95 @@ under the License.
<#if contactMechTypeId??>
<#if !contactMech??>
- <h2>${uiLabelMap.PartyCreateNewContactInfo}</h2>
- <a href='<@o...@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a>
- <table width="90%" border="0" cellpadding="2" cellspacing="0">
- <form method="post" action='<@o...@ofbizUrl>' name="editcontactmechform" id="editcontactmechform">
- <div>
- <input type='hidden' name='contactMechTypeId' value='${contactMechTypeId}' />
- <#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>
- <#if paymentMethodId?has_content><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if>
+ <h2>${uiLabelMap.PartyCreateNewContactInfo}</h2>
+ <a href='<@o...@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a>
+ <a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a>
+ <table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <form method="post" action='<@o...@ofbizUrl>' name="editcontactmechform" id="editcontactmechform">
+ <div>
+ <input type='hidden' name='contactMechTypeId' value='${contactMechTypeId}'/>
+ <#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>
+ <#if paymentMethodId?has_content>
+ <input type='hidden' name='paymentMethodId' value='${paymentMethodId}'/>
+ </#if>
<#else>
- <h2>${uiLabelMap.PartyEditContactInfo}</h2>
+ <h2>${uiLabelMap.PartyEditContactInfo}</h2>
<a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
<a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a>
- <table width="90%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <td align="right" valign="top">${uiLabelMap.PartyContactPurposes}</td>
- <td> </td>
- <td>
- <table border="0" cellspacing="1">
- <#list partyContactMechPurposes! as partyContactMechPurpose>
- <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
- <tr>
- <td>
- <#if contactMechPurposeType??>
- ${contactMechPurposeType.get("description",locale)}
- <#else>
- ${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"
- </#if>
- (${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()})
- <#if partyContactMechPurpose.thruDate??>(${uiLabelMap.CommonExpires}:${partyContactMechPurpose.thruDate.toString()})</#if>
- </td>
- <td>
- <form name="deletePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}" method="post" action="<@o...@ofbizUrl>">
- <div>
- <input type="hidden" name="contactMechId" value="${contactMechId}"/>
- <input type="hidden" name="contactMechPurposeTypeId" value="${partyContactMechPurpose.contactMechPurposeTypeId}"/>
- <input type="hidden" name="fromDate" value="${partyContactMechPurpose.fromDate}"/>
- <input type="hidden" name="useValues" value="true"/>
- <a href='javascript:document.deletePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}.submit()' class='button'> ${uiLabelMap.CommonDelete} </a>
- </div>
- </form>
- </td>
- </tr>
- </#list>
- <#if purposeTypes?has_content>
+ <table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <td align="right" valign="top">${uiLabelMap.PartyContactPurposes}</td>
+ <td> </td>
+ <td>
+ <table border="0" cellspacing="1">
+ <#list partyContactMechPurposes! as partyContactMechPurpose>
+ <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
+ <tr>
+ <td>
+ <#if contactMechPurposeType??>
+ ${contactMechPurposeType.get("description",locale)}
+ <#else>
+ ${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"
+ </#if>
+ (${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()})
+ <#if partyContactMechPurpose.thruDate??>(${uiLabelMap.CommonExpires}
+ :${partyContactMechPurpose.thruDate.toString()})</#if>
+ </td>
+ <td>
+ <form name="deletePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}"
+ method="post" action="<@o...@ofbizUrl>">
+ <div>
+ <input type="hidden" name="contactMechId" value="${contactMechId}"/>
+ <input type="hidden" name="contactMechPurposeTypeId"
+ value="${partyContactMechPurpose.contactMechPurposeTypeId}"/>
+ <input type="hidden" name="fromDate" value="${partyContactMechPurpose.fromDate}"/>
+ <input type="hidden" name="useValues" value="true"/>
+ <a href='javascript:document.deletePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}.submit()'
+ class='button'> ${uiLabelMap.CommonDelete} </a>
+ </div>
+ </form>
+ </td>
+ </tr>
+ </#list>
+ <#if purposeTypes?has_content>
<tr>
<td>
- <form method="post" action='<@o...@ofbizUrl>' name='newpurposeform'>
+ <form method="post" action='<@o...@ofbizUrl>'
+ name='newpurposeform'>
<div>
- <input type="hidden" name="contactMechId" value="${contactMechId}"/>
- <input type="hidden" name="useValues" value="true"/>
+ <input type="hidden" name="contactMechId" value="${contactMechId}"/>
+ <input type="hidden" name="useValues" value="true"/>
<select name='contactMechPurposeTypeId' class='selectBox'>
<option></option>
<#list purposeTypes as contactMechPurposeType>
- <option value='${contactMechPurposeType.contactMechPurposeTypeId}'>${contactMechPurposeType.get("description",locale)}</option>
+ <option value='${contactMechPurposeType.contactMechPurposeTypeId}'>
+ ${contactMechPurposeType.get("description",locale)}
+ </option>
</#list>
</select>
- </div>
+ </div>
</form>
</td>
- <td><a href='javascript:document.newpurposeform.submit()' class='button'>${uiLabelMap.PartyAddPurpose}</a></td>
+ <td>
+ <a href='javascript:document.newpurposeform.submit()' class='button'>${uiLabelMap.PartyAddPurpose}</a>
+ </td>
</tr>
- </#if>
- </table>
- </td>
- </tr>
- <form method="post" action='<@o...@ofbizUrl>' name="editcontactmechform" id="editcontactmechform">
- <div>
- <input type="hidden" name="contactMechId" value='${contactMechId}' />
- <input type="hidden" name="contactMechTypeId" value='${contactMechTypeId}' />
+ </#if>
+ </table>
+ </td>
+ </tr>
+ <form method="post" action='<@o...@ofbizUrl>' name="editcontactmechform" id="editcontactmechform">
+ <div>
+ <input type="hidden" name="contactMechId" value='${contactMechId}'/>
+ <input type="hidden" name="contactMechTypeId" value='${contactMechTypeId}'/>
</#if>
<#if contactMechTypeId = "POSTAL_ADDRESS">
@@ -127,67 +145,74 @@ 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!}" />
+ <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!}" />
+ <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!}" />
- *</td>
+ <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!}" />
+ <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!}" />
- *</td>
+ <input type="text" class='inputBox' size="30" maxlength="30" name="city" value="${postalAddressData.city!}"/>*
+ </td>
</tr>
<tr>
<td align="right" valign="top"> ${uiLabelMap.PartyState}
<td> </td>
- <td>
+ <td>
<select name="stateProvinceGeoId" id="editcontactmechform_stateProvinceGeoId">
</select>
</td>
- </tr>
+ </tr>
<tr>
<td align="right" valign="top">${uiLabelMap.PartyZipCode}</td>
- <td > </td>
+ <td> </td>
<td>
- <input type="text" class='inputBox' size="12" maxlength="10" name="postalCode" value="${postalAddressData.postalCode!}" />
- *</td>
+ <input type="text" class='inputBox' size="12" maxlength="10" name="postalCode"
+ value="${postalAddressData.postalCode!}"/>*
+ </td>
</tr>
- <tr>
+ <tr>
<td align="right" valign="top">${uiLabelMap.CommonCountry}</td>
<td> </td>
<td>
<select name="countryGeoId" id="editcontactmechform_countryGeoId">
- ${screens.render("component://common/widget/CommonScreens.xml#countries")}
- <#if (postalAddress??) && (postalAddress.countryGeoId??)>
- <#assign defaultCountryGeoId = postalAddress.countryGeoId>
- <#else>
- <#assign defaultCountryGeoId = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "country.geo.id.default", delegator)>
- </#if>
- <option selected="selected" value="${defaultCountryGeoId}">
- <#assign countryGeo = delegator.findOne("Geo",Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("geoId",defaultCountryGeoId), false)>
- ${countryGeo.get("geoName",locale)}
- </option>
+ ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+ <#if (postalAddress??) && (postalAddress.countryGeoId??)>
+ <#assign defaultCountryGeoId = postalAddress.countryGeoId>
+ <#else>
+ <#assign defaultCountryGeoId = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"]
+ .getPropertyValue("general", "country.geo.id.default", delegator)>
+ </#if>
+ <option selected="selected" value="${defaultCountryGeoId}">
+ <#assign countryGeo = delegator.findOne("Geo",Static["org.apache.ofbiz.base.util.UtilMisc"]
+ .toMap("geoId",defaultCountryGeoId), false)>
+ ${countryGeo.get("geoName",locale)}
+ </option>
</select>
</td>
</tr>
@@ -196,54 +221,64 @@ 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!}" />
- - <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!}" />
+ <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>
<td align="right" valign="top"></td>
<td> </td>
- <td>[${uiLabelMap.CommonCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</td>
+ <td>[${uiLabelMap.CommonCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}]
+ [${uiLabelMap.PartyExtension}]
+ </td>
</tr>
<#elseif contactMechTypeId = "EMAIL_ADDRESS">
<tr>
<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!}<#else>${requestParameters.emailAddress!}</#if>" />
- *</td>
+ <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)!}</td>
<td> </td>
<td>
- <input type="text" class='inputBox' size="60" maxlength="255" name="infoString" value="${contactMechData.infoString!}" />
- *</td>
- </tr>
- </#if>
- <tr>
- <td align="right" valign="top">${uiLabelMap.PartyAllowSolicitation}?</td>
- <td> </td>
- <td>
- <select name="allowSolicitation" class='selectBox'>
- <#if (((partyContactMechData.allowSolicitation)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
- <#if (((partyContactMechData.allowSolicitation)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
- <option></option>
- <option value="Y">${uiLabelMap.CommonY}</option>
- <option value="N">${uiLabelMap.CommonN}</option>
- </select>
+ <input type="text" class='inputBox' size="60" maxlength="255" name="infoString"
+ value="${contactMechData.infoString!}"/>*
</td>
</tr>
- </div>
- </form>
+ </#if>
+ <tr>
+ <td align="right" valign="top">${uiLabelMap.PartyAllowSolicitation}?</td>
+ <td> </td>
+ <td>
+ <select name="allowSolicitation" class='selectBox'>
+ <#if (((partyContactMechData.allowSolicitation)!"") == "Y")>
+ <option value="Y">${uiLabelMap.CommonY}</option></#if>
+ <#if (((partyContactMechData.allowSolicitation)!"") == "N")>
+ <option value="N">${uiLabelMap.CommonN}</option></#if>
+ <option></option>
+ <option value="Y">${uiLabelMap.CommonY}</option>
+ <option value="N">${uiLabelMap.CommonN}</option>
+ </select>
+ </td>
+ </tr>
+ </div>
+ </form>
</table>
-
<a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
<a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a>
- <#else>
+ <#else>
<a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
</#if>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditCreditCard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditCreditCard.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditCreditCard.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditCreditCard.ftl Sat Sep 17 07:17:15 2016
@@ -19,124 +19,145 @@ under the License.
<#if canNotView>
<h3>${uiLabelMap.AccountingCardInfoNotBelongToYou}.</h3>
-<a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+ <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
<#else>
<#if !creditCard??>
- <h2>${uiLabelMap.AccountingAddNewCreditCard}</h2>
- <form method="post" action="<@o...@ofbizUrl>" name="editcreditcardform">
- <div>
- <#else>
- <h2>${uiLabelMap.AccountingEditCreditCard}</h2>
- <form method="post" action="<@o...@ofbizUrl>" name="editcreditcardform">
- <div>
- <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" />
- </#if>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.editcreditcardform.submit()" class="button">${uiLabelMap.CommonSave}</a>
- <p/>
- <table width="90%" border="0" cellpadding="2" cellspacing="0">
- ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")}
- <tr>
- <td align="right" valign="top">${uiLabelMap.PartyBillingAddress}</td>
- <td> </td>
- <td>
- <#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
- <a href="<@o...@ofbizUrl>" class="buttontext">
- [Create New Address]</a>
- -->
- <table width="100%" border="0" cellpadding="1">
- <#assign hasCurrent = false />
- <#if curPostalAddress?has_content>
- <#assign hasCurrent = true />
- <tr>
- <td align="right" valign="top">
- <input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked" />
- </td>
- <td valign="top">
- ${uiLabelMap.PartyUseCurrentAddress}:
- <#list curPartyContactMechPurposes as curPartyContactMechPurpose>
- <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
- <div>
- ${curContactMechPurposeType.get("description",locale)!}
- <#if curPartyContactMechPurpose.thruDate??>
- ((${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
- </#if>
- </div>
- </#list>
- <div>
- <#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??><br />${curPostalAddress.countryGeoId}</#if>
- <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())!})</div>
- <#if curPartyContactMech.thruDate??><div>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</#if>
- </div>
- </td>
- </tr>
- <#else>
- <#-- <tr>
- <td valign="top" colspan="2">
- <div>${uiLabelMap.PartyBillingAddressNotSelected}</div>
- </td>
- </tr> -->
- </#if>
+ <h2>${uiLabelMap.AccountingAddNewCreditCard}</h2>
+ <form method="post" action="<@o...@ofbizUrl>" name="editcreditcardform">
+ <div>
+ <#else>
+ <h2>${uiLabelMap.AccountingEditCreditCard}</h2>
+ <form method="post" action="<@o...@ofbizUrl>" name="editcreditcardform">
+ <div>
+ <input type="hidden" name="paymentMethodId" value="${paymentMethodId}"/>
+ </#if>
+ <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+ <a href="javascript:document.editcreditcardform.submit()" class="button">${uiLabelMap.CommonSave}</a>
+ <p/>
+ <table width="90%" border="0" cellpadding="2" cellspacing="0">
+ ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")}
+ <tr>
+ <td align="right" valign="top">${uiLabelMap.PartyBillingAddress}</td>
+ <td> </td>
+ <td>
+ <#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
+ <a href="<@o...@ofbizUrl>" class="buttontext">
+ [Create New Address]</a>
+ -->
+ <table width="100%" border="0" cellpadding="1">
+ <#assign hasCurrent = false />
+ <#if curPostalAddress?has_content>
+ <#assign hasCurrent = true />
+ <tr>
+ <td align="right" valign="top">
+ <input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked"/>
+ </td>
+ <td valign="top">
+ ${uiLabelMap.PartyUseCurrentAddress}:
+ <#list curPartyContactMechPurposes as curPartyContactMechPurpose>
+ <#assign curContactMechPurposeType =
+ curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
+ <div>
+ ${curContactMechPurposeType.get("description",locale)!}
+ <#if curPartyContactMechPurpose.thruDate??>
+ ((${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
+ </#if>
+ </div>
+ </#list>
+ <div>
+ <#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??><br/>${curPostalAddress.countryGeoId}</#if>
+ <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())!})</div>
+ <#if curPartyContactMech.thruDate??>
+ <div>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}
+ </#if>
+ </div>
+ </td>
+ </tr>
+ <#else>
+ <#-- <tr>
+ <td valign="top" colspan="2">
+ <div>${uiLabelMap.PartyBillingAddressNotSelected}</div>
+ </td>
+ </tr> -->
+ </#if>
<#-- is confusing
+ <tr>
+ <td valign="top" colspan="2">
+ <div>${uiLabelMap.EcommerceMessage3}</div>
+ </td>
+ </tr>
+ -->
+ <#list postalAddressInfos as postalAddressInfo>
+ <#assign contactMech = postalAddressInfo.contactMech />
+ <#assign partyContactMechPurposes = postalAddressInfo.partyContactMechPurposes />
+ <#assign postalAddress = postalAddressInfo.postalAddress />
+ <#assign partyContactMech = postalAddressInfo.partyContactMech />
+ <tr>
+ <td align="right" valign="top">
+ <input type="radio" name="contactMechId" value="${contactMech.contactMechId}"/>
+ </td>
+ <td valign="middle">
+ <#list partyContactMechPurposes as partyContactMechPurpose>
+ <#assign contactMechPurposeType =
+ partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
+ <div>
+ ${contactMechPurposeType.get("description",locale)!}
+ <#if partyContactMechPurpose.thruDate??>
+ (${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})
+ </#if>
+ </div>
+ </#list>
+ <div>
+ <#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??><br/>${postalAddress.countryGeoId}</#if>
+ </div>
+ <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??>
+ <tr>
+ <td colspan="2">
+ <div>${uiLabelMap.PartyNoContactInformation}.</div>
+ </td>
+ </tr>
+ </#if>
<tr>
- <td valign="top" colspan="2">
- <div>${uiLabelMap.EcommerceMessage3}</div>
+ <td align="right" valign="top">
+ <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked="checked"</#if>/>
+ </td>
+ <td valign="middle">
+ <span>${uiLabelMap.PartyCreateNewBillingAddress}.</span>
</td>
</tr>
- -->
- <#list postalAddressInfos as postalAddressInfo>
- <#assign contactMech = postalAddressInfo.contactMech />
- <#assign partyContactMechPurposes = postalAddressInfo.partyContactMechPurposes />
- <#assign postalAddress = postalAddressInfo.postalAddress />
- <#assign partyContactMech = postalAddressInfo.partyContactMech />
- <tr>
- <td align="right" valign="top">
- <input type="radio" name="contactMechId" value="${contactMech.contactMechId}" />
- </td>
- <td valign="middle">
- <#list partyContactMechPurposes as partyContactMechPurpose>
- <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
- <div>
- ${contactMechPurposeType.get("description",locale)!}
- <#if partyContactMechPurpose.thruDate??>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if>
- </div>
- </#list>
- <div>
- <#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??><br />${postalAddress.countryGeoId}</#if>
- </div>
- <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??>
- <tr><td colspan="2"><div>${uiLabelMap.PartyNoContactInformation}.</div></td></tr>
- </#if>
- <tr>
- <td align="right" valign="top">
- <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked="checked"</#if> />
- </td>
- <td valign="middle">
- <span>${uiLabelMap.PartyCreateNewBillingAddress}.</span>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- </form>
+ </table>
+ </td>
+ </tr>
+ </table>
+</div>
+</form>
<a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.editcreditcardform.submit()" class="button">${uiLabelMap.CommonSave}</a>
+ <a href="javascript:document.editcreditcardform.submit()" class="button">${uiLabelMap.CommonSave}</a>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditEftAccount.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditEftAccount.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditEftAccount.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditEftAccount.ftl Sat Sep 17 07:17:15 2016
@@ -18,51 +18,67 @@ under the License.
-->
<#if canNotView>
- <p><h3>${uiLabelMap.AccountingEFTNotBelongToYou}.</h3></p>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
+ <p><h3>${uiLabelMap.AccountingEFTNotBelongToYou}.</h3></p>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
<#else>
- <#if !eftAccount??>
- <h1>${uiLabelMap.AccountingAddNewEftAccount}</h1>
- <form method="post" action="<@o...@ofbizUrl>" name="editeftaccountform" style="margin: 0;">
- <#else>
- <h1>${uiLabelMap.PageTitleEditEFTAccount}</h1>
- <form method="post" action="<@o...@ofbizUrl>" name="editeftaccountform" style="margin: 0;">
- <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" />
- </#if>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.editeftaccountform.submit()" class="button">${uiLabelMap.CommonSave}</a>
- <p/>
- <table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <#if !eftAccount??>
+ <h1>${uiLabelMap.AccountingAddNewEftAccount}</h1>
+ <form method="post" action="<@o...@ofbizUrl>" name="editeftaccountform"
+ style="margin: 0;">
+ <#else>
+ <h1>${uiLabelMap.PageTitleEditEFTAccount}</h1>
+ <form method="post" action="<@o...@ofbizUrl>" name="editeftaccountform"
+ style="margin: 0;">
+ <input type="hidden" name="paymentMethodId" value="${paymentMethodId}"/>
+ </#if>
+ <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+ <a href="javascript:document.editeftaccountform.submit()" class="button">${uiLabelMap.CommonSave}</a>
+ <p/>
+ <table width="90%" border="0" cellpadding="2" cellspacing="0">
<tr>
- <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingNameOnAccount}</div></td>
+ <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!}" />
- *</td>
+ <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="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!}" />
+ <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="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!}" />
- *</td>
+ <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="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!}" />
- *</td>
+ <input type="text" class="inputBox" size="10" maxlength="30"
+ name="routingNumber" value="${eftAccountData.routingNumber!}"/>*
+ </td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountType}</div></td>
+ <td width="26%" align="right" valign="top">
+ <div>${uiLabelMap.AccountingAccountType}</div>
+ </td>
<td width="5"> </td>
<td width="74%">
<select name="accountType" class="selectBox">
@@ -70,26 +86,33 @@ under the License.
<option></option>
<option>${uiLabelMap.CommonChecking}</option>
<option>${uiLabelMap.CommonSavings}</option>
- </select>
- *</td>
+ </select>*
+ </td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
+ <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!}" />
- *</td>
+ <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="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!}" />
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description"
+ value="${paymentMethodData.description!}"/>
</td>
</tr>
-
<tr>
- <td width="26%" align="right" valign="top"><div>${uiLabelMap.PartyBillingAddress}</div></td>
+ <td width="26%" align="right" valign="top">
+ <div>${uiLabelMap.PartyBillingAddress}</div>
+ </td>
<td width="5"> </td>
<td width="74%">
<#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
@@ -97,41 +120,54 @@ under the License.
[Create New Address]</a>
-->
<table width="100%" border="0" cellpadding="1">
- <#if curPostalAddress??>
- <tr>
- <td align="right" valign="top" width="1%">
- <input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked" />
- </td>
- <td valign="top" width="80%">
- <div><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div>
- <#list curPartyContactMechPurposes as curPartyContactMechPurpose>
- <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
+ <#if curPostalAddress??>
+ <tr>
+ <td align="right" valign="top" width="1%">
+ <input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked"/>
+ </td>
+ <td valign="top" width="80%">
+ <div><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div>
+ <#list curPartyContactMechPurposes as curPartyContactMechPurpose>
+ <#assign curContactMechPurposeType =
+ curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
+ <div>
+ <b>${curContactMechPurposeType.get("description",locale)!}</b>
+ <#if curPartyContactMechPurpose.thruDate??>
+ (${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
+ </#if>
+ </div>
+ </#list>
<div>
- <b>${curContactMechPurposeType.get("description",locale)!}</b>
- <#if curPartyContactMechPurpose.thruDate??>
- (${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
+ <#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??><br/>${curPostalAddress.countryGeoId}</#if>
</div>
- </#list>
- <div>
- <#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??><br />${curPostalAddress.countryGeoId}</#if>
- </div>
- <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())!})</div>
- <#if curPartyContactMech.thruDate??><div><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if>
- </td>
- </tr>
- <#else>
- <#-- <tr>
- <td valign="top" colspan="2">
- <div>${uiLabelMap.PartyNoBillingAddress}</div>
- </td>
- </tr> -->
- </#if>
+ <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())!})</div>
+ <#if curPartyContactMech.thruDate??>
+ <div><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div>
+ </#if>
+ </td>
+ </tr>
+ <#else>
+ <#--
+ <tr>
+ <td valign="top" colspan="2">
+ <div>${uiLabelMap.PartyNoBillingAddress}</div>
+ </td>
+ </tr>
+ -->
+ </#if>
<#-- is confusing
<tr>
<td valign="top" colspan="2">
@@ -146,38 +182,53 @@ under the License.
<#assign partyContactMech = postalAddressInfo.partyContactMech>
<tr>
<td align="right" valign="top" width="1%">
- <input type="radio" name="contactMechId" value="${contactMech.contactMechId}" />
+ <input type="radio" name="contactMechId" value="${contactMech.contactMechId}"/>
</td>
<td valign="top" width="80%">
<#list partyContactMechPurposes as partyContactMechPurpose>
- <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
- <div>
- <b>${contactMechPurposeType.get("description",locale)!}</b>
- <#if partyContactMechPurpose.thruDate??>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if>
- </div>
+ <#assign contactMechPurposeType =
+ partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
+ <div>
+ <b>${contactMechPurposeType.get("description",locale)!}</b>
+ <#if partyContactMechPurpose.thruDate??>
+ (${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})
+ </#if>
+ </div>
</#list>
<div>
- <#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??><br />${postalAddress.countryGeoId}</#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??><br/>${postalAddress.countryGeoId}</#if>
</div>
<div>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())!})</div>
- <#if partyContactMech.thruDate??><div><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div></#if>
+ <#if partyContactMech.thruDate??>
+ <div><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div>
+ </#if>
</td>
</tr>
</#list>
<#if !postalAddressInfos?has_content && !curContactMech??>
- <tr><td colspan="2"><div>${uiLabelMap.PartyNoContactInformation}.</div></td></tr>
+ <tr>
+ <td colspan="2">
+ <div>${uiLabelMap.PartyNoContactInformation}.</div>
+ </td>
+ </tr>
</#if>
</table>
</td>
</tr>
</table>
- </form>
+</form>
<a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.editeftaccountform.submit()" class="button">${uiLabelMap.CommonSave}</a>
+ <a href="javascript:document.editeftaccountform.submit()" class="button">${uiLabelMap.CommonSave}</a>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditGiftCard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditGiftCard.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditGiftCard.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditGiftCard.ftl Sat Sep 17 07:17:15 2016
@@ -18,96 +18,108 @@ under the License.
-->
<#if canNotView>
- <p><h3>${uiLabelMap.AccountingCardInfoNotBelongToYou}.</h3></p>
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a>
+ <p><h3>${uiLabelMap.AccountingCardInfoNotBelongToYou}.</h3></p>
+ <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a>
<#else>
- <#if !giftCard??>
- <h1>${uiLabelMap.AccountingAddNewGiftCard}</h1>
- <form method="post" action="<@o...@ofbizUrl>" name="editgiftcardform" style="margin: 0;">
- <#else>
- <h1>${uiLabelMap.AccountingEditGiftCard}</h1>
- <form method="post" action="<@o...@ofbizUrl>" name="editgiftcardform" style="margin: 0;">
- <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" />
- </#if>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.editgiftcardform.submit()" class="button">${uiLabelMap.CommonSave}</a>
- <p/>
- <table width="90%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCardNumber}</div></td>
- <td width="5"> </td>
- <td width="74%">
- <#if giftCardData?has_content && giftCardData.cardNumber?has_content>
- <#assign pcardNumberDisplay = "">
- <#assign pcardNumber = giftCardData.cardNumber!>
- <#if pcardNumber?has_content>
- <#assign psize = pcardNumber?length - 4>
- <#if 0 < psize>
- <#list 0 .. psize-1 as foo>
- <#assign pcardNumberDisplay = pcardNumberDisplay + "*">
- </#list>
- <#assign pcardNumberDisplay = pcardNumberDisplay + pcardNumber[psize .. psize + 3]>
- <#else>
- <#assign pcardNumberDisplay = pcardNumber>
+ <#if !giftCard??>
+ <h1>${uiLabelMap.AccountingAddNewGiftCard}</h1>
+ <form method="post" action="<@o...@ofbizUrl>"
+ name="editgiftcardform" style="margin: 0;">
+ <#else>
+ <h1>${uiLabelMap.AccountingEditGiftCard}</h1>
+ <form method="post" action="<@o...@ofbizUrl>" name="editgiftcardform"
+ style="margin: 0;">
+ <input type="hidden" name="paymentMethodId" value="${paymentMethodId}"/>
+ </#if>
+ <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+ <a href="javascript:document.editgiftcardform.submit()" class="button">${uiLabelMap.CommonSave}</a>
+ <p/>
+ <table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <td width="26%" align="right" valign="top">
+ <div>${uiLabelMap.AccountingCardNumber}</div>
+ </td>
+ <td width="5"> </td>
+ <td width="74%">
+ <#if giftCardData?has_content && giftCardData.cardNumber?has_content>
+ <#assign pcardNumberDisplay = "">
+ <#assign pcardNumber = giftCardData.cardNumber!>
+ <#if pcardNumber?has_content>
+ <#assign psize = pcardNumber?length - 4>
+ <#if 0 < psize>
+ <#list 0 .. psize-1 as foo>
+ <#assign pcardNumberDisplay = pcardNumberDisplay + "*">
+ </#list>
+ <#assign pcardNumberDisplay = pcardNumberDisplay + pcardNumber[psize .. psize + 3]>
+ <#else>
+ <#assign pcardNumberDisplay = pcardNumber>
+ </#if>
+ </#if>
</#if>
- </#if>
- </#if>
- <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!}" />
- </td>
- </tr>
- <tr>
- <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingExpirationDate}</div></td>
- <td width="5"> </td>
- <td width="74%">
- <#assign expMonth = "">
- <#assign expYear = "">
- <#if giftCardData?? && giftCardData.expireDate??>
- <#assign expDate = giftCard.expireDate>
- <#if (expDate?? && expDate.indexOf("/") > 0)>
- <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))>
- <#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
- </#if>
- </#if>
- <select name="expMonth" class="selectBox" onchange="javascript:makeExpDate();">
- <#if giftCardData?has_content && expMonth?has_content>
- <#assign ccExprMonth = expMonth>
- <#else>
- <#assign ccExprMonth = requestParameters.expMonth!>
- </#if>
- <#if ccExprMonth?has_content>
- <option value="${ccExprMonth!}">${ccExprMonth!}</option>
- </#if>
- ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
- </select>
- <select name="expYear" class="selectBox" onchange="javascript:makeExpDate();">
- <#if giftCard?has_content && expYear?has_content>
- <#assign ccExprYear = expYear>
- <#else>
- <#assign ccExprYear = requestParameters.expYear!>
- </#if>
- <#if ccExprYear?has_content>
- <option value="${ccExprYear!}">${ccExprYear!}</option>
- </#if>
- ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
- </select>
- </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!}" />
- </td>
- </tr>
- </table>
- </form>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.editgiftcardform.submit()" class="button">${uiLabelMap.CommonSave}</a>
+ <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!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top">
+ <div>${uiLabelMap.AccountingExpirationDate}</div>
+ </td>
+ <td width="5"> </td>
+ <td width="74%">
+ <#assign expMonth = "">
+ <#assign expYear = "">
+ <#if giftCardData?? && giftCardData.expireDate??>
+ <#assign expDate = giftCard.expireDate>
+ <#if (expDate?? && expDate.indexOf("/") > 0)>
+ <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))>
+ <#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
+ </#if>
+ </#if>
+ <select name="expMonth" class="selectBox" onchange="javascript:makeExpDate();">
+ <#if giftCardData?has_content && expMonth?has_content>
+ <#assign ccExprMonth = expMonth>
+ <#else>
+ <#assign ccExprMonth = requestParameters.expMonth!>
+ </#if>
+ <#if ccExprMonth?has_content>
+ <option value="${ccExprMonth!}">${ccExprMonth!}</option>
+ </#if>
+ ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
+ </select>
+ <select name="expYear" class="selectBox" onchange="javascript:makeExpDate();">
+ <#if giftCard?has_content && expYear?has_content>
+ <#assign ccExprYear = expYear>
+ <#else>
+ <#assign ccExprYear = requestParameters.expYear!>
+ </#if>
+ <#if ccExprYear?has_content>
+ <option value="${ccExprYear!}">${ccExprYear!}</option>
+ </#if>
+ ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
+ </select>
+ </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!}"/>
+ </td>
+ </tr>
+ </table>
+ </form>
+ <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+ <a href="javascript:document.editgiftcardform.submit()" class="button">${uiLabelMap.CommonSave}</a>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditPerson.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditPerson.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditPerson.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditPerson.ftl Sat Sep 17 07:17:15 2016
@@ -17,162 +17,172 @@ specific language governing permissions
under the License.
-->
<#if person??>
- <h2>${uiLabelMap.PartyEditPersonalInformation}</h2>
- <form id="editpersonform1" method="post" action="<@o...@ofbizUrl>" name="editpersonform">
+ <h2>${uiLabelMap.PartyEditPersonalInformation}</h2>
+ <form id="editpersonform1" method="post" action="<@o...@ofbizUrl>" name="editpersonform">
<#else>
- <h2>${uiLabelMap.PartyAddNewPersonalInformation}</h2>
- <form id="editpersonform2" method="post" action="<@o...@ofbizUrl>" name="editpersonform">
+ <h2>${uiLabelMap.PartyAddNewPersonalInformation}</h2>
+ <form id="editpersonform2" method="post" action="<@o...@ofbizUrl>"
+ name="editpersonform">
</#if>
-<div>
- <a href='<@o...@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!}" />
- <table width="90%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <td align="right">${uiLabelMap.CommonTitle}</td>
- <td>
- <select name="personalTitle" class="selectBox">
- <#if personData.personalTitle?has_content >
- <option>${personData.personalTitle}</option>
- <option value="${personData.personalTitle}"> -- </option>
- <#else>
- <option value="">${uiLabelMap.CommonSelectOne}</option>
- </#if>
- <option>${uiLabelMap.CommonTitleMr}</option>
- <option>${uiLabelMap.CommonTitleMrs}</option>
- <option>${uiLabelMap.CommonTitleMs}</option>
- <option>${uiLabelMap.CommonTitleDr}</option>
- </select>
- </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.PartyFirstName}</td>
- <td>
- <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!}"/>
- </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.PartyLastName}</td>
- <td>
- <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!}"/>
- </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.PartyNickName}</td>
- <td>
- <input type="text" class='inputBox' size="30" maxlength="60" name="nickname" value="${personData.nickname!}"/>
- </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.PartyGender}</td>
- <td>
- <select name="gender" class='selectBox'>
- <#if personData.gender?has_content >
- <option value="${personData.gender}">
+ <div>
+ <a href='<@o...@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!}"/>
+ <table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <td align="right">${uiLabelMap.CommonTitle}</td>
+ <td>
+ <select name="personalTitle" class="selectBox">
+ <#if personData.personalTitle?has_content >
+ <option>${personData.personalTitle}</option>
+ <option value="${personData.personalTitle}"> --</option>
+ <#else>
+ <option value="">${uiLabelMap.CommonSelectOne}</option>
+ </#if>
+ <option>${uiLabelMap.CommonTitleMr}</option>
+ <option>${uiLabelMap.CommonTitleMrs}</option>
+ <option>${uiLabelMap.CommonTitleMs}</option>
+ <option>${uiLabelMap.CommonTitleDr}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">${uiLabelMap.PartyFirstName}</td>
+ <td>
+ <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!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">${uiLabelMap.PartyLastName}</td>
+ <td>
+ <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!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">${uiLabelMap.PartyNickName}</td>
+ <td>
+ <input type="text" class='inputBox' size="30" maxlength="60" name="nickname" value="${personData.nickname!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">${uiLabelMap.PartyGender}</td>
+ <td>
+ <select name="gender" class='selectBox'>
+ <#if personData.gender?has_content >
+ <option value="${personData.gender}">
<#if personData.gender == "M" >${uiLabelMap.CommonMale}</#if>
- <#if personData.gender == "F" >${uiLabelMap.CommonFemale}</#if>
- </option>
- <option value="${personData.gender}"> -- </option>
- <#else>
- <option value="">${uiLabelMap.CommonSelectOne}</option>
- </#if>
- <option value="M">${uiLabelMap.CommonMale}</option>
- <option value="F">${uiLabelMap.CommonFemale}</option>
- </select>
- </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.PartyBirthDate}</td>
- <td>
- <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!}"/>
- </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.PartyWeight}</td>
- <td>
- <input type="text" class='inputBox' size="30" maxlength="60" name="weight" value="${personData.weight!}"/>
- </td>
- </tr>
+ <#if personData.gender == "F" >${uiLabelMap.CommonFemale}</#if>
+ </option>
+ <option value="${personData.gender}"> --</option>
+ <#else>
+ <option value="">${uiLabelMap.CommonSelectOne}</option>
+ </#if>
+ <option value="M">${uiLabelMap.CommonMale}</option>
+ <option value="F">${uiLabelMap.CommonFemale}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">${uiLabelMap.PartyBirthDate}</td>
+ <td>
+ <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!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">${uiLabelMap.PartyWeight}</td>
+ <td>
+ <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!}"/>
- </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.PartyMaritalStatus}</td>
- <td>
- <select name="maritalStatus" class='selectBox'>
- <#if personData.maritalStatus?has_content>
- <option value="${personData.maritalStatus}">
- <#if personData.maritalStatus == "S">${uiLabelMap.PartySingle}</#if>
- <#if personData.maritalStatus == "M">${uiLabelMap.PartyMarried}</#if>
- <#if personData.maritalStatus == "D">${uiLabelMap.PartyDivorced}</#if>
- </option>
- <option value="${personData.maritalStatus}"> -- </option>
- <#else>
- <option></option>
- </#if>
- <option value="S">${uiLabelMap.PartySingle}</option>
- <option value="M">${uiLabelMap.PartyMarried}</option>
- <option value="D">${uiLabelMap.PartyDivorced}</option>
- </select>
- </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.PartySocialSecurityNumber}</td>
- <td>
- <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!}"/>
- </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.PartyPassportExpireDate}</td>
- <td>
- <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!}"/>
- </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.CommonComment}</td>
- <td>
- <input type="text" class='inputBox' size="30" maxlength="60" name="comments" value="${personData.comments!}"/>
- </td>
- </tr>
-</table>
-</div>
-</form>
- <a href='<@o...@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a>
- <a id="editpersonform3" href="javascript:document.editpersonform.submit()" class="button">${uiLabelMap.CommonSave}</a>
\ No newline at end of file
+ <tr>
+ <td align="right">${uiLabelMap.PartyMaidenName}</td>
+ <td>
+ <input type="text" class='inputBox' size="30" maxlength="60" name="mothersMaidenName"
+ value="${personData.mothersMaidenName!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">${uiLabelMap.PartyMaritalStatus}</td>
+ <td>
+ <select name="maritalStatus" class='selectBox'>
+ <#if personData.maritalStatus?has_content>
+ <option value="${personData.maritalStatus}">
+ <#if personData.maritalStatus == "S">${uiLabelMap.PartySingle}</#if>
+ <#if personData.maritalStatus == "M">${uiLabelMap.PartyMarried}</#if>
+ <#if personData.maritalStatus == "D">${uiLabelMap.PartyDivorced}</#if>
+ </option>
+ <option value="${personData.maritalStatus}"> --</option>
+ <#else>
+ <option></option>
+ </#if>
+ <option value="S">${uiLabelMap.PartySingle}</option>
+ <option value="M">${uiLabelMap.PartyMarried}</option>
+ <option value="D">${uiLabelMap.PartyDivorced}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">${uiLabelMap.PartySocialSecurityNumber}</td>
+ <td>
+ <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!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">${uiLabelMap.PartyPassportExpireDate}</td>
+ <td>
+ <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!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">${uiLabelMap.CommonComment}</td>
+ <td>
+ <input type="text" class='inputBox' size="30" maxlength="60" name="comments" value="${personData.comments!}"/>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </form>
+ <a href='<@o...@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a>
+ <a id="editpersonform3" href="javascript:document.editpersonform.submit()" class="button">${uiLabelMap.CommonSave}</a>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/FinAccountDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/FinAccountDetail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/FinAccountDetail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/FinAccountDetail.ftl Sat Sep 17 07:17:15 2016
@@ -19,27 +19,47 @@ under the License.
<table border="0" cellpadding="1">
<tr>
- <td align="right" width="25%"><div class="tableheadtext">Account Number:</div></td>
- <td><div>${ownedFinAccount.finAccountId}</div></td>
+ <td align="right" width="25%">
+ <div class="tableheadtext">Account Number:</div>
+ </td>
+ <td>
+ <div>${ownedFinAccount.finAccountId}</div>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ <div class="tableheadtext">Currency:</div>
+ </td>
+ <td>
+ <div>${(accountCurrencyUom.description)!} [${ownedFinAccount.currencyUomId!}]</div>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ <div class="tableheadtext">Date Opened:</div>
+ </td>
+ <td>
+ <div>${ownedFinAccount.fromDate!}</div>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ <div class="tableheadtext">Status:</div>
+ </td>
+ <td>
+ <div>${(finAccountStatusItem.description)?default("Active")}</div>
+ </td>
+ </tr>
+<#if ownedFinAccount.replenishLevel??>
+ <tr>
+ <td align="right">
+ <div class="tableheadtext">Replenish Level:</div>
+ </td>
+ <td>
+ <div>${ownedFinAccount.replenishLevel}</div>
+ </td>
</tr>
- <tr>
- <td align="right"><div class="tableheadtext">Currency:</div></td>
- <td><div>${(accountCurrencyUom.description)!} [${ownedFinAccount.currencyUomId!}]</div></td>
- </tr>
- <tr>
- <td align="right"><div class="tableheadtext">Date Opened:</div></td>
- <td><div>${ownedFinAccount.fromDate!}</div></td>
- </tr>
- <tr>
- <td align="right"><div class="tableheadtext">Status:</div></td>
- <td><div>${(finAccountStatusItem.description)?default("Active")}</div></td>
- </tr>
- <#if ownedFinAccount.replenishLevel??>
- <tr>
- <td align="right"><div class="tableheadtext">Replenish Level:</div></td>
- <td><div>${ownedFinAccount.replenishLevel}</div></td>
- </tr>
- </#if>
+</#if>
</table>
<table border="0" cellpadding="1" border="2">
@@ -51,21 +71,26 @@ under the License.
<th>Type</th>
<th>Amount</th>
</tr>
- <#list ownedFinAccountTransList as ownedFinAccountTrans>
- <#assign finAccountTransType = ownedFinAccountTrans.getRelatedOne("FinAccountTransType", false)/>
- <#assign displayAmount = ownedFinAccountTrans.amount/>
- <#if ownedFinAccountTrans.finAccountTransTypeId == "WITHDRAWAL">
- <#assign displayAmount = -displayAmount/>
- </#if>
- <tr>
- <td>${ownedFinAccountTrans.transactionDate!}</td>
- <td>${ownedFinAccountTrans.finAccountTransId}</td>
- <td><#if ownedFinAccountTrans.orderId?has_content>${ownedFinAccountTrans.orderId!}:${ownedFinAccountTrans.orderItemSeqId!}<#else> </#if></td>
- <td><#if ownedFinAccountTrans.paymentId?has_content>${ownedFinAccountTrans.paymentId!}<#else> </#if></td>
- <td>${finAccountTransType.description?default(ownedFinAccountTrans.finAccountTransTypeId)!}</td>
- <td><@ofbizCurrency amount=displayAmount isoCode=ownedFinAccount.currencyUomId/></td>
- </tr>
- </#list>
+ <#list ownedFinAccountTransList as ownedFinAccountTrans>
+ <#assign finAccountTransType = ownedFinAccountTrans.getRelatedOne("FinAccountTransType", false)/>
+ <#assign displayAmount = ownedFinAccountTrans.amount/>
+ <#if ownedFinAccountTrans.finAccountTransTypeId == "WITHDRAWAL">
+ <#assign displayAmount = -displayAmount/>
+ </#if>
+ <tr>
+ <td>${ownedFinAccountTrans.transactionDate!}</td>
+ <td>${ownedFinAccountTrans.finAccountTransId}</td>
+ <td>
+ <#if ownedFinAccountTrans.orderId?has_content>
+ ${ownedFinAccountTrans.orderId!}:${ownedFinAccountTrans.orderItemSeqId!}
+ <#else>
+ </#if>
+ </td>
+ <td><#if ownedFinAccountTrans.paymentId?has_content>${ownedFinAccountTrans.paymentId!}<#else> </#if></td>
+ <td>${finAccountTransType.description?default(ownedFinAccountTrans.finAccountTransTypeId)!}</td>
+ <td><@ofbizCurrency amount=displayAmount isoCode=ownedFinAccount.currencyUomId/></td>
+ </tr>
+ </#list>
<tr>
<th>Actual Balance</th>
<td> </td>
@@ -75,32 +100,32 @@ under the License.
</table>
<#if ownedFinAccountAuthList?has_content>
-<table border="0" cellpadding="1">
- <tr>
- <th>Authorization ${uiLabelMap.CommonDate}</th>
- <th>ID</th>
- <th>Expires</th>
- <th>Amount</th>
- </tr>
- <tr>
- <td>Actual Balance</td>
- <td> </td>
- <td> </td>
- <td><@ofbizCurrency amount=ownedFinAccount.actualBalance isoCode=ownedFinAccount.currencyUomId/></td>
- </tr>
- <#list ownedFinAccountAuthList as ownedFinAccountAuth>
- <tr>
- <td>${ownedFinAccountAuth.authorizationDate!}</td>
- <td>${ownedFinAccountAuth.finAccountAuthId}</td>
- <td>${ownedFinAccountAuth.thruDate!}</td>
- <td><@ofbizCurrency amount=-ownedFinAccountAuth.amount isoCode=ownedFinAccount.currencyUomId/></td>
- </tr>
- </#list>
- <tr>
- <th>Available Balance</th>
- <td> </td>
- <td> </td>
- <th><@ofbizCurrency amount=ownedFinAccount.availableBalance isoCode=ownedFinAccount.currencyUomId/></th>
- </tr>
-</table>
+ <table border="0" cellpadding="1">
+ <tr>
+ <th>Authorization ${uiLabelMap.CommonDate}</th>
+ <th>ID</th>
+ <th>Expires</th>
+ <th>Amount</th>
+ </tr>
+ <tr>
+ <td>Actual Balance</td>
+ <td> </td>
+ <td> </td>
+ <td><@ofbizCurrency amount=ownedFinAccount.actualBalance isoCode=ownedFinAccount.currencyUomId/></td>
+ </tr>
+ <#list ownedFinAccountAuthList as ownedFinAccountAuth>
+ <tr>
+ <td>${ownedFinAccountAuth.authorizationDate!}</td>
+ <td>${ownedFinAccountAuth.finAccountAuthId}</td>
+ <td>${ownedFinAccountAuth.thruDate!}</td>
+ <td><@ofbizCurrency amount=-ownedFinAccountAuth.amount isoCode=ownedFinAccount.currencyUomId/></td>
+ </tr>
+ </#list>
+ <tr>
+ <th>Available Balance</th>
+ <td> </td>
+ <td> </td>
+ <th><@ofbizCurrency amount=ownedFinAccount.availableBalance isoCode=ownedFinAccount.currencyUomId/></th>
+ </tr>
+ </table>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardBalance.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardBalance.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardBalance.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardBalance.ftl Sat Sep 17 07:17:15 2016
@@ -18,11 +18,11 @@ under the License.
-->
<h1>${uiLabelMap.AccountingGiftCardBalance}</h1>
-<br />
+<br/>
<div>${uiLabelMap.AccountingEnterGiftCardNumber}</div>
-<br />
+<br/>
-<br />
+<br/>
<table align="center">
<#if requestAttributes.processResult??>
<tr>
@@ -43,23 +43,35 @@ under the License.
</div>
</td>
</tr>
- <tr><td colspan="2"> </td></tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
</#if>
<form method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="currency" value="USD" />
- <input type="hidden" name="paymentConfig" value="${paymentProperties?default("payment.properties")}" />
+ <input type="hidden" name="currency" value="USD"/>
+ <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)!}"/>
+ </td>
+ </tr>
<tr>
- <td><div class="tableheadtext">${uiLabelMap.AccountingCardNumber}</div></td>
- <td><input type="text" class="inputBox" name="cardNumber" size="20" value="${(requestParameters.cardNumber)!}" /></td>
+ <td>
+ <div class="tableheadtext">${uiLabelMap.AccountingPINNumber}</div>
+ </td>
+ <td><input type="text" class="inputBox" name="pin" size="15" value="${(requestParameters.pin)!}"/></td>
</tr>
<tr>
- <td><div class="tableheadtext">${uiLabelMap.AccountingPINNumber}</div></td>
- <td><input type="text" class="inputBox" name="pin" size="15" value="${(requestParameters.pin)!}" /></td>
+ <td colspan="2"> </td>
</tr>
- <tr><td colspan="2"> </td></tr>
<tr>
- <td colspan="2" align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceCheckBalance}" /></td>
+ <td colspan="2" align="center">
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceCheckBalance}"/>
+ </td>
</tr>
</form>
</table>
-<br />
+<br/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardLink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardLink.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardLink.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardLink.ftl Sat Sep 17 07:17:15 2016
@@ -18,14 +18,14 @@ under the License.
-->
<h1>${uiLabelMap.AccountingGiftCardLink}</h1>
-<br />
+<br/>
<div>${uiLabelMap.AccountingEnterGiftCardLink}.</div>
-<br />
+<br/>
<form name="gclink" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="paymentConfig" value="${paymentProperties?default("payment.properties")}" />
+ <input type="hidden" name="paymentConfig" value="${paymentProperties?default("payment.properties")}"/>
<#if userLogin?has_content>
- <input type="hidden" name="partyId" value="${userLogin.partyId}" />
+ <input type="hidden" name="partyId" value="${userLogin.partyId}"/>
</#if>
<table align="center">
<tr>
@@ -34,12 +34,16 @@ under the License.
</td>
</tr>
<tr>
- <td><div>${uiLabelMap.AccountingCardNumber}</div></td>
- <td><input type="text" class="inputBox" name="physicalCard" size="20" /></td>
+ <td>
+ <div>${uiLabelMap.AccountingCardNumber}</div>
+ </td>
+ <td><input type="text" class="inputBox" name="physicalCard" size="20"/></td>
</tr>
<tr>
- <td><div>${uiLabelMap.AccountingPINNumber}</div></td>
- <td><input type="text" class="inputBox" name="physicalPin" size="20" /></td>
+ <td>
+ <div>${uiLabelMap.AccountingPINNumber}</div>
+ </td>
+ <td><input type="text" class="inputBox" name="physicalPin" size="20"/></td>
</tr>
<tr>
<td colspan="2"> </td>
@@ -50,19 +54,24 @@ under the License.
</td>
</tr>
<tr>
- <td><div>${uiLabelMap.AccountingCardNumber}</div></td>
- <td><input type="text" class="inputBox" name="virtualCard" size="20" /></td>
+ <td>
+ <div>${uiLabelMap.AccountingCardNumber}</div>
+ </td>
+ <td><input type="text" class="inputBox" name="virtualCard" size="20"/></td>
</tr>
<tr>
- <td><div>${uiLabelMap.AccountingPINNumber}</div></td>
- <td><input type="text" class="inputBox" name="virtualPin" size="20" /></td>
+ <td>
+ <div>${uiLabelMap.AccountingPINNumber}</div>
+ </td>
+ <td><input type="text" class="inputBox" name="virtualPin" size="20"/></td>
</tr>
<tr>
<td colspan="2"> </td>
</tr>
<tr>
- <td colspan="2" align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceLinkCards}" /></td>
+ <td colspan="2" align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceLinkCards}"/>
+ </td>
</tr>
</table>
</form>
-<br />
+<br/>