You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2012/05/19 13:13:39 UTC
svn commit: r1340415 - in /ofbiz/trunk: applications/order/config/
applications/order/webapp/ordermgr/WEB-INF/
applications/order/webapp/ordermgr/WEB-INF/actions/entry/
applications/order/webapp/ordermgr/entry/
applications/order/widget/ordermgr/ speci...
Author: jleroux
Date: Sat May 19 11:13:38 2012
New Revision: 1340415
URL: http://svn.apache.org/viewvc?rev=1340415&view=rev
Log:
A patch from Ankit Jain "Split Into Multiple Shipment Button is not working in Order Manager quick checkout" https://issues.apache.org/jira/browse/OFBIZ-4866
Split Into Multiple Shipment Button is not working on quick checkout page
jleroux: part the current known issue with Freemarker and findByAnd(), it works well on both sides (Order Manager and eCommerce)
Added:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy (with props)
ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl (with props)
Removed:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/SplitShip.groovy
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1340415&r1=1340414&r2=1340415&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sat May 19 11:13:38 2012
@@ -1879,6 +1879,22 @@
<value xml:lang="zh">å·²æ¹åç产åéæ±</value>
<value xml:lang="zh_TW">å·²æ¹åçç¢åéæ±</value>
</property>
+ <property key="OrderAssignItems">
+ <value xml:lang="da">Tildel emne</value>
+ <value xml:lang="en">Assign Items</value>
+ <value xml:lang="es">Asignar Ãtems</value>
+ <value xml:lang="fr">Affecter les articles</value>
+ <value xml:lang="it">Assegna articoli</value>
+ <value xml:lang="ja">Assign Items</value>
+ <value xml:lang="nl">Wijs items toe</value>
+ <value xml:lang="pt_BR">Atribuir itens</value>
+ <value xml:lang="ro">Atribuie Linii</value>
+ <value xml:lang="ru">ÐазнаÑиÑÑ Ð¿Ð¾Ð·Ð¸ÑиÑ</value>
+ <value xml:lang="th">à¸à¸³à¸«à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£</value>
+ <value xml:lang="vi">Các mục Äược nhượng lại</value>
+ <value xml:lang="zh">åé
æç»</value>
+ <value xml:lang="zh_TW">åé
æç´°</value>
+ </property>
<property key="OrderAssociatedProducts">
<value xml:lang="de">Authentifizierungsservice</value>
<value xml:lang="en">Associated Products</value>
@@ -13093,6 +13109,23 @@
<value xml:lang="zh">æ¾ç¤ºä¿é详ç»ä¿¡æ¯</value>
<value xml:lang="zh_TW">顯示ä¿é·è©³ç´°è³è¨</value>
</property>
+ <property key="PageTitleSplitItemsForShipping">
+ <value xml:lang="da">Opdel varer til forsendelse</value>
+ <value xml:lang="de">Positionen aufteilen für Versand</value>
+ <value xml:lang="en">Split Items For Shipping</value>
+ <value xml:lang="es">Dividir ArtÃculos para envÃo</value>
+ <value xml:lang="fr">Dissocier les articles lors de l'expédition</value>
+ <value xml:lang="it">Dividi gli articoli per spedizioni</value>
+ <value xml:lang="ja">Split Items For Shipping</value>
+ <value xml:lang="nl">Splits items op voor verzending</value>
+ <value xml:lang="pt_BR">Dividir itens em grupos para o envio</value>
+ <value xml:lang="ro">Divide linii pe expedieri </value>
+ <value xml:lang="ru">РазделиÑÑ Ð¿Ð¾Ð·Ð¸Ñии Ð´Ð»Ñ Ð´Ð¾ÑÑавки</value>
+ <value xml:lang="th">à¹à¸¢à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¸·à¹à¸à¸à¸²à¸£à¸à¸à¸ªà¹à¸</value>
+ <value xml:lang="vi">Phân chia danh mục sản phẩm Äá» váºn chuyá»n</value>
+ <value xml:lang="zh">为éè´§åææç»</value>
+ <value xml:lang="zh_TW">çºé貨åææç´°</value>
+ </property>
<property key="PageTitleViewRequest">
<value xml:lang="de">Anfrage anzeigen</value>
<value xml:lang="en">View Request</value>
Added: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy?rev=1340415&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy (added)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy Sat May 19 11:13:38 2012
@@ -0,0 +1,32 @@
+/*
+* 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.
+*/
+
+import org.ofbiz.party.contact.ContactHelper;
+import org.ofbiz.product.store.ProductStoreWorker;
+
+shoppingCart = session.getAttribute("shoppingCart");
+partyId = shoppingCart.getPartyId();
+party = delegator.findOne("Party", [partyId : partyId], true);
+productStoreId = ProductStoreWorker.getProductStoreId(request);
+
+context.cart = shoppingCart;
+context.shippingContactMechList = ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false);
+
+profiledefs = delegator.findOne("PartyProfileDefault", [partyId : partyId, productStoreId : productStoreId], true);
+context.profileDefs = profiledefs;
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1340415&r1=1340414&r2=1340415&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat May 19 11:13:38 2012
@@ -1904,6 +1904,31 @@ under the License.
<security auth="true" https="true"/>
<response name="success" type="view" value="EditQuoteTermItem" save-last-view="true"/>
</request-map>
+
+ <!-- Split Shipment Requests -->
+ <request-map uri="splitship">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="splitship"/>
+ </request-map>
+ <request-map uri="updatesplit">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="assignItemShipGroup"/>
+ <response name="success" type="view" value="splitship"/>
+ <response name="error" type="view" value="splitship"/>
+ </request-map>
+ <request-map uri="updateShippingAddress">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="setCartShippingAddress"/>
+ <response name="success" type="view" value="splitship"/>
+ <response name="error" type="request" value="splitship"/>
+ </request-map>
+ <request-map uri="updateShippingOptions">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="setCartShippingOptions"/>
+ <response name="success" type="view" value="splitship"/>
+ <response name="error" type="request" value="splitship"/>
+ </request-map>
+
<!--
These are just examples of reports developed using JasperReport and not really
useful reports. In order to run them you'll have to follow the notes in the
@@ -2113,5 +2138,7 @@ under the License.
<view-map name="EditQuoteTerm" type="screen" page="component://order/widget/ordermgr/QuoteScreens.xml#EditQuoteTerm"/>
<view-map name="EditQuoteTermItem" type="screen" page="component://order/widget/ordermgr/QuoteScreens.xml#EditQuoteTermItem"/>
<view-map name="ListQuoteTerms" type="screen" page="component://order/widget/ordermgr/QuoteScreens.xml#ListQuoteTerms"/>
+
+ <view-map name="splitship" type="screen" page="component://order/widget/ordermgr/OrderEntryOrderScreens.xml#splitship"/>
<!-- end of view mappings -->
</site-conf>
Added: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl?rev=1340415&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl (added)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl Sat May 19 11:13:38 2012
@@ -0,0 +1,263 @@
+<#--
+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.
+-->
+
+<script language="javascript" type="text/javascript">
+//<![CDATA[
+function submitForm(form, mode, value) {
+ if (mode == "DN") {
+ // done action; payment info
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "CS") {
+ // continue shopping
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "NA") {
+ // new address
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "SV") {
+ // save option; return to current screen
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ } else if (mode == "SA") {
+ // selected shipping address
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
+ }
+}
+//]]>
+</script>
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderItemGroups}</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" cellspacing="0" cellpadding="1" border="0">
+ <#assign shipGroups = cart.getShipGroups()>
+ <#if (shipGroups.size() > 0)>
+ <#assign groupIdx = 0>
+ <#list shipGroups as group>
+ <#assign shipEstimateWrapper = Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher, cart, groupIdx)>
+ <#assign carrierShipmentMethods = shipEstimateWrapper.getShippingMethods()>
+ <#assign groupNumber = groupIdx + 1>
+ <form method="post" action="#" name="editgroupform${groupIdx}" style="margin: 0;">
+ <input type="hidden" name="groupIndex" value="${groupIdx}"/>
+ <tr>
+ <td>
+ <div class="tabletext"><b>${uiLabelMap.CommonGroup} ${groupNumber}:</b></div>
+ <#list group.getShipItems() as item>
+ <#assign groupItem = group.getShipItemInfo(item)>
+ <div class="tabletext"> ${item.getName()} - (${groupItem.getItemQuantity()})</div>
+ </#list>
+ </td>
+ <td>
+ <div>
+ <span class='tabletext'>${uiLabelMap.CommonAdd}:</span>
+ <a href="javascript:submitForm(document.editgroupform${groupIdx}, 'NA', '');" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
+ </div>
+ <div>
+ <#assign selectedContactMechId = cart.getShippingContactMechId(groupIdx)?default("")>
+ <select name="shippingContactMechId" class="selectBox" onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA', null);">
+ <option value="">${uiLabelMap.OrderSelectShippingAddress}</option>
+ <#list shippingContactMechList as shippingContactMech>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
+ <option value="${shippingAddress.contactMechId}" <#if (shippingAddress.contactMechId == selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
+ </#list>
+ </select>
+ </div>
+ <#if cart.getShipmentMethodTypeId(groupIdx)?exists>
+ <#assign selectedShippingMethod = cart.getShipmentMethodTypeId(groupIdx) + "@" + cart.getCarrierPartyId(groupIdx)>
+ <#else>
+ <#assign selectedShippingMethod = "">
+ </#if>
+ <select name="shipmentMethodString" class="selectBox">
+ <option value="">${uiLabelMap.OrderSelectShippingMethod}</option>
+ <#list carrierShipmentMethods as carrierShipmentMethod>
+ <#assign shippingEst = shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
+ <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
+ <option value="${shippingMethod}" <#if (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
+ <#if carrierShipmentMethod.partyId != "_NA_">
+ ${carrierShipmentMethod.partyId?if_exists}
+ </#if>
+ ${carrierShipmentMethod.description?if_exists}
+ <#if shippingEst?has_content>
+ -
+ <#if (shippingEst > -1)>
+ <@ofbizCurrency amount=shippingEst isoCode=cart.getCurrency()/>
+ <#else>
+ ${uiLabelMap.OrderCalculatedOffline}
+ </#if>
+ </#if>
+ </option>
+ </#list>
+ </select>
+
+ <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
+ <textarea class='textAreaBox' cols="35" rows="3" wrap="hard" name="shippingInstructions">${cart.getShippingInstructions(groupIdx)?if_exists}</textarea>
+ </td>
+ <td>
+ <div>
+ <select name="maySplit" class="selectBox">
+ <#assign maySplitStr = cart.getMaySplit(groupIdx)?default("")>
+ <option value="">${uiLabelMap.OrderSplittingPreference}</option>
+ <option value="false" <#if maySplitStr == "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
+ <option value="true" <#if maySplitStr == "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
+ </select>
+ </div>
+ <div>
+ <select name="isGift" class="selectBox">
+ <#assign isGiftStr = cart.getIsGift(groupIdx)?default("")>
+ <option value="">${uiLabelMap.OrderIsGift} ?</option>
+ <option value="false" <#if isGiftStr == "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
+ <option value="true" <#if isGiftStr == "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
+ </select>
+ </div>
+
+ <h2>${uiLabelMap.OrderGiftMessage}</h2>
+ <textarea class='textAreaBox' cols="30" rows="3" wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)?if_exists}</textarea>
+ </td>
+ <td><input type="button" class="smallSubmit" value="${uiLabelMap.CommonSave}" onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV', null);"/></td>
+ </tr>
+ <#assign groupIdx = groupIdx + 1>
+ <#if group_has_next>
+ <tr>
+ <td colspan="6"><hr /></td>
+ </tr>
+ </#if>
+ </form>
+ </#list>
+ <#else>
+ <div class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div>
+ </#if>
+ </table>
+ </div>
+</div>
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderAssignItems}</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" cellspacing="0" cellpadding="1" border="0">
+ <tr>
+ <td><div class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
+ <td align="center"><div class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td>
+ <td> </td>
+ <td align="center"><div class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td>
+ <td> </td>
+ <td> </td>
+ </tr>
+
+ <#list cart.items() as cartLine>
+ <#assign cartLineIndex = cart.getItemIndex(cartLine)>
+ <tr>
+ <form method="post" action="<@o...@ofbizUrl>" name="editgroupform" style="margin: 0;">
+ <input type="hidden" name="itemIndex" value="${cartLineIndex}"/>
+ <td>
+ <div class="tabletext">
+ <#if cartLine.getProductId()?exists>
+ <#-- product item -->
+ <#-- start code to display a small image of the product -->
+ <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
+ <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
+ <#if smallImageUrl?string?has_content>
+ <a href="<@o...@ofbizUrl>">
+ <img src="<@o...@ofbizContentUrl>" class="cssImgSmall" alt="" />
+ </a>
+ </#if>
+ <#-- end code to display a small image of the product -->
+ <a href="<@o...@ofbizUrl>" class="buttontext">${cartLine.getProductId()} -
+ ${cartLine.getName()?if_exists}</a> : ${cartLine.getDescription()?if_exists}
+
+ <#-- display the registered ship groups and quantity -->
+ <#assign itemShipGroups = cart.getShipGroups(cartLine)>
+ <#list itemShipGroups.entrySet() as group>
+ <div class="tabletext">
+ <#assign groupNumber = group.getKey() + 1>
+ <b>Group - </b>${groupNumber} / <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()}
+ </div>
+ </#list>
+
+ <#-- if inventory is not required check to see if it is out of stock and needs to have a message shown about that... -->
+ <#assign itemProduct = cartLine.getProduct()>
+ <#assign isStoreInventoryNotRequiredAndNotAvailable = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request, itemProduct, cartLine.getQuantity(), false, false)>
+ <#if isStoreInventoryNotRequiredAndNotAvailable && itemProduct.inventoryMessage?has_content>
+ <b>(${itemProduct.inventoryMessage})</b>
+ </#if>
+
+ <#else>
+ <#-- this is a non-product item -->
+ <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists}
+ </#if>
+ </div>
+
+ </td>
+ <td align="right">
+ <div class="tabletext">${cartLine.getQuantity()?string.number} </div>
+ </td>
+ <td>
+ <div> </div>
+ </td>
+ <td align="center">
+ <input size="6" class="inputBox" type="text" name="quantity" value="${cartLine.getQuantity()?string.number}"/>
+ </td>
+ <td>
+ <div> </div>
+ </td>
+ <td>
+ <div class="tabletext">${uiLabelMap.CommonFrom}:
+ <select name="fromGroupIndex" class="selectBox">
+ <#list itemShipGroups.entrySet() as group>
+ <#assign groupNumber = group.getKey() + 1>
+ <option value="${group.getKey()}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ <td>
+ <div class="tabletext">${uiLabelMap.CommonTo}:
+ <select name="toGroupIndex" class="selectBox">
+ <#list 0..(cart.getShipGroupSize() - 1) as groupIdx>
+ <#assign groupNumber = groupIdx + 1>
+ <option value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
+ </#list>
+ <option value="-1">${uiLabelMap.CommonNew} ${uiLabelMap.CommonGroup}</option>
+ </select>
+ </div>
+ </td>
+ <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonSubmit}"/></td>
+ </form>
+ </tr>
+ </#list>
+ </table>
+ </div>
+</div>
+
+<table>
+ <tr valign="top">
+ <td>
+ <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
+ </td>
+ <td align="right">
+ <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.CommonContinue}</a>
+ </td>
+ </tr>
+</table>
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1340415&r1=1340414&r2=1340415&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sat May 19 11:13:38 2012
@@ -318,4 +318,19 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="splitship">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleSplitItemsForShipping"/>
+ <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/SplitShip.ftl"/></html></platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1340415&r1=1340414&r2=1340415&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml Sat May 19 11:13:38 2012
@@ -311,7 +311,7 @@ under the License.
<section>
<actions>
<set field="titleProperty" value="PageTitleSplitItemsForShipping"/>
- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/SplitShip.groovy"/>
+ <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">