svn commit: r1351866 [45/48] - in /ofbiz/branches/20120329_portl
Locked
svn commit: r1351866 [45/48] - in /ofbiz/branches/20120329_portl
 
|
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoProduct.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoProduct.xml Tue Jun 19 21:36:11 2012 @@ -121,6 +121,7 @@ under the License. <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="[hidden email]" fromAddress="[hidden email]"/> <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="[hidden email]" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_ACTIVATED" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#AccountActivatedNotification" subject="Account Activated" bccAddress="[hidden email]" fromAddress="[hidden email]"/> <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="[hidden email]" /> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/ofbiz-component.xml Tue Jun 19 21:36:11 2012 @@ -25,7 +25,7 @@ under the License. <classpath type="jar" location="build/lib/*"/> <classpath type="dir" location="config"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceSecurityData.xml"/> + <entity-resource type="data" reader-name="security" loader="main" location="data/EcommerceSecurityData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProduct.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoSurvey.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRentalShipping.xml"/> @@ -69,3 +69,4 @@ under the License. mount-point="/ecomclone" app-bar-display="false"/> </ofbiz-component> + Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java Tue Jun 19 21:36:11 2012 @@ -128,7 +128,7 @@ public class ThirdPartyEvents { } try { - party = userLogin == null ? null : userLogin.getRelatedOne("Party"); + party = userLogin == null ? null : userLogin.getRelatedOne("Party", false); } catch (GenericEntityException gee) { Debug.logWarning(gee, module); } @@ -205,7 +205,7 @@ public class ThirdPartyEvents { return "success"; try { - party = userLogin == null ? null : userLogin.getRelatedOne("Party"); + party = userLogin == null ? null : userLogin.getRelatedOne("Party", false); } catch (GenericEntityException gee) { Debug.logWarning(gee, module); } @@ -248,7 +248,7 @@ public class ThirdPartyEvents { private static GenericValue getPartyRelationship(GenericValue party, String roleTypeTo) { try { - return EntityUtil.getFirst(EntityUtil.filterByDate(party.getRelatedByAnd("FromPartyRelationship", UtilMisc.toMap("roleTypeIdTo", roleTypeTo)), true)); + return EntityUtil.getFirst(EntityUtil.filterByDate(party.getRelated("FromPartyRelationship", UtilMisc.toMap("roleTypeIdTo", roleTypeTo), null, false), true)); } catch (GenericEntityException gee) { Debug.logWarning(gee, module); } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl Tue Jun 19 21:36:11 2012 @@ -51,7 +51,7 @@ under the License. <tr><td colspan="10"><hr /></td></tr> <#list shipmentItems as shipmentItem> <#assign productId = shipmentItem.productId> - <#assign product = shipmentItem.getRelatedOne("Product")> + <#assign product = shipmentItem.getRelatedOne("Product", false)> <tr> <td colspan="1" valign="top"> ${productId?if_exists} - ${product.internalName?if_exists}</td> <td align="right" valign="top"> ${shipmentItem.quantity?if_exists}</td> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/returnaccept.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/returnaccept.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/returnaccept.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/returnaccept.ftl Tue Jun 19 21:36:11 2012 @@ -23,8 +23,8 @@ ${uiLabelMap.EcommerceReturnRequest} <br /><br /> <pre> <#list returnItems as item> - <#assign returnReason = item.getRelatedOne("ReturnReason")?if_exists> - <#assign returnType = item.getRelatedOne("ReturnType")?if_exists> + <#assign returnReason = item.getRelatedOne("ReturnReason", false)?if_exists> + <#assign returnType = item.getRelatedOne("ReturnType", false)?if_exists> ${item.description?default("N/A")} - ${item.returnQuantity?string.number} @ ${item.returnPrice} </#list> </pre> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/genericresult.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/genericresult.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/genericresult.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/genericresult.ftl Tue Jun 19 21:36:11 2012 @@ -98,11 +98,11 @@ under the License. <div class="tabletext">[${uiLabelMap.CommonNotShown}]</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT"> <#if answer.contentId?has_content> - <#assign content = answer.getRelatedOne("Content")> + <#assign content = answer.getRelatedOne("Content", false)> <a href="/content/control/img?imgId=${content.dataResourceId}" class="buttontext">${answer.contentId}</a> - ${content.contentName?if_exists} </#if> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION"> - <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", sequenceSort)?if_exists> + <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists> <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")> <#if options?has_content> <#list options as option> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/miniresult.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/miniresult.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/miniresult.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/miniresult.ftl Tue Jun 19 21:36:11 2012 @@ -57,7 +57,7 @@ under the License. </span></div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION"> - <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", sequenceSort)?if_exists> + <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists> <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")> <#if options?has_content> <#list options as option> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/minisurvey.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/minisurvey.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/minisurvey.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/minisurvey.ftl Tue Jun 19 21:36:11 2012 @@ -89,7 +89,7 @@ under the License. <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "PASSWORD"> <input type="password" size="30" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)?if_exists}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION"> - <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", sequenceSort)?if_exists> + <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists> <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")> <select class="selectBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}"> <#if surveyQuestionAndAppl.requiredField?default("N") != "Y"> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy Tue Jun 19 21:36:11 2012 @@ -73,7 +73,7 @@ if(shoppingCartItems) { productCategoryMembers = delegator.findList("ProductCategoryMember", EntityCondition.makeCondition("productId", EntityOperator.EQUALS, parentProductId), null, null, null, false); if (productCategoryMembers) { productCategoryMember = EntityUtil.getFirst(productCategoryMembers); - productCategory = productCategoryMember.getRelatedOne("ProductCategory"); + productCategory = productCategoryMember.getRelatedOne("ProductCategory", false); context.productCategory = productCategory; } } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy Tue Jun 19 21:36:11 2012 @@ -37,7 +37,7 @@ List fillTree(rootCat ,CatLvl, parentCat def listTree = FastList.newInstance(); for(root in rootCat) { preCatChilds = delegator.findByAnd("ProductCategoryRollup", ["parentProductCategoryId": root.productCategoryId], null, false); - catChilds = EntityUtil.getRelated("CurrentProductCategory",preCatChilds); + catChilds = EntityUtil.getRelated("CurrentProductCategory",null,preCatChilds,false); def childList = FastList.newInstance(); // CatLvl uses for identify the Category level for display different css class Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy Tue Jun 19 21:36:11 2012 @@ -44,8 +44,8 @@ webSiteContactList = delegator.findList( publicEmailContactLists = []; webSiteContactList.each { webSiteContactList -> - contactList = webSiteContactList.getRelatedOne("ContactList"); - contactListType = contactList.getRelatedOne("ContactListType"); + contactList = webSiteContactList.getRelatedOne("ContactList", false); + contactListType = contactList.getRelatedOne("ContactListType", false); temp = [:]; temp.contactList = contactList; temp.contactListType = contactListType; Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy Tue Jun 19 21:36:11 2012 @@ -29,7 +29,7 @@ productStoreSurveyId = parameters.produc surveyAppl = delegator.findOne("ProductStoreSurveyAppl", [productStoreSurveyId : productStoreSurveyId], false); if (surveyAppl) { - survey = surveyAppl.getRelatedOne("Survey"); + survey = surveyAppl.getRelatedOne("Survey", false); context.survey = survey; if (!parameters._ERROR_MESSAGE_) { Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy Tue Jun 19 21:36:11 2012 @@ -22,10 +22,10 @@ import org.ofbiz.party.contact.ContactHe import org.ofbiz.entity.condition.EntityCondition; if (userLogin) { - party = userLogin.getRelatedOne("Party"); + party = userLogin.getRelatedOne("Party", false); contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "BILLING_LOCATION", "POSTAL_ADDRESS", false)); if (contactMech) { - postalAddress = contactMech.getRelatedOne("PostalAddress"); + postalAddress = contactMech.getRelatedOne("PostalAddress", false); billToContactMechId = postalAddress.contactMechId; context.billToContactMechId = billToContactMechId; context.billToName = postalAddress.toName; @@ -48,7 +48,7 @@ if (userLogin) { creditCards = []; paymentMethod = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findList("PaymentMethod", EntityCondition.makeCondition([partyId : party.partyId, paymentMethodTypeId : "CREDIT_CARD"]), null, ["fromDate"], null, false))); if (paymentMethod) { - creditCard = paymentMethod.getRelatedOne("CreditCard"); + creditCard = paymentMethod.getRelatedOne("CreditCard", false); context.paymentMethodTypeId = "CREDIT_CARD"; context.cardNumber = creditCard.cardNumber; context.cardType = creditCard.cardType; @@ -67,16 +67,16 @@ if (userLogin) { billToContactMechList = ContactHelper.getContactMech(party, "PHONE_BILLING", "TELECOM_NUMBER", false) if (billToContactMechList) { - billToTelecomNumber = (EntityUtil.getFirst(billToContactMechList)).getRelatedOne("TelecomNumber"); - pcm = EntityUtil.getFirst(billToTelecomNumber.getRelated("PartyContactMech")); + billToTelecomNumber = (EntityUtil.getFirst(billToContactMechList)).getRelatedOne("TelecomNumber", false); + pcm = EntityUtil.getFirst(billToTelecomNumber.getRelated("PartyContactMech", null, null, false)); context.billToTelecomNumber = billToTelecomNumber; context.billToExtension = pcm.extension; } billToFaxNumberList = ContactHelper.getContactMech(party, "FAX_BILLING", "TELECOM_NUMBER", false) if (billToFaxNumberList) { - billToFaxNumber = (EntityUtil.getFirst(billToFaxNumberList)).getRelatedOne("TelecomNumber"); - faxPartyContactMech = EntityUtil.getFirst(billToFaxNumber.getRelated("PartyContactMech")); + billToFaxNumber = (EntityUtil.getFirst(billToFaxNumberList)).getRelatedOne("TelecomNumber", false); + faxPartyContactMech = EntityUtil.getFirst(billToFaxNumber.getRelated("PartyContactMech", null, null, false)); context.billToFaxNumber = billToFaxNumber; context.billToFaxExtension = faxPartyContactMech.extension; } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy Tue Jun 19 21:36:11 2012 @@ -21,7 +21,7 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.party.contact.ContactHelper; if (userLogin) { - party = userLogin.getRelatedOne("Party"); + party = userLogin.getRelatedOne("Party", false); contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "PRIMARY_EMAIL", "EMAIL_ADDRESS", false)); if (contactMech) { @@ -33,7 +33,7 @@ if (userLogin) { if (contactMech) { partyContactMech = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactMech", [partyId : party.partyId, contactMechId : contactMech.contactMechId], null, false))); if (partyContactMech) { - telecomNumber = partyContactMech.getRelatedOne("TelecomNumber"); + telecomNumber = partyContactMech.getRelatedOne("TelecomNumber", false); context.phoneContactMechId = telecomNumber.contactMechId; context.countryCode = telecomNumber.countryCode; context.areaCode = telecomNumber.areaCode; Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy Tue Jun 19 21:36:11 2012 @@ -21,7 +21,7 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.party.contact.ContactHelper; if (userLogin) { - party = userLogin.getRelatedOne("Party"); + party = userLogin.getRelatedOne("Party", false); context.partyId = party.partyId if ("PERSON".equals(party.partyTypeId)) { person = delegator.findOne("Person", [partyId : party.partyId], false); @@ -35,7 +35,7 @@ if (userLogin) { contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false)); if (contactMech) { - postalAddress = contactMech.getRelatedOne("PostalAddress"); + postalAddress = contactMech.getRelatedOne("PostalAddress", false); context.shipToContactMechId = postalAddress.contactMechId; context.shipToName = postalAddress.toName; @@ -60,16 +60,16 @@ if (userLogin) { shipToContactMechList = ContactHelper.getContactMech(party, "PHONE_SHIPPING", "TELECOM_NUMBER", false) if (shipToContactMechList) { - shipToTelecomNumber = (EntityUtil.getFirst(shipToContactMechList)).getRelatedOne("TelecomNumber"); - pcm = EntityUtil.getFirst(shipToTelecomNumber.getRelated("PartyContactMech")); + shipToTelecomNumber = (EntityUtil.getFirst(shipToContactMechList)).getRelatedOne("TelecomNumber", false); + pcm = EntityUtil.getFirst(shipToTelecomNumber.getRelated("PartyContactMech", null, null, false)); context.shipToTelecomNumber = shipToTelecomNumber; context.shipToExtension = pcm.extension; } shipToFaxNumberList = ContactHelper.getContactMech(party, "FAX_SHIPPING", "TELECOM_NUMBER", false) if (shipToFaxNumberList) { - shipToFaxNumber = (EntityUtil.getFirst(shipToFaxNumberList)).getRelatedOne("TelecomNumber"); - faxPartyContactMech = EntityUtil.getFirst(shipToFaxNumber.getRelated("PartyContactMech")); + shipToFaxNumber = (EntityUtil.getFirst(shipToFaxNumberList)).getRelatedOne("TelecomNumber", false); + faxPartyContactMech = EntityUtil.getFirst(shipToFaxNumber.getRelated("PartyContactMech", null, null, false)); context.shipToFaxNumber = shipToFaxNumber; context.shipToFaxExtension = faxPartyContactMech.extension; } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy Tue Jun 19 21:36:11 2012 @@ -1,8 +1,27 @@ -import org.ofbiz.order.shoppingcart.shipping.*; +/* + * 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.order.shoppingcart.shipping.*; shoppingCart = session.getAttribute("shoppingCart"); // Reassign items requiring drop-shipping to new or existing drop-ship groups if (shoppingCart) { - shoppingCart.createDropShipGroups(dispatcher); + shoppingCart.createDropShipGroups(dispatcher); } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy Tue Jun 19 21:36:11 2012 @@ -18,6 +18,7 @@ */ import org.ofbiz.base.util.*; +import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.entity.*; import org.ofbiz.security.*; import org.ofbiz.service.*; @@ -30,7 +31,6 @@ import org.ofbiz.content.content.Content import org.ofbiz.content.ContentManagementWorker; import java.io.StringWriter; -import freemarker.ext.beans.BeansWrapper; import freemarker.template.SimpleHash; import freemarker.template.WrappingTemplateModel; @@ -75,7 +75,7 @@ if (currentValue) { mimeTypeId = currentValue.mimeTypeId; rootDir = request.getSession().getServletContext().getRealPath("/"); - wrapper = BeansWrapper.getDefaultInstance(); + wrapper = FreeMarkerWorker.getDefaultOfbizWrapper(); WrappingTemplateModel.setDefaultObjectWrapper(wrapper); //templateRoot = new SimpleHash(wrapper); templateRoot = [:]; Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy Tue Jun 19 21:36:11 2012 @@ -56,7 +56,7 @@ if (!pubPt) { */ contentToValue = delegator.findOne("Content", [contentId : contentIdTo], false); -contentToPurposeList = contentToValue.getRelatedCache("ContentPurpose"); +contentToPurposeList = contentToValue.getRelated("ContentPurpose", null, null, true); currentValue = delegator.makeValue("Content", [contentTypeId : "DOCUMENT", statusId : "CTNT_PUBLISHED", privilegeEnumId : "_00_"]); if (contentToPurposeList.contains("RESPONSE")) { Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy Tue Jun 19 21:36:11 2012 @@ -41,11 +41,11 @@ request.removeAttribute("_EVENT_MESSAGE_ if (partyId && !partyId.equals("_NA_")) { party = delegator.findOne("Party", [partyId : partyId], false); - person = party.getRelatedOne("Person"); + person = party.getRelatedOne("Person", false); context.party = party; context.person = person; if (party) { - context.paymentMethodList = EntityUtil.filterByDate(party.getRelated("PaymentMethod")); + context.paymentMethodList = EntityUtil.filterByDate(party.getRelated("PaymentMethod", null, null, false)); billingAccountList = BillingAccountWorker.makePartyBillingAccountList(userLogin, currencyUomId, partyId, delegator, dispatcher); if (billingAccountList) { @@ -79,22 +79,22 @@ if (cart && !parameters.singleUsePayment account = null; if ("CREDIT_CARD".equals(paymentMethod.paymentMethodTypeId)) { - account = paymentMethod.getRelatedOne("CreditCard"); + account = paymentMethod.getRelatedOne("CreditCard", false); context.creditCard = account; context.paymentMethodType = "CC"; } else if ("EFT_ACCOUNT".equals(paymentMethod.paymentMethodTypeId)) { - account = paymentMethod.getRelatedOne("EftAccount"); + account = paymentMethod.getRelatedOne("EftAccount", false); context.eftAccount = account; context.paymentMethodType = "EFT"; } else if ("GIFT_CARD".equals(paymentMethod.paymentMethodTypeId)) { - account = paymentMethod.getRelatedOne("GiftCard"); + account = paymentMethod.getRelatedOne("GiftCard", false); context.giftCard = account; context.paymentMethodType = "GC"; } else { context.paymentMethodType = "offline"; } if (account && parameters.useShipAddr) { - address = account.getRelatedOne("PostalAddress"); + address = account.getRelatedOne("PostalAddress", false); context.postalAddress = address; context.postalFields = address; } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy Tue Jun 19 21:36:11 2012 @@ -55,7 +55,7 @@ context.headerAdjustmentsToShow = OrderR orderSubTotal = OrderReadHelper.getOrderItemsSubTotal(orderItems, orderAdjustments, workEfforts); context.orderSubTotal = orderSubTotal; -context.placingCustomerPerson = userLogin?.getRelatedOne("Person"); +context.placingCustomerPerson = userLogin?.getRelatedOne("Person", false); context.paymentMethods = cart.getPaymentMethods(); paymentMethodTypeIds = cart.getPaymentMethodTypeIds(); Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy Tue Jun 19 21:36:11 2012 @@ -25,7 +25,7 @@ import org.ofbiz.product.store.*; import org.ofbiz.order.shoppingcart.shipping.*; cart = session.getAttribute("shoppingCart"); -party = userLogin.getRelatedOne("Party"); +party = userLogin.getRelatedOne("Party", false); productStore = ProductStoreWorker.getProductStore(request); if (cart) { Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy Tue Jun 19 21:36:11 2012 @@ -27,7 +27,7 @@ if (partyRole) { if ("SUPPLIER".equals(partyRole.roleTypeId)) { /** drop shipper or supplier **/ porderRoleCollection = delegator.findByAnd("OrderRole", [partyId : userLogin.partyId, roleTypeId : "SUPPLIER_AGENT"], null, false); - porderHeaderList = EntityUtil.orderBy(EntityUtil.filterByAnd(EntityUtil.getRelated("OrderHeader", porderRoleCollection), + porderHeaderList = EntityUtil.orderBy(EntityUtil.filterByAnd(EntityUtil.getRelated("OrderHeader", null, porderRoleCollection, false), [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED"), EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, "PURCHASE_ORDER")]), ["orderDate DESC"]); @@ -35,7 +35,7 @@ if (partyRole) { } } orderRoleCollection = delegator.findByAnd("OrderRole", [partyId : userLogin.partyId, roleTypeId : "PLACING_CUSTOMER"], null, false); -orderHeaderList = EntityUtil.orderBy(EntityUtil.filterByAnd(EntityUtil.getRelated("OrderHeader", orderRoleCollection), +orderHeaderList = EntityUtil.orderBy(EntityUtil.filterByAnd(EntityUtil.getRelated("OrderHeader", null, orderRoleCollection, false), [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED")]), ["orderDate DESC"]); context.orderHeaderList = orderHeaderList; Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy Tue Jun 19 21:36:11 2012 @@ -38,12 +38,12 @@ if (!userLogin) { if (!userLogin) { if (orderId) { orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); - orderStatuses = orderHeader.getRelated("OrderStatus"); + orderStatuses = orderHeader.getRelated("OrderStatus", null, null, false); filteredOrderStatusList = []; extOfflineModeExists = false; // Handled the case of OFFLINE payment method. In case of OFFLINE payment "ORDER_CREATED" status must be checked. - orderPaymentPreferences = orderHeader.getRelated("OrderPaymentPreference", UtilMisc.toList("orderPaymentPreferenceId")); + orderPaymentPreferences = orderHeader.getRelated("OrderPaymentPreference", null, UtilMisc.toList("orderPaymentPreferenceId"), false); filteredOrderPaymentPreferences = EntityUtil.filterByCondition(orderPaymentPreferences, EntityCondition.makeCondition("paymentMethodTypeId", EntityOperator.IN, ["EXT_OFFLINE"])); if (filteredOrderPaymentPreferences) { extOfflineModeExists = true; @@ -110,7 +110,7 @@ if (orderId) { } if (orderHeader) { - productStore = orderHeader.getRelatedOneCache("ProductStore"); + productStore = orderHeader.getRelatedOne("ProductStore", true); if (productStore) isDemoStore = !"N".equals(productStore.isDemoStore); orderReadHelper = new OrderReadHelper(orderHeader); @@ -131,16 +131,16 @@ if (orderHeader) { placingCustomerOrderRole = EntityUtil.getFirst(placingCustomerOrderRoles); placingCustomerPerson = placingCustomerOrderRole == null ? null : delegator.findOne("Person", [partyId : placingCustomerOrderRole.partyId], false); - billingAccount = orderHeader.getRelatedOne("BillingAccount"); + billingAccount = orderHeader.getRelatedOne("BillingAccount", false); - orderPaymentPreferences = EntityUtil.filterByAnd(orderHeader.getRelated("OrderPaymentPreference"), [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PAYMENT_CANCELLED")]); + orderPaymentPreferences = EntityUtil.filterByAnd(orderHeader.getRelated("OrderPaymentPreference", null, null, false), [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PAYMENT_CANCELLED")]); paymentMethods = []; orderPaymentPreferences.each { opp -> - paymentMethod = opp.getRelatedOne("PaymentMethod"); + paymentMethod = opp.getRelatedOne("PaymentMethod", false); if (paymentMethod) { paymentMethods.add(paymentMethod); } else { - paymentMethodType = opp.getRelatedOne("PaymentMethodType"); + paymentMethodType = opp.getRelatedOne("PaymentMethodType", false); if (paymentMethodType) { context.paymentMethodType = paymentMethodType; } @@ -177,9 +177,9 @@ if (orderHeader) { totalItems = 0.00; orderItems.each { oitem -> totalItems += oitem.quantity; - ritems = oitem.getRelated("ReturnItem"); + ritems = oitem.getRelated("ReturnItem", null, null, false); ritems.each { ritem -> - rh = ritem.getRelatedOne("ReturnHeader"); + rh = ritem.getRelatedOne("ReturnHeader", false); if (!rh.statusId.equals("RETURN_CANCELLED")) { returned += ritem.returnQuantity; } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy Tue Jun 19 21:36:11 2012 @@ -37,7 +37,7 @@ context.partyId = partyId; if (partyId && !partyId.equals("_NA_")) { party = delegator.findOne("Party", [partyId : partyId], false); - person = party.getRelatedOne("Person"); + person = party.getRelatedOne("Person", false); context.party = party; context.person = person; } @@ -67,15 +67,15 @@ if (cart) { paymentMethods.each { paymentMethod -> account = null; if ("CREDIT_CARD".equals(paymentMethod?.paymentMethodTypeId)) { - account = paymentMethod.getRelatedOne("CreditCard"); + account = paymentMethod.getRelatedOne("CreditCard", false); context.creditCard = account; context.paymentMethodTypeId = "CREDIT_CARD"; } else if ("EFT_ACCOUNT".equals(paymentMethod?.paymentMethodTypeId)) { - account = paymentMethod.getRelatedOne("EftAccount"); + account = paymentMethod.getRelatedOne("EftAccount", false); context.eftAccount = account; context.paymentMethodTypeId = "EFT_ACCOUNT"; } else if ("GIFT_CARD".equals(paymentMethod?.paymentMethodTypeId)) { - account = paymentMethod.getRelatedOne("GiftCard"); + account = paymentMethod.getRelatedOne("GiftCard", false); context.giftCard = account; context.paymentMethodTypeId = "GIFT_CARD"; context.addGiftCard = "Y"; @@ -83,7 +83,7 @@ if (cart) { context.paymentMethodTypeId = "EXT_OFFLINE"; } if (account && !parameters.useShipAddr) { - address = account.getRelatedOne("PostalAddress"); + address = account.getRelatedOne("PostalAddress", false); context.postalAddress = address; } } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy Tue Jun 19 21:36:11 2012 @@ -95,7 +95,7 @@ request.removeAttribute("_EVENT_MESSAGE_ if (cartPartyId && !cartPartyId.equals("_NA_")) { cartParty = delegator.findOne("Party", [partyId : cartPartyId], false); if (cartParty) { - cartPerson = cartParty.getRelatedOne("Person"); + cartPerson = cartParty.getRelatedOne("Person", false); context.party = cartParty; context.person = cartPerson; } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy Tue Jun 19 21:36:11 2012 @@ -24,7 +24,7 @@ import org.ofbiz.party.contact.*; orderId = parameters.orderId; context.orderId = orderId; -party = userLogin.getRelatedOne("Party"); +party = userLogin.getRelatedOne("Party", false); context.party = party; returnTypes = delegator.findList("ReturnType", null, null, ["sequenceId"], null, false); @@ -48,7 +48,7 @@ context.returnItemTypeMap = typeMap; //put in the return to party information from the order header if (orderId) { order = delegator.findOne("OrderHeader", [orderId : orderId], false); - productStore = order.getRelatedOne("ProductStore"); + productStore = order.getRelatedOne("ProductStore", false); context.toPartyId = productStore.payToPartyId; } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy Tue Jun 19 21:36:11 2012 @@ -33,7 +33,7 @@ request.removeAttribute("_EVENT_MESSAGE_ if (partyId && !partyId.equals("_NA_")) { party = delegator.findOne("Party", [partyId : partyId], false); - person = party.getRelatedOne("Person"); + person = party.getRelatedOne("Person", false); context.party = party; context.person = person; } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy Tue Jun 19 21:36:11 2012 @@ -30,7 +30,7 @@ import org.ofbiz.product.catalog.*; import org.ofbiz.product.store.*; import org.ofbiz.service.calendar.*; -party = userLogin.getRelatedOne("Party"); +party = userLogin.getRelatedOne("Party", false); cart = ShoppingCartEvents.getCartObject(request); currencyUomId = cart.getCurrency(); @@ -78,13 +78,13 @@ if (shoppingListId) { shoppingListItemTotal = 0.0; shoppingListChildTotal = 0.0; - shoppingListItems = shoppingList.getRelatedCache("ShoppingListItem"); + shoppingListItems = shoppingList.getRelated("ShoppingListItem", null, null, true); if (shoppingListItems) { shoppingListItemDatas = new ArrayList(shoppingListItems.size()); shoppingListItems.each { shoppingListItem -> shoppingListItemData = [:]; - product = shoppingListItem.getRelatedOneCache("Product"); + product = shoppingListItem.getRelatedOne("Product", true); calcPriceInMap = [product : product, quantity : shoppingListItem.quantity, currencyUomId : currencyUomId, userLogin : userLogin]; calcPriceInMap.webSiteId = webSiteId; @@ -125,7 +125,7 @@ if (shoppingListId) { productVariantAssocs = null; if ("Y".equals(product.isVirtual)) { - productVariantAssocs = product.getRelatedCache("MainProductAssoc", [productAssocTypeId : "PRODUCT_VARIANT"], ["sequenceNum"]); + productVariantAssocs = product.getRelated("MainProductAssoc", [productAssocTypeId : "PRODUCT_VARIANT"], ["sequenceNum"], true); productVariantAssocs = EntityUtil.filterByDate(productVariantAssocs); } shoppingListItemData.shoppingListItem = shoppingListItem; @@ -155,7 +155,7 @@ if (shoppingListId) { context.highIndex = highIndex; } - shoppingListType = shoppingList.getRelatedOne("ShoppingListType"); + shoppingListType = shoppingList.getRelatedOne("ShoppingListType", false); context.shoppingListType = shoppingListType; // get the child shopping lists of the current list for the logged in user @@ -182,14 +182,14 @@ if (shoppingListId) { context.shoppingListChildTotal = shoppingListChildTotal; // get the parent shopping list if there is one - parentShoppingList = shoppingList.getRelatedOne("ParentShoppingList"); + parentShoppingList = shoppingList.getRelatedOne("ParentShoppingList", false); context.parentShoppingList = parentShoppingList; context.canView = userLogin.partyId.equals(shoppingList.partyId); // auto-reorder info if ("SLT_AUTO_REODR".equals(shoppingListType?.shoppingListTypeId)) { - recurrenceVo = shoppingList.getRelatedOne("RecurrenceInfo"); + recurrenceVo = shoppingList.getRelatedOne("RecurrenceInfo", false); context.recurrenceInfo = recurrenceVo; if (userLogin.partyId.equals(shoppingList.partyId)) { @@ -198,7 +198,7 @@ if (shoppingListId) { // get customer's shipping & payment info context.chosenShippingMethod = shoppingList.shipmentMethodTypeId + "@" + shoppingList.carrierPartyId; context.shippingContactMechList = ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); - context.paymentMethodList = EntityUtil.filterByDate(party.getRelated("PaymentMethod", null, ["paymentMethodTypeId"])); + context.paymentMethodList = EntityUtil.filterByDate(party.getRelated("PaymentMethod", null, ["paymentMethodTypeId"], false)); shipAddress = delegator.findOne("PostalAddress", ["contactMechId" : shoppingList.contactMechId], false); Debug.log("SL - address : " + shipAddress); Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Tue Jun 19 21:36:11 2012 @@ -385,7 +385,7 @@ function setAlternateGwp(field) { </tr> </#if> <#list shoppingCart.getAdjustments() as cartAdjustment> - <#assign adjustmentType = cartAdjustment.getRelatedOneCache("OrderAdjustmentType") /> + <#assign adjustmentType = cartAdjustment.getRelatedOne("OrderAdjustmentType", true) /> <tr> <th> ${uiLabelMap.EcommerceAdjustment} - ${adjustmentType.get("description",locale)?if_exists} Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Tue Jun 19 21:36:11 2012 @@ -610,8 +610,8 @@ function getConfigDetails(event) { <tr><td colspan="2"><hr class='sepbar'/></td></tr> <#if productReviews?has_content> <#list productReviews as productReview> - <#assign postedUserLogin = productReview.getRelatedOne("UserLogin")> - <#assign postedPerson = postedUserLogin.getRelatedOne("Person")?if_exists> + <#assign postedUserLogin = productReview.getRelatedOne("UserLogin", false)> + <#assign postedPerson = postedUserLogin.getRelatedOne("Person", false)?if_exists> <tr> <td colspan="2"> <table border="0" cellpadding="0" cellspacing='0'> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Tue Jun 19 21:36:11 2012 @@ -322,10 +322,10 @@ $(function(){ <#if unavailableVariants?exists> <ul> <#list unavailableVariants as prod> - <#assign features = prod.getRelated("ProductFeatureAppl")/> + <#assign features = prod.getRelated("ProductFeatureAppl", null, null, false)/> <li> <#list features as feature> - <em>${feature.getRelatedOne("ProductFeature").description}</em><#if feature_has_next>, </#if> + <em>${feature.getRelatedOne("ProductFeature", false).description}</em><#if feature_has_next>, </#if> </#list> <span>${uiLabelMap.ProductItemOutOfStock}</span> </li> @@ -355,7 +355,7 @@ $(function(){ <hr /> <div id="productImageBox"> - <#if productImageList != null && productImageList?has_content> + <#if productImageList?has_content> <#-- Product image/name/price --> <div id="detailImageBox"> <#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL")?if_exists /> @@ -495,32 +495,32 @@ $(function(){ </div> </#if> <#if (product.quantityIncluded?exists && product.quantityIncluded != 0) || product.quantityUomId?has_content> - <#assign quantityUom = product.getRelatedOneCache("QuantityUom")?if_exists /> + <#assign quantityUom = product.getRelatedOne("QuantityUom", true)?if_exists /> <div> ${uiLabelMap.CommonQuantity}: ${product.quantityIncluded?if_exists} ${((quantityUom.abbreviation)?default(product.quantityUomId))?if_exists} </div> </#if> <#if (product.weight?exists && product.weight != 0) || product.weightUomId?has_content> - <#assign weightUom = product.getRelatedOneCache("WeightUom")?if_exists /> + <#assign weightUom = product.getRelatedOne("WeightUom", true)?if_exists /> <div> ${uiLabelMap.CommonWeight}: ${product.weight?if_exists} ${((weightUom.abbreviation)?default(product.weightUomId))?if_exists} </div> </#if> <#if (product.productHeight?exists && product.productHeight != 0) || product.heightUomId?has_content> - <#assign heightUom = product.getRelatedOneCache("HeightUom")?if_exists /> + <#assign heightUom = product.getRelatedOne("HeightUom", true)?if_exists /> <div> ${uiLabelMap.CommonHeight}: ${product.productHeight?if_exists} ${((heightUom.abbreviation)?default(product.heightUomId))?if_exists} </div> </#if> <#if (product.productWidth?exists && product.productWidth != 0) || product.widthUomId?has_content> - <#assign widthUom = product.getRelatedOneCache("WidthUom")?if_exists /> + <#assign widthUom = product.getRelatedOne("WidthUom", true)?if_exists /> <div> ${uiLabelMap.CommonWidth}: ${product.productWidth?if_exists} ${((widthUom.abbreviation)?default(product.widthUomId))?if_exists} </div> </#if> <#if (product.productDepth?exists && product.productDepth != 0) || product.depthUomId?has_content> - <#assign depthUom = product.getRelatedOneCache("DepthUom")?if_exists /> + <#assign depthUom = product.getRelatedOne("DepthUom", true)?if_exists /> <div> ${uiLabelMap.CommonDepth}: ${product.productDepth?if_exists} ${((depthUom.abbreviation)?default(product.depthUomId))?if_exists} </div> @@ -539,7 +539,7 @@ $(function(){ <#if disFeatureList?exists && 0 < disFeatureList.size()> <p> </p> <#list disFeatureList as currentFeature> - <#assign disFeatureType = currentFeature.getRelatedOneCache("ProductFeatureType") /> + <#assign disFeatureType = currentFeature.getRelatedOne("ProductFeatureType", true) /> <div> <#if disFeatureType.description?exists>${disFeatureType.get("description", locale)}<#else>${currentFeature.productFeatureTypeId}</#if>: ${currentFeature.description} </div> @@ -784,8 +784,8 @@ $(function(){ <hr /> <#if productReviews?has_content> <#list productReviews as productReview> - <#assign postedUserLogin = productReview.getRelatedOne("UserLogin") /> - <#assign postedPerson = postedUserLogin.getRelatedOne("Person")?if_exists /> + <#assign postedUserLogin = productReview.getRelatedOne("UserLogin", false) /> + <#assign postedPerson = postedUserLogin.getRelatedOne("Person", false)?if_exists /> <div><strong>${uiLabelMap.CommonBy}: </strong><#if productReview.postedAnonymous?default("N") == "Y"> ${uiLabelMap.OrderAnonymous}<#else> ${postedPerson.firstName} ${postedPerson.lastName} </#if></div> <div><strong>${uiLabelMap.CommonAt}: </strong>${productReview.postedDateTime?if_exists} </div> <div><strong>${uiLabelMap.OrderRanking}: </strong>${productReview.productRating?if_exists?string}</div> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl Tue Jun 19 21:36:11 2012 @@ -52,7 +52,7 @@ under the License. <th>Amount</th> </tr> <#list ownedFinAccountTransList as ownedFinAccountTrans> - <#assign finAccountTransType = ownedFinAccountTrans.getRelatedOne("FinAccountTransType")/> + <#assign finAccountTransType = ownedFinAccountTrans.getRelatedOne("FinAccountTransType", false)/> <#assign displayAmount = ownedFinAccountTrans.amount/> <#if ownedFinAccountTrans.finAccountTransTypeId == "WITHDRAWAL"> <#assign displayAmount = -displayAmount/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl Tue Jun 19 21:36:11 2012 @@ -35,7 +35,7 @@ under the License. </thead> <tbody> <#list inventoryItemList as inventoryItem> - <#assign product = inventoryItem.getRelatedOne('Product')?if_exists> + <#assign product = inventoryItem.getRelatedOne('Product', false)?if_exists> <tr> <td>${inventoryItem.inventoryItemId}</td> <td> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl Tue Jun 19 21:36:11 2012 @@ -39,12 +39,12 @@ under the License. <tr> <td>${subscription.subscriptionId}</td> <td> - <#assign subscriptionType = subscription.getRelatedOne('SubscriptionType')?if_exists> + <#assign subscriptionType = subscription.getRelatedOne('SubscriptionType', false)?if_exists> ${(subscriptionType.description)?default(subscription.subscriptionTypeId?default('N/A'))} </td> <td>${subscription.description?if_exists}</td> <td> - <#assign product = subscription.getRelatedOne('Product')?if_exists> + <#assign product = subscription.getRelatedOne('Product', false)?if_exists> <#if product?has_content> <#assign productName = Static['org.ofbiz.product.product.ProductContentWrapper'].getProductContentAsText(product, 'PRODUCT_NAME', request)?if_exists> <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" class="linktext">${productName?default(product.productId)}</a> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl Tue Jun 19 21:36:11 2012 @@ -36,7 +36,7 @@ under the License. <td width="20%"> </td> </tr> <#list supplierProductList as supplierProduct> - <#assign product = supplierProduct.getRelatedOneCache("Product")/> + <#assign product = supplierProduct.getRelatedOne("Product", true)/> <tr><td colspan="5"><hr /></td></tr> <tr> <td> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Tue Jun 19 21:36:11 2012 @@ -70,7 +70,7 @@ under the License. <td> <table border="0" cellspacing="1"> <#list partyContactMechPurposes?if_exists as partyContactMechPurpose> - <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType") /> + <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) /> <tr> <td> <#if contactMechPurposeType?exists> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl Tue Jun 19 21:36:11 2012 @@ -55,7 +55,7 @@ under the License. <td valign="top"> ${uiLabelMap.PartyUseCurrentAddress}: <#list curPartyContactMechPurposes as curPartyContactMechPurpose> - <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType") /> + <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) /> <div class="tabletext"> ${curContactMechPurposeType.get("description",locale)?if_exists} <#if curPartyContactMechPurpose.thruDate?exists> @@ -100,7 +100,7 @@ under the License. </td> <td valign="middle"> <#list partyContactMechPurposes as partyContactMechPurpose> - <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType") /> + <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) /> <div class="tabletext"> ${contactMechPurposeType.get("description",locale)?if_exists} <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl Tue Jun 19 21:36:11 2012 @@ -105,7 +105,7 @@ under the License. <td valign="top" width="80%"> <div class="tabletext"><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div> <#list curPartyContactMechPurposes as curPartyContactMechPurpose> - <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> + <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)> <div class="tabletext"> <b>${curContactMechPurposeType.get("description",locale)?if_exists}</b> <#if curPartyContactMechPurpose.thruDate?exists> @@ -150,7 +150,7 @@ under the License. </td> <td valign="top" width="80%"> <#list partyContactMechPurposes as partyContactMechPurpose> - <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> + <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)> <div class="tabletext"> <b>${contactMechPurposeType.get("description",locale)?if_exists}</b> <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Tue Jun 19 21:36:11 2012 @@ -21,7 +21,7 @@ under the License. <#macro contactList publicEmailContactLists> <select name="contactListId" class="selectBox" style="width:134px"> <#list publicEmailContactLists as publicEmailContactList> - <#assign publicContactMechType = publicEmailContactList.contactList.getRelatedOneCache("ContactMechType")?if_exists> + <#assign publicContactMechType = publicEmailContactList.contactList.getRelatedOne("ContactMechType", true)?if_exists> <option value="${publicEmailContactList.contactList.contactListId}">${publicEmailContactList.contactListType.description?if_exists} - ${publicEmailContactList.contactList.contactListName?if_exists}</option> </#list> </select> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Tue Jun 19 21:36:11 2012 @@ -126,7 +126,7 @@ under the License. <td> </td> <td valign="top"> <#list partyContactMechValueMap.partyContactMechPurposes?if_exists as partyContactMechPurpose> - <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType") /> + <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) /> <div class="tabletext"> <#if contactMechPurposeType?exists> ${contactMechPurposeType.get("description",locale)} @@ -403,10 +403,10 @@ under the License. <table width="100%" border="0" cellpadding="1"> <#if partyContent?has_content> <#list partyContent as contentRole> - <#assign content = contentRole.getRelatedOne("Content") /> - <#assign contentType = content.getRelatedOneCache("ContentType") /> - <#assign mimeType = content.getRelatedOneCache("MimeType")?if_exists /> - <#assign status = content.getRelatedOneCache("StatusItem") /> + <#assign content = contentRole.getRelatedOne("Content", false) /> + <#assign contentType = content.getRelatedOne("ContentType", true) /> + <#assign mimeType = content.getRelatedOne("MimeType", true)?if_exists /> + <#assign status = content.getRelatedOne("StatusItem", true) /> <tr> <td><a href="<@ofbizUrl>img/${content.contentName?if_exists}?imgId=${content.dataResourceId?if_exists}</@ofbizUrl>" class="button">${content.contentId}</a></td> <td>${content.contentName?if_exists}</td> @@ -475,10 +475,10 @@ under the License. <th> </th> </tr> <#list contactListPartyList as contactListParty> - <#assign contactList = contactListParty.getRelatedOne("ContactList")?if_exists /> - <#assign statusItem = contactListParty.getRelatedOneCache("StatusItem")?if_exists /> - <#assign emailAddress = contactListParty.getRelatedOneCache("PreferredContactMech")?if_exists /> - <#-- <#assign contactListType = contactList.getRelatedOneCache("ContactListType")/> --> + <#assign contactList = contactListParty.getRelatedOne("ContactList", false)?if_exists /> + <#assign statusItem = contactListParty.getRelatedOne("StatusItem", true)?if_exists /> + <#assign emailAddress = contactListParty.getRelatedOne("PreferredContactMech", true)?if_exists /> + <#-- <#assign contactListType = contactList.getRelatedOne("ContactListType", true)/> --> <tr><td colspan="7"></td></tr> <tr> <td>${contactList.contactListName?if_exists}<#if contactList.description?has_content> - ${contactList.description}</#if></td> @@ -538,8 +538,8 @@ under the License. <span class="tableheadtext">${uiLabelMap.EcommerceNewListSubscription}: </span> <select name="contactListId" class="selectBox"> <#list publicContactLists as publicContactList> - <#-- <#assign publicContactListType = publicContactList.getRelatedOneCache("ContactListType")> --> - <#assign publicContactMechType = publicContactList.getRelatedOneCache("ContactMechType")?if_exists /> + <#-- <#assign publicContactListType = publicContactList.getRelatedOne("ContactListType", true)> --> + <#assign publicContactMechType = publicContactList.getRelatedOne("ContactMechType", true)?if_exists /> <option value="${publicContactList.contactListId}">${publicContactList.contactListName?if_exists} <#-- ${publicContactListType.get("description",locale)} --> <#if publicContactMechType?has_content>[${publicContactMechType.get("description",locale)}]</#if></option> </#list> </select> @@ -564,7 +564,7 @@ under the License. <div class="screenlet-body"> <table width="100%" border="0" cellpadding="1"> <#list surveys as surveyAppl> - <#assign survey = surveyAppl.getRelatedOne("Survey") /> + <#assign survey = surveyAppl.getRelatedOne("Survey", false) /> <tr> <td> </td> <td valign="top"><div class="tabletext">${survey.surveyName?if_exists} - ${survey.description?if_exists}</div></td> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl Tue Jun 19 21:36:11 2012 @@ -37,7 +37,7 @@ under the License. <td>${review.productReview!}</td> <td>${review.productRating}</td> <td>${review.postedAnonymous}</td> - <td>${review.getRelatedOne("StatusItem").get("description", locale)}</td> + <td>${review.getRelatedOne("StatusItem", false).get("description", locale)}</td> </tr> </#list> </table> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl Tue Jun 19 21:36:11 2012 @@ -16,7 +16,12 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<html xmlns="http://www.w3.org/1999/xhtml"> +<#assign docLangAttr = locale.toString()?replace("_", "-")> +<#assign langDir = "ltr"> +<#if "ar.iw"?contains(docLangAttr?substring(0, 2))> + <#assign langDir = "rtl"> +</#if> +<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)?if_exists}</title> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl Tue Jun 19 21:36:11 2012 @@ -156,7 +156,7 @@ var issuerId = ""; <#list paymentMethodList as paymentMethod> <#if paymentMethod.paymentMethodTypeId == "GIFT_CARD"> <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> - <#assign giftCard = paymentMethod.getRelatedOne("GiftCard") /> + <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false) /> <#if giftCard?has_content && giftCard.cardNumber?has_content> <#assign giftCardNumber = "" /> @@ -184,7 +184,7 @@ var issuerId = ""; </#if> <#elseif paymentMethod.paymentMethodTypeId == "CREDIT_CARD"> <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> - <#assign creditCard = paymentMethod.getRelatedOne("CreditCard") /> + <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false) /> <div> <input type="checkbox" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if> /> <label for="checkOutPayment_${paymentMethod.paymentMethodId}">CC:${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</label> @@ -195,7 +195,7 @@ var issuerId = ""; </#if> <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT"> <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> - <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount") /> + <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false) /> <div> <input type="radio" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if> /> <label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingEFTAccount}:${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</label> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl Tue Jun 19 21:36:11 2012 @@ -109,18 +109,18 @@ under the License. <#if paymentMethods?has_content> <#list paymentMethods as paymentMethod> <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId> - <#assign creditCard = paymentMethod.getRelatedOne("CreditCard")> + <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)> <#assign formattedCardNumber = Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)> <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId> - <#assign giftCard = paymentMethod.getRelatedOne("GiftCard")> + <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)> <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId> - <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount")> + <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)> </#if> <#-- credit card info --> <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId && creditCard?has_content> <#if outputted?default(false)> </#if> - <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress")?if_exists> + <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress", false)?if_exists> <li> <ul> <li> ${uiLabelMap.AccountingCreditCard} @@ -139,7 +139,7 @@ under the License. <#if outputted?default(false)> </#if> <#if giftCard?has_content && giftCard.cardNumber?has_content> - <#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress")?if_exists> + <#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress", false)?if_exists> <#assign giftCardNumber = ""> <#assign pcardNumber = giftCard.cardNumber> <#if pcardNumber?has_content> @@ -162,7 +162,7 @@ under the License. <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId && eftAccount?has_content> <#if outputted?default(false)> </#if> - <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress")?if_exists> + <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress", false)?if_exists> <li> <ul> <li> @@ -238,7 +238,7 @@ under the License. <#assign groupIdx = 0> <#list orderItemShipGroups as shipGroup> <#if orderHeader?has_content> - <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists> + <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists> <#assign groupNumber = shipGroup.shipGroupSeqId?if_exists> <#else> <#assign shippingAddress = cart.getShippingAddress(groupIdx)?if_exists> @@ -277,7 +277,7 @@ under the License. <li> ${uiLabelMap.OrderMethod}: <#if orderHeader?has_content> - <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType")?if_exists> + <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType", false)?if_exists> <#assign carrierPartyId = shipGroup.carrierPartyId?if_exists> <#else> <#assign shipmentMethodType = cart.getShipmentMethodType(groupIdx)?if_exists> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl Tue Jun 19 21:36:11 2012 @@ -34,7 +34,7 @@ under the License. <tbody> <#if orderHeaderList?has_content> <#list orderHeaderList as orderHeader> - <#assign status = orderHeader.getRelatedOneCache("StatusItem") /> + <#assign status = orderHeader.getRelatedOne("StatusItem", true) /> <tr> <td>${orderHeader.orderDate.toString()}</td> <td>${orderHeader.orderId}</td> @@ -76,7 +76,7 @@ under the License. <tbody> <#if porderHeaderList?has_content> <#list porderHeaderList as porderHeader> - <#assign pstatus = porderHeader.getRelatedOneCache("StatusItem") /> + <#assign pstatus = porderHeader.getRelatedOne("StatusItem", true) /> <tr> <td>${porderHeader.orderDate.toString()}</td> <td>${porderHeader.orderId}</td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |