You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/09/29 16:16:39 UTC
svn commit: r1177318 - in /ofbiz/trunk/applications/order:
config/OrderErrorUiLabels.xml script/org/ofbiz/order/quote/QuoteServices.xml
Author: hansbak
Date: Thu Sep 29 14:16:38 2011
New Revision: 1177318
URL: http://svn.apache.org/viewvc?rev=1177318&view=rev
Log:
show error message when a virtual product is added to a quote
Modified:
ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=1177318&r1=1177317&r2=1177318&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Thu Sep 29 14:16:38 2011
@@ -4990,4 +4990,7 @@
<value xml:lang="zh_CN">shoppingListId æ¯å¿
é¡»çåæ°</value>
<value xml:lang="zh_TW">è³¼ç©å表IDæ¯ä¸åå¿
é çåæ¸ã</value>
</property>
+ <property key="OrderCannotAddVirtualProductToQuote">
+ <value xml:lang="en">You cannot add a 'Virtual' product here, select one of the related variants.</value>
+ </property>
</resource>
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=1177318&r1=1177317&r2=1177318&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 Thu Sep 29 14:16:38 2011
@@ -343,6 +343,11 @@ under the License.
<if-empty field="parameters.quoteUnitPrice">
<if-not-empty field="parameters.productId">
<entity-one entity-name="Product" value-field="product"/>
+ <if-compare operator="equals" value="Y" field="product.isVirtual">
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels" property="OrderCannotAddVirtualProductToQuote"/>
+ </add-error>
+ </if-compare>
<if>
<condition>
<and>