OFBiz › OFBiz - Commits

svn commit: r1002968 - in /ofbiz/branches/release10.04: ./ applications/order/config/OrderUiLabels.xml applications/order/script/org/ofbiz/order/request/CustRequestServices.xml

‹ 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: r1002968 - in /ofbiz/branches/release10.04: ./ applications/order/config/OrderUiLabels.xml applications/order/script/org/ofbiz/order/request/CustRequestServices.xml

jleroux@apache.org
Author: jleroux
Date: Thu Sep 30 08:55:51 2010
New Revision: 1002968

URL: http://svn.apache.org/viewvc?rev=1002968&view=rev
Log:
"Applied fix from trunk for revision: 1002963"
------------------------------------------------------------------------
r1002963 | jleroux | 2010-09-30 10:49:15 +0200 (jeu. 30 sept. 2010) | 16 lignes

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/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/config/OrderUiLabels.xml
    ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 30 08:55:51 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963

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=1002968&r1=1002967&r2=1002968&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/release10.04/applications/order/config/OrderUiLabels.xml Thu Sep 30 08:55:51 2010
@@ -8187,7 +8187,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>
@@ -8202,6 +8202,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/branches/release10.04/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=1002968&r1=1002967&r2=1002968&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Thu Sep 30 08:55:51 2010
@@ -330,6 +330,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"/>


Free forum by Nabble Edit this page