svn commit: r1002963 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml script/org/ofbiz/order/request/CustRequestServices.xml

Author: jleroux
Date: Thu Sep 30 08:49:15 2010
New Revision: 1002963

URL: http://svn.apache.org/viewvc?rev=1002963&view=rev
Log:
A modified patch from Hans Bakker "Ecommerce Customer Request has error" (https://issues.apache.org/jira/browse/OFBIZ-3965) - OFBIZ-3965

BJ: Login from ecomerce as DemoCustomer
click on
Create Customer Request
put in product # WG-1111
click on Add to cart
Following Errors Occurred:

Customer Request should have a 'Name' if not in the draft status

Hans: We decided that a customer request needs a name of the request when it is not in the draft status.
I try to find the 'create customer request' option in e-commerce but i cannot find it.
Attached a diff file which could solve the problem, but could not test it. of course need internationalisation.

JLR: I provided the i18n, but weirdly it always render in English (I tested in French and double-checked the labels I created)

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1002963&r1=1002962&r2=1002963&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Thu Sep 30 08:49:15 2010
@@ -8194,7 +8194,7 @@
         <value xml:lang="it">Contenuto</value>
         <value xml:lang="pt_BR">Conteúdo</value>
         <value xml:lang="zh">内容</value>
-    </property>
+    </property>    
     <property key="OrderRequestCreatedDate">
         <value xml:lang="de">Erstellungsdatum</value>
         <value xml:lang="en">Created Date</value>
@@ -8209,6 +8209,10 @@
         <value xml:lang="zh">创建日期</value>
         <value xml:lang="zh_CN">创建日期</value>
     </property>
+    <property key="OrderRequestCreatedFromShoppingCart">
+        <value xml:lang="en">Request created from shopping cart</value>
+        <value xml:lang="fr">Demande de devis créée depuis le panier</value>
+    </property>    
     <property key="OrderRequestDate">
         <value xml:lang="de">Anfragedatum</value>
         <value xml:lang="en">Request Date</value>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=1002963&r1=1002962&r2=1002963&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Thu Sep 30 08:49:15 2010
@@ -341,6 +341,10 @@ under the License.
         <set value="RF_QUOTE" field="createCustRequestInMap.custRequestTypeId"/>
         <set value="CRQ_SUBMITTED" field="createCustRequestInMap.statusId"/>
         <set field="createCustRequestInMap.custRequestName" from-field="parameters.custRequestName"/>
+        <if-empty field="createCustRequestInMap.custRequestName">
+            <property-to-field resource="OrderUiLabels" property="OrderRequestCreatedFromShoppingCart" field="custRequestName"/>
+            <set field="createCustRequestInMap.custRequestName" from-field="custRequestName"/>
+        </if-empty>
         <call-object-method obj-field="parameters.cart" method-name="getCurrency" ret-field="createCustRequestInMap.maximumAmountUomId"/>
         <call-object-method obj-field="parameters.cart" method-name="getProductStoreId" ret-field="createCustRequestInMap.productStoreId"/>
         <call-object-method obj-field="parameters.cart" method-name="getChannelType" ret-field="createCustRequestInMap.salesChannelEnumId"/>