Added: ofbiz/trunk/applications/order/template/entry/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/custsettings.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/custsettings.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/custsettings.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,140 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)> + <div class="screenlet-body"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom"> + <form name="checkoutsetupform" method="post" action="<@ofbizUrl>createCustomer</@ofbizUrl>"> + <input type="hidden" name="finalizeMode" value="cust" /> + <input type="hidden" name="finalizeReqNewShipAddress" value="true" /> + <tr> + <td> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <tr> + <td width="26%" align="right"><div>${uiLabelMap.CommonTitle}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" name="personalTitle" value="${requestParameters.personalTitle!}" size="10" maxlength="30"/> + </td> + </tr> + <tr> + <td width="26%" align="right"><div>${uiLabelMap.PartyFirstName}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" name="firstName" value="${requestParameters.firstName!}" size="30" maxlength="30"/> + *</td> + </tr> + <tr> + <td width="26%" align="right"><div>${uiLabelMap.PartyMiddleInitial}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" name="middleName" value="${requestParameters.middleName!}" size="4" maxlength="4"/> + </td> + </tr> + <tr> + <td width="26%" align="right"><div>${uiLabelMap.PartyLastName}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" name="lastName" value="${requestParameters.lastName!}" size="30" maxlength="30"/> + *</td> + </tr> + <tr> + <td width="26%" align="right"><div>${uiLabelMap.PartySuffix}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" name="suffix" value="${requestParameters.suffix!}" size="10" maxlength="30"/> + </td> + </tr> + <tr> + <td colspan="3"> </td> + </tr> + <tr> + <td width="26%" align="right"><div>${uiLabelMap.PartyHomePhone}<br/>${uiLabelMap.OrderAllowSolicitation}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" name="homeCountryCode" value="${requestParameters.homeCountryCode!}" size="4" maxlength="10"/> + - <input type="text" name="homeAreaCode" value="${requestParameters.homeAreaCode!}" size="4" maxlength="10"/>* + - <input type="text" name="homeContactNumber" value="${requestParameters.homeContactNumber!}" size="15" maxlength="15"/>* + ext <input type="text" name="homeExt" value="${requestParameters.homeExt!}" size="6" maxlength="10"/> + <br/> + <select name="homeSol"> + <#if (((requestParameters.homeSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> + <#if (((requestParameters.homeSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> + </select> + </td> + </tr> + <tr> + <td width="26%" align="right"><div>${uiLabelMap.PartyBusinessPhone}<br/>${uiLabelMap.OrderAllowSolicitation}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" name="workCountryCode" value="${requestParameters.CUSTOMER_WORK_COUNTRY!}" size="4" maxlength="10"/> + - <input type="text" name="workAreaCode" value="${requestParameters.CUSTOMER_WORK_AREA!}" size="4" maxlength="10"/> + - <input type="text" name="workContactNumber" value="${requestParameters.CUSTOMER_WORK_CONTACT!}" size="15" maxlength="15"/> + ext <input type="text" name="workExt" value="${requestParameters.CUSTOMER_WORK_EXT!}" size="6" maxlength="10"/> + <br/> + <select name="workSol"> + <#if (((requestParameters.workSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> + <#if (((requestParameters.workSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> + </select> + </td> + </tr> + <tr> + <td colspan="3"> </td> + </tr> + <tr> + <td width="26%" align="right"><div>${uiLabelMap.PartyEmailAddress}<br/>${uiLabelMap.OrderAllowSolicitation}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" name="emailAddress" value="" size="60" maxlength="255" /> + <br/> + <select name="emailSol"> + <#if (((requestParameters.emailSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> + <#if (((requestParameters.emailSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> + </select> + </td> + </tr> + <tr> + <td colspan="3"> </td> + </tr> + <tr> + <td width="26%" align="right"><div>${uiLabelMap.CommonUsername}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" name="userLoginId" value="${requestParameters.USERNAME!}" size="20" maxlength="250"/> + </td> + </tr> + </form> + </table> + </td> + </tr> + </table> + </div> +<br /> +<#else> + <h3>${uiLabelMap.OrderViewPermissionError}</h3> +</#if> Propchange: ofbiz/trunk/applications/order/template/entry/custsettings.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/custsettings.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/custsettings.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,128 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)> + + <div class="screenlet-body"> + <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> + <tr> + <td> + <#if postalAddress?has_content> + <form method="post" action="<@ofbizUrl>updatePostalAddressOrderEntry</@ofbizUrl>" name="checkoutsetupform"> + <input type="hidden" name="contactMechId" value="${shipContactMechId!}"/> + <#else> + <form method="post" action="<@ofbizUrl>createPostalAddress</@ofbizUrl>" name="checkoutsetupform"> + <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"/> + <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> + </#if> + <input type="hidden" name="partyId" value="${cart.getPartyId()?default("_NA_")}"/> + <input type="hidden" name="finalizeMode" value="ship"/> + <#if orderPerson?? && orderPerson?has_content> + <#assign toName = ""> + <#if orderPerson.personalTitle?has_content><#assign toName = orderPerson.personalTitle + " "></#if> + <#assign toName = toName + orderPerson.firstName + " "> + <#if orderPerson.middleName?has_content><#assign toName = toName + orderPerson.middleName + " "></#if> + <#assign toName = toName + orderPerson.lastName> + <#if orderPerson.suffix?has_content><#assign toName = toName + " " + orderPerson.suffix></#if> + <#elseif parameters.toName??> + <#assign toName = parameters.toName> + <#else> + <#assign toName = ""> + </#if> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <tr> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonToName}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="30" maxlength="60" name="toName" value="${toName}"/> + </td> + </tr> + <tr> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAttentionName}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="30" maxlength="60" name="attnName" value="${parameters.attnName!}"/> + </td> + </tr> + <tr> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 1</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="30" maxlength="30" name="address1" value="${parameters.address1!}"/> + *</td> + </tr> + <tr> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 2</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="30" maxlength="30" name="address2" value="${parameters.address2!}"/> + </td> + </tr> + <tr> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCity}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="30" maxlength="30" name="city" value="${parameters.city!}"/> + *</td> + </tr> + <tr> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td> + <td width="5"> </td> + <td width="74%"> + <select name="stateProvinceGeoId"> + <option value=""></option> + ${screens.render("component://common/widget/CommonScreens.xml#states")} + </select> + </td> + </tr> + <tr> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonZipPostalCode}</div></td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="12" maxlength="10" name="postalCode" value="${parameters.postalCode!}"/> + *</td> + </tr> + <tr> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCountry}</div></td> + <td width="5"> </td> + <td width="74%"> + <select name="countryGeoId"> + ${screens.render("component://common/widget/CommonScreens.xml#countries")} + </select> + *</td> + </tr> + <tr> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.OrderAllowSolicitation}</div></td> + <td width="5"> </td> + <td width="74%"> + <select name="allowSolicitation"> + <#assign selectedValue = parameters.allowSolicitation?default("")/> + <option></option><option ${(selectedValue=="Y")?string("selected=\"selected\"","")}>Y</option><option ${(selectedValue=="N")?string("selected=\"selected\"","")}>N</option> + </select> + </td> + </tr> + </table> + </form> + </td> + </tr> + </table> + </div> +<#else> + <h3>${uiLabelMap.OrderViewPermissionError}</h3> +</#if> Propchange: ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/entry/optionsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/optionsettings.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/optionsettings.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/optionsettings.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,220 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)> +<form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="checkoutsetupform"> +<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> +<tr> + <td width='100%'> + <br /> + <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> + <tr> + <td> + <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.OrderInternalNote}</h2> + </td> + <td colspan="2"> + <h2>${uiLabelMap.OrderShippingNotes}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <textarea cols="30" rows="3" name="internal_order_notes"><#if (cart.getInternalOrderNotes().size()>0)>${(cart.getInternalOrderNotes()[0])!}</#if></textarea> + </td> + <td colspan="2"> + <textarea cols="30" rows="3" name="shippingNotes"><#if (cart.getOrderNotes().size()>0)>${(cart.getOrderNotes()[0])!}</#if></textarea> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td> + <input type="hidden" name="finalizeMode" value="options"/> +<#list 1..cart.getShipGroupSize() as currIndex> +<#assign shipGroupIndex = currIndex - 1> + +<#if cart.getShipmentMethodTypeId(shipGroupIndex)?? && cart.getCarrierPartyId(shipGroupIndex)??> + <#assign chosenShippingMethod = cart.getShipmentMethodTypeId(shipGroupIndex) + '@' + cart.getCarrierPartyId(shipGroupIndex)> +</#if> +<#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)!> +<#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", supplierPartyId), false)! /> + + <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> + <tr><td colspan="2"><hr /></td></tr> + <tr> + <td colspan="2"> + <h1><b>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</b><#if supplier?has_content> - ${supplier.groupName?default(supplier.partyId)}</#if></h1> + </td> + </tr> + <#if cart.getOrderType() != "PURCHASE_ORDER"> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.ProductShipmentMethod}</h2> + </td> + </tr> + <#assign shipEstimateWrapper = Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher, cart, 0)> + <#assign carrierShipmentMethods = shipEstimateWrapper.getShippingMethods()> + <#list carrierShipmentMethods as carrierShipmentMethod> + <tr> + <td width='1%' valign="top" > + <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> + <input type='radio' name='${shipGroupIndex?default("0")}_shipping_method' value='${shippingMethod}'<#if shippingMethod == chosenShippingMethod?default("N@A")> checked="checked"</#if> id='${shipGroupIndex?default("0")}_shipping_method_${shippingMethod}' /> + </td> + <td valign="top"> + <label for="${shipGroupIndex?default("0")}_shipping_method_${shippingMethod}"> + <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!} + <#if cart.getShippingContactMechId(shipGroupIndex)??> + <#assign shippingEst = shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)> + <#if shippingEst?has_content> + - + <#if (shippingEst > -1)> + <@ofbizCurrency amount=shippingEst isoCode=cart.getCurrency()/> + <#else> + Calculated Offline + </#if> + </#if> + </#if> + </label> + </td> + </tr> + </#list> + <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0> + <tr> + <td width='1%' valign="top"> + <input type='radio' name='${shipGroupIndex?default("0")}_shipping_method' value="Default" checked="checked" /> + </td> + <td valign="top"> + <div class='tabletext'>${uiLabelMap.FacilityNoOtherShippingMethods}</div> + </td> + </tr> + </#if> + <#else> + <tr> + <td> + <h2>${uiLabelMap.OrderOrderShipEstimate}</h2> + </td> + </tr> + <tr> + <input type='hidden' name='${shipGroupIndex?default("0")}_shipping_method' value="STANDARD@_NA_" /> + <td> + <input type='text' name='${shipGroupIndex?default("0")}_ship_estimate' value="${cart.getItemShipGroupEstimate(shipGroupIndex?default('0'))!}"/> + </td> + </tr> + </#if> + <tr> + <td colspan='2'> + <h2>${uiLabelMap.FacilityShipOnceOrAvailable}</h2> + </td> + </tr> + <tr> + <td valign="top"> + <input type='radio' <#if cart.getMaySplit(shipGroupIndex)?default("N") == "N">checked="checked"</#if> name='${shipGroupIndex?default("0")}_may_split' value='false' /> + </td> + <td valign="top"> + <div>${uiLabelMap.FacilityWaitEntireOrderReady}</div> + </td> + </tr> + <tr> + <td valign="top"> + <input <#if cart.getMaySplit(shipGroupIndex)?default("N") == "Y">checked="checked"</#if> type='radio' name='${shipGroupIndex?default("0")}_may_split' value='true' /> + </td> + <td valign="top"> + <div>${uiLabelMap.FacilityShipAvailable}</div> + </td> + </tr> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.OrderShipBeforeDate}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <div> + <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipBeforeDate" event="" action="" value="${(cart.getShipBeforeDate(shipGroupIndex))!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipBeforeDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + </div> + </td> + </tr> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.OrderShipAfterDate}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <div> + <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipAfterDate" event="" action="" value="${(cart.getShipAfterDate(shipGroupIndex))!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + </div> + </td> + </tr> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.FacilitySpecialInstructions}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <textarea cols="30" rows="3" name="${shipGroupIndex?default("0")}_shipping_instructions">${cart.getShippingInstructions(shipGroupIndex)!}</textarea> + </td> + </tr> + + <#if cart.getOrderType() == 'PURCHASE_ORDER'> + <input type="hidden" name="${shipGroupIndex?default('0')}_is_gift" value="false" /> + <#else> + <#if (productStore.showCheckoutGiftOptions)?default('Y') != 'N'> + <tr> + <td colspan="2"> + <div> + <span class="h2"><b>${uiLabelMap.OrderIsThisGift}</b></span> + <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('Y') == 'Y'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="true" /><span>${uiLabelMap.CommonYes}</span> + <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('N') == 'N'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="false" /><span>${uiLabelMap.CommonNo}</span> + </div> + </td> + </tr> + </#if> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.OrderGiftMessage}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <textarea cols="30" rows="3" name="${shipGroupIndex?default('0')}_gift_message">${cart.getGiftMessage(shipGroupIndex)!}</textarea> + </td> + </tr> + </#if> + + <tr> + <td colspan="2"></td> + </tr> + </table> +</#list> + </td> + </tr> + </table> + </td> + </tr> +</table> +</form> +<br /> +<#else> + <h3>${uiLabelMap.OrderViewPermissionError}</h3> +</#if> Propchange: ofbiz/trunk/applications/order/template/entry/optionsettings.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/optionsettings.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/optionsettings.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,189 @@ +<#-- +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"> + <div class="screenlet-body"> + <table width="100%" border="0" cellpadding="1"> + <#-- order name --> + <#if (orderName?has_content)> + <tr> + <td align="right" valign="top" width="15%"> + <span> <b>${uiLabelMap.OrderOrderName}</b> </span> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + ${orderName} + </td> + </tr> + <tr><td colspan="7"><hr /></td></tr> + </#if> + <#-- order for party --> + <#if (orderForParty??)> + <tr> + <td align="right" valign="top" width="15%"> + <span> <b>${uiLabelMap.OrderOrderFor}</b> </span> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(orderForParty, false)} [${orderForParty.partyId}] + </td> + </tr> + <tr><td colspan="7"><hr /></td></tr> + </#if> + <#if (cart.getPoNumber()?has_content)> + <tr> + <td align="right" valign="top" width="15%"> + <span> <b>${uiLabelMap.OrderPONumber}</b> </span> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + ${cart.getPoNumber()} + </td> + </tr> + <tr><td colspan="7"><hr /></td></tr> + </#if> + <#if orderTerms?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.OrderOrderTerms}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <table> + <tr> + <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="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/> + <#list orderTerms as orderTerm> + <tr> + <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="10%"><div>${orderTerm.textValue?default("")}</div></td> + <td width="35%"><div>${orderTerm.description?default("")}</div></td> + </tr> + <#if orderTerms.size()<index> + <tr><td colspan="5"><hr /></td></tr> + </#if> + <#assign index=index+1/> + </#list> + </table> + </td> + </tr> + <tr><td colspan="7"><hr /></td></tr> + </#if> + <#-- tracking number --> + <#if trackingNumber?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.OrderTrackingNumber}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId --> + <div>${trackingNumber}</div> + </td> + </tr> + <tr><td colspan="7"><hr /></td></tr> + </#if> + <#-- splitting preference --> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.OrderSplittingPreference}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div> + <#if maySplit?default("N") == "N">${uiLabelMap.FacilityWaitEntireOrderReady}</#if> + <#if maySplit?default("Y") == "Y">${uiLabelMap.FacilityShipAvailable}</#if> + </div> + </td> + </tr> + <#-- shipping instructions --> + <#if shippingInstructions?has_content> + <tr><td colspan="7"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.OrderSpecialInstructions}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div>${shippingInstructions}</div> + </td> + </tr> + </#if> + <tr><td colspan="7"><hr /></td></tr> + <#if orderType != "PURCHASE_ORDER" && (productStore.showCheckoutGiftOptions)! != "N"> + <#-- gift settings --> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.OrderGift}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div> + <#if isGift?default("N") == "N">${uiLabelMap.OrderThisOrderNotGift}</#if> + <#if isGift?default("N") == "Y">${uiLabelMap.OrderThisOrderGift}</#if> + </div> + </td> + </tr> + <tr><td colspan="7"><hr /></td></tr> + <#if giftMessage?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.OrderGiftMessage}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div>${giftMessage}</div> + </td> + </tr> + <tr><td colspan="7"><hr /></td></tr> + </#if> + </#if> + <#if shipAfterDate?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.OrderShipAfterDate}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div>${shipAfterDate}</div> + </td> + </tr> + </#if> + <#if shipBeforeDate?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.OrderShipBeforeDate}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div>${shipBeforeDate}</div> + </td> + </tr> + </#if> + </table> + </div> +</div> Propchange: ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,159 @@ +<#-- +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"> + <div class="screenlet-title-bar"> + <div class="boxlink"> + <#if maySelectItems?default(false)> + <a href="javascript:document.addOrderToCartForm.add_all.value="true";document.addOrderToCartForm.submit()" class="lightbuttontext">${uiLabelMap.OrderAddAllToCart}</a> + <a href="javascript:document.addOrderToCartForm.add_all.value="false";document.addOrderToCartForm.submit()" class="lightbuttontext">${uiLabelMap.OrderAddCheckedToCart}</a> + </#if> + </div> + <div class="h3">${uiLabelMap.OrderOrderItems}</div> + </div> + <div class="screenlet-body"> + <table width="100%" border="0" cellpadding="0"> + <tr valign="bottom"> + <td width="65%"><span><b>${uiLabelMap.ProductProduct}</b></span></td> + <td width="5%" align="right"><span><b>${uiLabelMap.OrderQuantity}</b></span></td> + <td width="10%" align="right"><span><b>${uiLabelMap.CommonUnitPrice}</b></span></td> + <td width="10%" align="right"><span><b>${uiLabelMap.OrderAdjustments}</b></span></td> + <td width="10%" align="right"><span><b>${uiLabelMap.OrderSubTotal}</b></span></td> + </tr> + <#list orderItems! as orderItem> + <#assign itemType = orderItem.getRelatedOne("OrderItemType", false)!> + <tr><td colspan="6"><hr /></td></tr> + <tr> + <#if orderItem.productId?? && orderItem.productId == "_?_"> + <td colspan="1" valign="top"> + <b><div> >> ${orderItem.itemDescription}</div></b> + </td> + <#else> + <td valign="top"> + <div> + <#if orderItem.productId??> + <a href="<@ofbizUrl>product?product_id=${orderItem.productId}</@ofbizUrl>" class="buttontext">${orderItem.productId} - ${orderItem.itemDescription}</a> + <#else> + <b>${(itemType.description)!}</b> : ${orderItem.itemDescription!} + </#if> + </div> + + </td> + <td align="right" valign="top"> + <div nowrap="nowrap">${orderItem.quantity?string.number}</div> + </td> + <td align="right" valign="top"> + <div nowrap="nowrap"><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/></div> + </td> + <td align="right" valign="top"> + <div nowrap="nowrap"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentsTotal(orderItem) isoCode=currencyUomId/></div> + </td> + <td align="right" valign="top" nowrap="nowrap"> + <div><@ofbizCurrency amount=localOrderReadHelper.getOrderItemSubTotal(orderItem) isoCode=currencyUomId/></div> + </td> + <#if maySelectItems?default(false)> + <td> + <input name="item_id" value="${orderItem.orderItemSeqId}" type="checkbox" /> + </td> + </#if> + </#if> + </tr> + <#-- show info from workeffort if it was a rental item --> + <#if orderItem.orderItemTypeId?? && orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM"> + <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)!> + <#if WorkOrderItemFulfillments?has_content> + <#list WorkOrderItemFulfillments as WorkOrderItemFulfillment> + <#assign workEffort = WorkOrderItemFulfillment.getRelatedOne("WorkEffort", true)!> + <tr><td> </td><td> </td><td colspan="8"><div>${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNbrPersons}: ${workEffort.reservPersons}</div></td></tr> + <#break><#-- need only the first one --> + </#list> + </#if> + </#if> + + <#-- now show adjustment details per line item --> + <#assign itemAdjustments = localOrderReadHelper.getOrderItemAdjustments(orderItem)> + <#list itemAdjustments as orderItemAdjustment> + <tr> + <td align="right"> + <div style="font-size: xx-small;"> + <b><i>${uiLabelMap.OrderAdjustment}</i>:</b> <b>${localOrderReadHelper.getAdjustmentType(orderItemAdjustment)}</b> + <#if orderItemAdjustment.description?has_content>: ${StringUtil.wrapString(orderItemAdjustment.get("description",locale))}</#if> + + <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> + <#if orderItemAdjustment.primaryGeoId?has_content> + <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/> + <#if primaryGeo.geoName?has_content> + <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation!}] + </#if> + <#if orderItemAdjustment.secondaryGeoId?has_content> + <#assign secondaryGeo = orderItemAdjustment.getRelatedOne("SecondaryGeo", true)/> + (<b>in:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation!}]) + </#if> + </#if> + <#if orderItemAdjustment.sourcePercentage??><b>${uiLabelMap.OrderRate}:</b> ${orderItemAdjustment.sourcePercentage}%</#if> + <#if orderItemAdjustment.customerReferenceId?has_content><b>${uiLabelMap.OrderCustomerTaxId}:</b> ${orderItemAdjustment.customerReferenceId}</#if> + <#if orderItemAdjustment.exemptAmount??><b>${uiLabelMap.OrderExemptAmount}:</b> ${orderItemAdjustment.exemptAmount}</#if> + </#if> + </div> + </td> + <td> </td> + <td> </td> + <td align="right"> + <div style="font-size: xx-small;"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentTotal(orderItem, orderItemAdjustment) isoCode=currencyUomId/></div> + </td> + <td> </td> + <td> </td> + <#if maySelectItems?default(false)><td> </td></#if> + </tr> + </#list> + </#list> + <#if !orderItems?has_content> + <tr><td><font color="red">${uiLabelMap.checkhelpertotalsdonotmatchordertotal}</font></td></tr> + </#if> + + <tr><td colspan="8"><hr /></td></tr> + <tr> + <td align="right" colspan="4"><div><b>${uiLabelMap.OrderSubTotal}</b></div></td> + <td align="right" nowrap="nowrap"><div> <#if orderSubTotal??><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></#if></div></td> + </tr> + <#list headerAdjustmentsToShow! as orderHeaderAdjustment> + <tr> + <td align="right" colspan="4"><div><b>${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)}</b></div></td> + <td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/></div></td> + </tr> + </#list> + <tr> + <td align="right" colspan="4"><div><b>${uiLabelMap.FacilityShippingAndHandling}</b></div></td> + <td align="right" nowrap="nowrap"><div><#if orderShippingTotal??><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></#if></div></td> + </tr> + <tr> + <td align="right" colspan="4"><div><b>${uiLabelMap.OrderSalesTax}</b></div></td> + <td align="right" nowrap="nowrap"><div><#if orderTaxTotal??><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></#if></div></td> + </tr> + + <tr><td colspan=2></td><td colspan="8"><hr /></td></tr> + <tr> + <td align="right" colspan="4"><div><b>${uiLabelMap.OrderGrandTotal}</b></div></td> + <td align="right" nowrap="nowrap"> + <div><#if orderGrandTotal??><@ofbizCurrency amount=orderGrandTotal isoCode=currencyUomId/></#if></div> + </td> + </tr> + </table> + </div> +</div> Propchange: ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,116 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#if paymentMethod?has_content || paymentMethodType?has_content || billingAccount?has_content> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <div class="h3">${uiLabelMap.AccountingPaymentInformation}</div> + </div> + <div class="screenlet-body"> + <#-- order payment info --> + <table width="100%" border="0" cellpadding="1"> + <#-- offline payment address infomation :: change this to use Company's address --> + <#if !paymentMethod?has_content && paymentMethodType?has_content> + <tr> + <#if paymentMethodType.paymentMethodTypeId == "EXT_OFFLINE"> + <td colspan="3" valign="top"> + <div align="center"><b>${uiLabelMap.AccountingOfflinePayment}</b></div> + <#if orderHeader?has_content && paymentAddress?has_content> + <div align="center"><hr /></div> + <div align="center"><b>${uiLabelMap.AccountingPleaseSendPaymentTo}:</b></div> + <#if paymentAddress.toName?has_content><div align="center">${paymentAddress.toName}</div></#if> + <#if paymentAddress.attnName?has_content><div align="center"><b>${uiLabelMap.CommonAttn}:</b> ${paymentAddress.attnName}</div></#if> + <div align="center">${paymentAddress.address1}</div> + <#if paymentAddress.address2?has_content><div align="center">${paymentAddress.address2}</div></#if> + <div align="center">${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId}</#if> ${paymentAddress.postalCode} + <div align="center">${paymentAddress.countryGeoId}</div> + <div align="center"><hr /></div> + <div align="center"><b>${uiLabelMap.OrderBeSureIncludeOrder} ${uiLabelMap.CommonNbr}</b></div> + </#if> + </td> + <#else> + <#assign outputted = true> + <td colspan="3" valign="top"> + <div align="center"><b>${uiLabelMap.AccountingPaymentVia} ${paymentMethodType.get("description",locale)}</b></div> + </td> + </#if> + </tr> + </#if> + <#if paymentMethod?has_content> + <#assign outputted = true> + <#-- credit card info --> + <#if creditCard?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.AccountingCreditCard}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div> + <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}<br /></#if> + <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> + ${creditCard.firstNameOnCard} + <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if> + ${creditCard.lastNameOnCard} + <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if> + <br /> + ${formattedCardNumber} + </div> + </td> + </tr> + <#-- EFT account info --> + <#elseif eftAccount?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.AccountingEFTAccount}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div> + ${eftAccount.nameOnAccount}<br /> + <#if eftAccount.companyNameOnAccount?has_content>${eftAccount.companyNameOnAccount}<br /></#if> + Bank: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br /> + Account #: ${eftAccount.accountNumber} + </div> + </td> + </tr> + </#if> + </#if> + <#-- billing account info --> + <#if billingAccount?has_content> + <#if outputted?default(false)> + <tr><td colspan="3"><hr /></td></tr> + </#if> + <#assign outputted = true/> + <tr> + <td align="right" valign="top" width="15%"> + <div> <b>${uiLabelMap.AccountingBillingAccount}</b></div> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div> + #${billingAccount.billingAccountId!} - ${billingAccount.description!} + </div> + </td> + </tr> + </#if> + </table> + </div> +</div> +</#if> Propchange: ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,121 @@ +<#-- +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. +--> + +<#-- +Ship group summary for order confirmation. Lists each ship group, its +destination address, products and quantities associated with it, +and similar information. This is designed to be tacked on to the +standard order confirmation page and to be re-usable by other screens. +--> + +<#if !(cart??)><#assign cart = shoppingCart!/></#if> + +<#if cart??> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <div class="h3">${uiLabelMap.OrderShippingInformation}</div> + </div> + <div class="screenlet-body"> + <table width="100%"> + + <#-- header --> + + <tr> + <td><span>${uiLabelMap.OrderDestination}</span></td> + <td><span>${uiLabelMap.PartySupplier}</span></td> + <td><span>${uiLabelMap.ProductShipmentMethod}</span></td> + <td><span>${uiLabelMap.ProductItem}</span></td> + <td><span>${uiLabelMap.ProductQuantity}</span></td> + </tr> + + + <#-- BEGIN LIST SHIP GROUPS --> + <#-- + The structure of this table is one row per line item, grouped by ship group. + The address column spans a number of rows equal to the number of items of its group. + --> + + <#list cart.getShipGroups() as cartShipInfo> + <#assign numberOfItems = cartShipInfo.getShipItems().size()> + <#if (numberOfItems > 0)> + + <#-- spacer goes here --> + <tr><td colspan="5"><hr /></td></tr> + + <tr> + + <#-- address destination column (spans a number of rows = number of cart items in it) --> + + <td rowspan="${numberOfItems}"> + <#assign contactMech = delegator.findOne("ContactMech", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", cartShipInfo.contactMechId), false)! /> + <#if contactMech?has_content> + <#assign address = contactMech.getRelatedOne("PostalAddress", false)! /> + </#if> + + <#if address??> + <#if address.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${address.toName}<br /></#if> + <#if address.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${address.attnName}<br /></#if> + <#if address.address1?has_content>${address.address1}<br /></#if> + <#if address.address2?has_content>${address.address2}<br /></#if> + <#if address.city?has_content>${address.city}</#if> + <#if address.stateProvinceGeoId?has_content> ${address.stateProvinceGeoId}</#if> + <#if address.postalCode?has_content>, ${address.postalCode!}</#if> + </#if> + </td> + + <#-- supplier id (for drop shipments) (also spans rows = number of items) --> + + <td rowspan="${numberOfItems}" valign="top"> + <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getSupplierPartyId()), false)! /> + <#if supplier?has_content>${supplier.groupName?default(supplier.partyId)}</#if> + </td> + + <#-- carrier column (also spans rows = number of items) --> + + <td rowspan="${numberOfItems}" valign="top"> + <#assign carrier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getCarrierPartyId()), false)! /> + <#assign method = delegator.findOne("ShipmentMethodType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentMethodTypeId", cartShipInfo.getShipmentMethodTypeId()), false)! /> + <#if carrier?has_content>${carrier.groupName?default(carrier.partyId)}</#if> + <#if method?has_content>${method.description?default(method.shipmentMethodTypeId)}</#if> + </td> + + <#-- list each ShoppingCartItem in this group --> + + <#assign itemIndex = 0 /> + <#list cartShipInfo.getShipItems() as shoppingCartItem> + <#if (itemIndex > 0)> <tr> </#if> + + <td valign="top"> ${shoppingCartItem.getProductId()?default("")} - ${shoppingCartItem.getName()?default("")} </td> + <td valign="top"> ${cartShipInfo.getShipItemInfo(shoppingCartItem).getItemQuantity()?default("0")} </td> + + <#if (itemIndex == 0)> </tr> </#if> + <#assign itemIndex = itemIndex + 1 /> + </#list> + + </tr> + + </#if> + </#list> + + <#-- END LIST SHIP GROUPS --> + + </table> + </div> +</div> +</#if> Propchange: ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,83 @@ +<#-- +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. +--> + +<#assign shoppingCart = sessionAttributes.shoppingCart!> +<#assign currencyUomId = shoppingCart.getCurrency()> +<#assign partyId = shoppingCart.getPartyId()> +<#assign partyMap = Static["org.ofbiz.party.party.PartyWorker"].getPartyOtherValues(request, partyId, "party", "person", "partyGroup")> +<#assign agreementId = shoppingCart.getAgreementId()!> +<#assign quoteId = shoppingCart.getQuoteId()!> + +<#if shoppingCart?has_content> + <#assign shoppingCartSize = shoppingCart.size()> +<#else> + <#assign shoppingCartSize = 0> +</#if> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.OrderOrderHeaderInfo}</h3> + </div> + <div class="screenlet-body"> + <form method="post" action="setOrderName" name="setCartOrderNameForm"> + <fieldset> + <label for="orderName"><strong>${uiLabelMap.OrderOrderName}</strong>:</label> + <input type="text" id="orderName" name="orderName" size="12" maxlength="200" value="${shoppingCart.getOrderName()?default("")}" /> + <input type="submit" value="${uiLabelMap.CommonSet}" /> + </fieldset> + </form> + <p> + <strong>${uiLabelMap.Party}</strong>: + <a href="${customerDetailLink}${partyId}${externalKeyParam!}" target="partymgr" class="buttontext">${partyId}</a> + <#if partyMap.person??> + ${partyMap.person.firstName!} ${partyMap.person.lastName!} + </#if> + <#if partyMap.partyGroup??> + ${partyMap.partyGroup.groupName!} + </#if> + </p> + <#if shoppingCart.getOrderType() != "PURCHASE_ORDER"> + <form method="post" action="setPoNumber" name="setCartPoNumberForm"> + <fieldset> + <label for="correspondingPoId"><strong>${uiLabelMap.OrderPONumber}</strong>:</label> + <input type="text" id="correspondingPoId" name="correspondingPoId" size="12" value="${shoppingCart.getPoNumber()?default("")}" /> + <input type="submit" value="${uiLabelMap.CommonSet}" /> + </fieldset> + </form> + </#if> + <p> + <strong>${uiLabelMap.CommonCurrency}</strong>: + ${currencyUomId} + </p> + <#if agreementId?has_content> + <p> + <strong>${uiLabelMap.AccountingAgreement}</strong>: + ${agreementId} + </p> + </#if> + <#if quoteId?has_content> + <p> + <strong>${uiLabelMap.OrderOrderQuote}</strong>: + ${quoteId} + </p> + </#if> + <p><strong>${uiLabelMap.CommonTotal}</strong>: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></p> + </div> +</div> +<br /> Propchange: ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,53 @@ +<#-- +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. +--> + +<#assign shoppingCart = sessionAttributes.shoppingCart!> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <div class="h3">${uiLabelMap.OrderOrderShortcuts}</div> + </div> + <div class="screenlet-body"> + <ul> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> + <li><a href="<@ofbizUrl>RequirementsForSupplier</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderRequirements}</a></li> + </#if> + <#if shoppingCart.getOrderType()?has_content && shoppingCart.items()?has_content> + <li><a href="<@ofbizUrl>createQuoteFromCart?destroyCart=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateQuoteFromCart}</a></li> + <li><a href="<@ofbizUrl>FindQuoteForCart</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOrderQuotes}</a></li> + </#if> + <#if shoppingCart.getOrderType() == "SALES_ORDER"> + <li><a href="<@ofbizUrl>createCustRequestFromCart?destroyCart=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateCustRequestFromCart}</a></li> + </#if> + <li><a href="/partymgr/control/findparty?${externalKeyParam!}" class="buttontext">${uiLabelMap.PartyFindParty}</a></li> + <#if shoppingCart.getOrderType() == "SALES_ORDER"> + <li><a href="<@ofbizUrl>setCustomer</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyCreateNewCustomer}</a></li> + </#if> + <li><a href="<@ofbizUrl>checkinits</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyChangeParty}</a></li> + <#if security.hasEntityPermission("CATALOG", "_CREATE", session)> + <li><a href="/catalog/control/EditProduct?${externalKeyParam!}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></li> + </#if> + <li><a href="<@ofbizUrl>quickadd</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickAdd}</a></li> + <#if shoppingLists??> + <li><a href="<@ofbizUrl>viewPartyShoppingLists?partyId=${partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleShoppingList}</a></li> + </#if> + </ul> + </div> +</div> +<br /> Propchange: ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/entry/orderagreements.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/orderagreements.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/orderagreements.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/orderagreements.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,214 @@ +<#-- +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. +--> + + +<form method="post" name="agreementForm" action="<@ofbizUrl>setOrderCurrencyAgreementShipDates</@ofbizUrl>"> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.OrderOrderEntryCurrencyAgreementShipDates}</li> + <li><a href="javascript:document.agreementForm.submit()">${uiLabelMap.CommonContinue}</a></li> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> + <table> + + <#if agreements??> + <tr><td colspan="4"> <input type='hidden' name='hasAgreements' value='Y'/></td></tr> + + <tr> + <td> </td> + <td align='right' valign='top' nowrap="nowrap"> + <div class='tableheadtext'> + ${uiLabelMap.OrderSelectAgreement} + </div> + </td> + <td> </td> + <td valign='middle'> + <div class='tabletext' valign='top'> + <select name="agreementId"> + <option value="">${uiLabelMap.CommonNone}</option> + <#list agreements as agreement> + <option value='${agreement.agreementId}' >${agreement.agreementId} - ${agreement.description!}</option> + </#list> + </select> + </div> + </td> + </tr> + <#else> + <tr><td colspan="4"> <input type='hidden' name='hasAgreements' value='N'/></td></tr> + </#if> + <#if agreementRoles??> + <tr> + <td> </td> + <td align='right' valign='top' nowrap="nowrap"> + <div class='tableheadtext'> + ${uiLabelMap.OrderSelectAgreementRoles} + </div> + </td> + <td> </td> + <td valign='middle'> + <div class='tabletext'> + <select name="agreementId"> + <option value="">${uiLabelMap.CommonNone}</option> + <#list agreementRoles as agreementRole> + <option value='${agreementRole.agreementId!}' >${agreementRole.agreementId!} - ${agreementRole.roleTypeId!}</option> + </#list> + </select> + </div> + </td> + </tr> + </#if> + + <#if "PURCHASE_ORDER" == cart.getOrderType()> + <tr> + <td> </td> + <td align='right' valign='middle' class='tableheadtext'> + ${uiLabelMap.OrderOrderId} + </td> + <td> </td> + <td align='left'> + <input type='text' size='15' maxlength='100' name='orderId' value=""/> + </td> + </tr> + </#if> + + <tr> + <td> </td> + <td align='right' valign='middle' class='tableheadtext' nowrap="nowrap"> + ${uiLabelMap.OrderOrderName} + </td> + <td> </td> + <td align='left'> + <input type='text' size='60' maxlength='100' name='orderName'/> + </td> + </tr> + + <#if cart.getOrderType() != "PURCHASE_ORDER"> + <tr> + <td> </td> + <td align='right' valign='middle' class='tableheadtext' nowrap="nowrap"> + ${uiLabelMap.OrderPONumber} + </td> + <td> </td> + <td align='left'> + <input type="text" class='inputBox' name="correspondingPoId" size="15" /> + </td> + </tr> + </#if> + + <tr> + <td> </td> + <td align='right' valign='middle' nowrap="nowrap"> + <div class='tableheadtext'> + <#if agreements??>${uiLabelMap.OrderSelectCurrencyOr} + <#else>${uiLabelMap.OrderSelectCurrency} + </#if> + </div> + </td> + <td> </td> + <td valign='middle'> + <div class='tabletext'> + <select name="currencyUomId"> + <option value=""></option> + <#list currencies as currency> + <option value="${currency.uomId}" <#if currencyUomId?default('') == currency.uomId>selected="selected"</#if> >${currency.uomId}</option> + </#list> + </select> + </div> + </td> + </tr> + + <tr> + <td> </td> + <td align="right"> + ${uiLabelMap.ProductChooseCatalog} + </td> + <td> </td> + <td> + <#if catalogCol?has_content> + <select name='CURRENT_CATALOG_ID'> + <#list catalogCol! as catalogId> + <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)> + <option value="${catalogId}" <#if currentCatalogId?default('') == catalogId>selected="selected"</#if> >${thisCatalogName}</option> + </#list> + </select> + <#else> + <input type="hidden" name='CURRENT_CATALOG_ID' value=""/> + </#if> + </td> + </tr> + + <tr> + <td> </td> + <td align="right"> + ${uiLabelMap.WorkEffortWorkEffortId} + </td> + <td> </td> + <td> + <@htmlTemplate.lookupField formName="agreementForm" name="workEffortId" id="workEffortId" fieldFormName="LookupWorkEffort"/> + </td> + </tr> + + <tr> + <td> </td> + <td align='right' valign='top' nowrap="nowrap"> + <div class='tableheadtext'> + ${uiLabelMap.OrderShipAfterDateDefault} + </div> + </td> + <td> </td> + <td> + <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + </td> + </tr> + + <tr> + <td> </td> + <td align='right' valign='top' nowrap="nowrap"> + <div class='tableheadtext'> + ${uiLabelMap.OrderShipBeforeDateDefault} + </div> + </td> + <td> </td> + <td> + <@htmlTemplate.renderDateTimeField name="shipBeforeDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipBeforeDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + </td> + </tr> + + <#if cart.getOrderType() == "PURCHASE_ORDER"> + <tr> + <td> </td> + <td align='right' valign='top'> + <div class='tableheadtext'> + ${uiLabelMap.FormFieldTitle_cancelBackOrderDate} + </div> + </td> + <td> </td> + <td> + <@htmlTemplate.renderDateTimeField name="cancelBackOrderDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="cancelBackOrderDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + </td> + </tr> + </#if> + + </table> + </div> +</div> +</form> Propchange: ofbiz/trunk/applications/order/template/entry/orderagreements.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/orderagreements.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/orderagreements.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/entry/orderparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/orderparty.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/entry/orderparty.ftl (added) +++ ofbiz/trunk/applications/order/template/entry/orderparty.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,57 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)> +<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> + <tr> + <td width='100%'> + <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'> + <tr> + <td valign="middle" align="center"> + <div class="boxhead"> ${uiLabelMap.PartyParty}</div> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td width='100%'> + <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> + <tr> + <td align="center"> + <#if person?has_content> + <div><a href="${customerDetailLink}${partyId}" class="buttontext">${person.firstName!} ${person.lastName!}</a></div> + <#elseif partyGroup?has_content> + <div class='tabletext'><a href="${customerDetailLink}${partyId}" class="buttontext">${partyGroup.groupName!}</a></div> + </#if> + <form method="post" action="<@ofbizUrl>orderentry</@ofbizUrl>" name="setpartyform"> + <div><input type="text" name="partyId" size='10' value="${partyId!}" /></div> + <div> + <a href="javascript:document.setpartyform.submit();" class="buttontext">${uiLabelMap.CommonSet}</a> | <a href="/partymgr/control/findparty" class="buttontext">${uiLabelMap.CommonFind}</a><#if partyId?default("_NA_") != "_NA_" && partyId?default("_NA_") != ""> | <a href="${customerDetailLink}${partyId}" class="buttontext">${uiLabelMap.CommonView}</a></#if> + </div> + </form> + </td> + </tr> + </table> + </td> + </tr> +</table> +<#else> + <h3>${uiLabelMap.OrderViewPermissionError}</h3> +</#if> Propchange: ofbiz/trunk/applications/order/template/entry/orderparty.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/entry/orderparty.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/entry/orderparty.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain |
Free forum by Nabble | Edit this page |