svn commit: r1626688 [16/46] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1626688 [16/46] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml Mon Sep 22 08:09:27 2014 @@ -256,6 +256,7 @@ under the License. location="org.ofbiz.order.order.OrderServices" invoke="recalcOrderTax"> <description>Adjust the order tax amount</description> <attribute name="orderId" type="String" mode="IN"/> + <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/> </service> <service name="changeOrderStatus" engine="java" auth="true" Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Mon Sep 22 08:09:27 2014 @@ -1759,7 +1759,10 @@ public class OrderReadHelper { if ((returnedItem.get("returnPrice") != null) && (returnedItem.get("returnQuantity") != null)) { returnedAmount = returnedAmount.add(returnedItem.getBigDecimal("returnPrice").multiply(returnedItem.getBigDecimal("returnQuantity")).setScale(scale, rounding)); } - Map<String, Object> itemAdjustmentCondition = UtilMisc.toMap("returnId", returnedItem.get("returnId"), "returnItemSeqId", returnedItem.get("returnItemSeqId"), "returnTypeId", returnTypeId); + Map<String, Object> itemAdjustmentCondition = UtilMisc.toMap("returnId", returnedItem.get("returnId"), "returnItemSeqId", returnedItem.get("returnItemSeqId"));; + if (UtilValidate.isNotEmpty(returnTypeId)) { + itemAdjustmentCondition.put("returnTypeId", returnTypeId); + } returnedAmount = returnedAmount.add(getReturnAdjustmentTotal(orderHeader.getDelegator(), itemAdjustmentCondition)); if (orderId.equals(returnedItem.getString("orderId")) && (!returnHeaderList.contains(returnedItem.getString("returnId")))) { returnHeaderList.add(returnedItem.getString("returnId")); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java Mon Sep 22 08:09:27 2014 @@ -1542,6 +1542,7 @@ public class OrderServices { LocalDispatcher dispatcher = ctx.getDispatcher(); Delegator delegator = ctx.getDelegator(); String orderId = (String) context.get("orderId"); + String orderItemSeqId = (String) context.get("orderItemSeqId"); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); @@ -1725,7 +1726,11 @@ public class OrderServices { Map<String, Object> createOrderAdjContext = new HashMap<String, Object>(); createOrderAdjContext.put("orderAdjustmentTypeId", "SALES_TAX"); createOrderAdjContext.put("orderId", orderId); - createOrderAdjContext.put("orderItemSeqId", "_NA_"); + if (UtilValidate.isNotEmpty(orderItemSeqId)) { + createOrderAdjContext.put("orderItemSeqId", orderItemSeqId); + } else { + createOrderAdjContext.put("orderItemSeqId", "_NA_"); + } createOrderAdjContext.put("shipGroupSeqId", "_NA_"); createOrderAdjContext.put("description", "Tax adjustment due to order change"); createOrderAdjContext.put("amount", orderTaxDifference); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy Mon Sep 22 08:09:27 2014 @@ -104,5 +104,15 @@ if ("SALES_ORDER".equals(cart.getOrderTy } context.facilityMaps = facilityMaps; } + // Ship to another party + if (shipToPartyId) { + shipToParty = delegator.findOne("Party", [partyId : shipToPartyId], false); + if (shipToParty) + { + context.shipToParty = shipToParty; + shipToPartyShippingContactMechList = ContactHelper.getContactMech(shipToParty, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); + context.shipToPartyShippingContactMechList = shipToPartyShippingContactMechList; + } + } } -} +} \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Mon Sep 22 08:09:27 2014 @@ -143,11 +143,12 @@ if (partyGroup?.groupName) { context.companyName = companyName; // the address -addresses = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "GENERAL_LOCATION"], null, false); -selAddresses = EntityUtil.filterByDate(addresses, nowTimestamp, "fromDate", "thruDate", true); +addresses = delegator.findByAnd("PartyContactWithPurpose", [partyId : partyId, contactMechPurposeTypeId : "GENERAL_LOCATION"], null, false); +addresses = EntityUtil.filterByDate(addresses, null, "contactFromDate", "contactThruDate", true); +addresses = EntityUtil.filterByDate(addresses, null, "purposeFromDate", "purposeThruDate", true); address = null; -if (selAddresses) { - address = delegator.findOne("PostalAddress", [contactMechId : selAddresses[0].contactMechId], false); +if (addresses) { + address = delegator.findOne("PostalAddress", [contactMechId : addresses[0].contactMechId], false); } if (address) { // get the country name and state/province abbreviation @@ -163,24 +164,27 @@ if (address) { context.postalAddress = address; //telephone -phones = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_PHONE"], null, false); -selPhones = EntityUtil.filterByDate(phones, nowTimestamp, "fromDate", "thruDate", true); -if (selPhones) { - context.phone = delegator.findOne("TelecomNumber", [contactMechId : selPhones[0].contactMechId], false); +phones = delegator.findByAnd("PartyContactWithPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_PHONE"], null, false); +phones = EntityUtil.filterByDate(phones, null, "contactFromDate", "contactThruDate", true); +phones = EntityUtil.filterByDate(phones, null, "purposeFromDate", "purposeThruDate", true); +if (phones) { + context.phone = delegator.findOne("TelecomNumber", [contactMechId : phones[0].contactMechId], false); } // Fax -faxNumbers = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "FAX_NUMBER"], null, false); -faxNumbers = EntityUtil.filterByDate(faxNumbers, nowTimestamp, null, null, true); +faxNumbers = delegator.findByAnd("PartyContactWithPurpose", [partyId : partyId, contactMechPurposeTypeId : "FAX_NUMBER"], null, false); +faxNumbers = EntityUtil.filterByDate(faxNumbers, null, "contactFromDate", "contactThruDate", true); +faxNumbers = EntityUtil.filterByDate(faxNumbers, null, "purposeFromDate", "purposeThruDate", true); if (faxNumbers) { context.fax = delegator.findOne("TelecomNumber", [contactMechId : faxNumbers[0].contactMechId], false); } -emails = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_EMAIL"], null, false); -selEmails = EntityUtil.filterByDate(emails, nowTimestamp, "fromDate", "thruDate", true); -if (selEmails) { - context.email = delegator.findOne("ContactMech", [contactMechId : selEmails[0].contactMechId], false); +emails = delegator.findByAnd("PartyContactWithPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_EMAIL"], null, false); +emails = EntityUtil.filterByDate(emails, null, "contactFromDate", "contactThruDate", true); +emails = EntityUtil.filterByDate(emails, null, "purposeFromDate", "purposeThruDate", true); +if (emails) { + context.email = delegator.findOne("ContactMech", [contactMechId : emails[0].contactMechId], false); } else { //get email address from party contact mech contacts = delegator.findByAnd("PartyContactMech", [partyId : partyId], null, false); selContacts = EntityUtil.filterByDate(contacts, nowTimestamp, "fromDate", "thruDate", true); @@ -197,7 +201,9 @@ if (selEmails) { } // website -websiteUrls = EntityUtil.filterByDate(delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_WEB_URL"], null, false)); +websiteUrls = delegator.findByAnd("PartyContactWithPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_WEB_URLs"], null, false); +websiteUrls = EntityUtil.filterByDate(websiteUrls, null, "contactFromDate", "contactThruDate", true); +websiteUrls = EntityUtil.filterByDate(websiteUrls, null, "purposeFromDate", "purposeThruDate", true); if (websiteUrls) { websiteUrl = EntityUtil.getFirst(websiteUrls); context.website = delegator.findOne("ContactMech", [contactMechId : websiteUrl.contactMechId], false); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/billsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/billsettings.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/billsettings.ftl Mon Sep 22 08:09:27 2014 @@ -346,13 +346,7 @@ function makeExpDate() { <option>${creditCard.cardType}</option> <option value="${creditCard.cardType}">---</option> </#if> - <option>Visa</option> - <option value='MasterCard'>Master Card</option> - <option value='AmericanExpress'>American Express</option> - <option value='DinersClub'>Diners Club</option> - <option>Discover</option> - <option>EnRoute</option> - <option>JCB</option> + ${screens.render("component://common/widget/CommonScreens.xml#cctypes")} </select> *</td> </tr> @@ -489,9 +483,9 @@ function makeExpDate() { <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="checkoutsetupform" id="checkoutsetupform"> <input type="hidden" name="finalizeMode" value="payment"/> - <input type="hidden" name="createNew" value="Y"/> + <input type="hidden" name="createNew" value="${(requestParameters.createNew)!}"/> <table width="100%" border="0" cellpadding="1" cellspacing="0"> - <#if !requestParameters.createNew??> + <#if "Y" != requestParameters.createNew?default("")> <tr> <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td> <td width='50%' nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Mon Sep 22 08:09:27 2014 @@ -70,7 +70,8 @@ under the License. <td width="35%"><div><b>${uiLabelMap.OrderOrderTermType}</b></div></td> <td width="10%"><div><b>${uiLabelMap.OrderOrderTermValue}</b></div></td> <td width="10%"><div><b>${uiLabelMap.OrderOrderTermDays}</b></div></td> - <td width="45%"><div><b>${uiLabelMap.CommonDescription}</b></div></td> + <td width="10%"><div><b>${uiLabelMap.OrderOrderTextValue}</b></div></td> + <td width="35%"><div><b>${uiLabelMap.CommonDescription}</b></div></td> </tr> <tr><td colspan="4"><hr /></td></tr> <#assign index=0/> @@ -79,10 +80,11 @@ under the License. <td width="35%"><div>${orderTerm.getRelatedOne("TermType", false).get("description",locale)}</div></td> <td width="10%"><div>${orderTerm.termValue?default("")}</div></td> <td width="10%"><div>${orderTerm.termDays?default("")}</div></td> - <td width="45%"><div>${orderTerm.textValue?default("")}</div></td> + <td width="10%"><div>${orderTerm.textValue?default("")}</div></td> + <td width="35%"><div>${orderTerm.description?default("")}</div></td> </tr> <#if orderTerms.size()<index> - <tr><td colspan="4"><hr /></td></tr> + <tr><td colspan="5"><hr /></td></tr> </#if> <#assign index=index+1/> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderterms.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderterms.ftl?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderterms.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderterms.ftl Mon Sep 22 08:09:27 2014 @@ -33,6 +33,7 @@ under the License. <td>${uiLabelMap.OrderOrderTermType}</td> <td align="center">${uiLabelMap.OrderOrderTermValue}</td> <td align="center">${uiLabelMap.OrderOrderTermDays}</td> + <td align="center">${uiLabelMap.OrderOrderTextValue}</td> <td>${uiLabelMap.CommonDescription}</td> <td> </td> </tr> @@ -42,6 +43,7 @@ under the License. <td align="center">${orderTerm.termValue!}</td> <td align="center">${orderTerm.termDays!}</td> <td nowrap="nowrap">${orderTerm.textValue!}</td> + <td nowrap="nowrap">${orderTerm.description?if_exists}</td> <td align="right"> <a href="<@ofbizUrl>setOrderTerm?termIndex=${orderTerm_index}&createNew=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a> <a href="<@ofbizUrl>removeCartOrderTerm?termIndex=${orderTerm_index}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> @@ -94,11 +96,20 @@ under the License. </tr> <tr> <td width="26%" align="right" valign="top"> + ${uiLabelMap.OrderOrderTextValue} + </td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="30" maxlength="60" name="textValue" value="${textValue?if_exists}" /> + </td> + </tr> + <tr> + <td width="26%" align="right" valign="top"> ${uiLabelMap.CommonDescription} </td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="255" name="textValue" value="${textValue!}" /> + <input type="text" size="30" maxlength="255" name="description" value="${description?if_exists}" /> </td> </tr> <tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/shipsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/shipsettings.ftl Mon Sep 22 08:09:27 2014 @@ -21,22 +21,19 @@ under the License. <#-- Purchase Orders --> -<#if facilityMaps??> - <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="checkoutsetupform"> - <input type="hidden" name="finalizeMode" value="ship"/> - <#if (cart.getShipGroupSize() > 1)> - <input type="hidden" name="finalizeReqShipGroups" value="true"/> - </#if> + <#if facilityMaps??> + <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="checkoutsetupform"> + <input type="hidden" name="finalizeMode" value="ship"/> + <#if (cart.getShipGroupSize() > 1)> + <input type="hidden" name="finalizeReqShipGroups" value="true"/> + </#if> <table width='100%' border='0' cellspacing='0' cellpadding='0' class="boxboutside"> <tr> - <td> - <a href="<@ofbizUrl>setShipping?createNewShipGroup=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShipGroup}</a> - - -<#list 1..cart.getShipGroupSize() as currIndex> -<#assign shipGroupIndex = currIndex - 1> - - <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <td colspan="4"> + <a href="<@ofbizUrl>setShipping?createNewShipGroup=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShipGroup}</a> + <#list 1..cart.getShipGroupSize() as currIndex> + <#assign shipGroupIndex = currIndex - 1> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> <tr> <td colspan="4"> <h1>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</h1> @@ -45,100 +42,133 @@ under the License. <#assign i = 0> <#assign shipGroup = cart.getShipInfo(shipGroupIndex)> <#list facilityMaps as facilityMap> - <#assign facility = facilityMap.facility> - <#assign facilityContactMechList = facilityMap.facilityContactMechList> - <tr> - <td colspan="4"> - <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName!} [${facility.facilityId}]</div> - </td> - </tr> - <tr><td colspan="4"><hr /></td></tr> - - <#-- company postal addresses --> - - <#if facilityContactMechList?has_content> - <#list facilityContactMechList as shippingContactMech> - <#if shippingContactMech.postalAddress??> - <#assign shippingAddress = shippingContactMech.postalAddress> + <#assign facility = facilityMap.facility> + <#assign facilityContactMechList = facilityMap.facilityContactMechList> <tr> - <td valign="top" nowrap="nowrap"> - <#assign checked='' /> - <#if shipGroup?has_content && (shipGroup.getFacilityId()?has_content && shipGroup.getFacilityId() == facility.facilityId) && (shipGroup.getContactMechId()?has_content && shipGroup.getContactMechId() == shippingAddress.contactMechId) > - <#assign checked='checked' /> - <#elseif i == 0> - <#assign checked='checked' /> - </#if> - <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}_@_${facility.facilityId}" ${checked} /> - </td> - <td nowrap="nowrap"> </td> - <td valign="top" width="100%" nowrap="nowrap"> - <div> - <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> - <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> - <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> - <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> - <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> - <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> - </div> - </td> - <td> - <div><a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&contactMechId=${shippingAddress.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div> + <td colspan="4"> + <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName!} [${facility.facilityId}]</div> </td> </tr> - <#if shippingContactMech_has_next> - <tr><td colspan="4"><hr /></td></tr> - </#if> - </#if> - <#assign i = i + 1> - </#list> - <#else> <tr> - <td colspan="4"> - <div> - ${uiLabelMap.CommonNoContactInformationOnFile}: - <a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&preContactMechTypeId=POSTAL_ADDRESS" target="_blank" class="buttontext">${uiLabelMap.CommonNew}</a> - </div> - </td> - </#if> + <td colspan="4"><hr /></td> + </tr> + +<#-- company postal addresses --> + + <#if facilityContactMechList?has_content> + <#list facilityContactMechList as shippingContactMech> + <#if shippingContactMech.postalAddress??> + <#assign shippingAddress = shippingContactMech.postalAddress> + <tr> + <td valign="top" nowrap="nowrap"> + <#assign checked='' /> + <#if shipGroup?has_content && (shipGroup.getFacilityId()?has_content && shipGroup.getFacilityId() == facility.facilityId) && (shipGroup.getContactMechId()?has_content && shipGroup.getContactMechId() == shippingAddress.contactMechId) > + <#assign checked='checked' /> + <#elseif i == 0> + <#assign checked='checked' /> + </#if> + <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}_@_${facility.facilityId}" ${checked} /> + </td> + <td nowrap="nowrap"> </td> + <td valign="top" width="100%" nowrap="nowrap"> + <div> + <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> + <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> + <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> + <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> + <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> + <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> + <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> + </div> + </td> + <td> + <div><a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&contactMechId=${shippingAddress.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div> + </td> + </tr> + <#if shippingContactMech_has_next> + <tr><td colspan="4"><hr /></td></tr> + </#if> + </#if> + <#assign i = i + 1> + </#list> + <#else> + <tr> + <td colspan="4"> + <div> + ${uiLabelMap.CommonNoContactInformationOnFile}: + <a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&preContactMechTypeId=POSTAL_ADDRESS" target="_blank" class="buttontext">${uiLabelMap.CommonNew}</a> + </div> + </td> + </tr> + </#if> </#list> - </table> -</#list> + </table> + </#list> </td> </tr> + <#if shipToPartyShippingContactMechList?has_content> + <tr><td colspan="4"><hr /></td></tr> + <tr><td colspan="4">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr> + <tr><td colspan="4"><hr /></td></tr> + <#list shipToPartyShippingContactMechList as shippingContactMech> + <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> + <tr> + <td valign="top" nowrap="nowrap"> + <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/> + </td> + <td nowrap="nowrap"> </td> + <td valign="top" width="100%" nowrap="nowrap"> + <div> + <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> + <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> + <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> + <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> + <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> + <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> + <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> + </div> + </td> + <td> + <div><a href="/partymgr/control/editcontactmech?partyId=${orderParty.partyId}&contactMechId=${shippingContactMech.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div> + </td> + </tr> + <#if shippingContactMech_has_next> + <tr><td colspan="4"><hr /></td></tr> + </#if> + </#list> + </#if> </table> - </form> - -<#else> + </form> + <#else> <#-- Sales Orders --> - <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="checkoutsetupform"> - <input type="hidden" name="finalizeMode" value="ship"/> - <#if (cart.getShipGroupSize() > 1)> - <input type="hidden" name="finalizeReqShipGroups" value="true"/> - </#if> + <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="checkoutsetupform"> + <input type="hidden" name="finalizeMode" value="ship"/> + <#if (cart.getShipGroupSize() > 1)> + <input type="hidden" name="finalizeReqShipGroups" value="true"/> + </#if> <table width='100%' border='0' cellspacing='0' cellpadding='0' class="boxoutside"> <tr> <td> -<a href="<@ofbizUrl>setShipping?createNewShipGroup=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew} ${uiLabelMap.OrderShipGroup}</a> -<a href="<@ofbizUrl>EditShipAddress</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShippingAddress}</a> -<#list 1..cart.getShipGroupSize() as currIndex> -<#assign shipGroupIndex = currIndex - 1> - -<#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)!> -<#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)!> -<#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)!> - <hr /> - <table width="100%" border="0" cellpadding="1" cellspacing="0"> - <tr> - <td colspan="3"> + <a href="<@ofbizUrl>setShipping?createNewShipGroup=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew} ${uiLabelMap.OrderShipGroup}</a> + <a href="<@ofbizUrl>EditShipAddress</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShippingAddress}</a> + <#list 1..cart.getShipGroupSize() as currIndex> + <#assign shipGroupIndex = currIndex - 1> + <#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)!> + <#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)!> + <#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)!> + <hr /> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <tr> + <td colspan="3"> <h1>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</h1> - </td> - </tr> - <tr> - <td colspan="3"> + </td> + </tr> + <tr> + <td colspan="3"> <div> ${uiLabelMap.PartySupplier}: <select name="${shipGroupIndex?default("0")}_supplierPartyId"> @@ -156,121 +186,118 @@ under the License. </#list> </select> </div> - </td> - </tr> - <#if shippingContactMechList?has_content> - <tr><td colspan="3"><hr /></td></tr> - <#assign i = 0> - <#list shippingContactMechList as shippingContactMech> - <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> - <#if currShipContactMechId?? && currShipContactMechId?has_content> + </td> + </tr> + <#if shippingContactMechList?has_content> + <tr><td colspan="3"><hr /></td></tr> + <#assign i = 0> + <#list shippingContactMechList as shippingContactMech> + <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> + <#if currShipContactMechId?? && currShipContactMechId?has_content> <#if currShipContactMechId == shippingContactMech.contactMechId> <#assign checkedValue = "checked='checked'"> <#else> <#assign checkedValue = ""> </#if> - <#else> + <#else> <#if i == 0> - <#assign checkedValue = "checked='checked'"> + <#assign checkedValue = "checked='checked'"> <#else> - <#assign checkedValue = ""> + <#assign checkedValue = ""> </#if> - </#if> - <tr> - <td valign="top" width="1%" nowrap="nowrap"> - <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" ${checkedValue} /> - </td> - <td valign="top" width="99%" nowrap="nowrap"> - <div> - <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> - <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> - <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> - <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> - <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> - <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> - </div> - </td> - <td> - <div><a href="/partymgr/control/editcontactmech?partyId=${orderParty.partyId}&contactMechId=${shippingContactMech.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div> - </td> - </tr> - <#if shippingContactMech_has_next> + </#if> + <tr> + <td valign="top" width="1%" nowrap="nowrap"> + <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" ${checkedValue} /> + </td> + <td valign="top" width="99%" nowrap="nowrap"> + <div> + <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> + <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> + <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> + <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> + <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> + <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> + <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> + </div> + </td> + <td> + <div><a href="/partymgr/control/editcontactmech?partyId=${orderParty.partyId}&contactMechId=${shippingContactMech.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div> + </td> + </tr> + <#if shippingContactMech_has_next> + <tr><td colspan="3"><hr /></td></tr> + </#if> + <#assign i = i + 1> + </#list> + </#if> + <#if shipToPartyShippingContactMechList?has_content> <tr><td colspan="3"><hr /></td></tr> - </#if> - <#assign i = i + 1> - </#list> - </#if> - <#if shipToPartyShippingContactMechList?has_content> - <tr><td colspan="3"><hr /></td></tr> - <tr><td colspan="3">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr> - <tr><td colspan="3"><hr /></td></tr> - <#list shipToPartyShippingContactMechList as shippingContactMech> - <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> - <tr> - <td valign="top" width="1%" nowrap="nowrap"> - <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/> - </td> - <td valign="top" width="99%" nowrap="nowrap"> - <div> - <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> - <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> - <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> - <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> - <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> - <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> - </div> - </td> - <td> </td> - </tr> - <#if shippingContactMech_has_next> + <tr><td colspan="3">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr> <tr><td colspan="3"><hr /></td></tr> - </#if> - </#list> - </#if> - </table> -</#list> + <#list shipToPartyShippingContactMechList as shippingContactMech> + <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> + <tr> + <td valign="top" width="1%" nowrap="nowrap"> + <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/> + </td> + <td valign="top" width="99%" nowrap="nowrap"> + <div> + <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> + <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> + <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> + <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> + <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> + <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> + <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> + </div> + </td> + <td> </td> + </tr> + <#if shippingContactMech_has_next> + <tr><td colspan="3"><hr /></td></tr> + </#if> + </#list> + </#if> + </table> + </#list> </td> </tr> </table> + </form> + </#if> - </form> -</#if> - - - - <#-- select a party id to ship to instead --> +<#-- select a party id to ship to instead --> - <br /> - <form method="post" action="setShipping" name="partyshipform"> - <div class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.OrderShipToAnotherParty}</li> - </ul> - <br class="clear" /> - </div> - <div class="screenlet-body"> - <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxbottom'> - <tr><td colspan="4"> </td></tr> - <tr> - <td> </td> - <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td> - <td> </td> - <td valign='middle'> - <div class='tabletext'> - <@htmlTemplate.lookupField value='${thisPartyId!}' formName="partyshipform" name="shipToPartyId" id="shipToPartyId" fieldFormName="LookupPartyName"/> - <input type="submit" class="smallSubmit" value="Continue" /> - </div> - </td> - </tr> - </table> - </div> + <br /> + <form method="post" action="setShipping" name="partyshipform"> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.OrderShipToAnotherParty}</li> + </ul> + <br class="clear" /> </div> - </form> + <div class="screenlet-body"> + <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxbottom'> + <tr><td colspan="4"> </td></tr> + <tr> + <td> </td> + <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td> + <td> </td> + <td valign='middle'> + <div class='tabletext'> + <@htmlTemplate.lookupField value='${thisPartyId!}' formName="partyshipform" name="shipToPartyId" id="shipToPartyId" fieldFormName="LookupPartyName"/> + <input type="submit" class="smallSubmit" value="Continue" /> + </div> + </td> + </tr> + </table> + </div> + </div> + </form> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> -</#if> +</#if> \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderterms.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderterms.ftl?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderterms.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderterms.ftl Mon Sep 22 08:09:27 2014 @@ -29,16 +29,18 @@ under the License. <table class="basic-table" cellspacing='0'> <tr class="header-row"> <td width="35%">${uiLabelMap.OrderOrderTermType}</td> - <td width="15%" align="center">${uiLabelMap.OrderOrderTermValue}</td> - <td width="15%" align="center">${uiLabelMap.OrderOrderTermDays}</td> + <td width="10%" align="center">${uiLabelMap.OrderOrderTermValue}</td> + <td width="10%" align="center">${uiLabelMap.OrderOrderTermDays}</td> + <td width="10%" align="center">${uiLabelMap.OrderOrderTextValue}</td> <td width="35%" align="center">${uiLabelMap.CommonDescription}</td> </tr> <#list orderTerms as orderTerm> <tr> <td width="35%">${orderTerm.getRelatedOne("TermType", false).get("description", locale)}</td> - <td width="15%" align="center">${orderTerm.termValue?default("")}</td> - <td width="15%" align="center">${orderTerm.termDays?default("")}</td> - <td width="35%" align="center">${orderTerm.textValue?default("")}</td> + <td width="10%" align="center">${orderTerm.termValue?default("")}</td> + <td width="10%" align="center">${orderTerm.termDays?default("")}</td> + <td width="10%" align="center">${orderTerm.textValue?default("")}</td> + <td width="35%" align="center">${orderTerm.description?default("")}</td> </tr> </#list> </table> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |