svn commit: r1062219 - in /ofbiz/branches/release10.04: ./ specialpurpose/ebaystore/src/o
Locked
svn commit: r1062219 - in /ofbiz/branches/release10.04: ./ specialpurpose/ebaystore/src/o
 
|
Author: jleroux
Date: Sat Jan 22 18:11:58 2011 New Revision: 1062219 URL: http://svn.apache.org/viewvc?rev=1062219&view=rev Log: "Applied fix from trunk for revision: 1061939" ------------------------------------------------------------------------ r1061939 | jleroux | 2011-01-21 19:02:56 +0100 (ven., 21 janv. 2011) | 3 lines A patch from Arun Patidar "Some misc issues in ebayStore component." (https://issues.apache.org/jira/browse/OFBIZ-4118) - OFBIZ-4118 Patch to export single product to ebay in ebay store component. Added require attributes in item and call request of export product to ebay after successfully verify item. ------------------------------------------------------------------------ Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java ofbiz/branches/release10.04/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml ofbiz/branches/release10.04/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 22 18:11:58 2011 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1062138 +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138 Modified: ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java?rev=1062219&r1=1062218&r2=1062219&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java (original) +++ ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java Sat Jan 22 18:11:58 2011 @@ -88,6 +88,8 @@ import com.ebay.soap.eBLBaseComponents.I import com.ebay.soap.eBLBaseComponents.SalesTaxType; import com.ebay.soap.eBLBaseComponents.AddItemRequestType; import com.ebay.soap.eBLBaseComponents.AddItemResponseType; +import com.ebay.soap.eBLBaseComponents.AddItemRequestType; +import com.ebay.soap.eBLBaseComponents.AddItemResponseType; public class EbayEvents { @@ -753,6 +755,7 @@ public class EbayEvents { attributeMapList.put("ShippingServiceCostCurrency", "USD"); attributeMapList.put("ShippingServicePriority", "1"); attributeMapList.put("ShippingType", "Flat"); + attributeMapList.put("ShippingServiceAdditionalCost", amtServiceCost.getValue()); EbayStoreHelper.mappedShippingLocations(requestParams, item, apiContext, request, attributeMapList); @@ -794,6 +797,12 @@ public class EbayEvents { if (UtilValidate.isNotEmpty(requestParams.get("ebayStore1Category")) || UtilValidate.isNotEmpty(requestParams.get("ebayStore2Category"))) { item.setStorefront(storeFront); } + //TODO: set value of country and currency on the basis of request param values + item.setCountry(CountryCodeType.US); + attributeMapList.put("Country", "US"); + item.setCurrency(CurrencyCodeType.USD); + attributeMapList.put("Currency", "USD"); + if (UtilValidate.isNotEmpty(requestParams.get("requireEbayInventory")) && "Y".equals(requestParams.get("requireEbayInventory").toString())) { GenericValue ebayProductStore = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("EbayProductStoreInventory", UtilMisc.toMap("productStoreId", productStoreId, "productId", productId)))); if (UtilValidate.isNotEmpty(ebayProductStore)) { @@ -892,7 +901,7 @@ public class EbayEvents { return "success"; } - public static String verifyItemBeforeAdd(HttpServletRequest request, HttpServletResponse response) { + public static String verifyItemBeforeAddAndExportToEbay(HttpServletRequest request, HttpServletResponse response) { Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); Map<String,Object> requestParams = UtilHttp.getParameterMap(request); @@ -905,6 +914,8 @@ public class EbayEvents { ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); VerifyAddItemRequestType req = new VerifyAddItemRequestType(); VerifyAddItemResponseType resp = null; + AddItemResponseType addItemResp = null; + VerifyAddItemCall verifyCall = new VerifyAddItemCall(apiContext); Map<String,Object> addItemObject = getAddItemListingObject(request, apiContext); @@ -932,6 +943,10 @@ public class EbayEvents { double dfee = fee.getFee().getValue(); feesummary = feesummary + dfee; } + //if item is verified then export it to ebay + AddItemRequestType addItemReq = new AddItemRequestType(); + addItemReq.setItem(item); + addItemResp = (AddItemResponseType) addItemCall.execute(addItemReq); } else { EbayStoreHelper.createErrorLogMessage(userLogin, dispatcher, productStoreId, resp.getAck().toString(), "Verify Item : verifyItemBeforeAdd", resp.getErrors(0).getLongMessage()); } Modified: ofbiz/branches/release10.04/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml?rev=1062219&r1=1062218&r2=1062219&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml Sat Jan 22 18:11:58 2011 @@ -302,10 +302,10 @@ <response name="success" type="view" value="prepareProductListing"/> <response name="error" type="view" value="exportProductListing"/> </request-map> - <request-map uri="verifyItem"> + <request-map uri="verifyItemBeforeAddAndExportToEbay"> <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.ebaystore.EbayEvents" invoke="verifyItemBeforeAdd"/> - <response name="success" type="view" value="prepareProductListing"/> + <event type="java" path="org.ofbiz.ebaystore.EbayEvents" invoke="verifyItemBeforeAddAndExportToEbay"/> + <response name="success" type="request" value="clearExpListing"/> <response name="error" type="view" value="exportProductListing"/> </request-map> <request-map uri="exportListingToEbay"> Modified: ofbiz/branches/release10.04/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=1062219&r1=1062218&r2=1062219&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl (original) +++ ofbiz/branches/release10.04/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl Sat Jan 22 18:11:58 2011 @@ -248,7 +248,7 @@ under the License. <a href="#" onclick="javascript:document.ProductsExportToEbay.action='<@ofbizUrl>updateProductExportDetail</@ofbizUrl>';document.ProductsExportToEbay.submit();" class="buttontext">${uiLabelMap.CommonSave}</a> <#-- request.setAttribute("isSaved")--> <#if isSaved?exists && isSaved=="Y"> - <a href="#" class="buttontext" onclick="javascript:document.ProductsExportToEbay.action='<@ofbizUrl>verifyItem</@ofbizUrl>';document.ProductsExportToEbay.submit();">Verifly Item</a> + <a href="#" class="buttontext" onclick="javascript:document.ProductsExportToEbay.action='<@ofbizUrl>verifyItemBeforeAddAndExportToEbay</@ofbizUrl>';document.ProductsExportToEbay.submit();">Verifly Item</a> </#if> <a href="#" class="buttontext" onclick="javascript:document.ProductsExportToEbay.action='<@ofbizUrl>removeProductFromListing</@ofbizUrl>';document.ProductsExportToEbay.submit();">Remove</a> <#--a href="#" class="buttontext">Save and ${uiLabelMap.EbayExportToEbay}</a--> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |