svn commit: r1746290 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml script/org/ofbiz/order/quote/QuoteServices.xml webapp/ordermgr/WEB-INF/controller.xml widget/ordermgr/QuoteForms.xml

Author: jleroux
Date: Tue May 31 15:27:56 2016
New Revision: 1746290

URL: http://svn.apache.org/viewvc?rev=1746290&view=rev
Log:
An enhanced patch from Yashwant Dhakad based on Pierre Smits's for "Creating a QuoteRole doesn't return to overview of QuoteRoles" https://issues.apache.org/jira/browse/OFBIZ-6026

Currently, when adding a QuoteRole to a Quote the user stays in the screen associated with 'EditQuoteRole'. Thus the user has no confirmation that the QuoteRole is added successfully. It is better to show the overviews of the quote roles.

Yashwant Dhakad werified the patch and found that success message not shown on the screen, so updated the patch and now shown the success message when added role successfully.

jleroux: I moved the party field line to have the lookup show. Note: in case of error the message is still awful, not a big deal

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1746290&r1=1746289&r2=1746290&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Tue May 31 15:27:56 2016
@@ -8177,6 +8177,9 @@
         <value xml:lang="zh-CN">价格成本</value>
         <value xml:lang="zh-TW">成本到價格</value>
     </property>
+    <property key="OrderOrderQuoteCreatedSuccessfully">
+        <value xml:lang="en">Quote Created Successfully</value>
+    </property>
     <property key="OrderOrderQuoteDefaultUnitPrice">
         <value xml:lang="ar">سعر الوحدة الإفتراضي</value>
         <value xml:lang="de">Standard Stückpreis</value>
@@ -8754,6 +8757,9 @@
         <value xml:lang="zh">询价报告</value>
         <value xml:lang="zh-TW">報價報表</value>
     </property>
+    <property key="OrderOrderQuoteRoleAddedSuccessfully">
+        <value xml:lang="en">Quote Role Added Successfully.</value>
+    </property>
     <property key="OrderOrderQuoteRoles">
         <value xml:lang="ar">أدوار عرض السعر</value>
         <value xml:lang="de">Angebotsrolle</value>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=1746290&r1=1746289&r2=1746290&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Tue May 31 15:27:56 2016
@@ -143,8 +143,9 @@ under the License.
             <set from-field="newEntity.quoteId" field="takerMap.quoteId"/>
             <set from-field="userLogin.partyId" field="takerMap.partyId"/>
             <set value="REQ_TAKER" field="takerMap.roleTypeId"/>
-            <call-service service-name="createQuoteRole" in-map-name="takerMap"/>
+            <call-service service-name="createQuoteRole" in-map-name="takerMap" />
         </if-compare-field>
+        <property-to-field resource="OrderUiLabels" property="OrderOrderQuoteCreatedSuccessfully" field="successMessage"/>
         
         <!-- Set ProductStore's payToPartyId as internal organisation for quote -->
         <if-not-empty field="productStore.payToPartyId">
@@ -305,6 +306,7 @@ under the License.
         <make-value value-field="newEntity" entity-name="QuoteRole"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-field="newEntity"/>
+        <property-to-field resource="OrderUiLabels" property="OrderOrderQuoteRoleAddedSuccessfully" field="successMessage"/>
         <check-errors/>
     </simple-method>
 

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=1746290&r1=1746289&r2=1746290&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Tue May 31 15:27:56 2016
@@ -1449,13 +1449,20 @@ under the License.
         <response name="success" type="view" value="EditQuote"/>
         <response name="error" type="view" value="EditQuote"/>
     </request-map>
-
-    <request-map uri="ListQuoteRoles"><security https="true" auth="true"/><response name="success" type="view" value="ListQuoteRoles"/></request-map>
-    <request-map uri="EditQuoteRole"><security https="true" auth="true"/><response name="success" type="view" value="EditQuoteRole"/></request-map>
+    <request-map uri="ListQuoteRoles">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ListQuoteRoles"/>
+    </request-map>
+    <request-map uri="EditQuoteRole">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditQuoteRole"/>
+    </request-map>
     <request-map uri="createQuoteRole">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="createQuoteRole"/>
-        <response name="success" type="view" value="EditQuoteRole"/>
+        <response name="success" type="request-redirect" value="ListQuoteRoles">
+            <redirect-parameter name="quoteId"/>
+        </response>
         <response name="error" type="view" value="EditQuoteRole"/>
     </request-map>
     <request-map uri="removeQuoteRole">

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml?rev=1746290&r1=1746289&r2=1746290&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml Tue May 31 15:27:56 2016
@@ -174,6 +174,7 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="QuoteRole" default-field-type="edit"/>
         <field name="quoteId"><hidden/></field>
+        <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="RoleType">
@@ -181,7 +182,6 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
-        <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListQuoteItems" list-name="quoteItems" target="" title="" type="list"