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:17:58 UTC
svn commit: r1340418 - in /ofbiz/branches/release11.04: ./
applications/order/config/ applications/order/webapp/ordermgr/WEB-INF/
applications/order/webapp/ordermgr/WEB-INF/actions/entry/
applications/order/webapp/ordermgr/entry/ applications/order/wid...
Author: jleroux
Date: Sat May 19 11:17:58 2012
New Revision: 1340418
URL: http://svn.apache.org/viewvc?rev=1340418&view=rev
Log:
"Applied fix from trunk for revision: 1340415 "
------------------------------------------------------------------------
r1340415 | jleroux | 2012-05-19 13:13:38 +0200 (sam., 19 mai 2012) | 8 lines
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/branches/release11.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy
- copied unchanged from r1340415, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy
ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/SplitShip.ftl
- copied unchanged from r1340415, ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl
Removed:
ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/SplitShip.groovy
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/order/config/OrderUiLabels.xml
ofbiz/branches/release11.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/branches/release11.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/OrderScreens.xml
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1340415
Modified: ofbiz/branches/release11.04/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/config/OrderUiLabels.xml?rev=1340418&r1=1340417&r2=1340418&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/release11.04/applications/order/config/OrderUiLabels.xml Sat May 19 11:17:58 2012
@@ -1856,6 +1856,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="en">Associated Products</value>
<value xml:lang="fr">Produits associés</value>
@@ -12749,6 +12765,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>
Modified: ofbiz/branches/release11.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1340418&r1=1340417&r2=1340418&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release11.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat May 19 11:17:58 2012
@@ -1870,6 +1870,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
@@ -2076,5 +2101,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>
Modified: ofbiz/branches/release11.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1340418&r1=1340417&r2=1340418&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/branches/release11.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sat May 19 11:17:58 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/branches/release11.04/specialpurpose/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1340418&r1=1340417&r2=1340418&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/OrderScreens.xml Sat May 19 11:17:58 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}">