You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/05/15 22:18:45 UTC
svn commit: r538305 [1/2] - in
/ofbiz/trunk/applications/party/webapp/partymgr: WEB-INF/actions/party/
party/ party/profileblocks/
Author: jaz
Date: Tue May 15 13:18:42 2007
New Revision: 538305
URL: http://svn.apache.org/viewvc?view=rev&rev=538305
Log:
refactored view profile to be a set of blocks instead of one big page; can now re-use these blocks in other places
Added:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getContactMechs.bsh (with props)
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getCurrentCart.bsh (with props)
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getLoyaltyPoints.bsh (with props)
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh (with props)
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPaymentMethods.bsh (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl
- copied unchanged from r537915, ofbiz/trunk/applications/party/webapp/partymgr/party/FinAccountDetail.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl
- copied unchanged from r537915, ofbiz/trunk/applications/party/webapp/partymgr/party/SerializedInventorySummary.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Subscriptions.ftl
- copied unchanged from r537915, ofbiz/trunk/applications/party/webapp/partymgr/party/SubscriptionSummary.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl (with props)
Removed:
ofbiz/trunk/applications/party/webapp/partymgr/party/FinAccountDetail.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/SerializedInventorySummary.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/SubscriptionSummary.ftl
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/viewprofile.bsh
ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
Added: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getContactMechs.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getContactMechs.bsh?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getContactMechs.bsh (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getContactMechs.bsh Tue May 15 13:18:42 2007
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.party.contact.*;
+
+if (partyId == null) {
+ partyId = parameters.get("partyId");
+}
+boolean showOld = "true".equals(parameters.get("SHOW_OLD"));
+context.put("showOld", new Boolean(showOld));
+
+List partyContactMechValueMaps = ContactMechWorker.getPartyContactMechValueMaps(delegator, partyId, showOld);
+context.put("contactMeches", partyContactMechValueMaps);
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getContactMechs.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getContactMechs.bsh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getContactMechs.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getCurrentCart.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getCurrentCart.bsh?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getCurrentCart.bsh (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getCurrentCart.bsh Tue May 15 13:18:42 2007
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.base.util.*;
+import org.ofbiz.entity.util.EntityUtil;
+
+if (partyId == null) {
+ partyId = parameters.get("partyId");
+}
+
+savedCartList = EntityUtil.getFirst(delegator.findByAnd("ShoppingList",UtilMisc.toMap("partyId", partyId,
+ "shoppingListTypeId", "SLT_SPEC_PURP", "listName", "auto-save")));
+
+if (savedCartList != null){
+ savedCartListId = savedCartList.getString("shoppingListId");
+ context.put("savedCartListId", savedCartListId);
+ savedCartItems = savedCartList.getRelated("ShoppingListItem");
+ context.put("savedCartItems", savedCartItems);
+}
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getCurrentCart.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getCurrentCart.bsh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getCurrentCart.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getLoyaltyPoints.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getLoyaltyPoints.bsh?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getLoyaltyPoints.bsh (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getLoyaltyPoints.bsh Tue May 15 13:18:42 2007
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.base.util.*;
+
+if (partyId == null) {
+ partyId = parameters.get("partyId");
+}
+
+if (partyId != null) {
+ // get the system user
+ system = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system"));
+
+ monthsToInclude = new Integer(12);
+
+ Map serviceIn = UtilMisc.toMap("partyId", partyId, "roleTypeId", "PLACING_CUSTOMER", "orderTypeId", "SALES_ORDER",
+ "statusId", "ORDER_COMPLETED", "monthsToInclude", monthsToInclude, "userLogin", system);
+ Map result = dispatcher.runSync("getOrderedSummaryInformation", serviceIn);
+
+ context.put("monthsToInclude", monthsToInclude);
+ context.put("totalSubRemainingAmount", result.get("totalSubRemainingAmount"));
+ context.put("totalOrders", result.get("totalOrders"));
+}
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getLoyaltyPoints.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getLoyaltyPoints.bsh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getLoyaltyPoints.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh Tue May 15 13:18:42 2007
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.party.party.*;
+
+if (partyId == null) {
+ partyId = parameters.get("partyId");
+}
+
+boolean showOld = "true".equals(parameters.get("SHOW_OLD"));
+context.put("showOld", new Boolean(showOld));
+
+Map otherValues = PartyWorker.getPartyOtherValues(request, partyId, "party", "lookupPerson", "lookupGroup");
+context.put("party", otherValues.get("party"));
+context.put("lookupPerson", otherValues.get("lookupPerson"));
+context.put("lookupGroup", otherValues.get("lookupGroup"));
+context.put("custRequestTypes", delegator.findAllCache("CustRequestType"));
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPaymentMethods.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPaymentMethods.bsh?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPaymentMethods.bsh (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPaymentMethods.bsh Tue May 15 13:18:42 2007
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.accounting.payment.*;
+
+if (partyId == null) {
+ partyId = parameters.get("partyId");
+}
+boolean showOld = "true".equals(parameters.get("SHOW_OLD"));
+context.put("showOld", new Boolean(showOld));
+
+List paymentMethodValueMaps = PaymentWorker.getPartyPaymentMethodValueMaps(delegator, partyId, showOld);
+context.put("paymentMethodValueMaps", paymentMethodValueMaps);
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPaymentMethods.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPaymentMethods.bsh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPaymentMethods.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/viewprofile.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/viewprofile.bsh?view=diff&rev=538305&r1=538304&r2=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/viewprofile.bsh (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/viewprofile.bsh Tue May 15 13:18:42 2007
@@ -17,21 +17,11 @@
* under the License.
*/
-import java.util.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.base.util.*;
-import org.ofbiz.securityext.login.*;
-import org.ofbiz.common.*;
-import org.ofbiz.party.contact.*;
-import org.ofbiz.party.party.*;
-import org.ofbiz.accounting.payment.*;
-import org.ofbiz.securityext.login.*;
-
-partyId = parameters.get("party_id");
-if (partyId == null) partyId = parameters.get("partyId");
-context.put("partyId", partyId);
+partyId = parameters.get("partyId");
+if (partyId == null)
+ partyId = parameters.get("party_id");
userLoginId = parameters.get("userlogin_id");
if (UtilValidate.isEmpty(userLoginId)) {
@@ -45,83 +35,11 @@
}
}
-content = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId", partyId));
-context.put("partyContent", content);
-
-attributes = delegator.findByAnd("PartyAttribute", UtilMisc.toMap("partyId", partyId));
-context.put("attributes", attributes);
-
-userLogins = delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId));
-context.put("userLogins", userLogins);
-
-partyRoles = delegator.findByAnd("RoleTypeAndParty", UtilMisc.toMap("partyId", partyId));
-context.put("partyRoles", partyRoles);
-
-partyNameHistoryList = delegator.findByAnd("PartyNameHistory", UtilMisc.toMap("partyId", partyId), UtilMisc.toList("-changeDate"));
-context.put("partyNameHistoryList", partyNameHistoryList);
-
-custRole = delegator.findByPrimaryKey("PartyRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", "CUSTOMER"));
-if (custRole != null) {
- context.put("isCustomer", custRole);
-}
-
-roles = delegator.findAll("RoleType", UtilMisc.toList("description", "roleTypeId"));
-context.put("roles", roles);
-
-mimeTypes = delegator.findAll("MimeType", UtilMisc.toList("description", "mimeTypeId"));
-context.put("mimeTypes", mimeTypes);
-
-relateTypes = delegator.findAll("PartyRelationshipType", UtilMisc.toList("description", "partyRelationshipTypeId"));
-context.put("relateTypes", relateTypes);
-
-savedCartList = EntityUtil.getFirst(delegator.findByAnd("ShoppingList",UtilMisc.toMap("partyId", partyId, "shoppingListTypeId","SLT_SPEC_PURP", "listName", "auto-save")));
-
-if (savedCartList != null){
- savedCartListId = savedCartList.getString("shoppingListId");
- context.put("savedCartListId", savedCartListId);
- savedCartItems = savedCartList.getRelated("ShoppingListItem");
- context.put("savedCartItems", savedCartItems);
-}
-
-notes = delegator.findByAnd("PartyNoteView", UtilMisc.toMap("targetPartyId", partyId), UtilMisc.toList("-noteDateTime"));
-context.put("notes", notes);
-
-GenericValue avsOverride = delegator.findByPrimaryKey("PartyIcsAvsOverride", UtilMisc.toMap("partyId", partyId));
-context.put("avsOverride", avsOverride);
-
-visits = delegator.findByAnd("Visit", UtilMisc.toMap("partyId", partyId), UtilMisc.toList("-fromDate"));
-context.put("visits", visits);
-
-otherValues = PartyWorker.getPartyOtherValues(request, partyId, "party", "lookupPerson", "lookupGroup");
-context.put("party", otherValues.get("party"));
-context.put("lookupPerson", otherValues.get("lookupPerson"));
-context.put("lookupGroup", otherValues.get("lookupGroup"));
-
boolean showOld = "true".equals(parameters.get("SHOW_OLD"));
context.put("showOld", new Boolean(showOld));
-List partyContactMechValueMaps = ContactMechWorker.getPartyContactMechValueMaps(delegator, partyId, showOld);
-context.put("contactMeches", partyContactMechValueMaps);
-
-List paymentMethodValueMaps = PaymentWorker.getPartyPaymentMethodValueMaps(delegator, partyId, showOld);
-context.put("paymentMethodValueMaps", paymentMethodValueMaps);
-
+context.put("partyId", partyId);
+context.put("party", delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", partyId)));
context.put("nowStr", UtilDateTime.nowTimestamp().toString());
-context.put("custRequestTypes", delegator.findAllCache("CustRequestType"));
-// content purposes
-contentPurposes = delegator.findByAnd("Enumeration", UtilMisc.toMap("enumTypeId", "PTYCNT_PRP"), UtilMisc.toList("sequenceId"));
-context.put("contentPurposes", contentPurposes);
-
-// call the getOrderedSummaryInformation service to get the sub-total of valid orders in last X months
-/* this is being commented out because 1) it supplies loyalty points data which is commented out in viewprofile.ftl and 2) it will crash unless user has ORDERMGR_VIEW permission
-if (partyId != null) {
- monthsToInclude = new Integer(12);
- Map serviceIn = UtilMisc.toMap("partyId", partyId, "roleTypeId", "PLACING_CUSTOMER", "orderTypeId", "SALES_ORDER", "statusId", "ORDER_COMPLETED", "monthsToInclude", monthsToInclude, "userLogin", userLogin);
- Map result = dispatcher.runSync("getOrderedSummaryInformation", serviceIn);
- context.put("monthsToInclude", monthsToInclude);
- context.put("totalSubRemainingAmount", result.get("totalSubRemainingAmount"));
- context.put("totalOrders", result.get("totalOrders"));
-}
-*/
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?view=diff&rev=538305&r1=538304&r2=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Tue May 15 13:18:42 2007
@@ -18,6 +18,9 @@
-->
<#assign extInfo = parameters.extInfo?default("N")>
+<#assign inventoryItemId = parameters.inventoryItemId?default("")>
+<#assign serialNumber = parameters.serialNumber?default("")>
+<#assign softIdentifier = parameters.softIdentifier?default("")>
<div id="findPartyParameters" class="screenlet">
<div class="screenlet-title-bar">
@@ -87,6 +90,18 @@
</select>
</td>
</tr>
+ <tr>
+ <td class="label">${uiLabelMap.ProductInventoryItemId} :</td>
+ <td><input type="text" name="inventoryItemId" value="${parameters.inventoryItemId?if_exists}"/></td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.ProductSerialNumber} :</td>
+ <td><input type="text" name="serialNumber" value="${parameters.serialNumber?if_exists}"/></td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.ProductSoftIdentifier} :</td>
+ <td><input type="text" name="softIdentifier" value="${parameters.softIdentifier?if_exists}"/></td>
+ </tr>
<#if extInfo == "P">
<tr><td colspan="3"><hr/></td></tr>
<tr>
@@ -199,6 +214,15 @@
<#if extInfo?default("") == "T">
<td>${uiLabelMap.PartyAreaCode}</td>
</#if>
+ <#if inventoryItemId?default("") != "">
+ <td>${uiLabelMap.ProductInventoryItemId}</td>
+ </#if>
+ <#if serialNumber?default("") != "">
+ <td>${uiLabelMap.ProductSerialNumber}</td>
+ </#if>
+ <#if softIdentifier?default("") != "">
+ <td>${uiLabelMap.ProductSoftIdentifier}</td>
+ </#if>
<td>${uiLabelMap.PartyType}</td>
<td> </td>
</tr>
@@ -246,6 +270,15 @@
</#if>
<#if extInfo?default("") == "P">
<td>${partyRow.postalCode?if_exists}</td>
+ </#if>
+ <#if inventoryItemId?default("") != "">
+ <td>${partyRow.inventoryItemId?if_exists}</td>
+ </#if>
+ <#if serialNumber?default("") != "">
+ <td>${partyRow.serialNumber?if_exists}</td>
+ </#if>
+ <#if softIdentifier?default("") != "">
+ <td>${partyRow.softIdentifier?if_exists}</td>
</#if>
<td><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></td>
<td class="button-col align-float">
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,51 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <div id="partyAttributes" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.PartyAttributes}</li>
+ <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <#if attributes?has_content>
+ <table class="basic-table" cellspacing="0">
+ <#list attributes as attr>
+ <tr>
+ <td class="label">
+ ${uiLabelMap.CommonName}: ${attr.attrName}
+ </td>
+ <td>
+ ${uiLabelMap.CommonValue}: ${attr.attrValue}
+ </td>
+ <td class="button-col">
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
+ </td>
+ </tr>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoPartyAttributesFound}
+ </#if>
+ </div>
+ </div>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,33 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <div id="partyAVS" class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PartyAvsOver}</h3>
+ </div>
+ <div class="screenlet-body">
+ <span class="label">${uiLabelMap.PartyAvsString}</span>${(avsOverride.avsDeclineString)?default("${uiLabelMap.CommonGlobal}")}
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+ <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonEdit}</a>
+ <#if avsOverride?exists>
+ <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonReset}</a>
+ </#if>
+ </#if>
+ </div>
+ </div>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,59 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <#if savedCartItems?has_content>
+ <div id="partyShoppingCart" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.PartyCurrentShoppingCart}</li>
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+ <#if savedCartListId?has_content>
+ <#assign listParam = "&shoppingListId=" + savedCartListId>
+ <#else>
+ <#assign listParam = "">
+ </#if>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <#if savedCartItems?has_content>
+ <table class="basic-table" cellspacing="0">
+ <tr class="header-row">
+ <td>${uiLabelMap.PartySequenceId}</td>
+ <td>${uiLabelMap.PartyProductId}</td>
+ <td>${uiLabelMap.PartyQuantity}</td>
+ <td>${uiLabelMap.PartyQuantityPurchased}</td>
+ </tr>
+ <#list savedCartItems as savedCartItem>
+ <tr>
+ <td>${savedCartItem.shoppingListItemSeqId?if_exists}</td>
+ <td class="button-col"><a href="/catalog/control/EditProduct?productId=${savedCartItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${savedCartItem.productId?if_exists}</a></td>
+ <td>${savedCartItem.quantity?if_exists}</td>
+ <td>${savedCartItem.quantityPurchased?if_exists}</td>
+ </tr>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoShoppingCartSavedForParty}
+ </#if>
+ </div>
+ </div>
+ </#if>
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,145 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <div id="partyContactInfo" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.PartyContactInformation}</li>
+ <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <#if contactMeches?has_content>
+ <table class="basic-table" cellspacing="0">
+ <tr>
+ <th>${uiLabelMap.PartyContactType}</th>
+ <th>${uiLabelMap.PartyContactInformation}</th>
+ <th>${uiLabelMap.PartyContactSolicitingOk}</th>
+ <th> </th>
+ </tr>
+ <#list contactMeches as contactMechMap>
+ <#assign contactMech = contactMechMap.contactMech>
+ <#assign partyContactMech = contactMechMap.partyContactMech>
+ <tr><td colspan="4"><hr/></td></tr>
+ <tr>
+ <td class="label align-top">${contactMechMap.contactMechType.get("description",locale)}</td>
+ <td>
+ <#list contactMechMap.partyContactMechPurposes as partyContactMechPurpose>
+ <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
+ <div>
+ <#if contactMechPurposeType?has_content>
+ <b>${contactMechPurposeType.get("description",locale)}</b>
+ <#else>
+ <b>${uiLabelMap.PartyMechPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b>
+ </#if>
+ <#if partyContactMechPurpose.thruDate?has_content>
+ (${uiLabelMap.CommonExpire}: ${partyContactMechPurpose.thruDate.toString()})
+ </#if>
+ </div>
+ </#list>
+ <#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId>
+ <#assign postalAddress = contactMechMap.postalAddress>
+ <div>
+ <#if postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b> ${postalAddress.toName}<br /></#if>
+ <#if postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1?if_exists}<br />
+ <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
+ ${postalAddress.city?if_exists},
+ <#if postalAddress.stateProvinceGeoId?has_content>
+ <#assign stateProvince = postalAddress.getRelatedOneCache("StateProvinceGeo")>
+ ${stateProvince.abbreviation?default(stateProvince.geoId)}
+ </#if>
+ ${postalAddress.postalCode?if_exists}
+ <#if postalAddress.countryGeoId?has_content><br />
+ <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+ ${country.geoName?default(country.geoId)}
+ </#if>
+ </div>
+ <#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA">
+ <#assign addr1 = postalAddress.address1?if_exists>
+ <#if (addr1.indexOf(" ") > 0)>
+ <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))>
+ <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)>
+ <a target="_blank" href="http://www.whitepages.com/find_person_results.pl?fid=a&s_n=${addressNum}&s_a=${addressOther}&c=${postalAddress.city?if_exists}&s=${postalAddress.stateProvinceGeoId?if_exists}&x=29&y=18">(lookup:whitepages.com)</a>
+ </#if>
+ </#if>
+ <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>
+ <#assign telecomNumber = contactMechMap.telecomNumber>
+ <div>
+ ${telecomNumber.countryCode?if_exists}
+ <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")}
+ <#if partyContactMech.extension?has_content>${uiLabelMap.PartyContactExt} ${partyContactMech.extension}</#if>
+ <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
+ <a target="_blank" href="http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&telephone=${telecomNumber.contactNumber?if_exists}&btnsubmit.x=20&btnsubmit.y=8">(lookup:anywho.com)</a>
+ <a target="_blank" href="http://whitepages.com/find_person_results.pl?fid=p&ac=${telecomNumber.areaCode?if_exists}&s=&p=${telecomNumber.contactNumber?if_exists}&pt=b&x=40&y=9">(lookup:whitepages.com)</a>
+ </#if>
+ </div>
+ <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId>
+ <div>
+ ${contactMech.infoString?if_exists}
+ <a href="<@ofbizUrl>EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyId=${party.partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMech.contactMechId}&contactMechTypeId=EMAIL_ADDRESS<#if thisUserPrimaryEmail?has_content>&contactMechIdFrom=${thisUserPrimaryEmail.contactMechId}</#...@ofbizUrl>">(${uiLabelMap.CommonSendEmail})</a>
+ </div>
+ <#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId>
+ <div>
+ ${contactMech.infoString?if_exists}
+ <#assign openAddress = contactMech.infoString?default("")>
+ <#if !openAddress?starts_with("http") && !openAddress?starts_with("HTTP")><#assign openAddress = "http://" + openAddress></#if>
+ <a target="_blank" href="${openAddress}">(${uiLabelMap.CommonOpenPageNewWindow})</a>
+ </div>
+ <#else>
+ <div>${contactMech.infoString?if_exists}</div>
+ </#if>
+ <div>(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate.toString()})</div>
+ <#if partyContactMech.thruDate?has_content><div><b>${uiLabelMap.PartyContactEffectiveThru}: ${partyContactMech.thruDate.toString()}</b></div></#if>
+ <#-- create cust request -->
+ <#if custRequestTypes?exists>
+ <form name="createCustRequestForm" action="<@o...@ofbizUrl>" method="POST">
+ <input type="hidden" name="partyId" value="${party.partyId}"/>
+ <input type="hidden" name="fromPartyId" value="${party.partyId}"/>
+ <input type="hidden" name="fulfillContactMechId" value="${contactMech.contactMechId}"/>
+ <select name="custRequestTypeId">
+ <#list custRequestTypes as type>
+ <option value="${type.custRequestTypeId}">${type.get("description", locale)}</option>
+ </#list>
+ </select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.PartyCreateNewCustRequest}"/>
+ </form>
+ </#if>
+ </td>
+ <td valign="top"><b>(${partyContactMech.allowSolicitation?if_exists})</b></td>
+ <td class="button-col">
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ </#if>
+ <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonExpire}</a>
+ </#if>
+ </td>
+ </tr>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoContactInformation}
+ </#if>
+ </div>
+ </div>
+
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,81 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <div id="partyContent" class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PartyContent}</h3>
+ </div>
+ <div class="screenlet-body">
+ <#if partyContent?has_content>
+ <table class="basic-table" cellspacing="0">
+ <#list partyContent as pContent>
+ <#assign content = pContent.getRelatedOne("Content")>
+ <#assign contentType = content.getRelatedOneCache("ContentType")>
+ <#assign mimeType = content.getRelatedOneCache("MimeType")?if_exists>
+ <#assign status = content.getRelatedOneCache("StatusItem")>
+ <#assign pcPurpose = pContent.getRelatedOne("Enumeration")>
+ <tr>
+ <td class="button-col"><a href="<@o...@ofbizUrl>">${content.contentId}</a></td>
+ <td>${pcPurpose.description?if_exists}</td>
+ <td>${content.contentName?if_exists}</td>
+ <td>${(contentType.get("description",locale))?if_exists}</td>
+ <td>${(mimeType.description)?if_exists}</td>
+ <td>${(status.get("description",locale))?if_exists}</td>
+ <#-- <td>${contentRole.fromDate?if_exists}</td> -->
+ <td class="button-col">
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonView}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
+ </td>
+ </tr>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoContent}
+ </#if>
+ <hr/>
+ <div class="label">${uiLabelMap.PartyAttachContent}</div>
+ <form method="post" enctype="multipart/form-data" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="dataCategoryId" value="PERSONAL"/>
+ <input type="hidden" name="contentTypeId" value="DOCUMENT"/>
+ <input type="hidden" name="statusId" value="CTNT_PUBLISHED"/>
+ <input type="hidden" name="partyId" value="${partyId}"/>
+ <input type="file" name="uploadedFile" size="20"/>
+ <select name="contentPurposeEnumId">
+ <option value="">${uiLabelMap.PartySelectPurpose}</option>
+ <#list contentPurposes as contentPurpose>
+ <option value="${contentPurpose.enumId}">${contentPurpose.get("description", locale)?default(contentPurpose.enumId)}</option>
+ </#list>
+ </select>
+ <select name="roleTypeId">
+ <option value="">${uiLabelMap.PartySelectRole}</option>
+ <#list roles as role>
+ <option value="${role.roleTypeId}">${role.get("description", locale)?default(role.roleTypeId)}</option>
+ </#list>
+ </select>
+ <select name="mimeTypeId">
+ <option value="">${uiLabelMap.PartySelectMimeType}</option>
+ <#list mimeTypes as mimeType>
+ <option value="${mimeType.mimeTypeId}">${mimeType.get("description", locale)?default(mimeType.mimeTypeId)}</option>
+ </#list>
+ </select>
+ <input type="submit" value="${uiLabelMap.CommonUpload}"/>
+ </form>
+ </div>
+ </div>
+
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,29 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <#if monthsToInclude?exists && totalSubRemainingAmount?exists && totalOrders?exists>
+ <div id="totalOrders" class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PartyLoyaltyPoints}</h3>
+ </div>
+ <div class="screenlet-body">
+ ${uiLabelMap.PartyYouHave} ${totalSubRemainingAmount} ${uiLabelMap.PartyPointsFrom} ${totalOrders} ${uiLabelMap.PartyOrderInLast} ${monthsToInclude} ${uiLabelMap.CommonMonths}.
+ </div>
+ </div>
+ </#if>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,52 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <div id="partyNotes" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.CommonNotes}</li>
+ <#if security.hasEntityPermission("PARTYMGR", "_NOTE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <#if notes?has_content>
+ <table width="100%" border="0" cellpadding="1">
+ <#list notes as noteRef>
+ <tr>
+ <td>
+ <div><b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, noteRef.noteParty, true)}</div>
+ <div><b>${uiLabelMap.CommonAt}: </b>${noteRef.noteDateTime.toString()}</div>
+ </td>
+ <td>
+ ${noteRef.noteInfo}
+ </td>
+ </tr>
+ <#if noteRef_has_next>
+ <tr><td colspan="2"><hr></td></tr>
+ </#if>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoNotesForParty}
+ </#if>
+ </div>
+ </div>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,106 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <div id="partyInformation" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <#if lookupPerson?has_content>
+ <li class="head3">${uiLabelMap.PartyPersonalInformation}</li>
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a></li>
+ </#if>
+ </#if>
+ <#if lookupGroup?has_content>
+ <#assign lookupPartyType = party.getRelatedOneCache("PartyType")>
+ <li class="head3">${uiLabelMap.PartyPartyGroupInformation}</li>
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a></li>
+ </#if>
+ </#if>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <#if lookupPerson?has_content>
+ <table class="basic-table" cellspacing="0">
+ <tr>
+ <td class="label">${uiLabelMap.PartyName}</td>
+ <td>
+ ${lookupPerson.personalTitle?if_exists}
+ ${lookupPerson.firstName?if_exists}
+ ${lookupPerson.middleName?if_exists}
+ ${lookupPerson.lastName?if_exists}
+ ${lookupPerson.suffix?if_exists}
+ </td>
+ </tr>
+ <#if lookupPerson.nickname?has_content>
+ <tr><td class="label">${uiLabelMap.PartyNickname}</td><td>${lookupPerson.nickname}</td></tr>
+ </#if>
+ <#if lookupPerson.gender?has_content>
+ <tr><td class="label">${uiLabelMap.PartyGender}</td><td>${lookupPerson.gender}</td></tr>
+ </#if>
+ <#if lookupPerson.birthDate?has_content>
+ <tr><td class="label">${uiLabelMap.PartyBirthDate}</td><td>${lookupPerson.birthDate.toString()}</td></tr>
+ </#if>
+ <#if lookupPerson.height?has_content>
+ <tr><td class="label">${uiLabelMap.PartyHeight}</td><td>${lookupPerson.height}</td></tr>
+ </#if>
+ <#if lookupPerson.weight?has_content>
+ <tr><td class="label">${uiLabelMap.PartyWeight}</td><td>${lookupPerson.weight}</td></tr>
+ </#if>
+ <#if lookupPerson.mothersMaidenName?has_content>
+ <tr><td class="label">${uiLabelMap.PartyMothersMaidenName}</td><td>${lookupPerson.mothersMaidenName}</td></tr>
+ </#if>
+ <#if lookupPerson.maritalStatus?has_content>
+ <tr><td class="label">${uiLabelMap.PartyMaritalStatus}</td><td>${lookupPerson.maritalStatus}</td></tr>
+ </#if>
+ <#if lookupPerson.socialSecurityNumber?has_content>
+ <tr><td class="label">${uiLabelMap.PartySocialSecurityNumber}</td><td>${lookupPerson.socialSecurityNumber}</td></tr>
+ </#if>
+ <#if lookupPerson.passportNumber?has_content>
+ <tr><td class="label">${uiLabelMap.PartyPassportNumber}</td><td>${lookupPerson.passportNumber}</td></tr>
+ </#if>
+ <#if lookupPerson.passportExpireDate?has_content>
+ <tr><td class="label">${uiLabelMap.PartyPassportExpire}</td><td>${lookupPerson.passportExpireDate.toString()}</td></tr>
+ </#if>
+ <#if lookupPerson.totalYearsWorkExperience?has_content>
+ <tr><td class="label">${uiLabelMap.PartyYearsWork}</td><td>${lookupPerson.totalYearsWorkExperience}</td></tr>
+ </#if>
+ <#if lookupPerson.comments?has_content>
+ <tr><td class="label">${uiLabelMap.PartyComments}</td><td>${lookupPerson.comments}</td></tr>
+ </#if>
+ </table>
+ <#elseif lookupGroup?has_content>
+ <div>${lookupGroup.groupName} (${(lookupPartyType.get("description",locale))?if_exists})</div>
+ <#else>
+ <div>${uiLabelMap.PartyInformationNotFound}</div>
+ </#if>
+ <#if partyNameHistoryList?has_content>
+ <div><hr/></div>
+ <div>${uiLabelMap.PartyHistoryName}</div>
+ <#list partyNameHistoryList as partyNameHistory>
+ <#if lookupPerson?has_content>
+ <div>${uiLabelMap.PartyHistoryWas}: ${partyNameHistory.personalTitle?if_exists} ${partyNameHistory.firstName?if_exists} ${partyNameHistory.middleName?if_exists} ${partyNameHistory.lastName?if_exists} ${partyNameHistory.suffix?if_exists} (${uiLabelMap.PartyHistoryChanged}: ${partyNameHistory.changeDate})</div>
+ <#elseif lookupGroup?has_content>
+ <div>${uiLabelMap.PartyHistoryWas}: ${partyNameHistory.groupName?if_exists} (${uiLabelMap.PartyHistoryChanged}: ${partyNameHistory.changeDate})</div>
+ </#if>
+ </#list>
+ </#if>
+ </div>
+ </div>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,152 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <div id="partyPaymentMethod" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.PartyPaymentMethodInformation}</li>
+ <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewEftAccount}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewGiftCard}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewCreditCard}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <#if paymentMethodValueMaps?has_content>
+ <table class="basic-table" cellspacing="0">
+ <#list paymentMethodValueMaps as paymentMethodValueMap>
+ <#assign paymentMethod = paymentMethodValueMap.paymentMethod/>
+ <tr>
+ <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
+ <#assign creditCard = paymentMethodValueMap.creditCard/>
+ <td class="label">
+ ${uiLabelMap.AccountingCreditCard}
+ </td>
+ <td>
+ <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard} </#if>
+ <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if>
+ ${creditCard.firstNameOnCard}
+ <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if>
+ ${creditCard.lastNameOnCard}
+ <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if>
+ -
+ <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)>
+ ${creditCard.cardType}
+ ${creditCard.cardNumber}
+ ${creditCard.expireDate}
+ <#else>
+ ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
+ </#if>
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate})</#if>
+ </td>
+ <td class="button-col">
+ <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
+ <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${externalKeyParam}">Manual Tx</a>
+ </#if>
+ <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ </#if>
+ <#-- </td> -->
+ <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId>
+ <#assign giftCard = paymentMethodValueMap.giftCard>
+ <td class="label" valign="top">
+ ${uiLabelMap.AccountingGiftCard}
+ </td>
+ <td>
+ <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)>
+ ${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}]
+ <#else>
+ <#if giftCard?has_content && giftCard.cardNumber?has_content>
+ <#assign giftCardNumber = "">
+ <#assign pcardNumber = giftCard.cardNumber>
+ <#if pcardNumber?has_content>
+ <#assign psize = pcardNumber?length - 4>
+ <#if 0 < psize>
+ <#list 0 .. psize-1 as foo>
+ <#assign giftCardNumber = giftCardNumber + "*">
+ </#list>
+ <#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3]>
+ <#else>
+ <#assign giftCardNumber = pcardNumber>
+ </#if>
+ </#if>
+ </#if>
+ ${giftCardNumber?default("N/A")}
+ </#if>
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</b></#if>
+ </td>
+ <td class="button-col">
+ <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ </#if>
+ <#-- </td> -->
+ <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
+ <#assign eftAccount = paymentMethodValueMap.eftAccount>
+ <td class="label" valign="top">
+ ${uiLabelMap.PartyEftAccount}
+ </td>
+ <td>
+ ${eftAccount.nameOnAccount} - <#if eftAccount.bankName?has_content>${uiLabelMap.PartyBank}: ${eftAccount.bankName}</#if> <#if eftAccount.accountNumber?has_content>${uiLabelMap.PartyAccount} #: ${eftAccount.accountNumber}</#if> <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</#if>
+ </td>
+ <td class="button-col">
+ <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ </#if>
+ <#-- </td> -->
+ <#elseif "COMPANY_CHECK" == paymentMethod.paymentMethodTypeId>
+ <td class="label" valign="top">
+ <#-- TODO: Convert hard-coded text to UI label properties -->
+ Company Check
+ </td>
+ <td>
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</#if>
+ </td>
+ <td class="button-col">
+
+ <#-- </td> -->
+ </#if>
+ <#if security.hasEntityPermission("PAY_INFO", "_DELETE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonExpire}</a>
+ <#else>
+
+ </#if>
+ </td> <#-- closes out orphaned <td> elements inside conditionals -->
+ </tr>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoPaymentMethodInformation}
+ </#if>
+ </div>
+ </div>
+
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,64 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <div id="partyUserLogins" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.PartyUserName}</li>
+ <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <#if userLogins?exists>
+ <table class="basic-table" cellspacing="0">
+ <#list userLogins as userUserLogin>
+ <tr>
+ <td class="label">${uiLabelMap.PartyUserLogin}</td>
+ <td>${userUserLogin.userLoginId}</td>
+ <td>
+ <#assign enabled = uiLabelMap.PartyEnabled>
+ <#if (userUserLogin.enabled)?default("Y") == "N">
+ <#if userUserLogin.disabledDateTime?exists>
+ <#assign disabledTime = userUserLogin.disabledDateTime.toString()>
+ <#else>
+ <#assign disabledTime = "??">
+ </#if>
+ <#assign enabled = uiLabelMap.PartyDisabled + " - " + disabledTime>
+ </#if>
+ ${enabled}
+ </td>
+ <td class="button-col">
+ <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
+ </#if>
+ <#if security.hasEntityPermission("SECURITY", "_VIEW", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.PartySecurityGroups}</a>
+ </#if>
+ </td>
+ </tr>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoUserLogin}
+ </#if>
+ </div>
+ </div>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl?view=auto&rev=538305
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl Tue May 15 13:18:42 2007
@@ -0,0 +1,59 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <div id="partyVisits" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.PartyLastVisit}</li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonListAll}</a></li>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <#if visits?has_content>
+ <table class="basic-table" cellspacing="0">
+ <tr class="header-row">
+ <td>${uiLabelMap.PartyVisitId}</td>
+ <td>${uiLabelMap.PartyUserLogin}</td>
+ <td>${uiLabelMap.PartyNewUser}</td>
+ <td>${uiLabelMap.PartyWebApp}</td>
+ <td>${uiLabelMap.PartyClientIP}</td>
+ <td>${uiLabelMap.CommonFromDate}</td>
+ <td>${uiLabelMap.CommonThruDate}</td>
+ </tr>
+ <#list visits as visitObj>
+ <#if (visitObj_index > 4)><#break></#if>
+ <tr>
+ <td class="button-col">
+ <a href="<@o...@ofbizUrl>">${visitObj.visitId?if_exists}</a>
+ </td>
+ <td>${visitObj.userLoginId?if_exists}</td>
+ <td>${visitObj.userCreated?if_exists}</td>
+ <td>${visitObj.webappName?if_exists}</td>
+ <td>${visitObj.clientIpAddress?if_exists}</td>
+ <td>${(visitObj.fromDate.toString())?if_exists}</td>
+ <td>${(visitObj.thruDate.toString())?if_exists}</td>
+ </tr>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoVisitFound}
+ </#if>
+ </div>
+ </div>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain