|
Author: mrisaliti
Date: Tue Jan 25 20:50:43 2011 New Revision: 1063455 URL: http://svn.apache.org/viewvc?rev=1063455&view=rev Log: Internationalization of java services for ebaystore component (OFBIZ-4091) Modified: ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java Modified: ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml?rev=1063455&r1=1063454&r2=1063455&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml Tue Jan 25 20:50:43 2011 @@ -44,6 +44,14 @@ <value xml:lang="en">Export To eBay Store</value> <value xml:lang="th">à¸à¸²à¸£à¸ªà¹à¸à¸à¸à¸à¹à¸à¸¢à¸±à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹</value> </property> + <property key="EbayExportToEbayStoreFailed"> + <value xml:lang="en">Fail to export categories to an eBay store ${errorString}</value> + <value xml:lang="it">Fallita esportazione delle categorie al negozio eBay ${errorString}</value> + </property> + <property key="EbayExportToEbayStoreSuccess"> + <value xml:lang="en">Export categories to ebay store success.</value> + <value xml:lang="it">Esportazione delle categorie al negozio eBay avvenuta con successo.</value> + </property> <property key="EbaySellingManager"> <value xml:lang="en">Selling Manager</value> </property> @@ -51,6 +59,26 @@ <value xml:lang="en">Ebay Store</value> <value xml:lang="th">à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹</value> </property> + <property key="EbayStoreAddSecondChanceOfferSuccessful"> + <value xml:lang="en">Add Second Chance Offer Successful.</value> + <value xml:lang="it">Aggiunto secondo tentativo offerta con successo.</value> + </property> + <property key="EbayStoreAutoPrefJobEmpty"> + <value xml:lang="en">If you add a new job, you have to add service name.</value> + <value xml:lang="it">Se tu aggiungi un nuovo job, tu devi aggiungere un nuovo servizio.</value> + </property> + <property key="EbayStoreErrorFromDeleteContactStatus"> + <value xml:lang="en">Error from deleteContactAlert service </value> + <value xml:lang="it">Errore dal servizio deleteContactAlert </value> + </property> + <property key="EbayStoreErrorFromListBestOfferIncludeMessage"> + <value xml:lang="en">Error from listBestOfferIncludeMessage service: </value> + <value xml:lang="it">Errore dal servizio listBestOfferIncludeMessage: </value> + </property> + <property key="EbayStoreErrorFromUpdateContactStatus"> + <value xml:lang="en">Error from updateContactStatus service </value> + <value xml:lang="it">Errore dal servizio updateContactStatus </value> + </property> <property key="EbayStores"> <value xml:lang="en">Ebay Stores</value> <value xml:lang="th">รายà¸à¸·à¹à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹</value> @@ -59,14 +87,82 @@ <value xml:lang="en">Ebay Store Setting</value> <value xml:lang="th">รายà¸à¸·à¹à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹</value> </property> + <property key="EbayStoreInventoryStatusUpdated"> + <value xml:lang="en">Updated inventory status of product ${productId}</value> + <value xml:lang="it">Aggiornato stato inventario del prodotto ${productId}</value> + </property> + <property key="EbayStoreInventoryFolderIdLoaded"> + <value xml:lang="en">load eBay store folderId ${folderId} success..</value> + <value xml:lang="it">Caricamento folderId ${folderId} per il negozio eBay avvenuto con successo..</value> + </property> + <property key="EbayStoreInventoryFolderIdRequired"> + <value xml:lang="en">The process was required productStoreId, productId and eBay inventory folderId.</value> + <value xml:lang="it">Questo processo richiedere il productStoreId, productId e il folderId inventario eBay.</value> + </property> + <property key="EbayStoreInventoryFolderIdUpdated"> + <value xml:lang="en">Updated eBay store inventory in folder ${folderId} success..</value> + <value xml:lang="it">Aggiornato inventario negozio eBay del ${folderId} con successo..</value> + </property> + <property key="EbayStoreInventoryFolderIdUpdatedFailed"> + <value xml:lang="en">Fail to update eBay store inventory.</value> + <value xml:lang="it">Fallito aggiornato dell'inventario negozio eBay.</value> + </property> <property key="EbayStoreLoadSuccess"> <value xml:lang="en">Load Ebay Store success.</value> <value xml:lang="th">à¹à¸«à¸¥à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸¢</value> </property> + <property key="EbayStoreLoadAdvancedThemeSuccess"> + <value xml:lang="en">load store advanced Theme option data success..</value> + <value xml:lang="it">Caricamento opzioni avanzate temi negozio avvenuto con successo..</value> + </property> + <property key="EbayStoreLoadBasicThemeSuccess"> + <value xml:lang="en">load store Basic Theme option data success..</value> + <value xml:lang="it">Caricamento opzioni base temi negozio avvenuto con successo..</value> + </property> + <property key="EbayStoreLoadLogoSuccess"> + <value xml:lang="en">load store logo data success..</value> + <value xml:lang="it">Caricamento logo negozio avvenuto con successo..</value> + </property> + <property key="EbayStorePartyWithoutRoleEbayAccount"> + <value xml:lang="en">Party ${partyId} no roleTypeId EBAY_ACCOUNT for export categories to ebay store.</value> + <value xml:lang="it">Soggetto ${partyId} non ha il ruolo EBAY_ACCOUNT per esportaor export categories to ebay store.</value> + </property> + <property key="EbayStoreProblemConnectingToEbaySite"> + <value xml:lang="en">Problems to connect with eBay site message: </value> + <value xml:lang="it">Problema durante la connesione con il sito eBay messaggio: </value> + </property> + <property key="EbayStoreRequiredContactStatusSetting"> + <value xml:lang="en">Required contactStatus setting.</value> + <value xml:lang="it">Richiesto impostazioni stato contatto.</value> + </property> + <property key="EbayStoreRequiredProductStoreId"> + <value xml:lang="en">Required productStoreId for get api context to connect with eBay site.</value> + <value xml:lang="it">Richiesto productStoreId per ottente il contesto api con il sito eBay.</value> + </property> + <property key="EbayStoreRequiredUserIdAndItemId"> + <value xml:lang="en">Required userId and itemId.</value> + <value xml:lang="it">Richiesto userId e itemId.</value> + </property> + <property key="EbayStoreRequiredUserIdAndItemIdAndProductStoreIdAndOfferIdAndContactStatus"> + <value xml:lang="en">Required userId, itemId, productStoreId, OfferId and contactStatus.</value> + <value xml:lang="it">Richiesto userId, itemId, productStoreId, OfferId e contactStatus.</value> + </property> + <property key="EbayStoreRequiredShippingAddressParameter"> + <value xml:lang="en">Required shippingAddress parameter.</value> + <value xml:lang="it">Richiesto parametro indirizzo di spedizione.</value> + </property> + <property key="EbayStoreRootCategoryNotFound"> + <value xml:lang="en">Not found product Category type EBAY_ROOT in catalog ${prodCatalogId}</value> + <value xml:lang="it">Tipo categoria EBAY_ROOT non trovata nel catalogo ${prodCatalogId}</value> + </property> <property key="EbayStoreSaveSuccess"> <value xml:lang="en">Save ebay setting success.</value> <value xml:lang="th">à¸à¸±à¸à¸à¸¶à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸¢</value> </property> + <property key="EbayStoreSetCatalogIdAndProductStoreId"> + <value xml:lang="en">Please set catalogId and productStoreId.</value> + <value xml:lang="it">Per favore impostare il catalogId e il productStoreId.</value> + </property> <property key="EbayStoreStoreName"> <value xml:lang="en">Store Name</value> <value xml:lang="th">à¸à¸·à¹à¸à¸£à¹à¸²à¸à¸à¹à¸²</value> @@ -149,6 +245,14 @@ <value xml:lang="en">Store Subscription Level</value> <value xml:lang="th"></value> </property> + <property key="EbayStoreUpdateItemSuccessfully"> + <value xml:lang="en">Update Item Successfully.</value> + <value xml:lang="it">Aggiornamento asta con successo.</value> + </property> + <property key="EbayStoreUnableToCreatePostalAddress"> + <value xml:lang="en">Unable to create postalAddress with input map: </value> + <value xml:lang="it">Non è possibile create l'indirizzo postal con l'input: </value> + </property> <property key="EbayPersonalInformation"> <value xml:lang="en">Personal Information</value> </property> Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java?rev=1063455&r1=1063454&r2=1063455&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java Tue Jan 25 20:50:43 2011 @@ -24,7 +24,6 @@ import java.util.Map; import javolution.util.FastMap; -import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java?rev=1063455&r1=1063454&r2=1063455&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java Tue Jan 25 20:50:43 2011 @@ -669,7 +669,7 @@ public class EbayEvents { } } } - + try { ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); Map<String,Object> addItemObject = getAddItemListingObject(request, apiContext); Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=1063455&r1=1063454&r2=1063455&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Tue Jan 25 20:50:43 2011 @@ -30,8 +30,6 @@ import java.net.HttpURLConnection; import java.net.URL; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import java.sql.Timestamp; -import java.text.DateFormat; import java.util.Calendar; import java.util.Date; import java.util.Iterator; @@ -48,7 +46,6 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilDateTime; -import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; @@ -76,7 +73,6 @@ import com.ebay.sdk.call.AddDisputeCall; import com.ebay.sdk.call.AddSecondChanceItemCall; import com.ebay.sdk.call.GetAllBiddersCall; import com.ebay.sdk.call.GetItemCall; -import com.ebay.sdk.call.GetItemTransactionsCall; import com.ebay.sdk.call.GetMyeBaySellingCall; import com.ebay.sdk.call.GetOrdersCall; import com.ebay.sdk.call.GetSellerTransactionsCall; @@ -111,12 +107,10 @@ import com.ebay.soap.eBLBaseComponents.I import com.ebay.soap.eBLBaseComponents.ListingTypeCodeType; import com.ebay.soap.eBLBaseComponents.MerchDisplayCodeType; import com.ebay.soap.eBLBaseComponents.OfferType; -import com.ebay.soap.eBLBaseComponents.OrderIDArrayType; import com.ebay.soap.eBLBaseComponents.OrderStatusCodeType; import com.ebay.soap.eBLBaseComponents.OrderTransactionType; import com.ebay.soap.eBLBaseComponents.OrderType; import com.ebay.soap.eBLBaseComponents.PaginatedItemArrayType; -import com.ebay.soap.eBLBaseComponents.PaginatedOrderTransactionArrayType; import com.ebay.soap.eBLBaseComponents.PaginationType; import com.ebay.soap.eBLBaseComponents.PhotoDisplayCodeType; import com.ebay.soap.eBLBaseComponents.PictureDetailsType; @@ -157,7 +151,6 @@ import com.ebay.soap.eBLBaseComponents.S import com.ebay.soap.eBLBaseComponents.StoreType; import com.ebay.soap.eBLBaseComponents.TaskStatusCodeType; import com.ebay.soap.eBLBaseComponents.TradingRoleCodeType; -import com.ebay.soap.eBLBaseComponents.TransactionArrayType; import com.ebay.soap.eBLBaseComponents.TransactionType; import com.ebay.soap.eBLBaseComponents.UserType; import com.ebay.soap.eBLBaseComponents.VerifyAddSecondChanceItemResponseType; @@ -240,10 +233,10 @@ public class EbayStore { List<GenericValue> catalogCategories = null; if (UtilValidate.isEmpty(context.get("prodCatalogId")) || UtilValidate.isEmpty(context.get("productStoreId")) || UtilValidate.isEmpty(context.get("partyId"))) { - return ServiceUtil.returnError("Please set catalogId and productStoreId."); + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreSetCatalogIdAndProductStoreId", locale)); } if (!EbayStoreHelper.validatePartyAndRoleType(delegator,context.get("partyId").toString())) { - return ServiceUtil.returnError("Party ".concat(context.get("partyId").toString()).concat(" no roleTypeId EBAY_ACCOUNT for export categories to ebay store.")); + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStorePartyWithoutRoleEbayAccount", UtilMisc.toMap("partyId", context.get("partyId").toString()), locale)); } try { SetStoreCategoriesCall call = new SetStoreCategoriesCall(EbayStoreHelper.getApiContext((String)context.get("productStoreId"), locale, delegator)); @@ -273,14 +266,14 @@ public class EbayStore { categoryArrayType = new StoreCustomCategoryArrayType(); categoryArrayType.setCustomCategory(toStoreCustomCategoryTypeArray(listAdd)); req.setStoreCategories(categoryArrayType); - result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.ADD, delegator,context.get("partyId").toString(), catalogCategories); + result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.ADD, delegator,context.get("partyId").toString(), catalogCategories, locale); } if (listEdit.size() > 0) { req = new SetStoreCategoriesRequestType(); categoryArrayType = new StoreCustomCategoryArrayType(); categoryArrayType.setCustomCategory(toStoreCustomCategoryTypeArray(listEdit)); req.setStoreCategories(categoryArrayType); - result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.RENAME, delegator,context.get("partyId").toString(), catalogCategories); + result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.RENAME, delegator,context.get("partyId").toString(), catalogCategories, locale); } //start at level 1 of categories @@ -312,7 +305,7 @@ public class EbayStore { categoryArrayType.setCustomCategory(toStoreCustomCategoryTypeArray(listAdd)); req.setStoreCategories(categoryArrayType); req.setDestinationParentCategoryID(new Long(ebayParentCategoryId)); - result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.ADD, delegator,context.get("partyId").toString(), catalogCategories); + result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.ADD, delegator,context.get("partyId").toString(), catalogCategories, locale); } if (listEdit.size() > 0) { req = new SetStoreCategoriesRequestType(); @@ -320,7 +313,7 @@ public class EbayStore { categoryArrayType.setCustomCategory(toStoreCustomCategoryTypeArray(listEdit)); req.setStoreCategories(categoryArrayType); req.setDestinationParentCategoryID(new Long(ebayParentCategoryId)); - result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.RENAME, delegator,context.get("partyId").toString(), catalogCategories); + result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.RENAME, delegator,context.get("partyId").toString(), catalogCategories, locale); } } } @@ -354,7 +347,7 @@ public class EbayStore { categoryArrayType.setCustomCategory(toStoreCustomCategoryTypeArray(listAdd)); req.setStoreCategories(categoryArrayType); req.setDestinationParentCategoryID(new Long(ebayParentCategoryId)); - result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.ADD, delegator, context.get("partyId").toString(), catalogCategories); + result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.ADD, delegator, context.get("partyId").toString(), catalogCategories, locale); } if (listEdit.size() > 0) { req = new SetStoreCategoriesRequestType(); @@ -362,19 +355,21 @@ public class EbayStore { categoryArrayType.setCustomCategory(toStoreCustomCategoryTypeArray(listEdit)); req.setStoreCategories(categoryArrayType); req.setDestinationParentCategoryID(new Long(ebayParentCategoryId)); - result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.RENAME, delegator, context.get("partyId").toString(), catalogCategories); + result = excuteExportCategoryToEbayStore(call, req, StoreCategoryUpdateActionCodeType.RENAME, delegator, context.get("partyId").toString(), catalogCategories, locale); } } } } } } else { - return ServiceUtil.returnError("Not found product Category type EBAY_ROOT in catalog "+context.get("prodCatalogId")); + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreRootCategoryNotFound", UtilMisc.toMap("prodCatalogId", context.get("prodCatalogId")), locale)); } } catch (GenericEntityException e) { result = ServiceUtil.returnFailure(e.getMessage()); } - if (result.get("responseMessage") != null && result.get("responseMessage").equals("fail")) result = ServiceUtil.returnError(result.get("errorMessage").toString()); + if (result.get("responseMessage") != null && result.get("responseMessage").equals("fail")) { + result = ServiceUtil.returnError(result.get("errorMessage").toString()); + } return result; } @@ -394,7 +389,7 @@ public class EbayStore { return storeCustomCategoryTypeArry; } - public static Map<String, Object> excuteExportCategoryToEbayStore(SetStoreCategoriesCall call, SetStoreCategoriesRequestType req, StoreCategoryUpdateActionCodeType actionCode,Delegator delegator, String partyId,List<GenericValue> catalogCategories) { + public static Map<String, Object> excuteExportCategoryToEbayStore(SetStoreCategoriesCall call, SetStoreCategoriesRequestType req, StoreCategoryUpdateActionCodeType actionCode,Delegator delegator, String partyId,List<GenericValue> catalogCategories, Locale locale) { Map<String, Object> result = FastMap.newInstance(); SetStoreCategoriesResponseType resp = null; try { @@ -419,9 +414,9 @@ public class EbayStore { } } } - result = ServiceUtil.returnSuccess("Export categories to ebay store".concat(" success.")); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayExportToEbayStoreSuccess", locale)); } else { - result = ServiceUtil.returnError("Fail to export categories to an ebay store ".concat(resp.getMessage())); + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayExportToEbayStoreFailed", UtilMisc.toMap("errorString", resp.getMessage()), locale)); } } } catch (ApiException e) { @@ -1005,7 +1000,7 @@ public class EbayStore { logoList.add(logo); i++; } - result = ServiceUtil.returnSuccess("load store logo data success.."); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreLoadLogoSuccess", locale)); result.put("storeLogoOptList", logoList); } else { EbayStoreHelper.createErrorLogMessage(userLogin, dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrievePredesignedLogoOption", resp.getErrors(0).getLongMessage()); @@ -1057,7 +1052,7 @@ public class EbayStore { themeList.add(basictheme); i++; } - result = ServiceUtil.returnSuccess("load store Basic Theme option data success.."); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreLoadBasicThemeSuccess", locale)); result.put("storeThemeList", themeList); } else { EbayStoreHelper.createErrorLogMessage(userLogin, dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrieveBasicThemeArray", resp.getErrors(0).getLongMessage()); @@ -1089,7 +1084,7 @@ public class EbayStore { resp = (GetStoreOptionsResponseType) call.execute(req); if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { - result = ServiceUtil.returnSuccess("load store advanced Theme option data success.."); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreLoadAdvancedThemeSuccess", locale)); returnedAdvancedThemeArray = resp.getAdvancedThemeArray(); @@ -1246,7 +1241,7 @@ public class EbayStore { advanceFontTheme.put("storeDescSizeList",descSizes); i++; } - result = ServiceUtil.returnSuccess("load store Basic Theme option data success.."); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreLoadBasicThemeSuccess", locale)); result.put("advanceFontTheme", advanceFontTheme); } else { EbayStoreHelper.createErrorLogMessage(userLogin, dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrieveStoreFontTheme", resp.getErrors(0).getLongMessage()); @@ -1906,7 +1901,7 @@ public class EbayStore { } catch (Exception e) { return ServiceUtil.returnError(e.getMessage()); } - return ServiceUtil.returnSuccess("Add Second Chance Offer Successful."); + return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreAddSecondChanceOfferSuccessful", locale)); } public Map<String, Object> getMyeBaySelling(DispatchContext dctx, Map<String, ? extends Object> context) { @@ -2380,7 +2375,7 @@ public class EbayStore { } catch (Exception e) { return ServiceUtil.returnError(e.getMessage()); } - return ServiceUtil.returnSuccess("Update Item Successfully."); + return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreUpdateItemSuccessfully", locale)); } public Map<String, Object> geteBayClosedItem(DispatchContext dctx, Map<String, ? extends Object> context) { Map <String, Object> result = FastMap.newInstance(); @@ -2507,9 +2502,9 @@ public class EbayStore { return result; } - public static Map<String, Object> getShippingDetail(AddressType shippingAddress) { + public static Map<String, Object> getShippingDetail(AddressType shippingAddress, Locale locale) { if(UtilValidate.isEmpty(shippingAddress)) { - return ServiceUtil.returnError("Required shippingAddress parameter."); + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreRequiredShippingAddressParameter", locale)); } Map<String, Object> result = FastMap.newInstance(); String buyerName = null; @@ -2626,7 +2621,7 @@ public class EbayStore { // this is a Chinese Auction: ItemID is used to uniquely identify the transaction externalId = "EBS_"+itemId; } else { - externalId = "EBS_"+externalId; + externalId = "EBS_"+externalId; } if (UtilValidate.isNotEmpty(transaction.getCreatedDate())) { @@ -2659,7 +2654,7 @@ public class EbayStore { if (UtilValidate.isNotEmpty(getBuyer.getBuyerInfo().getShippingAddress())) { userId = getBuyer.getUserID(); AddressType shipping = getBuyer.getBuyerInfo().getShippingAddress(); - address = getShippingDetail(shipping); + address = getShippingDetail(shipping, locale); } } if(UtilValidate.isNotEmpty(transaction.getStatus())) { @@ -2838,7 +2833,7 @@ public class EbayStore { } } catch (Exception e) { - result = ServiceUtil.returnFailure(e.getMessage()); + result = ServiceUtil.returnFailure(e.getMessage()); } System.out.println(orderList); result.put("productStoreId", productStoreId); @@ -2902,7 +2897,7 @@ public class EbayStore { } if (UtilValidate.isNotEmpty(order.getShippingAddress())) { AddressType shippingAddress = order.getShippingAddress(); - shippingAddressMap = EbayStore.getShippingDetail(shippingAddress); + shippingAddressMap = EbayStore.getShippingDetail(shippingAddress, locale); } if (UtilValidate.isNotEmpty(order.getShippingServiceSelected())) { ShippingServiceOptionsType shippingServiceSelected = order.getShippingServiceSelected(); Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=1063455&r1=1063454&r2=1063455&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java Tue Jan 25 20:50:43 2011 @@ -44,6 +44,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; @@ -117,6 +118,7 @@ import com.ebay.soap.eBLBaseComponents.U public class EbayStoreAutoPreferences { public static String module = EbayStoreAutoPreferences.class.getName(); + private static final String resource = "EbayStoreUiLabels"; public EbayStoreAutoPreferences() { @@ -129,7 +131,7 @@ public class EbayStoreAutoPreferences { Locale locale = (Locale) context.get("locale"); if (UtilValidate.isEmpty(context.get("productStoreId")) && UtilValidate.isEmpty(context.get("jobId"))) { - return ServiceUtil.returnFailure("Required productStoreId for get api context to connect with ebay site."); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredProductStoreId", locale)); } String jobId = (String) context.get("jobId"); String productStoreId = (String) context.get("productStoreId"); @@ -210,7 +212,7 @@ public class EbayStoreAutoPreferences { } } } catch (Exception e) { - return ServiceUtil.returnFailure("Problems to connect with ebay site message:" + e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreProblemConnectingToEbaySite", locale) + e); } return ServiceUtil.returnSuccess(); @@ -302,7 +304,7 @@ public class EbayStoreAutoPreferences { Locale locale = (Locale) context.get("locale"); GenericValue userLogin = delegator.findOne("UserLogin", false, "userLoginId", "system"); if (UtilValidate.isEmpty(context.get("productStoreId")) && UtilValidate.isEmpty(context.get("jobId"))) { - return ServiceUtil.returnFailure("Required productStoreId for get api context to connect with ebay site."); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredProductStoreId", locale)); } String jobId = (String) context.get("jobId"); String productStoreId = (String) context.get("productStoreId"); @@ -382,7 +384,7 @@ public class EbayStoreAutoPreferences { } } } catch (Exception e) { - return ServiceUtil.returnFailure("Problems to connect with ebay site message:" + e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreProblemConnectingToEbaySite", locale) + e); } return ServiceUtil.returnSuccess(); @@ -664,7 +666,7 @@ public class EbayStoreAutoPreferences { GenericValue userLogin = delegator.findOne("UserLogin", false, "userLoginId", "system"); if (UtilValidate.isEmpty(context.get("productStoreId")) && UtilValidate.isEmpty(context.get("jobId"))) { - return ServiceUtil.returnFailure("Required productStoreId for get api context to connect with ebay site."); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredProductStoreId", locale)); } String jobId = (String) context.get("jobId"); @@ -733,7 +735,7 @@ public class EbayStoreAutoPreferences { } } } catch (Exception e) { - return ServiceUtil.returnFailure("Problems to connect with ebay site message:" + e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreProblemConnectingToEbaySite", locale) + e); } return ServiceUtil.returnSuccess(); @@ -1072,7 +1074,6 @@ public class EbayStoreAutoPreferences { resp = (GetSellingManagerInventoryResponseType)call.execute(req); if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { returnedSellingManagerProductType = resp.getSellingManagerProduct(); - //result = ServiceUtil.returnSuccess("load store data success.."); for (int i = 0; i < returnedSellingManagerProductType.length; i++) { SellingManagerProductDetailsType prodDetailType = returnedSellingManagerProductType[i].getSellingManagerProductDetails(); int qty = prodDetailType.getQuantityAvailable(); @@ -1261,11 +1262,11 @@ public class EbayStoreAutoPreferences { //Get base price from kindOfPrice parameter Double doBasePrice = null; if (priceType.equals("BUY_IT_NOW_PRICE")) { - doBasePrice = buyItNowPrice; + doBasePrice = buyItNowPrice; } else if (priceType.equals("START_PRICE")) { - doBasePrice = itemBestOffer.getStartPrice().getValue(); + doBasePrice = itemBestOffer.getStartPrice().getValue(); } else if (priceType.equals("RESERVE_PRICE")) { - doBasePrice = itemBestOffer.getReservePrice().getValue(); + doBasePrice = itemBestOffer.getReservePrice().getValue(); } else if (priceType.equals("RETAIL_PRICE")) { //ignore } else if (priceType.equals("SELLER_COST")) { Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java?rev=1063455&r1=1063454&r2=1063455&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java Tue Jan 25 20:50:43 2011 @@ -24,6 +24,7 @@ import java.util.Map; import javolution.util.FastMap; import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; @@ -45,13 +46,14 @@ import com.ebay.soap.eBLBaseComponents.U public class EbayStoreCustomerService { public static String module = EbayStoreCustomerService.class.getName(); + private static final String resource = "EbayStoreUiLabels"; public static Map<String, Object> listBestOfferIncludeMessage(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); if (UtilValidate.isEmpty(context.get("userId")) || UtilValidate.isEmpty(context.get("itemId"))) { - return ServiceUtil.returnFailure("Required userId and itemId."); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredUserIdAndItemId", locale)); } Map <String, Object> result = FastMap.newInstance(); try { @@ -99,7 +101,7 @@ public class EbayStoreCustomerService { result.put("offerStatus", offerStatus); result.put("itemName", itemName); } catch (Exception e) { - return ServiceUtil.returnFailure("Error from listBestOfferIncludeMessage service "+ e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreErrorFromListBestOfferIncludeMessage", locale) + e); } return result; } @@ -108,7 +110,7 @@ public class EbayStoreCustomerService { Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); if (UtilValidate.isEmpty(context.get("productStoreId")) || UtilValidate.isEmpty(context.get("userId")) || UtilValidate.isEmpty(context.get("itemId")) || UtilValidate.isEmpty(context.get("offerId")) || UtilValidate.isEmpty(context.get("contactSetting"))) { - return ServiceUtil.returnFailure("Required userId, itemId, productStoreId, OfferId and contactStatus."); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredUserIdAndItemIdAndProductStoreIdAndOfferIdAndContactStatus", locale)); } String userId = (String) context.get("userId"); String itemId = (String) context.get("itemId"); @@ -141,7 +143,7 @@ public class EbayStoreCustomerService { respondToBestOfferCall.respondToBestOffer(); contactStatus = "FINISHED"; } else { - return ServiceUtil.returnFailure("Required contactStatus setting."); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredContactStatusSetting", locale)); } GenericValue ebayUserBestOffer = delegator.findByPrimaryKey("EbayUserBestOffer", UtilMisc.toMap("userId", userId, "itemId", itemId)); ebayUserBestOffer.set("contactStatus", contactStatus); @@ -157,16 +159,17 @@ public class EbayStoreCustomerService { result.put("itemName", itemName); result.put("quantity", quantity); } catch (Exception e) { - return ServiceUtil.returnFailure("Error from updateContactStatus service "+ e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreErrorFromUpdateContactStatus", locale) + e); } return result; } public static Map<String, Object> deleteContactAlert(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); String productStoreId = (String) context.get("productStoreId"); + Locale locale = (Locale) context.get("locale"); Map <String, Object> result = FastMap.newInstance(); if (UtilValidate.isEmpty(context.get("itemId")) || UtilValidate.isEmpty(context.get("userId"))) { - return ServiceUtil.returnFailure("Required userId and itemId"); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredUserIdAndItemId", locale)); } String itemId = (String) context.get("itemId"); String userId = (String) context.get("userId"); @@ -175,7 +178,7 @@ public class EbayStoreCustomerService { ebayUserBestOffer.remove(); result.put("productStoreId", productStoreId); } catch (Exception e) { - return ServiceUtil.returnFailure("Error from deleteContactAlert service "+ e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreErrorFromDeleteContactStatus", locale) + e); } return result; } Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java?rev=1063455&r1=1063454&r2=1063455&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java Tue Jan 25 20:50:43 2011 @@ -22,7 +22,6 @@ package org.ofbiz.ebaystore; import java.io.IOException; import java.math.BigDecimal; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.Iterator; @@ -38,6 +37,7 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.ebay.EbayHelper; import org.ofbiz.entity.Delegator; @@ -47,7 +47,6 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.serialize.SerializeException; import org.ofbiz.entity.serialize.XmlSerializer; import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.party.contact.ContactHelper; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -289,7 +288,9 @@ public class EbayStoreHelper { } } if (UtilValidate.isEmpty(ebayProductPref.getString("autoPrefJobId"))) { - if (UtilValidate.isEmpty(serviceName)) return ServiceUtil.returnError("If you add a new job, you have to add serviec name."); + if (UtilValidate.isEmpty(serviceName)) { + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreAutoPrefJobEmpty", locale)); + } /*** RuntimeData ***/ String runtimeDataId = null; GenericValue runtimeData = delegator.makeValue("RuntimeData"); Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java?rev=1063455&r1=1063454&r2=1063455&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java Tue Jan 25 20:50:43 2011 @@ -25,6 +25,7 @@ import java.util.Map; import javolution.util.FastMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilProperties; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -57,6 +58,7 @@ import com.ebay.soap.eBLBaseComponents.S public class EbayStoreInventoryServices { private static final String module = EbayStoreInventoryServices.class.getName(); + public static final String resource = "EbayStoreUiLabels"; private static final String defaultFolderName = "OFBizProducts"; private static String folderId = null; public EbayStoreInventoryServices() { @@ -74,7 +76,7 @@ public class EbayStoreInventoryServices boolean status = false; try { if (context.get("productStoreId") == null || context.get("productId") == null || context.get("folderId") == null) { - result = ServiceUtil.returnError("The process was required productStoreId, productId and ebay inventory folderId."); + result = ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreInventoryFolderIdRequired", locale)); result.put("productStoreId", context.get("productStoreId")); result.put("facilityId", context.get("facilityId")); result.put("folderId", context.get("folderId")); @@ -111,9 +113,9 @@ public class EbayStoreInventoryServices } if (status) { Debug.logInfo("Done to updated product ".concat(context.get("productId").toString()), module); - result = ServiceUtil.returnSuccess("Updated ebay store inventory in folder "+context.get("folderId")+" success.."); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreInventoryFolderIdUpdated", UtilMisc.toMap("folderId", context.get("folderId")), locale)); } else { - result = ServiceUtil.returnError("Fail to update ebay store inventory."); + result = ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreInventoryFolderIdUpdatedFailed", locale)); } } }catch (ApiException e) { @@ -268,7 +270,7 @@ public class EbayStoreInventoryServices } else { EbayStoreHelper.createErrorLogMessage(userLogin, dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "GetSellingManagerInventoryFolderCall : getFolderInEbayStoreInventory", resp.getErrors(0).getLongMessage()); } - result = ServiceUtil.returnSuccess("load ebay store folderId "+folderId+" success.."); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreInventoryFolderIdLoaded", UtilMisc.toMap("folderId", folderId), locale)); } } catch (ApiException e) { result = ServiceUtil.returnFailure(e.getMessage()); @@ -350,7 +352,7 @@ public class EbayStoreInventoryServices ebayProductStoreInventory.put("sold",new BigDecimal(prodInventoryStatus.getQuantitySold())); ebayProductStoreInventory.put("unSold",new BigDecimal(prodInventoryStatus.getQuantityUnsold())); ebayProductStoreInventory.store(); - result = ServiceUtil.returnSuccess("Updated inventory status of product ".concat(productId)); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreInventoryStatusUpdated", UtilMisc.toMap("productId", productId), locale)); break; } } Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java?rev=1063455&r1=1063454&r2=1063455&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java Tue Jan 25 20:50:43 2011 @@ -253,7 +253,7 @@ public class EbayStoreOrder { Debug.logInfo("Creating new postal address for party: " + partyId, module); contactMechId = EbayHelper.createAddress(dispatcher, partyId, userLogin, "SHIPPING_LOCATION", context); if (UtilValidate.isEmpty(contactMechId)) { - return ServiceUtil.returnFailure("Unable to create postalAddress with input map: " + context); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreUnableToCreatePostalAddress", locale) + context); } Debug.logInfo("Created postal address: " + contactMechId, module); Debug.logInfo("Creating new phone number for party: " + partyId, module); @@ -487,7 +487,7 @@ public class EbayStoreOrder { Debug.logInfo("Creating new postal address for party: " + partyId, module); contactMechId = EbayHelper.createAddress(dispatcher, partyId, userLogin, "SHIPPING_LOCATION", shippingAddressCtx); if (UtilValidate.isEmpty(contactMechId)) { - return ServiceUtil.returnFailure("Unable to create postalAddress with input map: " + shippingAddressCtx); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreUnableToCreatePostalAddress", locale) + shippingAddressCtx); } Debug.logInfo("Created postal address: " + contactMechId, module); Debug.logInfo("Creating new phone number for party: " + partyId, module); |
| Free forum by Nabble | Edit this page |
