OFBiz › OFBiz - Commits

svn commit: r1340419 - in /ofbiz/branches/release10.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...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1340419 - in /ofbiz/branches/release10.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...

jleroux@apache.org
Author: jleroux
Date: Sat May 19 11:18:40 2012
New Revision: 1340419

URL: http://svn.apache.org/viewvc?rev=1340419&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/release10.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/release10.04/applications/order/webapp/ordermgr/entry/SplitShip.ftl
      - copied unchanged from r1340415, ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl
Removed:
    ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/SplitShip.groovy
Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/config/OrderUiLabels.xml
    ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
    ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/OrderScreens.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1340415

Modified: ofbiz/branches/release10.04/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/config/OrderUiLabels.xml?rev=1340419&r1=1340418&r2=1340419&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/release10.04/applications/order/config/OrderUiLabels.xml Sat May 19 11:18:40 2012
@@ -1714,6 +1714,22 @@
         <value xml:lang="th">ปรับปรุงคำร้องสินค้า</value>
         <value xml:lang="zh">已批准的产品需求</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="pt_BR">Produtos relacionado</value>
@@ -11630,6 +11646,23 @@
         <value xml:lang="th">แสดงรายละเอียดของโปรโมชั่น</value>
         <value xml:lang="zh">显示促销详细信息</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/release10.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1340419&r1=1340418&r2=1340419&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat May 19 11:18:40 2012
@@ -1722,6 +1722,31 @@ under the License.
     </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
@@ -1915,5 +1940,7 @@ under the License.
 
     <view-map name="SendConfirmationMail" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#SendOrderConfirmation"/>
     <view-map name="ReturnHistory" type="screen" page="component://order/widget/ordermgr/OrderReturnScreens.xml#OrderReturnHistory"/>
+
+    <view-map name="splitship" type="screen" page="component://order/widget/ordermgr/OrderEntryOrderScreens.xml#splitship"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1340419&r1=1340418&r2=1340419&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sat May 19 11:18:40 2012
@@ -308,4 +308,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/release10.04/specialpurpose/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1340419&r1=1340418&r2=1340419&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/OrderScreens.xml Sat May 19 11:18:40 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}">


Free forum by Nabble Edit this page