Author: ashish
Date: Sun Sep 4 06:25:27 2016
New Revision: 1759142
URL: http://svn.apache.org/viewvc?rev=1759142&view=rev
Log:
Applied patch from jira issue - OFBIZ-8064 - Clean up commented out code in
Free Marker Template for Party. Thanks Aman for the contribution.
Modified:
ofbiz/trunk/applications/party/template/party/EditCreditCard.ftl
ofbiz/trunk/applications/party/template/party/EditEftAccount.ftl
ofbiz/trunk/applications/party/template/party/EditShoppingList.ftl
ofbiz/trunk/applications/party/template/party/profileblocks/MyTasks.ftl
ofbiz/trunk/applications/party/template/party/profileblocks/PaymentMethods.ftl
Modified: ofbiz/trunk/applications/party/template/party/EditCreditCard.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/party/EditCreditCard.ftl?rev=1759142&r1=1759141&r2=1759142&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/template/party/EditCreditCard.ftl (original)
+++ ofbiz/trunk/applications/party/template/party/EditCreditCard.ftl Sun Sep 4
06:25:27 2016
@@ -45,10 +45,6 @@ under the License.
<td class="label">${uiLabelMap.AccountingBillingAddress}</td>
<td width="5"> </td>
<td>
- <#-- Removed because is confusing, can add but would have to come
back here with all data populated as before...
- <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>"
class="smallSubmit">
- [Create New Address]</a>
- -->
<table cellspacing="0">
<#assign hasCurrent = false>
<#if curPostalAddress?has_content>
@@ -79,19 +75,7 @@ under the License.
</td>
</tr>
<#else>
- <#-- <tr>
- <td valign="top" colspan="2">
- ${uiLabelMap.PartyBillingAddressNotSelected}
- </td>
- </tr> -->
</#if>
- <#-- is confusing
- <tr>
- <td valign="top" colspan="2">
- <b>Select a New Billing Address:</b>
- </td>
- </tr>
- -->
<#list postalAddressInfos as postalAddressInfo>
<#assign contactMech = postalAddressInfo.contactMech>
<#assign partyContactMechPurposes =
postalAddressInfo.partyContactMechPurposes>
@@ -123,16 +107,6 @@ under the License.
<#if !postalAddressInfos?has_content && !curContactMech??>
<tr><td
colspan="2">${uiLabelMap.PartyNoContactInformation}.</td></tr>
</#if>
- <#-- not yet supported in party manager
- <tr>
- <td align="right" valigh="top" width="1%">
- <input type="radio" name="contactMechId" value="_NEW_" <#if
!hasCurrent>checked="checked"</#if> />
- </td>
- <td valign="middle" width="80%">
- ${uiLabelMap.PartyCreateNewBillingAddress}.
- </td>
- </tr>
- -->
</table>
</td>
</tr>
Modified: ofbiz/trunk/applications/party/template/party/EditEftAccount.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/party/EditEftAccount.ftl?rev=1759142&r1=1759141&r2=1759142&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/template/party/EditEftAccount.ftl (original)
+++ ofbiz/trunk/applications/party/template/party/EditEftAccount.ftl Sun Sep 4
06:25:27 2016
@@ -125,19 +125,7 @@ under the License.
</td>
</tr>
<#else>
- <#-- <tr>
- <td valign="top" colspan='2'>
- ${uiLabelMap.PartyNoBillingAddress}</div>
- </td>
- </tr> -->
</#if>
- <#-- is confusing
- <tr>
- <td valign="top" colspan='2'>
- <b>Select a New Billing Address:</b></div>
- </td>
- </tr>
- -->
<#list postalAddressInfos as postalAddressInfo>
<#assign contactMech = postalAddressInfo.contactMech>
<#assign partyContactMechPurposes =
postalAddressInfo.partyContactMechPurposes>
Modified: ofbiz/trunk/applications/party/template/party/EditShoppingList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/party/EditShoppingList.ftl?rev=1759142&r1=1759141&r2=1759142&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/template/party/EditShoppingList.ftl
(original)
+++ ofbiz/trunk/applications/party/template/party/EditShoppingList.ftl Sun Sep
4 06:25:27 2016
@@ -170,7 +170,6 @@ under the License.
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.PartyListItems} -
${shoppingList.listName}</li>
- <#-- <li><a
href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>">${uiLabelMap.PartyAddListToCart}</a></li>
-->
</ul>
<br class="clear"/>
</div>
Modified:
ofbiz/trunk/applications/party/template/party/profileblocks/MyTasks.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/party/profileblocks/MyTasks.ftl?rev=1759142&r1=1759141&r2=1759142&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/template/party/profileblocks/MyTasks.ftl
(original)
+++ ofbiz/trunk/applications/party/template/party/profileblocks/MyTasks.ftl Sun
Sep 4 06:25:27 2016
@@ -56,7 +56,6 @@ under the License.
<td>${uiLabelMap.WorkEffortPriority}</td>
<td>${uiLabelMap.WorkEffortActivityStatus}</td>
<td>${uiLabelMap.WorkEffortMyStatus}</td>
- <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
<td>${uiLabelMap.PartyRole}</td>
<td>${uiLabelMap.WorkEffortActivityName}</td>
<td>${uiLabelMap.CommonEdit}</td>
@@ -68,7 +67,6 @@ under the License.
<td>${workEffort.priority!}</td>
<td>${(delegator.findOne("StatusItem",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("currentStatusId")),
true).get("description",locale))!}</td>
<td>${(delegator.findOne("StatusItem",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("statusId")), true).get("description",locale))!}</td>
- <#-- <td>${workEffort.partyId}</td> -->
<td>${workEffort.roleTypeId}</td>
<td><a
href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td>
<td class="button-col"><a
href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortId}</a></td>
@@ -85,7 +83,6 @@ under the License.
<td>${uiLabelMap.WorkEffortPriority}</td>
<td>${uiLabelMap.WorkEffortActivityStatus}</td>
<td>${uiLabelMap.WorkEffortMyStatus}</td>
- <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
<td>${uiLabelMap.PartyRole}</td>
<td>${uiLabelMap.WorkEffortActivityName}</td>
<td>${uiLabelMap.CommonEdit}</td>
@@ -97,7 +94,6 @@ under the License.
<td>${workEffort.priority!}</td>
<td>${(delegator.findOne("StatusItem",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("currentStatusId")),
true).get("description",locale))!}</td>
<td>${(delegator.findOne("StatusItem",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("statusId")), true).get("description",locale))!}</td>
- <#-- <td>${workEffort.partyId}</td> -->
<td>${workEffort.roleTypeId}</td>
<td><a
href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td>
<td class="button-col"><a
href="<@ofbizContentUrl>/workeffort/control/acceptRoleAssignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate.toString()}</@ofbizContentUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td>
@@ -115,7 +111,6 @@ under the License.
<td>${uiLabelMap.WorkEffortActivityStatus}</td>
<td>${uiLabelMap.WorkEffortMyStatus}</td>
<td>${uiLabelMap.PartyGroupPartyId}</td>
- <#-- <td>${uiLabelMap.PartyRole}</td> -->
<td>${uiLabelMap.WorkEffortActivityName}</td>
<td>${uiLabelMap.CommonEdit}</td>
</tr>
@@ -127,7 +122,6 @@ under the License.
<td>${(delegator.findOne("StatusItem",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("currentStatusId")),
true).get("description",locale))!}</td>
<td>${(delegator.findOne("StatusItem",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("statusId")), true).get("description",locale))!}</td>
<td>${workEffort.groupPartyId}</td>
- <#-- <td>${workEffort.roleTypeId}</td> -->
<td><a
href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td>
<td class="button-col"><a
href="<@ofbizContentUrl>/workeffort/control/acceptassignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate}</@ofbizContentUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td>
</tr>
Modified:
ofbiz/trunk/applications/party/template/party/profileblocks/PaymentMethods.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/party/profileblocks/PaymentMethods.ftl?rev=1759142&r1=1759141&r2=1759142&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/template/party/profileblocks/PaymentMethods.ftl
(original)
+++
ofbiz/trunk/applications/party/template/party/profileblocks/PaymentMethods.ftl
Sun Sep 4 06:25:27 2016
@@ -87,7 +87,6 @@ under the License.
<#if security.hasEntityPermission("PAY_INFO", "_UPDATE",
session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)>
<a
href="<@ofbizUrl>editcreditcard?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
</#if>
- <#-- </td> -->
<#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId>
<#assign giftCard = paymentMethodValueMap.giftCard>
<td class="label" valign="top">
@@ -109,7 +108,6 @@ under the License.
<#if security.hasEntityPermission("PAY_INFO", "_UPDATE",
session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)>
<a
href="<@ofbizUrl>editgiftcard?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
</#if>
- <#-- </td> -->
<#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
<#assign eftAccount = paymentMethodValueMap.eftAccount>
<td class="label" valign="top">
@@ -125,7 +123,6 @@ under the License.
<#if security.hasEntityPermission("PAY_INFO", "_UPDATE",
session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)>
<a
href="<@ofbizUrl>editeftaccount?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
</#if>
- <#-- </td> -->
<#elseif "COMPANY_CHECK" == paymentMethod.paymentMethodTypeId>
<#assign checkAccount =
paymentMethodValueMap.companyCheckAccount>
<td class="label" valign="top">
@@ -142,7 +139,6 @@ under the License.
</td>
<td class="button-col">
- <#-- </td> -->
<#elseif "PERSONAL_CHECK" == paymentMethod.paymentMethodTypeId>
<#assign checkAccount =
paymentMethodValueMap.personalCheckAccount>
<td class="label" valign="top">
@@ -158,7 +154,6 @@ under the License.
</td>
<td class="button-col">
- <#-- </td> -->
<#elseif "CERTIFIED_CHECK" == paymentMethod.paymentMethodTypeId>
<#assign checkAccount =
paymentMethodValueMap.certifiedCheckAccount>
<td class="label" valign="top">
@@ -174,7 +169,6 @@ under the License.
</td>
<td class="button-col">
- <#-- </td> -->
<#else>
<td class="button-col">
