You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2006/10/04 08:47:24 UTC
svn commit: r452766 [2/2] - in /incubator/ofbiz/trunk/applications:
ecommerce/webapp/ecommerce/WEB-INF/ ecommerce/webapp/ecommerce/order/
ecommerce/widget/ order/webapp/ordermgr/WEB-INF/
order/webapp/ordermgr/entry/cart/ order/webapp/ordermgr/entry/ord...
Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?view=auto&rev=452766
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (added)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Oct 3 23:47:22 2006
@@ -0,0 +1,366 @@
+<#--
+
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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 shipGroups?has_content>
+<#list shipGroups as shipGroup>
+ <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType")?if_exists>
+ <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists>
+ <div class="screenlet">
+ <div class="screenlet-header">
+ <div class="boxhead"> ${uiLabelMap.OrderShipmentInformation} - ${shipGroup.shipGroupSeqId}</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <form name="updateOrderItemShipGroup" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="orderId" value="${orderId?if_exists}">
+ <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId?if_exists}">
+ <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION">
+ <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}">
+ <#if shipGroup.contactMechId?has_content>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderAddress}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">
+ <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
+ <select name="contactMechId" class="selectBox">
+ <option value="${shipGroup.contactMechId?if_exists}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option>
+ <option value="${shipGroup.contactMechId?if_exists}"></option>
+ <#list shippingContactMechList as shippingContactMech>
+ <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress")?if_exists>
+ <#if shippingContactMech.contactMechId?has_content>
+ <option value="${shippingContactMech.contactMechId?if_exists}">${(shippingPostalAddress.address1)?default("")} - ${shippingPostalAddress.city?default("")}</option>
+ </#if>
+ </#list>
+ </select>
+ <#else>
+ ${(shipGroupAddress.address1)?default("")}
+ </#if>
+ </div>
+ </td>
+ </tr>
+ </#if>
+
+ <#if shipGroup.shipmentMethodTypeId?has_content>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.CommonMethod}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <#if shipGroup.carrierPartyId?has_content || shipmentMethodType?has_content>
+ <div class="tabletext">
+ <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
+ <#-- passing the shipmentMethod value as the combination of two fields value
+ i.e shipmentMethodTypeId & carrierPartyId and this two field values are separated bye
+ "@" symbol.
+ -->
+ <select name="shipmentMethod" class="selectBox">
+ <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId?if_exists}"><#if shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId?if_exists}</#if> ${shipmentMethodType.get("description",locale)?default("")}</option>
+ <#list productStoreShipmentMethList as productStoreShipmentMethod>
+ <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId>
+ <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content>
+ <option value="${shipmentMethodTypeAndParty?if_exists}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId?if_exists}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option>
+ </#if>
+ </#list>
+ </select>
+ <#else>
+ <#if shipGroup.carrierPartyId != "_NA_">
+ ${shipGroup.carrierPartyId?if_exists}
+ </#if>
+ ${shipmentMethodType.get("description",locale)?default("")}
+ </#if>
+ </div>
+ </#if>
+ </td>
+ </tr>
+ </#if>
+ <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> </div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
+ </div>
+ </td>
+ </tr>
+ </#if>
+ </form>
+ <#if !shipGroup.contactMechId?has_content && !shipGroup.shipmentMethodTypeId?has_content>
+ <#assign noShipment = "true">
+ <tr>
+ <td colspan="3" align="center">
+ <div class="tableheadtext">${uiLabelMap.OrderNotShipped}</div>
+ </td>
+ </tr>
+ </#if>
+
+ <#if shipGroup.supplierPartyId?has_content>
+ <#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shipGroup.supplierPartyId))?if_exists />
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext"><#if supplier?has_content> - ${supplier.description?default(shipGroup.supplierPartyId)}</#if></div>
+ </td>
+ </tr>
+ </#if>
+
+ <#-- tracking number -->
+ <#if shipGroup.trackingNumber?has_content || orderShipmentInfoSummaryList?has_content>
+ <tr><td colspan="7"><hr class='sepbar'></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderTrackingNumber}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId -->
+ <#if shipGroup.trackingNumber?has_content>
+ <div class="tabletext">${shipGroup.trackingNumber}</div>
+ </#if>
+ <#if orderShipmentInfoSummaryList?has_content>
+ <#list orderShipmentInfoSummaryList as orderShipmentInfoSummary>
+ <#if orderShipmentInfoSummary.shipGroupSeqId?if_exists == shipGroup.shipGroupSeqId?if_exists>
+ <div class="tabletext">
+ <#if (orderShipmentInfoSummaryList?size > 1)>${orderShipmentInfoSummary.shipmentPackageSeqId}: </#if>
+ ${uiLabelMap.CommonIdCode}: ${orderShipmentInfoSummary.trackingCode?default("[${uiLabelMap.OrderNotYetKnown}]")}
+ <#if orderShipmentInfoSummary.boxNumber?has_content> ${uiLabelMap.ProductBox} #${orderShipmentInfoSummary.boxNumber}</#if>
+ <#if orderShipmentInfoSummary.carrierPartyId?has_content>((${uiLabelMap.ProductCarrier}: ${orderShipmentInfoSummary.carrierPartyId})</#if>
+ </div>
+ </#if>
+ </#list>
+ </#if>
+ </td>
+ </tr>
+ </#if>
+ <#if shipGroup.maySplit?has_content && noShipment?default("false") != "true">
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderSplittingPreference}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">
+ <#if shipGroup.maySplit?upper_case == "N">
+ ${uiLabelMap.FacilityWaitEntireOrderReady}
+ <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
+ <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderAllowSplit}</a></#if>
+ </#if>
+ <#else>
+ ${uiLabelMap.FacilityShipAvailable}
+ </#if>
+ </div>
+ </td>
+ </tr>
+ </#if>
+ <#if shipGroup.shippingInstructions?has_content>
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.CommonInstructions}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">${shipGroup.shippingInstructions}</div>
+ </td>
+ </tr>
+ </#if>
+ <#if shipGroup.isGift?has_content && noShipment?default("false") != "true">
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderGift}?</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">
+ <#if shipGroup.isGift?upper_case == "N">${uiLabelMap.OrderThisOrderNotGift}<#else>${uiLabelMap.OrderThisOrderGift}</#if>
+ </div>
+ </td>
+ </tr>
+ </#if>
+ <#if shipGroup.giftMessage?has_content>
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderGiftMessage}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">${shipGroup.giftMessage}</div>
+ </td>
+ </tr>
+ </#if>
+ <#if shipGroup.shipAfterDate?has_content>
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderShipAfterDate}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">${shipGroup.shipAfterDate}</div>
+ </td>
+ </tr>
+ </#if>
+ <#if shipGroup.shipByDate?has_content>
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderShipBeforeDate}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">${shipGroup.shipByDate}</div>
+ </td>
+ </tr>
+ </#if>
+ <#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment")>
+ <#if shipGroupShipments?has_content>
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.FacilityShipments}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <#list shipGroupShipments as shipment>
+ <div class="tabletext">${uiLabelMap.OrderNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a> <a href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a></div>
+ </#list>
+ </td>
+ </tr>
+ </#if>
+
+ <#-- shipment actions -->
+ <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && ((orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))>
+
+ <#-- Special shipment options -->
+ <#if security.hasEntityPermission("FACILITY", "_CREATE", session)>
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <#if orderHeader.orderTypeId == "PURCHASE_ORDER"><b>${uiLabelMap.ProductDestinationFacility}</b></#if></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">
+ <#if orderHeader.orderTypeId == "SALES_ORDER">
+ <#if !shipGroup.supplierPartyId?has_content>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickShipEntireOrder}</a>
+ </#if>
+ <#else> <#-- PURCHASE_ORDER -->
+ <#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)>
+ <#if facilities?has_content>
+ <form action="/facility/control/quickShipPurchaseOrder" method="POST">
+ <input type="hidden" name="initialSelected" value="Y"/>
+ <input type="hidden" name="orderId" value="${orderId}"/>
+ <#-- destination form (/facility/control/ReceiveInventory) wants purchaseOrderId instead of orderId, so we set it here as a workaround -->
+ <input type="hidden" name="purchaseOrderId" value="${orderId}"/>
+ <select name="facilityId" class="selectBox">
+ <#list facilities as facility>
+ <option value="${facility.facilityId}">${facility.facilityName}</option>
+ </#list>
+ </select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderQuickReceivePurchaseOrder}">
+ </form>
+ </#if>
+ </#if>
+ </div>
+ </td>
+ </tr>
+ </#if>
+
+ <#-- Manual shipment options -->
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> </div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+
+ <#if orderHeader.orderTypeId == "SALES_ORDER">
+ <#if !shipGroup.supplierPartyId?has_content>
+ <div class="tabletext"><a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div>
+ <div class="tabletext"><a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&statusId=SHIPMENT_INPUT&originFacilityId=${storeFacilityId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div>
+ </#if>
+ <#else>
+ <div class="tabletext">
+ <#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)>
+ <#if facilities?has_content>
+ <form action="/facility/control/createShipment" method="GET">
+ <input type="hidden" name="primaryOrderId" value="${orderId}"/>
+ <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
+ <input type="hidden" name="shipmentTypeId" value="PURCHASE_SHIPMENT"/>
+ <input type="hidden" name="statusId" value="PURCH_SHIP_CREATED"/>
+ <input type="hidden" name="externalLoginKey" value="${externalLoginKey}"/>
+ <select name="destinationFacilityId" class="selectBox">
+ <#list facilities as facility>
+ <option value="${facility.facilityId}">${facility.facilityName}</option>
+ </#list>
+ </select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]">
+ </div>
+ </form>
+ <#else>
+ <div class="tabletext"><a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&shipmentTypeId=DROP_SHIPMENT&statusId=PURCH_SHIP_CREATED&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div>
+ </#if>
+ </div>
+ </#if>
+ </td>
+ </tr>
+
+ </#if>
+
+ <#-- Refunds/Returns for Sales Orders and Delivery Schedules -->
+ <#if !shipGroup_has_next>
+ <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext">
+
+ </div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
+ <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED">
+ <div class="tabletext"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewEditDeliveryScheduleInfo}</a></div>
+ </#if>
+ <#if security.hasEntityPermission("ORDERMGR", "_RETURN", session) && orderHeader.statusId == "ORDER_COMPLETED">
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></div>
+ </#if>
+ </#if>
+ </td>
+ </tr>
+ </#if>
+ </table>
+ </div>
+</div>
+</#list>
+</#if>
Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl?view=auto&rev=452766
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl (added)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl Tue Oct 3 23:47:22 2006
@@ -0,0 +1,42 @@
+<#--
+
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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 orderTerms?has_content>
+<div class="screenlet">
+ <div class="screenlet-header">
+ <div class="boxhead"> ${uiLabelMap.OrderOrderTerms}</div>
+ </div>
+ <div class="screenlet-body">
+ <table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+ <td width="60%" align="left"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermType}</b></div></td>
+ <td width="20%" align="center"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermValue}</b></div></td>
+ <td width="20%" align="center"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermDays}</b></div></td>
+ </tr>
+ <tr><td colspan="3"><hr class='sepbar'></td></tr>
+ <#list orderTerms as orderTerm>
+ <tr>
+ <td width="60%" align="left"><div class="tabletext">${orderTerm.getRelatedOne("TermType").get("description", locale)}</div></td>
+ <td width="20%" align="center"><div class="tabletext">${orderTerm.termValue?default("")}</div></td>
+ <td width="20%" align="center"><div class="tabletext">${orderTerm.termDays?default("")}</div></td>
+ </tr>
+ <tr><td colspan="3"> </td></tr>
+ </#list>
+ </table>
+ </div>
+</div>
+</#if>
Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?view=diff&rev=452766&r1=452765&r2=452766
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Tue Oct 3 23:47:22 2006
@@ -281,7 +281,7 @@
<field name="facilityId"><display/></field>
<field name="partyId"><display/></field>
<field name="requiredByDate"><display/></field>
- <field name="quantity"><display/></field>
+ <field name="quantity" widget-area-style="tabletextright"><display/></field>
</form>
<form name="ApprovedProductRequirements" type="multi" use-row-submit="true" target="quickPurchaseOrderEntry" title="" list-name="requirementsForSupplier"
paginate-target="RequirementsForSupplier" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
Modified: incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?view=diff&rev=452766&r1=452765&r2=452766
==============================================================================
--- incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml Tue Oct 3 23:47:22 2006
@@ -135,10 +135,25 @@
<widgets>
<decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/showPromotionDetails.ftl"/></html></platform-specific>
+ <include-screen name="promotion"/>
</decorator-section>
</decorator-screen>
</widgets>
+ </section>
+ </screen>
+ <screen name="promotion">
+ <section>
+ <condition>
+ <not><if-empty field-name="productPromo"/></not>
+ </condition>
+ <widgets>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promotiondetails.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promotioncategories.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promotionproducts.ftl"/></html></platform-specific>
+ </widgets>
+ <fail-widgets>
+ <label text="${uiLabelMap.EcommerceErrorNoPromotionFoundWithID} [${productPromoId?if_exists}]" style="head2"/>
+ </fail-widgets>
</section>
</screen>
<screen name="LookupBulkAddProducts">
Modified: incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?view=diff&rev=452766&r1=452765&r2=452766
==============================================================================
--- incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Tue Oct 3 23:47:22 2006
@@ -241,19 +241,22 @@
<actions>
<set field="stepTitleId" value="OrderOrderConfirmation"/>
<set field="stepLabelId" value="OrderReviewOrder"/>
-
+
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/checkoutreview.bsh"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderCheckoutDecorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/entry/order/orderheader.ftl"/></html>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/entry/order/orderheaderinfo.ftl"/></html>
</platform-specific>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl"/></html>
- </platform-specific>
- <platform-specific>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl"/></html>
+ </platform-specific>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl"/></html>
+ </platform-specific>
+ <platform-specific>
<html><html-template location="component://order/webapp/ordermgr/entry/order/orderitems.ftl"/></html>
</platform-specific>
</decorator-section>
Modified: incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?view=diff&rev=452766&r1=452765&r2=452766
==============================================================================
--- incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Tue Oct 3 23:47:22 2006
@@ -42,12 +42,12 @@
<widgets>
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/orderheader.ftl"/></html>
- </platform-specific>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/orderitems.ftl"/></html>
- </platform-specific>
+ <include-screen name="orderHeader"/>
+ <container style="leftclear">
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/order/orderitems.ftl"/></html>
+ </platform-specific>
+ </container>
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/order/ordernotes.ftl"/></html>
</platform-specific>
@@ -59,6 +59,72 @@
</widgets>
</section>
</screen>
+ <screen name="orderHeader">
+ <section>
+ <condition>
+ <not><if-empty field-name="orderHeader"/></not>
+ </condition>
+ <widgets>
+ <container style="lefthalf">
+ <include-screen name="orderinfo"/>
+ <include-screen name="orderterms"/>
+ <include-screen name="orderpaymentinfo"/>
+ </container>
+ <container style="righthalf">
+ <include-screen name="ordercontactinfo"/>
+ <include-screen name="ordershippinginfo"/>
+ </container>
+ </widgets>
+ <fail-widgets>
+ <label style="head2" text="${uiLabelMap.OrderNoOrderFound} ${uiLabelMap.CommonWith} ${uiLabelMap.CommonId}: [${orderId?if_exists}]"></label>
+ </fail-widgets>
+ </section>
+ </screen>
+ <screen name="orderinfo">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/order/orderinfo.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="orderterms">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/order/orderterms.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="orderpaymentinfo">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/order/orderpaymentinfo.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ordercontactinfo">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/order/ordercontactinfo.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ordershippinginfo">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/order/ordershippinginfo.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
<screen name="OrderHeaderListView">
<section>
<actions>
@@ -87,12 +153,12 @@
<widgets>
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/orderheader.ftl"/></html>
- </platform-specific>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/editorderitems.ftl"/></html>
- </platform-specific>
+ <include-screen name="orderHeader"/>
+ <container style="leftclear">
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/order/editorderitems.ftl"/></html>
+ </platform-specific>
+ </container>
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/order/appendorderitem.ftl"/></html>
</platform-specific>
@@ -139,7 +205,7 @@
</screen>
<screen name="OrderDeliveryScheduleInfo">
<section>
- <actions>
+ <actions>
<set field="titleProperty" value="OrderViewEditDeliveryScheduleInfo"/>
<set field="headerItem" value="findorders"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>