You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by su...@apache.org on 2019/03/30 04:53:12 UTC
svn commit: r1856595 - 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: surajk
Date: Sat Mar 30 04:53:12 2019
New Revision: 1856595
URL: http://svn.apache.org/viewvc?rev=1856595&view=rev
Log:
Improved: Corrected typo in 'GiftCertificate' UiLabels.
(OFBIZ-10861)
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=1856595&r1=1856594&r2=1856595&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml Sat Mar 30 04:53:12 2019
@@ -431,7 +431,7 @@
<value xml:lang="zh">æ è¯ä¸º ${partyId} çä¼åä¸æ¯æ¯ä»æ¹æ³ ${paymentMethodId} çæ¥æè
ï¼æ æä¿®æ¹å®ã</value>
<value xml:lang="zh-TW">æ¨èçº ${partyId} çåé«ä¸æ¯æ¯ä»æ¹æ³ ${paymentMethodId} çææè
,ç¡æ¬ä¿®æ¹å®.</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotAuthorize">
+ <property key="AccountingGiftCertificateNumberCannotAuthorize">
<value xml:lang="ar">Ùا ÙÙ
Ù٠اÙتصرÙØ Ø¨Ø¨Ø·Ø§ÙØ© اÙÙدÙØ© بسبب: ${errorString}</value>
<value xml:lang="de">Kann Geschenkzertifikat nicht authorisieren weil: ${errorString}</value>
<value xml:lang="en">Cannot authorize gift certificate due to: ${errorString}</value>
@@ -441,7 +441,7 @@
<value xml:lang="zh">æ æ³ææ礼å¸ï¼åå ï¼${errorString}</value>
<value xml:lang="zh-TW">ç¡æ³ææ¬ç¦®å¸,åå :${errorString}</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotBeExpired">
+ <property key="AccountingGiftCertificateNumberCannotBeExpired">
<value xml:lang="ar">غÙر Ù
Ù
Ù٠اÙÙاء صÙاØÙØ© تصرÙØ Ø§ÙØساب اÙÙ
اÙÙ ÙØ´Ùادة اÙÙدÙØ©</value>
<value xml:lang="de">Kann Finanzkonto Authorisierung für Geschenkzertifikat nicht ablaufen lassen: </value>
<value xml:lang="en">Unable to expire financial account authorization for Gift Certificate: </value>
@@ -451,7 +451,7 @@
<value xml:lang="zh">æ æ³ä»¤ç¤¼å¸çè´¢å¡è´¦ç®ææ失æï¼ç¤¼å¸ä¸ºï¼</value>
<value xml:lang="zh-TW">ç¡æ³ä»¤ç¦®å¸ç財å帳ç®ææ¬å¤±æ,禮å¸çº:</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotFulfill">
+ <property key="AccountingGiftCertificateNumberCannotFulfill">
<value xml:lang="ar">Ùا ÙÙجد سÙع Ù
رتبطة ببÙد Ø£Ù
ر اÙبÙع/اÙشراء, Ùا ÙÙ
Ù٠اÙÙÙاء ببطاÙØ© اÙÙدÙØ©</value>
<value xml:lang="de">Kein Produkt mit Bestellposition verknüpft, kann Geschenkkarte nicht verarbeiten</value>
<value xml:lang="en">No product associated with OrderItem, cannot fulfill gift card</value>
@@ -461,10 +461,10 @@
<value xml:lang="zh">没æ产åä¸è®¢åæç»å
³èï¼æ æ³åºç¨ç¤¼åå¡</value>
<value xml:lang="zh-TW">æ²æç¢åèè¨å®ç´°é
çµå,ç¡æ³ä½¿ç¨ç¦®ç©å¡</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotFulfillFromSurvey">
+ <property key="AccountingGiftCertificateNumberCannotFulfillFromSurvey">
<value xml:lang="en">Unable to get survey response; cannot fulfill gift card reload</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotFulfillFromSurveyAnswers">
+ <property key="AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers">
<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>
<value xml:lang="it">Non è possibile ottenere la risposta sondaggio dalle domande; non è possibile caricare la carta regalo</value>
@@ -473,7 +473,7 @@
<value xml:lang="zh">æ æ³ä»è°æ¥çå¤ä¸è·å¾è°æ¥çå¤çåçï¼ä¸è½åºç¨ç¤¼åå¡</value>
<value xml:lang="zh-TW">ç¡æ³å¾èª¿æ¥åæä¸ç²å¾èª¿æ¥åæçåç;ä¸è½ä½¿ç¨ç¦®ç©å¡</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotGetPaymentConfiguration">
+ <property key="AccountingGiftCertificateNumberCannotGetPaymentConfiguration">
<value xml:lang="de">Kann Konfigurationsdatei für Zahlung nicht ermitteln</value>
<value xml:lang="en">Unable to get payment configuration file</value>
<value xml:lang="it">Non è possibile ottenere il file configurazione pagamento</value>
@@ -482,7 +482,7 @@
<value xml:lang="zh">æ æ³è·å¾æ¯ä»é
ç½®æ件</value>
<value xml:lang="zh-TW">ç¡æ³ç²å¾æ¯ä»è¨å®æª</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotLocateItFromOrderPaymentPreference">
+ <property key="AccountingGiftCertificateNumberCannotLocateItFromOrderPaymentPreference">
<value xml:lang="de">Kann Geschenkkarte aus der OrderPaymentPreference nicht ermitteln</value>
<value xml:lang="en">Unable to get GiftCard from OrderPaymentPreference</value>
<value xml:lang="it">Non è possibile localizzare il certificato regalo dalla preferenze pagamento dell'ordine</value>
@@ -491,7 +491,7 @@
<value xml:lang="zh">ä¸è½ä»è®¢åæ¯ä»è®¾ç½®ä¸è·å¾ç¤¼åå¡</value>
<value xml:lang="zh-TW">ä¸è½å¾è¨å®æ¯ä»å好ä¸åå¾ç¦®ç©å¡</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotProcess">
+ <property key="AccountingGiftCertificateNumberCannotProcess">
<value xml:lang="ar">غÙر Ù
Ù
Ù٠تÙعÙ٠شراء بطاÙØ© اÙÙدÙØ©: Ùا ÙÙجد دÙÙÙ Ù
Ø٠اÙسÙعة عÙ٠رأس Ø£Ù
ر اÙبÙع/اÙشراء: ${orderId}</value>
<value xml:lang="de">Kann Geschenkkartenkauf nicht verarbeiten; keine productStoreId an Bestellkopf: ${orderId}</value>
<value xml:lang="en">Unable to process gift card purchase; no productStoreId on OrderHeader: ${orderId}</value>
@@ -501,7 +501,7 @@
<value xml:lang="zh">æ æ³å¤ç礼åå¡è´ç©ï¼è®¢å头ä¸æ²¡æ产ååºéºæ è¯ï¼è®¢åæ è¯ï¼${orderId}</value>
<value xml:lang="zh-TW">ç¡æ³èç禮ç©å¡è³¼ç©;è¨å®é ä¸æ²æç¢åååºæ¨è,è¨å®æ¨è:${orderId}</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotRelease">
+ <property key="AccountingGiftCertificateNumberCannotRelease">
<value xml:lang="ar">ÙØ´Ù Ù
ØاÙÙØ© إطÙا٠دÙعة بطاÙØ© اÙÙدÙØ©: سج٠بطاÙØ© اÙÙدÙØ© غÙر صاÙØ</value>
<value xml:lang="de">Ausgabeversuch für Geschenkkartenzahlung fehlgeschlagen; keine gültige Geschenkkarte</value>
<value xml:lang="en">Attempt to release GiftCard payment failed; not a valid GiftCard record</value>
@@ -511,7 +511,7 @@
<value xml:lang="zh">å°è¯éæ¾ç¤¼åå¡æ¯ä»æ¶å¤±è´¥ï¼ä¸æ¯ææç礼åå¡è®°å½</value>
<value xml:lang="zh-TW">å試éæ¾ç¦®ç©å¡æ¯ä»æ失æ;ä¸æ¯ææç禮ç©å¡è¨é</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotReload">
+ <property key="AccountingGiftCertificateNumberCannotReload">
<value xml:lang="de">Kann Aufladung für Geschenkkarte nicht verarbeiten; keine productStoreId an Bestellkopf: ${orderId}</value>
<value xml:lang="en">Unable to process gift card reload; no productStoreId on OrderHeader: ${orderId}</value>
<value xml:lang="it">Non è possibile processare la ricarica con la carta regalo; nessun negozio impostato sulla testata ordine: ${orderId}</value>
@@ -520,7 +520,7 @@
<value xml:lang="zh">æ æ³å¤ç礼åå¡éæ°è½½å
¥ï¼è®¢å头ä¸æ²¡æ产ååºéºæ è¯ï¼è®¢åæ è¯ï¼${orderId}</value>
<value xml:lang="zh-TW">ç¡æ³èç禮ç©å¡éæ°è¼å
¥;è¨å®é ä¸æ²æç¢åååºæ¨è,è¨å®æ¨è:${orderId}</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotReloadFromSurveyAnswers">
+ <property key="AccountingGiftCertificateNumberCannotReloadFromSurveyAnswers">
<value xml:lang="de">Kann keine Fragen für Umfrage ermitteln; kann Geschenkkartenaufladung nicht durchführen</value>
<value xml:lang="en">Unable to get survey response answers from survey response; cannot fulfill gift card reload</value>
<value xml:lang="it">Non è possibile ottenere l'informazione relativa alla risposta sondaggio dalle domande; non è possibile ricaricare la carta regalo</value>
@@ -529,7 +529,7 @@
<value xml:lang="zh">æ æ³ä»è°æ¥çå¤ä¸è·å¾è°æ¥çå¤çåçï¼ä¸è½éæ°è½½å
¥ç¤¼åå¡</value>
<value xml:lang="zh-TW">ç¡æ³å¾èª¿æ¥åæä¸ç²å¾èª¿æ¥åæçåç;ä¸è½éæ°è¼å
¥ç¦®ç©å¡</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotSendEmailNotice">
+ <property key="AccountingGiftCertificateNumberCannotSendEmailNotice">
<value xml:lang="ar">خطأ اثÙاء ارسا٠برÙد اÙÙترÙÙÙ ÙتÙبÙ٠بطاÙØ© اÙÙدÙØ©: ${errorString}</value>
<value xml:lang="de">Fehler beim Senden der Geschenkkarten Benachrichtigungsmail: ${errorString}</value>
<value xml:lang="en">Error sending Gift Card notice email: ${errorString}</value>
@@ -539,7 +539,7 @@
<value xml:lang="zh">åé礼åå¡éç¥é®ä»¶æ¶åºéï¼${errorString}</value>
<value xml:lang="zh-TW">ç¼é禮ç©å¡éç¥è¨æ¯æåºé¯:${errorString}</value>
</property>
- <property key="AccountingGiftCerticateNumberCannotStoreFulfillmentInfo">
+ <property key="AccountingGiftCertificateNumberCannotStoreFulfillmentInfo">
<value xml:lang="de">Kann Ausführungsinformation nicht speichern: ${errorString}</value>
<value xml:lang="en">Unable to store fulfillment info: ${errorString}</value>
<value xml:lang="it">Non è possibile registrazione le informazioni di ricarica: ${errorString}</value>
@@ -548,7 +548,7 @@
<value xml:lang="zh">æ æ³åå¨æ§è¡ä¿¡æ¯ï¼${errorString}</value>
<value xml:lang="zh-TW">ç¡æ³å²å責任履è¡å±¥è¡è³è¨:${errorString}</value>
</property>
- <property key="AccountingGiftCerticateNumberCreationError">
+ <property key="AccountingGiftCertificateNumberCreationError">
<value xml:lang="ar">غÙر Ù
Ù
ÙÙ Ø®Ù٠رÙÙ
Ø´Ùادة اÙÙدÙØ©</value>
<value xml:lang="de">Kann Geschenkzertifikatsnummer nicht erstellen.</value>
<value xml:lang="en">Unable to create gift certificate number.</value>
@@ -558,7 +558,7 @@
<value xml:lang="zh">æ æ³æ°å»ºç¤¼å¸ç¼å·ã</value>
<value xml:lang="zh-TW">ç¡æ³æ°å»ºç¦®å¸ç·¨è.</value>
</property>
- <property key="AccountingGiftCerticateNumberExpired">
+ <property key="AccountingGiftCertificateNumberExpired">
<value xml:lang="ar">اÙتÙت صÙاØÙØ© Ø´Ùادة اÙÙدÙØ© Ù
ÙØ° ${thruDate}</value>
<value xml:lang="de">Geschenkzertifikat ist seit ${thruDate} abgelaufen</value>
<value xml:lang="en">Gift certificate has expired as of ${thruDate}</value>
@@ -568,7 +568,7 @@
<value xml:lang="zh">礼å¸å·²è¿æï¼è¿ææ¥ææ¯ ${thruDate}</value>
<value xml:lang="zh-TW">禮å¸å·²éæ,éææ¥ææ¯ ${thruDate}</value>
</property>
- <property key="AccountingGiftCerticateNumberNotFound">
+ <property key="AccountingGiftCertificateNumberNotFound">
<value xml:lang="ar">Ùا ÙÙ
Ù٠إÙجاد Ø´Ùادة اÙÙدÙØ© ${finAccountId}</value>
<value xml:lang="de">Geschenkzertifikat nicht gefunden ${finAccountId}</value>
<value xml:lang="en">Gift certificate not found ${finAccountId}</value>
@@ -578,7 +578,7 @@
<value xml:lang="zh">æ¾ä¸å°ç¤¼å¸ ${finAccountId}</value>
<value xml:lang="zh-TW">æ¾ä¸å°ç¦®å¸ ${finAccountId}</value>
</property>
- <property key="AccountingGiftCerticateNumberPinNotValid">
+ <property key="AccountingGiftCertificateNumberPinNotValid">
<value xml:lang="ar">اÙرÙ
ز اÙسر٠غÙر صاÙØ</value>
<value xml:lang="de">PIN Nummer ist ungültig</value>
<value xml:lang="en">PIN number is not valid</value>
@@ -588,7 +588,7 @@
<value xml:lang="zh">PINå¯ç æ æ</value>
<value xml:lang="zh-TW">PINå¯ç¢¼ç¡æ</value>
</property>
- <property key="AccountingGiftCerticateNumberRefundCallError">
+ <property key="AccountingGiftCertificateNumberRefundCallError">
<value xml:lang="ar">غÙر Ù
Ù
Ù٠اÙإتصا٠بخدÙ
Ø© اÙإسترجاع!</value>
<value xml:lang="de">Kann Service zur Rückerstattung nicht aufrufen!</value>
<value xml:lang="en">Unable to call refund service!</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=1856595&r1=1856594&r2=1856595&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 Mar 30 04:53:12 2019
@@ -144,7 +144,7 @@ public class GiftCertificateServices {
} catch (GenericEntityException | GenericServiceException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCreationError", locale));
+ "AccountingGiftCertificateNumberCreationError", locale));
} catch (GeneralException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
@@ -192,7 +192,7 @@ public class GiftCertificateServices {
if ("Y".equals(giftCertSettings.getString("requirePinCode"))) {
if (!validatePin(delegator, cardNumber, pinNumber)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberPinNotValid", locale));
+ "AccountingGiftCertificateNumberPinNotValid", locale));
}
finAccountId = cardNumber;
} else {
@@ -285,7 +285,7 @@ public class GiftCertificateServices {
.cache().queryOne();
if ("Y".equals(giftCertSettings.getString("requirePinCode")) && !validatePin(delegator, cardNumber, pinNumber)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberPinNotValid", locale));
+ "AccountingGiftCertificateNumberPinNotValid", locale));
}
} catch (GenericEntityException ex) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
@@ -346,7 +346,7 @@ public class GiftCertificateServices {
// validate the pin
if (!validatePin(delegator, cardNumber, pinNumber)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberPinNotValid", locale));
+ "AccountingGiftCertificateNumberPinNotValid", locale));
}
GenericValue finAccount = null;
@@ -407,7 +407,7 @@ public class GiftCertificateServices {
// make sure the fin account itself has not expired
if ((giftCard.getTimestamp("thruDate") != null) && (giftCard.getTimestamp("thruDate").before(UtilDateTime.nowTimestamp()))) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberExpired",
+ "AccountingGiftCertificateNumberExpired",
UtilMisc.toMap("thruDate", giftCard.getTimestamp("thruDate")), locale));
}
@@ -454,7 +454,7 @@ public class GiftCertificateServices {
} catch (GenericEntityException | GenericServiceException ex) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotProcess",
+ "AccountingGiftCertificateNumberCannotProcess",
UtilMisc.toMap("errorString", ex.getMessage()), locale));
}
}
@@ -496,7 +496,7 @@ public class GiftCertificateServices {
finAccount = FinAccountHelper.getFinAccountFromCode(giftCard.getString("cardNumber"), delegator);
if (finAccount == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberNotFound",
+ "AccountingGiftCertificateNumberNotFound",
UtilMisc.toMap("finAccountId", ""), locale));
}
finAccountId = finAccount.getString("finAccountId");
@@ -510,13 +510,13 @@ public class GiftCertificateServices {
if (finAccountId == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberPinNotValid", locale));
+ "AccountingGiftCertificateNumberPinNotValid", locale));
}
// check for expiration date
if ((finAccount.getTimestamp("thruDate") != null) && (finAccount.getTimestamp("thruDate").before(UtilDateTime.nowTimestamp()))) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberExpired",
+ "AccountingGiftCertificateNumberExpired",
UtilMisc.toMap("thruDate", finAccount.getTimestamp("thruDate")), locale));
}
@@ -563,7 +563,7 @@ public class GiftCertificateServices {
} catch (GenericEntityException | GenericServiceException ex) {
Debug.logError(ex, "Cannot authorize gift certificate", module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotAuthorize",
+ "AccountingGiftCertificateNumberCannotAuthorize",
UtilMisc.toMap("errorString", ex.getMessage()), locale));
}
}
@@ -584,7 +584,7 @@ public class GiftCertificateServices {
Locale locale = (Locale) context.get("locale");
String err = UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotBeExpired", locale);
+ "AccountingGiftCertificateNumberCannotBeExpired", locale);
try {
// expire the related financial authorization transaction
GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(paymentPref);
@@ -635,12 +635,12 @@ public class GiftCertificateServices {
} catch (GenericEntityException e) {
Debug.logError(e, "Unable to get GiftCard from OrderPaymentPreference", module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotLocateItFromOrderPaymentPreference", locale));
+ "AccountingGiftCertificateNumberCannotLocateItFromOrderPaymentPreference", locale));
}
if (giftCard == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotRelease", locale));
+ "AccountingGiftCertificateNumberCannotRelease", locale));
}
// make sure we have a currency
@@ -663,7 +663,7 @@ public class GiftCertificateServices {
} catch (GenericServiceException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberRefundCallError", locale));
+ "AccountingGiftCertificateNumberRefundCallError", locale));
}
if (ServiceUtil.isError(restoreGcResult)) {
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(restoreGcResult));
@@ -721,7 +721,7 @@ public class GiftCertificateServices {
}
if (productStoreId == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotProcess",
+ "AccountingGiftCertificateNumberCannotProcess",
UtilMisc.toMap("orderId", orderId), locale));
}
@@ -745,7 +745,7 @@ public class GiftCertificateServices {
}
if (product == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfill", locale));
+ "AccountingGiftCertificateNumberCannotFulfill", locale));
}
// Gift certificate settings are per store in this entity
@@ -775,11 +775,11 @@ public class GiftCertificateServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfillFromSurvey", locale));
+ "AccountingGiftCertificateNumberCannotFulfillFromSurvey", locale));
}
if (surveyResponse == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfillFromSurvey", locale));
+ "AccountingGiftCertificateNumberCannotFulfillFromSurvey", locale));
}
// get the response answers
@@ -789,7 +789,7 @@ public class GiftCertificateServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfillFromSurveyAnswers", locale));
+ "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
}
// make a map of answer info
@@ -802,7 +802,7 @@ public class GiftCertificateServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfillFromSurveyAnswers", locale));
+ "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
}
if (question != null) {
String desc = question.getString("description");
@@ -839,11 +839,11 @@ public class GiftCertificateServices {
} catch (GenericServiceException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCreationError", locale) + e.getMessage());
+ "AccountingGiftCertificateNumberCreationError", locale) + e.getMessage());
}
if (ServiceUtil.isError(createGcResult)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCreationError", locale)
+ "AccountingGiftCertificateNumberCreationError", locale)
+ ServiceUtil.getErrorMessage(createGcResult));
}
@@ -865,7 +865,7 @@ public class GiftCertificateServices {
} catch (GenericServiceException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotStoreFulfillmentInfo",
+ "AccountingGiftCertificateNumberCannotStoreFulfillmentInfo",
UtilMisc.toMap("errorString", e.getMessage()), locale));
}
@@ -923,7 +923,7 @@ public class GiftCertificateServices {
Debug.logError(e, "Problem sending mail", module);
// this is fatal; we will rollback and try again later
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotSendEmailNotice",
+ "AccountingGiftCertificateNumberCannotSendEmailNotice",
UtilMisc.toMap("errorString", e.toString()), locale));
}
}
@@ -971,7 +971,7 @@ public class GiftCertificateServices {
}
if (productStoreId == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError,
- "AccountingGiftCerticateNumberCannotReload", UtilMisc.toMap("orderId", orderId), locale));
+ "AccountingGiftCertificateNumberCannotReload", UtilMisc.toMap("orderId", orderId), locale));
}
// payment config
@@ -982,7 +982,7 @@ public class GiftCertificateServices {
}
if (paymentConfig == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError,
- "AccountingGiftCerticateNumberCannotGetPaymentConfiguration", locale));
+ "AccountingGiftCertificateNumberCannotGetPaymentConfiguration", locale));
}
// party ID for tracking
@@ -1008,7 +1008,7 @@ public class GiftCertificateServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError,
- "AccountingGiftCerticateNumberCannotReload", locale));
+ "AccountingGiftCertificateNumberCannotReload", locale));
}
// get the response answers
@@ -1018,7 +1018,7 @@ public class GiftCertificateServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError,
- "AccountingGiftCerticateNumberCannotReloadFromSurveyAnswers", locale));
+ "AccountingGiftCertificateNumberCannotReloadFromSurveyAnswers", locale));
}
// make a map of answer info
@@ -1031,7 +1031,7 @@ public class GiftCertificateServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError,
- "AccountingGiftCerticateNumberCannotReloadFromSurveyAnswers", locale));
+ "AccountingGiftCertificateNumberCannotReloadFromSurveyAnswers", locale));
}
if (question != null) {
String desc = question.getString("description");
@@ -1088,7 +1088,7 @@ public class GiftCertificateServices {
} catch (GenericServiceException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotStoreFulfillmentInfo",
+ "AccountingGiftCertificateNumberCannotStoreFulfillmentInfo",
UtilMisc.toMap("errorString", e.getMessage()), locale));
}
@@ -1149,7 +1149,7 @@ public class GiftCertificateServices {
Debug.logError(e, "Problem sending mail", module);
// this is fatal; we will rollback and try again later
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotSendEmailNotice",
+ "AccountingGiftCertificateNumberCannotSendEmailNotice",
UtilMisc.toMap("errorString", e.toString()), locale));
}
}
@@ -1183,7 +1183,7 @@ public class GiftCertificateServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotStoreFulfillmentInfo",
+ "AccountingGiftCertificateNumberCannotStoreFulfillmentInfo",
UtilMisc.toMap("errorString", e.toString()), locale));
}
return ServiceUtil.returnSuccess();
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=1856595&r1=1856594&r2=1856595&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 Mar 30 04:53:12 2019
@@ -842,7 +842,7 @@ public class ValueLinkServices {
} catch (GenericEntityException e) {
Debug.logError("Unable to get GiftCard from OrderPaymentPreference", module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotLocateItFromOrderPaymentPreference", locale));
+ "AccountingGiftCertificateNumberCannotLocateItFromOrderPaymentPreference", locale));
}
if (giftCard == null) {
@@ -907,7 +907,7 @@ public class ValueLinkServices {
} catch (GenericEntityException e) {
Debug.logError("Unable to get GiftCard from OrderPaymentPreference", module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotLocateItFromOrderPaymentPreference", locale));
+ "AccountingGiftCertificateNumberCannotLocateItFromOrderPaymentPreference", locale));
}
if (giftCard == null) {
@@ -993,7 +993,7 @@ public class ValueLinkServices {
}
if (productStoreId == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotProcess", locale));
+ "AccountingGiftCertificateNumberCannotProcess", locale));
}
// payment config
@@ -1028,7 +1028,7 @@ public class ValueLinkServices {
}
if (product == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfill", locale));
+ "AccountingGiftCertificateNumberCannotFulfill", locale));
}
// get the productFeature type TYPE (VL promo code)
@@ -1071,7 +1071,7 @@ public class ValueLinkServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfillFromSurvey", locale));
+ "AccountingGiftCertificateNumberCannotFulfillFromSurvey", locale));
}
// get the response answers
@@ -1081,7 +1081,7 @@ public class ValueLinkServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfillFromSurveyAnswers", locale));
+ "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
}
// make a map of answer info
@@ -1094,7 +1094,7 @@ public class ValueLinkServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfillFromSurveyAnswers", locale));
+ "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
}
if (question != null) {
String desc = question.getString("description");
@@ -1170,7 +1170,7 @@ public class ValueLinkServices {
} catch (GenericServiceException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotStoreFulfillmentInfo",
+ "AccountingGiftCertificateNumberCannotStoreFulfillmentInfo",
UtilMisc.toMap("errorString", e.toString() ), locale));
}
@@ -1229,7 +1229,7 @@ public class ValueLinkServices {
Debug.logError(e, "Problem sending mail", module);
// this is fatal; we will rollback and try again later
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotSendEmailNotice",
+ "AccountingGiftCertificateNumberCannotSendEmailNotice",
UtilMisc.toMap("errorString", e.toString()), locale));
}
}
@@ -1277,7 +1277,7 @@ public class ValueLinkServices {
}
if (productStoreId == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotProcess",
+ "AccountingGiftCertificateNumberCannotProcess",
UtilMisc.toMap("orderId", orderId), locale));
}
@@ -1289,7 +1289,7 @@ public class ValueLinkServices {
}
if (paymentConfig == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotGetPaymentConfiguration", locale));
+ "AccountingGiftCertificateNumberCannotGetPaymentConfiguration", locale));
}
// party ID for tracking
@@ -1316,7 +1316,7 @@ public class ValueLinkServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfillFromSurvey", locale));
+ "AccountingGiftCertificateNumberCannotFulfillFromSurvey", locale));
}
// get the response answers
@@ -1326,7 +1326,7 @@ public class ValueLinkServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfillFromSurveyAnswers", locale));
+ "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
}
// make a map of answer info
@@ -1339,7 +1339,7 @@ public class ValueLinkServices {
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotFulfillFromSurveyAnswers", locale));
+ "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
}
if (question != null) {
String desc = question.getString("description");
@@ -1394,7 +1394,7 @@ public class ValueLinkServices {
} catch (GenericServiceException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
- "AccountingGiftCerticateNumberCannotStoreFulfillmentInfo", locale));
+ "AccountingGiftCertificateNumberCannotStoreFulfillmentInfo", locale));
}
Boolean processResult = (Boolean) reloadResult.get("processResult");
@@ -1466,7 +1466,7 @@ public class ValueLinkServices {
Debug.logError(e, "Problem sending mail", module);
// this is fatal; we will rollback and try again later
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
- "AccountingGiftCerticateNumberCannotSendEmailNotice",
+ "AccountingGiftCertificateNumberCannotSendEmailNotice",
UtilMisc.toMap("errorString", e.toString()), locale));
}
}