svn commit: r1343493 - in /ofbiz/trunk/specialpurpose/ec
Locked
svn commit: r1343493 - in /ofbiz/trunk/specialpurpose/ec
 
|
Author: doogie
Date: Tue May 29 04:14:59 2012 New Revision: 1343493 URL: http://svn.apache.org/viewvc?rev=1343493&view=rev Log: DEPRECATION: specialpurpose/ecommerce: getRelatedOne variants replaced with a getRelatedOne variant that takes a boolean useCache parameter. Modified: ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Modified: ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java (original) +++ ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java Tue May 29 04:14:59 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); } Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl Tue May 29 04:14:59 2012 @@ -98,7 +98,7 @@ under the License. <div>[${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"> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy Tue May 29 04:14:59 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,7 +67,7 @@ if (userLogin) { billToContactMechList = ContactHelper.getContactMech(party, "PHONE_BILLING", "TELECOM_NUMBER", false) if (billToContactMechList) { - billToTelecomNumber = (EntityUtil.getFirst(billToContactMechList)).getRelatedOne("TelecomNumber"); + billToTelecomNumber = (EntityUtil.getFirst(billToContactMechList)).getRelatedOne("TelecomNumber", false); pcm = EntityUtil.getFirst(billToTelecomNumber.getRelated("PartyContactMech")); context.billToTelecomNumber = billToTelecomNumber; context.billToExtension = pcm.extension; @@ -75,7 +75,7 @@ if (userLogin) { billToFaxNumberList = ContactHelper.getContactMech(party, "FAX_BILLING", "TELECOM_NUMBER", false) if (billToFaxNumberList) { - billToFaxNumber = (EntityUtil.getFirst(billToFaxNumberList)).getRelatedOne("TelecomNumber"); + billToFaxNumber = (EntityUtil.getFirst(billToFaxNumberList)).getRelatedOne("TelecomNumber", false); faxPartyContactMech = EntityUtil.getFirst(billToFaxNumber.getRelated("PartyContactMech")); context.billToFaxNumber = billToFaxNumber; context.billToFaxExtension = faxPartyContactMech.extension; Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy Tue May 29 04:14:59 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,7 +60,7 @@ if (userLogin) { shipToContactMechList = ContactHelper.getContactMech(party, "PHONE_SHIPPING", "TELECOM_NUMBER", false) if (shipToContactMechList) { - shipToTelecomNumber = (EntityUtil.getFirst(shipToContactMechList)).getRelatedOne("TelecomNumber"); + shipToTelecomNumber = (EntityUtil.getFirst(shipToContactMechList)).getRelatedOne("TelecomNumber", false); pcm = EntityUtil.getFirst(shipToTelecomNumber.getRelated("PartyContactMech")); context.shipToTelecomNumber = shipToTelecomNumber; context.shipToExtension = pcm.extension; @@ -68,7 +68,7 @@ if (userLogin) { shipToFaxNumberList = ContactHelper.getContactMech(party, "FAX_SHIPPING", "TELECOM_NUMBER", false) if (shipToFaxNumberList) { - shipToFaxNumber = (EntityUtil.getFirst(shipToFaxNumberList)).getRelatedOne("TelecomNumber"); + shipToFaxNumber = (EntityUtil.getFirst(shipToFaxNumberList)).getRelatedOne("TelecomNumber", false); faxPartyContactMech = EntityUtil.getFirst(shipToFaxNumber.getRelated("PartyContactMech")); context.shipToFaxNumber = shipToFaxNumber; context.shipToFaxExtension = faxPartyContactMech.extension; Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy Tue May 29 04:14:59 2012 @@ -41,7 +41,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; if (party) { @@ -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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy Tue May 29 04:14:59 2012 @@ -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")]); 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; } @@ -179,7 +179,7 @@ if (orderHeader) { totalItems += oitem.quantity; ritems = oitem.getRelated("ReturnItem"); ritems.each { ritem -> - rh = ritem.getRelatedOne("ReturnHeader"); + rh = ritem.getRelatedOne("ReturnHeader", false); if (!rh.statusId.equals("RETURN_CANCELLED")) { returned += ritem.returnQuantity; } Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy Tue May 29 04:14:59 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(); @@ -84,7 +84,7 @@ if (shoppingListId) { 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; @@ -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)) { Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Tue May 29 04:14:59 2012 @@ -325,7 +325,7 @@ $(function(){ <#assign features = prod.getRelated("ProductFeatureAppl")/> <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> @@ -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/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl Tue May 29 04:14:59 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> ${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> ${contactMechPurposeType.get("description",locale)?if_exists} <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl Tue May 29 04:14:59 2012 @@ -105,7 +105,7 @@ under the License. <td valign="top" width="80%"> <div><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div> <#list curPartyContactMechPurposes as curPartyContactMechPurpose> - <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> + <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)> <div> <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> <b>${contactMechPurposeType.get("description",locale)?if_exists}</b> <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Tue May 29 04:14:59 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> <#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>${survey.surveyName?if_exists} - ${survey.description?if_exists}</div></td> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl Tue May 29 04:14:59 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl Tue May 29 04:14:59 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> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Tue May 29 04:14:59 2012 @@ -108,7 +108,7 @@ under the License. <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")?if_exists> <#if WorkOrderItemFulfillments?has_content> <#list WorkOrderItemFulfillments as WorkOrderItemFulfillment> - <#assign workEffortSave = WorkOrderItemFulfillment.getRelatedOneCache("WorkEffort")?if_exists> + <#assign workEffortSave = WorkOrderItemFulfillment.getRelatedOne("WorkEffort", true)?if_exists> <#break> </#list> </#if> @@ -120,7 +120,7 @@ under the License. ${orderItem.itemDescription?default("")} </td> <#else> - <#assign product = orderItem.getRelatedOneCache("Product")?if_exists/> <#-- should always exist because of FK constraint, but just in case --> + <#assign product = orderItem.getRelatedOne("Product", true)?if_exists/> <#-- should always exist because of FK constraint, but just in case --> <td > <a href="<@ofbizCatalogAltUrl fullPath="true" secure="false" productId=orderItem.productId/>" class="linktext">${orderItem.productId} - ${orderItem.itemDescription?default("")}</a> <#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute")/> @@ -138,23 +138,23 @@ under the License. [${uiLabelMap.OrderPieces}: ${product.piecesIncluded}] </#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/> [${uiLabelMap.CommonQuantity}: ${product.quantityIncluded?if_exists} ${((quantityUom.abbreviation)?default(product.quantityUomId))?if_exists}] </#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/> [${uiLabelMap.CommonWeight}: ${product.weight?if_exists} ${((weightUom.abbreviation)?default(product.weightUomId))?if_exists}] </#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/> [${uiLabelMap.CommonHeight}: ${product.productHeight?if_exists} ${((heightUom.abbreviation)?default(product.heightUomId))?if_exists}] </#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/> [${uiLabelMap.CommonWidth}: ${product.productWidth?if_exists} ${((widthUom.abbreviation)?default(product.widthUomId))?if_exists}] </#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/> [${uiLabelMap.CommonDepth}: ${product.productDepth?if_exists} ${((depthUom.abbreviation)?default(product.depthUomId))?if_exists}] </#if> </#if> @@ -162,7 +162,7 @@ under the License. <#assign returns = orderItem.getRelated("ReturnItem")?if_exists> <#if returns?has_content> <#list returns as return> - <#assign returnHeader = return.getRelatedOne("ReturnHeader")> + <#assign returnHeader = return.getRelatedOne("ReturnHeader", false)> <#if returnHeader.statusId != "RETURN_CANCELLED"> <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "RETURN_APPROVED"> <#assign displayState = "Return Pending"> @@ -252,12 +252,12 @@ under the License. <#if orderItemAdjustment.description?has_content>: ${orderItemAdjustment.description}</#if> <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> <#if orderItemAdjustment.primaryGeoId?has_content> - <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/> + <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/> <#if primaryGeo.geoName?has_content> ${uiLabelMap.OrderJurisdiction}: ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}] </#if> <#if orderItemAdjustment.secondaryGeoId?has_content> - <#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/> + <#assign secondaryGeo = orderItemAdjustment.getRelatedOne("SecondaryGeo", true)/> (${uiLabelMap.CommonIn}: ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}]) </#if> </#if> @@ -278,8 +278,8 @@ under the License. <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc")?if_exists> <#if orderItemShipGroupAssocs?has_content> <#list orderItemShipGroupAssocs as shipGroupAssoc> - <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup")?if_exists> - <#assign shipGroupAddress = (shipGroup.getRelatedOne("PostalAddress"))?if_exists> + <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)?if_exists> + <#assign shipGroupAddress = (shipGroup.getRelatedOne("PostalAddress", false))?if_exists> <tr> <td> ${uiLabelMap.OrderShipGroup}: [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("N/A")} Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl Tue May 29 04:14:59 2012 @@ -116,7 +116,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> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl Tue May 29 04:14:59 2012 @@ -67,7 +67,7 @@ under the License. <input type="hidden" name="returnPrice_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnablePrice")}"/> <#-- need some order item information --> - <#assign orderHeader = orderItem.getRelatedOne("OrderHeader")> + <#assign orderHeader = orderItem.getRelatedOne("OrderHeader", false)> <#assign itemCount = orderItem.quantity> <#assign itemPrice = orderItem.unitPrice> <#-- end of order item information --> @@ -119,7 +119,7 @@ under the License. <td colspan="6"> <table cellspacing="1" cellpadding="2" width="100%"> <#list shippingContactMechList as shippingContactMech> - <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> + <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> <tr> <td align="right" width="1%" valign="top" nowrap="nowrap"> <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl Tue May 29 04:14:59 2012 @@ -78,7 +78,7 @@ function submitForm(form, mode, value) { <select name="shippingContactMechId" class="selectBox" onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA', null);"> <option value="">${uiLabelMap.OrderSelectShippingAddress}</option> <#list shippingContactMechList as shippingContactMech> - <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> + <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> <option value="${shippingAddress.contactMechId}" <#if (shippingAddress.contactMechId == selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option> </#list> </select> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl Tue May 29 04:14:59 2012 @@ -47,7 +47,7 @@ under the License. <td width="10"> </td> </tr> <#list quoteList as quote> - <#assign status = quote.getRelatedOneCache("StatusItem")> + <#assign status = quote.getRelatedOne("StatusItem", true)> <tr> <td> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl Tue May 29 04:14:59 2012 @@ -51,8 +51,8 @@ under the License. <td width="10"> </td> </tr> <#list requestList as custRequest> - <#assign status = custRequest.getRelatedOneCache("StatusItem")> - <#assign type = custRequest.getRelatedOneCache("CustRequestType")> + <#assign status = custRequest.getRelatedOne("StatusItem", true)> + <#assign type = custRequest.getRelatedOne("CustRequestType", true)> <tr> <td> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl Tue May 29 04:14:59 2012 @@ -24,8 +24,8 @@ under the License. <table cellspacing="0" class="basic-table"> <#assign row = 1> <#list requestParties as requestParty> - <#assign roleType = requestParty.getRelatedOne("RoleType")> - <#assign party = requestParty.getRelatedOne("Party")> + <#assign roleType = requestParty.getRelatedOne("RoleType", false)> + <#assign party = requestParty.getRelatedOne("Party", false)> <tr> <td align="right" valign="top" width="15%" class="label"> ${roleType.get("description", locale)?if_exists} Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=1343493&r1=1343492&r2=1343493&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Tue May 29 04:14:59 2012 @@ -224,7 +224,7 @@ under the License. <td><div class="tableheadtext">${uiLabelMap.EcommerceRecurrence}</div></td> <td> <#if recurrenceInfo?has_content> - <#assign recurrenceRule = recurrenceInfo.getRelatedOne("RecurrenceRule")?if_exists> + <#assign recurrenceRule = recurrenceInfo.getRelatedOne("RecurrenceRule", false)?if_exists> </#if> <select name="intervalNumber" class="selectBox"> <option value="">${uiLabelMap.EcommerceSelectInterval}</option> @@ -263,7 +263,7 @@ under the License. <option value="">${uiLabelMap.OrderSelectAShippingAddress}</option> <#if shippingContactMechList?has_content> <#list shippingContactMechList as shippingContactMech> - <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> + <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> <option value="${shippingContactMech.contactMechId}"<#if (shoppingList.contactMechId)?default("") == shippingAddress.contactMechId> selected="selected"</#if>>${shippingAddress.address1}</option> </#list> <#else> @@ -307,10 +307,10 @@ under the License. <option value="">${uiLabelMap.OrderSelectPaymentMethod}</option> <#list paymentMethodList as paymentMethod> <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD"> - <#assign creditCard = paymentMethod.getRelatedOne("CreditCard")> + <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)> <option value="${paymentMethod.paymentMethodId}" <#if (shoppingList.paymentMethodId)?default("") == paymentMethod.paymentMethodId>selected="selected"</#if>>CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option> <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT"> - <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount")> + <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)> <option value="${paymentMethod.paymentMethodId}">EFT: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</option> </#if> </#list> @@ -508,7 +508,7 @@ under the License. <input type="hidden" name="quantity" value="${shoppingListItem.quantity}"/> <select name="add_product_id" class="selectBox"> <#list productVariantAssocs as productVariantAssoc> - <#assign variantProduct = productVariantAssoc.getRelatedOneCache("AssocProduct")> + <#assign variantProduct = productVariantAssoc.getRelatedOne("AssocProduct", true)> <#if variantProduct?exists> <#assign variantProductContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(variantProduct, request)> <option value="${variantProduct.productId}">${variantProductContentWrapper.get("PRODUCT_NAME")?default("No Name")} [${variantProduct.productId}]</option> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |