svn commit: r929019 - in /ofbiz/trunk/specialpurpose/eb
Locked
 
|
Author: hansbak
Date: Tue Mar 30 06:56:00 2010 New Revision: 929019 URL: http://svn.apache.org/viewvc?rev=929019&view=rev Log: Add new screen to display error message response from eBay. Modified: ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml 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/EbayStoreHelper.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Modified: ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml?rev=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml Tue Mar 30 06:56:00 2010 @@ -314,4 +314,7 @@ <property key="EbayOpenListings"> <value xml:lang="en">Open Listings</value> </property> + <property key="EbayErrorMessageList"> + <value xml:lang="en">Error Messages List</value> + </property> </resource> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml?rev=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml Tue Mar 30 06:56:00 2010 @@ -112,4 +112,17 @@ under the License. <key-map field-name="productListingId"/> </relation> </entity> + <entity entity-name="EBayLogMessagesInfo" package-name="org.ofbiz.ebay.store" + title="eBay Log Messages Info"> + <field name="productStoreId" type="id-ne"/> + <field name="ack" type="name"/> + <field name="functionName" type="name"/> + <field name="message" type="very-long"/> + <field name="createDatetime" type="date-time"/> + <prim-key field="productStoreId"/> + <prim-key field="createDatetime"/> + <relation type="one" fk-name="EBAY_ERROR_STR" rel-entity-name="ProductStore"> + <key-map field-name="productStoreId"/> + </relation> + </entity> </entitymodel> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml?rev=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml Tue Mar 30 06:56:00 2010 @@ -441,4 +441,11 @@ under the License. <attribute name="productStoreId" mode="IN" type="String" optional="false"/> <attribute name="orderId" type="String" mode="IN" optional="false"/> </service> + <service name="insertErrorMessagesFromEbay" engine="entity-auto" default-entity-name="EBayLogMessagesInfo" invoke="create" auth="true"> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + <attribute name="ack" mode="IN" type="String" optional="false"/> + <attribute name="functionName" mode="IN" type="String" optional="false"/> + <attribute name="message" mode="IN" type="String" optional="false"/> + </service> </services> \ No newline at end of file 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=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java Tue Mar 30 06:56:00 2010 @@ -794,6 +794,7 @@ public class EbayEvents { public static String verifyItemBeforeAdd(HttpServletRequest request, HttpServletResponse response) { Delegator delegator = (Delegator) request.getAttribute("delegator"); + LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); Map<String,Object> requestParams = UtilHttp.getParameterMap(request); Locale locale = UtilHttp.getLocale(request); String productStoreId = (String) requestParams.get("productStoreId"); @@ -829,6 +830,8 @@ public class EbayEvents { double dfee = fee.getFee().getValue(); feesummary = feesummary + dfee; } + } else { + EbayStoreHelper.createErrorLogMessage(dispatcher, productStoreId, resp.getAck().toString(), "Verify Item : verifyItemBeforeAdd", resp.getMessage()); } } } 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=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Tue Mar 30 06:56:00 2010 @@ -854,6 +854,7 @@ public class EbayStore { result.put("ebayStore", ebayResp); } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store : getEbayStoreOutput", resp.getMessage()); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR); result.put(ModelService.ERROR_MESSAGE, resp.getAck().toString() +":"+ resp.getMessage()); } @@ -939,6 +940,8 @@ public class EbayStore { i++; } result.put("storeFontScheme", storeColorSchemeMap); + } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrieveThemeColorSchemeByThemeId", resp.getMessage()); } } } catch (ApiException e) { @@ -981,6 +984,8 @@ public class EbayStore { } result = ServiceUtil.returnSuccess("load store logo data success.."); result.put("storeLogoOptList", logoList); + } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrievePredesignedLogoOption", resp.getMessage()); } } } catch (ApiException e) { @@ -1030,6 +1035,8 @@ public class EbayStore { } result = ServiceUtil.returnSuccess("load store Basic Theme option data success.."); result.put("storeThemeList", themeList); + } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrieveBasicThemeArray", resp.getMessage()); } } } catch (ApiException e) { @@ -1084,6 +1091,8 @@ public class EbayStore { j++; } result.put("storeAdvancedThemeColorOptList", themeColorList); + } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrieveAdvancedThemeArray", resp.getMessage()); } //this.returnedSubscriptionArray = resp.getSubscriptionArray(); } @@ -1207,6 +1216,8 @@ public class EbayStore { } result = ServiceUtil.returnSuccess("load store Basic Theme option data success.."); result.put("advanceFontTheme", advanceFontTheme); + } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrieveStoreFontTheme", resp.getMessage()); } } } catch (ApiException e) { 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=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java Tue Mar 30 06:56:00 2010 @@ -871,6 +871,8 @@ public class EbayStoreAutoPreferences { if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { String orderId = resp.getOrderID(); Debug.log(":: new order id is = " + orderId); + } else { + EbayStoreHelper.createErrorLogMessage(dispatcher, productStoreId, resp.getAck().toString(), "Add order : runCombineOrders", resp.getMessage()); } } } @@ -1082,12 +1084,16 @@ public class EbayStoreAutoPreferences { tresp = (DeleteSellingManagerTemplateResponseType) tcall.execute(treq); if (tresp != null && "SUCCESS".equals(tresp.getAck().toString())) { result = ServiceUtil.returnSuccess(); + } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), tresp.getAck().toString(), "Delete selling manager template : autoBlockItemsOutOfStock", tresp.getMessage()); } } } } } result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); + } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get selling manager inventory : autoBlockItemsOutOfStock", resp.getMessage()); } result = ServiceUtil.returnSuccess(); } catch (ApiException e) { 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=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java Tue Mar 30 06:56:00 2010 @@ -20,6 +20,7 @@ package org.ofbiz.ebaystore; import java.io.IOException; +import java.sql.Timestamp; import java.util.Date; import java.util.List; import java.util.Locale; @@ -688,9 +689,13 @@ public class EbayStoreHelper { addResp = (AddOrderResponseType) addOrderCall.execute(addReq); if (addResp != null && "SUCCESS".equals(addResp.getAck().toString())) { Debug.log("Upload tracking code to eBay success..."); + } else { + createErrorLogMessage(dctx.getDispatcher(), productStoreId, addResp.getAck().toString(), "Update order : uploadTrackingInfoBackToEbay", addResp.getMessage()); } } } + } else { + createErrorLogMessage(dctx.getDispatcher(), productStoreId, resp.getAck().toString(), "Get order : uploadTrackingInfoBackToEbay", resp.getMessage()); } } } @@ -699,4 +704,20 @@ public class EbayStoreHelper { } return ServiceUtil.returnSuccess(); } + + public static void createErrorLogMessage(LocalDispatcher dispatcher, String productStoreId, String ack, String fuction, String errorMessage) { + if (!"".equals(productStoreId) && (!"".equals(errorMessage))) { + try { + Map<String, Object> newMap = FastMap.newInstance(); + newMap.put("productStoreId", productStoreId); + newMap.put("ack", ack.toLowerCase()); + newMap.put("functionName", fuction); + newMap.put("message", errorMessage); + newMap.put("createDatetime", UtilDateTime.nowTimestamp()); + dispatcher.runSync("insertErrorMessagesFromEbay", newMap); + } catch (Exception ex) { + Debug.log("Error from create error log messages : "+ex.getMessage()); + } + } + } } 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=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java Tue Mar 30 06:56:00 2010 @@ -99,6 +99,8 @@ public class EbayStoreInventoryServices break; } } + } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), invenResp.getAck().toString(), "GetSellingManagerInventoryCall : updateEbayStoreInventory", invenResp.getMessage()); } // checkProduct is true then update detail but is false do create new one. @@ -160,6 +162,7 @@ public class EbayStoreInventoryServices ebayProductStoreInventory.put("folderId", folderId); ebayProductStoreInventory.store(); } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), productResp.getAck().toString(), "AddSellingManagerProductCall : createNewProductInEbayInventoryFolder", productResp.getMessage()); Debug.logError("Fail to create inventory product ".concat(productId).concat("in productStore ").concat(context.get("productStoreId").toString()).concat(" message from ebay : ").concat(productResp.getMessage()), module); } } @@ -214,6 +217,7 @@ public class EbayStoreInventoryServices ebayProductStoreInventory.put("folderId", folderId); ebayProductStoreInventory.store(); } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "ReviseSellingManagerProductCall : updateProductInEbayInventoryFolder", resp.getMessage()); Debug.logError("Fail to update inventory product ".concat(productId).concat("in productStore ").concat(context.get("productStoreId").toString()).concat(" message from ebay : ").concat(resp.getMessage()), module); } } @@ -258,6 +262,8 @@ public class EbayStoreInventoryServices if (!flag) { folderId = createNewFolderInEbayStoreInventory(dctx,context); } + } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "GetSellingManagerInventoryFolderCall : getFolderInEbayStoreInventory", resp.getMessage()); } result = ServiceUtil.returnSuccess("load ebay store folderId "+folderId+" success.."); } @@ -290,6 +296,7 @@ public class EbayStoreInventoryServices if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { folderId = String.valueOf(resp.getFolderID()); } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "AddSellingManagerInventoryFolderCall : createNewFolderInEbayStoreInventory", resp.getMessage()); Debug.logError("The problem with create new folder on ebay site.", module); return folderId; } @@ -343,6 +350,7 @@ public class EbayStoreInventoryServices } } } else { + EbayStoreHelper.createErrorLogMessage(dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "GetSellingManagerInventoryCall : updateEbayInventoryStatusByProductId", resp.getMessage()); Debug.logError("The problem with get manage inventory detail from ebay site.", module); } } Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java?rev=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java Tue Mar 30 06:56:00 2010 @@ -70,6 +70,7 @@ public class EbayStoreOptions { public static String retrieveThemeColorSchemeByThemeId(HttpServletRequest request, HttpServletResponse response) { Locale locale = UtilHttp.getLocale(request); Delegator delegator = (Delegator) request.getAttribute("delegator"); + LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); GetStoreOptionsRequestType req = null; GetStoreOptionsResponseType resp = null; StoreThemeArrayType returnedBasicThemeArray = null; @@ -126,6 +127,8 @@ public class EbayStoreOptions { } i++; } + } else { + EbayStoreHelper.createErrorLogMessage(dispatcher, paramMap.get("productStoreId").toString(), resp.getAck().toString(), "GetStoreOptionsCall : retrieveThemeColorSchemeByThemeId", resp.getMessage()); } } } catch (ApiException e) { Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml?rev=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml Tue Mar 30 06:56:00 2010 @@ -404,6 +404,11 @@ <response name="success" type="view" value="ordersImported"/> <response name="error" type="view" value="ordersImported"/> </request-map> + <request-map uri="errorMessageList"> + <security https="true" auth="true"/> + <response name="success" type="view" value="errorMessageList"/> + <response name="error" type="view" value="errorMessageList"/> + </request-map> <!-- end of request mappings --> <!-- View Mappings --> @@ -447,5 +452,6 @@ <!-- Waiting to shipping --> <view-map name="WaitingToShipping" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#WaitingToShipping"/> <view-map name="ordersImported" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#ordersImported"/> + <view-map name="errorMessageList" type="screen" page="component://ebaystore/widget/EbayStoreScreens.xml#errorMessageList"/> <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml?rev=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml Tue Mar 30 06:56:00 2010 @@ -120,4 +120,11 @@ value="${bsh:billingAccount != null ? or <field name="currentPasswordVerify"><password/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> </form> + <form name="errorMessageList" type="list" target="" list-name="errorMsgList" view-size="30" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="createDatetime"><display/></field> + <field name="ack"><display/></field> + <field name="functionName"><display/></field> + <field name="message"><display/></field> + </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml?rev=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml Tue Mar 30 06:56:00 2010 @@ -53,6 +53,11 @@ <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> </link> </menu-item> + <menu-item name="errorMessageList" title="${uiLabelMap.EbayErrorMessageList}"> + <link target="errorMessageList"> + <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> + </link> + </menu-item> </menu> <menu name="EbaySellingManagerTabBar" selected-menuitem-context-field-name="sellingManagerItem" type="simple" default-selected-style="selected" menu-container-style="button-bar button-style-2"> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml?rev=929019&r1=929018&r2=929019&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Tue Mar 30 06:56:00 2010 @@ -238,4 +238,25 @@ under the License. </widgets> </section> </screen> + <screen name="errorMessageList"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + <set field="tabButtonItem" value="errorMessageList"/> + <entity-and entity-name="EBayLogMessagesInfo" list="errorMsgList"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + <order-by field-name="createDatetime DESC"/> + </entity-and> + </actions> + <widgets> + <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.EbayErrorMessageList}"> + <include-form name="errorMessageList" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |