svn commit: r616182 - /ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml

Author: jleroux
Date: Mon Jan 28 22:28:18 2008
New Revision: 616182

URL: http://svn.apache.org/viewvc?rev=616182&view=rev
Log:
Fix <<You can't replenish a gift card from eCommerce using the "Gift Card Reload" product (GC-002)>> (https://issues.apache.org/jira/browse/OFBIZ-1605) - OFBIZ-1605

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml?rev=616182&r1=616181&r2=616182&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml Mon Jan 28 22:28:18 2008
@@ -615,11 +615,22 @@
             </if-validate-method>
         </if-compare>
         <if-compare field-name="surveyQuestionAndAppl.surveyQuestionTypeId" operator="equals" value="GIFT_CARD">
-            <if-validate-method field-name="${answerFieldName}" method="isGiftCard">
-                <else>
-                    <add-error><fail-message message="The question [${surveyQuestionAndAppl.question}] requires a valid gift-card number."/></add-error>
-                </else>
-            </if-validate-method>
+            <set field="finAccountMap.finAccountTypeId" value="GIFTCERT_ACCOUNT"/>
+            <set field="finAccountMap.statusId" value="FNACT_ACTIVE"/>
+            <set field="codeOk" value="false"/>            
+            <find-by-and entity-name="FinAccount" map-name="finAccountMap" list-name="finAccountList"/>
+            <iterate entry-name="finAccount" list-name="finAccountList">
+                <if-compare field-name="finAccount.finAccountCode" operator="equals" value="${${answerFieldName}}">
+                    <set field="codeOk" value="true"/>
+                </if-compare>
+            </iterate>
+            <if-compare field-name="codeOk" value="true"  operator="not-equals">
+                <if-validate-method field-name="${answerFieldName}" method="isGiftCard">
+                    <else>
+                        <add-error><fail-message message="The question [${surveyQuestionAndAppl.question}] requires a valid gift-card number."/></add-error>
+                    </else>
+                </if-validate-method>
+            </if-compare>
         </if-compare>
         <if-compare field-name="surveyQuestionAndAppl.surveyQuestionTypeId" operator="equals" value="DATE">
             <if-validate-method field-name="${answerFieldName}" method="isDate">