svn commit: r1736868 [9/20] - in /ofbiz/trunk/applications/orde
Locked
svn commit: r1736868 [9/20] - in /ofbiz/trunk/applications/orde
 
|
Added: ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl (added) +++ ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,63 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<#escape x as x?xml> + +<#if shipGroups?? && shipGroups.size() gt 1> + <fo:table table-layout="fixed" border-spacing="3pt" space-before="0.3in" font-size="9pt"> + <fo:table-column column-width="1in"/> + <fo:table-column column-width="1in"/> + <fo:table-column column-width="0.5in"/> + <fo:table-header> + <fo:table-row font-weight="bold"> + <fo:table-cell><fo:block>${uiLabelMap.OrderShipGroup}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${uiLabelMap.OrderProduct}</fo:block></fo:table-cell> + <fo:table-cell text-align="right"><fo:block>${uiLabelMap.OrderQuantity}</fo:block></fo:table-cell> + </fo:table-row> + </fo:table-header> + <fo:table-body> + <#list shipGroups as shipGroup> + <#assign orderItemShipGroupAssocs = shipGroup.getRelated("OrderItemShipGroupAssoc", null, null, false)!> + <#if orderItemShipGroupAssocs?has_content> + <#list orderItemShipGroupAssocs as shipGroupAssoc> + <#assign orderItem = shipGroupAssoc.getRelatedOne("OrderItem", false)!> + <fo:table-row> + <fo:table-cell><fo:block>${shipGroup.shipGroupSeqId}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${orderItem.productId!}</fo:block></fo:table-cell> + <fo:table-cell text-align="right"><fo:block>${shipGroupAssoc.quantity?string.number}</fo:block></fo:table-cell> + </fo:table-row> + </#list> + </#if> + </#list> + </fo:table-body> + </fo:table> +</#if> + + +<fo:block space-after="40pt"/> +<#if orderHeader.getString("orderTypeId") == "SALES_ORDER"> + <fo:block font-size="14pt" font-weight="bold" text-align="center">THANK YOU FOR YOUR PATRONAGE!</fo:block> + <fo:block font-size="8pt"> + <#-- Here is a good place to put policies and return information. --> + </fo:block> +<#elseif orderHeader.getString("orderTypeId") == "PURCHASE_ORDER"> + <fo:block font-size="8pt"> + <#-- Here is a good place to put boilerplate terms and conditions for a purchase order. --> + </fo:block> +</#if> +</#escape> Propchange: ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl (added) +++ ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,118 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<#escape x as x?xml> + +<#if orderHeader.getString("orderTypeId") == "PURCHASE_ORDER"> + <#if supplierGeneralContactMechValueMap??> + <#assign contactMech = supplierGeneralContactMechValueMap.contactMech> + <fo:block font-weight="bold">${uiLabelMap.OrderPurchasedFrom}:</fo:block> + <#assign postalAddress = supplierGeneralContactMechValueMap.postalAddress> + <#if postalAddress?has_content> + <fo:block text-indent="0.2in"> + <#if postalAddress.toName?has_content><fo:block>${postalAddress.toName}</fo:block></#if> + <#if postalAddress.attnName?has_content><fo:block>${postalAddress.attnName!}</fo:block></#if> + <fo:block>${postalAddress.address1!}</fo:block> + <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2!}</fo:block></#if> + <fo:block> + <#assign stateGeo = (delegator.findOne("Geo", {"geoId", postalAddress.stateProvinceGeoId!}, false))! /> + ${postalAddress.city}<#if stateGeo?has_content>, ${stateGeo.geoName!}</#if> ${postalAddress.postalCode!} + </fo:block> + <fo:block> + <#assign countryGeo = (delegator.findOne("Geo", {"geoId", postalAddress.countryGeoId!}, false))! /> + <#if countryGeo?has_content>${countryGeo.geoName!}</#if> + </fo:block> + </fo:block> + </#if> + <#else> + <#-- here we just display the name of the vendor, since there is no address --> + <#assign vendorParty = orderReadHelper.getBillFromParty()> + <fo:block> + <fo:inline font-weight="bold">${uiLabelMap.OrderPurchasedFrom}:</fo:inline> ${Static['org.ofbiz.party.party.PartyHelper'].getPartyName(vendorParty)} + </fo:block> + </#if> +</#if> + +<#-- list all postal addresses of the order. there should be just a billing and a shipping here. --> +<#list orderContactMechValueMaps as orderContactMechValueMap> + <#assign contactMech = orderContactMechValueMap.contactMech> + <#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType> + <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS"> + <#assign postalAddress = orderContactMechValueMap.postalAddress> + <fo:block font-weight="bold">${contactMechPurpose.get("description",locale)}:</fo:block> + <fo:block text-indent="0.2in"> + <#if postalAddress?has_content> + <#if postalAddress.toName?has_content><fo:block>${postalAddress.toName!}</fo:block></#if> + <#if postalAddress.attnName?has_content><fo:block>${postalAddress.attnName!}</fo:block></#if> + <fo:block>${postalAddress.address1!}</fo:block> + <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2!}</fo:block></#if> + <fo:block> + <#assign stateGeo = (delegator.findOne("Geo", {"geoId", postalAddress.stateProvinceGeoId!}, false))! /> + ${postalAddress.city}<#if stateGeo?has_content>, ${stateGeo.geoName!}</#if> ${postalAddress.postalCode!} + </fo:block> + <fo:block> + <#assign countryGeo = (delegator.findOne("Geo", {"geoId", postalAddress.countryGeoId!}, false))! /> + <#if countryGeo?has_content>${countryGeo.geoName!}</#if> + </fo:block> + </#if> + </fo:block> + </#if> +</#list> + +<fo:block space-after="0.2in"/> + +<#if orderPaymentPreferences?has_content> + <fo:block font-weight="bold">${uiLabelMap.AccountingPaymentInformation}:</fo:block> + <#list orderPaymentPreferences as orderPaymentPreference> + <fo:block text-indent="0.2in"> + <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType", false)!> + <#if (orderPaymentPreference?? && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))> + <#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod", false).getRelatedOne("CreditCard", false)> + ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} + <#else> + ${paymentMethodType.get("description",locale)!} + </#if> + </fo:block> + </#list> +</#if> +<#if orderHeader.getString("orderTypeId") == "SALES_ORDER" && shipGroups?has_content> + <fo:block font-weight="bold">${uiLabelMap.OrderShipmentInformation}:</fo:block> + <#list shipGroups as shipGroup> + <fo:block text-indent="0.2in"> + <#if shipGroups.size() gt 1>${shipGroup.shipGroupSeqId} - </#if> + <#if (shipGroup.shipmentMethodTypeId)??> + ${(shipGroup.getRelatedOne("ShipmentMethodType", false).get("description", locale))?default(shipGroup.shipmentMethodTypeId)} + </#if> + <#if (shipGroup.shipAfterDate)?? || (shipGroup.shipByDate)??> + <#if (shipGroup.shipAfterDate)??> - ${uiLabelMap.OrderShipAfterDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(shipGroup.shipAfterDate)}</#if><#if (shipGroup.shipByDate)??> - ${uiLabelMap.OrderShipBeforeDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(shipGroup.shipByDate)}</#if> + </#if> + </fo:block> + </#list> +</#if> + +<#if orderTerms?has_content && orderTerms.size() gt 0> + <fo:block font-weight="bold">${uiLabelMap.OrderOrderTerms}:</fo:block> + <#list orderTerms as orderTerm> + <fo:block text-indent="0.2in"> + ${orderTerm.getRelatedOne("TermType", false).get("description",locale)} ${orderTerm.termValue?default("")} ${orderTerm.termDays?default("")} ${orderTerm.textValue?default("")} + </fo:block> + </#list> +</#if> + +<fo:block space-after="0.2in"/> +</#escape> Propchange: ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl (added) +++ ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,56 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<#escape x as x?xml> + <fo:table table-layout="fixed"> + <fo:table-column column-width="2.0in"/> + <fo:table-column column-width="2.0in"/> + <fo:table-body> + <fo:table-row> + <fo:table-cell> + <fo:block number-columns-spanned="2" font-weight="bold">${orderHeader.getRelatedOne("OrderType", false).get("description",locale)}</fo:block> + </fo:table-cell> + </fo:table-row> + + <fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.OrderDateOrdered}</fo:block></fo:table-cell> + <#assign dateFormat = Static["java.text.DateFormat"].LONG> + <#assign orderDate = Static["java.text.DateFormat"].getDateInstance(dateFormat,locale).format(orderHeader.get("orderDate"))> + <fo:table-cell><fo:block>${orderDate}</fo:block></fo:table-cell> + </fo:table-row> + + <fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${orderId}</fo:block></fo:table-cell> + </fo:table-row> + + <fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.OrderCurrentStatus}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${currentStatus.get("description",locale)}</fo:block></fo:table-cell> + </fo:table-row> + <#if orderItem.cancelBackOrderDate??> + <fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</fo:block></fo:table-cell> + <#assign dateFormat = Static["java.text.DateFormat"].LONG> + <#assign cancelBackOrderDate = Static["java.text.DateFormat"].getDateInstance(dateFormat,locale).format(orderItem.get("cancelBackOrderDate"))> + <fo:table-cell><#if cancelBackOrderDate?has_content><fo:block>${cancelBackOrderDate}</fo:block></#if></fo:table-cell> + </fo:table-row> + </#if> + </fo:table-body> + </fo:table> +</#escape> Propchange: ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl (added) +++ ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,167 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#macro updateOrderContactMech orderHeader contactMechTypeId contactMechList contactMechPurposeTypeId contactMechAddress> + <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))> + <form name="updateOrderContactMech" method="post" action="<@ofbizUrl>updateOrderContactMech</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId!}" /> + <input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurpose.contactMechPurposeTypeId!}" /> + <input type="hidden" name="oldContactMechId" value="${contactMech.contactMechId!}" /> + <select name="contactMechId"> + <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS"> + <option value="${contactMechAddress.contactMechId}">${(contactMechAddress.address1)?default("")} - ${contactMechAddress.city?default("")}</option> + <option value="${contactMechAddress.contactMechId}"></option> + <#list contactMechList as contactMech> + <#assign postalAddress = contactMech.getRelatedOne("PostalAddress", false)! /> + <#assign partyContactPurposes = postalAddress.getRelated("PartyContactMechPurpose", null, null, false)! /> + <#list partyContactPurposes as partyContactPurpose> + <#if contactMech.contactMechId?has_content && partyContactPurpose.contactMechPurposeTypeId == contactMechPurposeTypeId> + <option value="${contactMech.contactMechId!}">${(postalAddress.address1)?default("")} - ${postalAddress.city?default("")}</option> + </#if> + </#list> + </#list> + <#elseif contactMech.contactMechTypeId == "TELECOM_NUMBER"> + <option value="${contactMechAddress.contactMechId}">${contactMechAddress.countryCode!} <#if contactMechAddress.areaCode??>${contactMechAddress.areaCode}-</#if>${contactMechAddress.contactNumber}</option> + <option value="${contactMechAddress.contactMechId}"></option> + <#list contactMechList as contactMech> + <#assign telecomNumber = contactMech.getRelatedOne("TelecomNumber", false)! /> + <#assign partyContactPurposes = telecomNumber.getRelated("PartyContactMechPurpose", null, null, false)! /> + <#list partyContactPurposes as partyContactPurpose> + <#if contactMech.contactMechId?has_content && partyContactPurpose.contactMechPurposeTypeId == contactMechPurposeTypeId> + <option value="${contactMech.contactMechId!}">${telecomNumber.countryCode!} <#if telecomNumber.areaCode??>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber}</option> + </#if> + </#list> + </#list> + <#elseif contactMech.contactMechTypeId == "EMAIL_ADDRESS"> + <option value="${contactMechAddress.contactMechId}">${(contactMechAddress.infoString)?default("")}</option> + <option value="${contactMechAddress.contactMechId}"></option> + <#list contactMechList as contactMech> + <#assign partyContactPurposes = contactMech.getRelated("PartyContactMechPurpose", null, null, false)! /> + <#list partyContactPurposes as partyContactPurpose> + <#if contactMech.contactMechId?has_content && partyContactPurpose.contactMechPurposeTypeId == contactMechPurposeTypeId> + <option value="${contactMech.contactMechId!}">${contactMech.infoString!}</option> + </#if> + </#list> + </#list> + </#if> + </select> + <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit" /> + </form> + </#if> +</#macro> + +<#if displayParty?has_content || orderContactMechValueMaps?has_content> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul><li class="h3"> ${uiLabelMap.OrderContactInformation}</li></ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table class="basic-table" cellspacing='0'> + <tr> + <td align="right" valign="top" width="19%"><span class="label"> ${uiLabelMap.CommonName}</span></td> + <td width="1%"> </td> + <td valign="top" width="80%"> + <div> + <#if displayParty?has_content> + <#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> + ${displayPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} + </#if> + <#if partyId??> + (<a href="${customerDetailLink}${partyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${partyId}</a>) + <br/> + <#if (orderHeader.salesChannelEnumId)?? && orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL"> + <div> + <a href="<@ofbizUrl>/orderentry?partyId=${partyId}&orderTypeId=${orderHeader.orderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewOrder}</a> + <a href="javascript:document.searchOtherOrders.submit()" class="buttontext">${uiLabelMap.OrderOtherOrders}</a> + </div> + <form name="searchOtherOrders" method="post" action="<@ofbizUrl>searchorders</@ofbizUrl>"> + <input type="hidden" name="lookupFlag" value="Y"/> + <input type="hidden" name="hideFields" value="Y"/> + <input type="hidden" name="partyId" value="${partyId}" /> + <input type="hidden" name="viewIndex" value="1"/> + <input type="hidden" name="viewSize" value="20"/> + </form> + </#if> + </#if> + </div> + </td> + </tr> + <#list orderContactMechValueMaps as orderContactMechValueMap> + <#assign contactMech = orderContactMechValueMap.contactMech> + <#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="19%"> + <span class="label"> ${contactMechPurpose.get("description",locale)}</span> + </td> + <td width="1%"> </td> + <td valign="top" width="80%"> + <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS"> + <#assign postalAddress = orderContactMechValueMap.postalAddress> + <#if postalAddress?has_content> + <div> + ${setContextField("postalAddress", postalAddress)} + ${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressHtmlFormatter")} + </div> + <@updateOrderContactMech orderHeader=orderHeader! contactMechTypeId=contactMech.contactMechTypeId contactMechList=postalContactMechList! contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId! contactMechAddress=postalAddress! /> + </#if> + <#elseif contactMech.contactMechTypeId == "TELECOM_NUMBER"> + <#assign telecomNumber = orderContactMechValueMap.telecomNumber> + <div> + ${telecomNumber.countryCode!} + <#if telecomNumber.areaCode??>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber} + <#--<#if partyContactMech.extension??>ext ${partyContactMech.extension}</#if>--> + <#if !telecomNumber.countryCode?? || telecomNumber.countryCode == "011" || telecomNumber.countryCode == "1"> + <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a> + <a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesTelNumberLink}" class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a> + </#if> + </div> + <@updateOrderContactMech orderHeader=orderHeader! contactMechTypeId=contactMech.contactMechTypeId contactMechList=telecomContactMechList! contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId! contactMechAddress=telecomNumber! /> + <#elseif contactMech.contactMechTypeId == "EMAIL_ADDRESS"> + <div> + ${contactMech.infoString} + <#if security.hasEntityPermission("ORDERMGR", "_SEND_CONFIRMATION", session)> + (<a href="<@ofbizUrl>confirmationmailedit?orderId=${orderId}&partyId=${partyId}&sendTo=${contactMech.infoString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSendConfirmationEmail}</a>) + <#else> + <a href="mailto:${contactMech.infoString}" class="buttontext">(${uiLabelMap.OrderSendEmail})</a> + </#if> + </div> + <@updateOrderContactMech orderHeader=orderHeader! contactMechTypeId=contactMech.contactMechTypeId contactMechList=emailContactMechList! contactMechPurposeTypeId=contactMechPurpose.contactMechPurposeTypeId! contactMechAddress=contactMech! /> + <#elseif contactMech.contactMechTypeId == "WEB_ADDRESS"> + <div> + ${contactMech.infoString} + <#assign openString = contactMech.infoString> + <#if !openString?starts_with("http") && !openString?starts_with("HTTP")> + <#assign openString = "http://" + openString> + </#if> + <a target="_blank" href="${openString}" class="buttontext">(open page in new window)</a> + </div> + <#else> + <div> + ${contactMech.infoString!} + </div> + </#if> + </td> + </tr> + </#list> + </table> + </div> +</div> +</#if> Propchange: ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/orderinfo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/order/orderinfo.ftl (added) +++ ofbiz/trunk/applications/order/template/order/orderinfo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,300 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<div class="screenlet order-info"> + <div class="screenlet-title-bar"> + <ul> + <#if orderHeader.externalId?has_content> + <#assign externalOrder = "(" + orderHeader.externalId + ")"/> + </#if> + <#assign orderType = orderHeader.getRelatedOne("OrderType", false)/> + <li class="h3"> ${(orderType.get("description", locale))?default(uiLabelMap.OrderOrder)} ${uiLabelMap.CommonNbr} <a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>">${orderId}</a> ${externalOrder!} [ <a href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" target="_blank">PDF</a> ]</li> + <#if currentStatus.statusId == "ORDER_APPROVED" && orderHeader.orderTypeId == "SALES_ORDER"> + <li class="h3"><a href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a> + <form name="PrintOrderPickSheet" method="post" action="<@ofbizUrl>orderPickSheet.pdf</@ofbizUrl>" target="_BLANK"> + <input type="hidden" name="facilityId" value="${storeFacilityId!}"/> + <input type="hidden" name="orderId" value="${orderHeader.orderId!}"/> + <input type="hidden" name="maxNumberOfOrdersToPrint" value="1"/> + </form> + </li> + </#if> + <#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING"> + <li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a> + <form name="OrderApproveOrder" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>"> + <input type="hidden" name="statusId" value="ORDER_APPROVED"/> + <input type="hidden" name="newStatusId" value="ORDER_APPROVED"/> + <input type="hidden" name="setItemStatus" value="Y"/> + <input type="hidden" name="workEffortId" value="${workEffortId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="partyId" value="${assignPartyId!}"/> + <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/> + <input type="hidden" name="fromDate" value="${fromDate!}"/> + </form> + </li> + <#elseif currentStatus.statusId == "ORDER_APPROVED"> + <li><a href="javascript:document.OrderHold.submit()">${uiLabelMap.OrderHold}</a> + <form name="OrderHold" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>"> + <input type="hidden" name="statusId" value="ORDER_HOLD"/> + <input type="hidden" name="workEffortId" value="${workEffortId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="partyId" value="${assignPartyId!}"/> + <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/> + <input type="hidden" name="fromDate" value="${fromDate!}"/> + </form> + </li> + <#elseif currentStatus.statusId == "ORDER_HOLD"> + <li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a> + <form name="OrderApproveOrder" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>"> + <input type="hidden" name="statusId" value="ORDER_APPROVED"/> + <input type="hidden" name="setItemStatus" value="Y"/> + <input type="hidden" name="workEffortId" value="${workEffortId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="partyId" value="${assignPartyId!}"/> + <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/> + <input type="hidden" name="fromDate" value="${fromDate!}"/> + </form> + </li> + </#if> + <#if currentStatus.statusId != "ORDER_COMPLETED" && currentStatus.statusId != "ORDER_CANCELLED"> + <li><a href="javascript:document.OrderCancel.submit()">${uiLabelMap.OrderCancelOrder}</a> + <form name="OrderCancel" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>"> + <input type="hidden" name="statusId" value="ORDER_CANCELLED"/> + <input type="hidden" name="setItemStatus" value="Y"/> + <input type="hidden" name="workEffortId" value="${workEffortId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="partyId" value="${assignPartyId!}"/> + <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/> + <input type="hidden" name="fromDate" value="${fromDate!}"/> + </form> + </li> + </#if> + <#if setOrderCompleteOption> + <li><a href="javascript:document.OrderCompleteOrder.submit()">${uiLabelMap.OrderCompleteOrder}</a> + <form name="OrderCompleteOrder" method="post" action="<@ofbizUrl>changeOrderStatus</@ofbizUrl>"> + <input type="hidden" name="statusId" value="ORDER_COMPLETED"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + </form> + </li> + </#if> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table class="basic-table" cellspacing='0'> + <#if orderHeader.orderName?has_content> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOrderName}</td> + <td width="5%"> </td> + <td valign="top" width="80%">${orderHeader.orderName}</td> + </tr> + <tr><td colspan="3"><hr /></td></tr> + </#if> + <#-- order status history --> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderStatusHistory}</td> + <td width="5%"> </td> + <td valign="top" width="80%"<#if currentStatus.statusCode?has_content> class="${currentStatus.statusCode}"</#if>> + <span class="current-status">${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)}</span> + <#if orderHeaderStatuses?has_content> + <hr /> + <#list orderHeaderStatuses as orderHeaderStatus> + <#assign loopStatusItem = orderHeaderStatus.getRelatedOne("StatusItem", false)> + <#assign userlogin = orderHeaderStatus.getRelatedOne("UserLogin", false)> + <div> + ${loopStatusItem.get("description",locale)} <#if orderHeaderStatus.statusDatetime?has_content>- ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeaderStatus.statusDatetime, "", locale, timeZone)?default("0000-00-00 00:00:00")}</#if> + + ${uiLabelMap.CommonBy} - <#--${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, userlogin.getString("partyId"), true)}--> [${orderHeaderStatus.statusUserLogin}] + </div> + </#list> + </#if> + </td> + </tr> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDateOrdered}</td> + <td width="5%"> </td> + <td valign="top" width="80%"><#if orderHeader.orderDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeader.orderDate, "", locale, timeZone)!}</#if></td> + </tr> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCurrency}</td> + <td width="5%"> </td> + <td valign="top" width="80%">${orderHeader.currencyUom?default("???")}</td> + </tr> + <#if orderHeader.internalCode?has_content> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderInternalCode}</td> + <td width="5%"> </td> + <td valign="top" width="80%">${orderHeader.internalCode}</td> + </tr> + </#if> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderSalesChannel}</td> + <td width="5%"> </td> + <td valign="top" width="80%"> + <#if orderHeader.salesChannelEnumId?has_content> + <#assign channel = orderHeader.getRelatedOne("SalesChannelEnumeration", false)> + ${(channel.get("description",locale))?default("N/A")} + <#else> + ${uiLabelMap.CommonNA} + </#if> + </td> + </tr> + <tr><td colspan="3"><hr /></td></tr> + <#if productStore?has_content> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderProductStore}</td> + <td width="5%"> </td> + <td valign="top" width="80%"> + ${productStore.storeName!} <a href="/catalog/control/EditProductStore?productStoreId=${productStore.productStoreId}${StringUtil.wrapString(externalKeyParam)}" target="catalogmgr" class="buttontext">(${productStore.productStoreId})</a> + </td> + </tr> + <tr><td colspan="3"><hr /></td></tr> + </#if> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOriginFacility}</td> + <td width="5%"> </td> + <td valign="top" width="80%"> + <#if orderHeader.originFacilityId?has_content> + <a href="/facility/control/EditFacility?facilityId=${orderHeader.originFacilityId}${StringUtil.wrapString(externalKeyParam)}" target="facilitymgr" class="buttontext">${orderHeader.originFacilityId}</a> + <#else> + ${uiLabelMap.CommonNA} + </#if> + </td> + </tr> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCreatedBy}</td> + <td width="5%"> </td> + <td valign="top" width="80%"> + <#if orderHeader.createdBy?has_content> + <a href="/partymgr/control/viewprofile?userlogin_id=${orderHeader.createdBy}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${orderHeader.createdBy}</a> + <#else> + ${uiLabelMap.CommonNotSet} + </#if> + </td> + </tr> + <#if (orderItem.cancelBackOrderDate)??> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</td> + <td width="5%"> </td> + <td valign="top" width="80%"><#if orderItem.cancelBackOrderDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderItem.cancelBackOrderDate, "", locale, timeZone)!}</#if></td> + </tr> + </#if> + <#if distributorId??> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDistributor}</td> + <td width="5%"> </td> + <td valign="top" width="80%"> + <#assign distPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", distributorId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> + ${distPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} + </td> + </tr> + </#if> + <#if affiliateId??> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderAffiliate}</td> + <td width="5%"> </td> + <td valign="top" width="80%"> + <#assign affPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", affiliateId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> + ${affPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} + </div> + </td> + </tr> + </#if> + <#if orderContentWrapper.get("IMAGE_URL", "url")?has_content> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderImage}</td> + <td width="5%"> </td> + <td valign="top" width="80%"> + <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> + </td> + </tr> + </#if> + <#if "SALES_ORDER" == orderHeader.orderTypeId> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_priority}</td> + <td width="5%"> </td> + <td valign="top" width="80%"> + <form name="setOrderReservationPriority" method="post" action="<@ofbizUrl>setOrderReservationPriority</@ofbizUrl>"> + <input type = "hidden" name="orderId" value="${orderId}"/> + <select name="priority"> + <option value="1" <#if (orderHeader.priority)! == "1">selected="selected" </#if>>${uiLabelMap.CommonHigh}</option> + <option value="2" <#if (orderHeader.priority)! == "2">selected="selected" <#elseif !(orderHeader.priority)?has_content>selected="selected"</#if>>${uiLabelMap.CommonNormal}</option> + <option value="3" <#if (orderHeader.priority)! == "3">selected="selected" </#if>>${uiLabelMap.CommonLow}</option> + </select> + <input type="submit" class="smallSubmit" value="${uiLabelMap.FormFieldTitle_reserveInventory}"/> + </form> + </td> + </tr> + </#if> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.AccountingInvoicePerShipment}</td> + <td width="5%"> </td> + <td valign="top" width="80%"> + <form name="setInvoicePerShipment" method="post" action="<@ofbizUrl>setInvoicePerShipment</@ofbizUrl>"> + <input type = "hidden" name="orderId" value="${orderId}"/> + <select name="invoicePerShipment"> + <option value="Y" <#if (orderHeader.invoicePerShipment)! == "Y">selected="selected" </#if>>${uiLabelMap.CommonYes}</option> + <option value="N" <#if (orderHeader.invoicePerShipment)! == "N">selected="selected" </#if>>${uiLabelMap.CommonNo}</option> + </select> + <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}"/> + </form> + </td> + </tr> + <tr><td colspan="3"><hr /></td></tr> + <#if orderHeader.isViewed?has_content && orderHeader.isViewed == "Y"> + <tr> + <td class="label">${uiLabelMap.OrderViewed}</td> + <td width="5%"></td> + <td valign="top" width="80%"> + ${uiLabelMap.CommonYes} + </td> + </tr> + <#else> + <tr id="isViewed"> + <td class="label">${uiLabelMap.OrderMarkViewed}</td> + <td width="5%"></td> + <td valign="top" width="80%"> + <form id="orderViewed" action=""> + <input type="checkbox" name="checkViewed" onclick="javascript:markOrderViewed();"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="isViewed" value="Y"/> + </form> + </td> + </tr> + <tr id="viewed" style="display: none;"> + <td class="label">${uiLabelMap.OrderViewed}</td> + <td width="5%"></td> + <td valign="top" width="80%"> + ${uiLabelMap.CommonYes} + </td> + </tr> + </#if> + </table> + </div> +</div> Propchange: ofbiz/trunk/applications/order/template/order/orderinfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/order/orderinfo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/order/orderinfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |