svn commit: r1829136 - in /ofbiz/ofbiz-framework/trunk/applications/accounting: config/ src/main/java/org/apache/ofbiz/accounting/payment/ src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/

Author: jleroux
Date: Sat Apr 14 12:31:29 2018
New Revision: 1829136

URL: http://svn.apache.org/viewvc?rev=1829136&view=rev
Log:
Improved: Same UiLabel used for multiple purposes
(OFBIZ-10336)

AccountingGiftCerticateNumberCannotFulfill uiLabel is used for multiple purposes
There should be separate UiLabel if survey response is not found for gift
certificate.

Thanks: Suraj Khurana

Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml
    ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java
    ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml?rev=1829136&r1=1829135&r2=1829136&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml Sat Apr 14 12:31:29 2018
@@ -461,6 +461,9 @@
         <value xml:lang="zh">没有产品与订单明细关联，无法应用礼品卡</value>
         <value xml:lang="zh-TW">沒有產品與訂單細項結合,無法使用禮物卡</value>
     </property>
+    <property key="AccountingGiftCerticateNumberCannotFulfillFromSurvey">
+        <value xml:lang="en">Unable to get survey response; cannot fulfill gift card reload</value>
+    </property>
     <property key="AccountingGiftCerticateNumberCannotFulfillFromSurveyAnswers">
         <value xml:lang="de">Kann keine Umfrageantworten von Umfrageantwort ermitteln; kann Geschenkkarte nicht verarbeiten</value>
         <value xml:lang="en">Unable to get survey response answers from survey response; cannot fulfill gift card</value>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1829136&r1=1829135&r2=1829136&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java Sat Apr 14 12:31:29 2018
@@ -775,11 +775,11 @@ public class GiftCertificateServices {
         } catch (GenericEntityException e) {
             Debug.logError(e, module);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
-                    "AccountingGiftCerticateNumberCannotFulfill", locale));
+                    "AccountingGiftCerticateNumberCannotFulfillFromSurvey", locale));
         }
         if (surveyResponse == null) {
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
-                    "AccountingGiftCerticateNumberCannotFulfill", locale));
+                    "AccountingGiftCerticateNumberCannotFulfillFromSurvey", locale));
         }
 
         // get the response answers

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1829136&r1=1829135&r2=1829136&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Sat Apr 14 12:31:29 2018
@@ -1071,7 +1071,7 @@ public class ValueLinkServices {
         } catch (GenericEntityException e) {
             Debug.logError(e, module);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
-                    "AccountingGiftCerticateNumberCannotFulfill", locale));
+                    "AccountingGiftCerticateNumberCannotFulfillFromSurvey", locale));
         }
 
         // get the response answers
@@ -1316,7 +1316,7 @@ public class ValueLinkServices {
         } catch (GenericEntityException e) {
             Debug.logError(e, module);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
-                    "AccountingGiftCerticateNumberCannotFulfill", locale));
+                    "AccountingGiftCerticateNumberCannotFulfillFromSurvey", locale));
         }
 
         // get the response answers