svn commit: r984399 [14/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r984399 [14/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original) +++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Wed Aug 11 13:22:40 2010 @@ -46,7 +46,6 @@ 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.base.util.collections.MapStack; import org.ofbiz.base.util.string.FlexibleStringExpander; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.entity.Delegator; @@ -448,6 +447,8 @@ public class MacroFormRenderer implement String className = ""; String alert = "false"; String name = ""; + String event = modelFormField.getEvent(); + String action = modelFormField.getAction(context); if (UtilValidate.isNotEmpty(modelFormField.getWidgetStyle())) { className = modelFormField.getWidgetStyle(); if (modelFormField.shouldBeRed(context)) { @@ -584,6 +585,10 @@ public class MacroFormRenderer implement sr.append(value); sr.append("\" id=\""); sr.append(id); + sr.append("\" event=\""); + sr.append(event); + sr.append("\" action=\""); + sr.append(action); sr.append("\" dateType=\""); sr.append(dateTimeField.getType()); sr.append("\" shortDateInput="); Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java (original) +++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java Wed Aug 11 13:22:40 2010 @@ -59,4 +59,4 @@ public class UtilHelpText { } return fieldDescription; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java (original) +++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java Wed Aug 11 13:22:40 2010 @@ -20,20 +20,18 @@ package org.ofbiz.widget.html; import java.io.IOException; import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.ParserConfigurationException; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.widget.menu.MenuStringRenderer; -import org.ofbiz.widget.menu.ModelMenuItem; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; - +import org.ofbiz.widget.menu.MenuStringRenderer; +import org.ofbiz.widget.menu.ModelMenuItem; import org.xml.sax.SAXException; /** Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original) +++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Wed Aug 11 13:22:40 2010 @@ -37,6 +37,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; +import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; @@ -622,6 +623,7 @@ public class ModelMenuItem { protected boolean secure = false; protected boolean encode = false; protected String linkType; + protected FlexibleMapAccessor<Map<String, String>> parametersMapAcsr; protected List<WidgetWorker.Parameter> parameterList = FastList.newInstance(); protected boolean requestConfirmation = false; protected FlexibleStringExpander confirmationMsgExdr; @@ -645,6 +647,7 @@ public class ModelMenuItem { } this.linkType = linkElement.getAttribute("link-type"); + this.parametersMapAcsr = FlexibleMapAccessor.getInstance(linkElement.getAttribute("parameters-map")); List<? extends Element> parameterElementList = UtilXml.childElementList(linkElement, "parameter"); for (Element parameterElement: parameterElementList) { this.parameterList.add(new WidgetWorker.Parameter(parameterElement)); @@ -748,13 +751,13 @@ public class ModelMenuItem { public Map<String, String> getParameterMap(Map<String, Object> context) { Map<String, String> fullParameterMap = FastMap.newInstance(); - /* leaving this here... may want to add it at some point like the hyperlink element: - Map<String, String> addlParamMap = this.parametersMapAcsr.get(context); - if (addlParamMap != null) { - fullParameterMap.putAll(addlParamMap); + if (this.parametersMapAcsr != null) { + Map<String, String> addlParamMap = this.parametersMapAcsr.get(context); + if (addlParamMap != null) { + fullParameterMap.putAll(addlParamMap); + } } - */ - + for (WidgetWorker.Parameter parameter: this.parameterList) { fullParameterMap.put(parameter.getName(), parameter.getValue(context)); } Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original) +++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Wed Aug 11 13:22:40 2010 @@ -102,6 +102,28 @@ public class MacroScreenRenderer impleme } } + private void executeMacro(Appendable writer, String macroName, Map<String, Object> parameters) throws IOException { + StringBuilder sb = new StringBuilder("<@"); + sb.append(macroName); + if (parameters != null) { + for (Map.Entry<String, Object> parameter : parameters.entrySet()) { + sb.append(' '); + sb.append(parameter.getKey()); + sb.append("="); + Object value = parameter.getValue(); + if (value instanceof String) { + sb.append('"'); + sb.append(((String) value).replaceAll("\"", "\\\\\"")); + sb.append('"'); + } else { + sb.append(value); + } + } + } + sb.append(" />"); + executeMacro(writer, sb.toString()); + } + private Environment getEnvironment(Appendable writer) throws TemplateException, IOException { Environment environment = environments.get(writer); if (environment == null) { @@ -117,11 +139,11 @@ public class MacroScreenRenderer impleme } public void renderScreenBegin(Appendable writer, Map<String, Object> context) throws IOException { - executeMacro(writer, "<@renderScreenBegin/>"); + executeMacro(writer, "renderScreenBegin", null); } public void renderScreenEnd(Appendable writer, Map<String, Object> context) throws IOException { - executeMacro(writer, "<@renderScreenEnd/>"); + executeMacro(writer, "renderScreenEnd", null); } public void renderSectionBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException { @@ -129,24 +151,23 @@ public class MacroScreenRenderer impleme this.widgetCommentsEnabled = ModelWidget.widgetBoundaryCommentsEnabled(context); } if (this.widgetCommentsEnabled) { - StringWriter sr = new StringWriter(); - sr.append("<@renderSectionBegin "); - sr.append("boundaryComment=\"Begin "); - sr.append(section.isMainSection ? "Screen " : "Section Widget "); - sr.append(section.getBoundaryCommentName()); - sr.append("\"/>"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + StringBuilder sb = new StringBuilder("Begin "); + sb.append(section.isMainSection ? "Screen " : "Section Widget "); + sb.append(section.getBoundaryCommentName()); + parameters.put("boundaryComment", sb.toString()); + executeMacro(writer, "renderSectionBegin", parameters); } } public void renderSectionEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException { if (this.widgetCommentsEnabled) { - StringWriter sr = new StringWriter(); - sr.append("<@renderSectionEnd "); - sr.append("boundaryComment=\"End "); - sr.append(section.isMainSection ? "Screen " : "Section Widget "); - sr.append(section.getBoundaryCommentName()); - sr.append("\"/>"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + StringBuilder sb = new StringBuilder(); + sb.append("End "); + sb.append(section.isMainSection ? "Screen " : "Section Widget "); + sb.append(section.getBoundaryCommentName()); + parameters.put("boundaryComment", sb.toString()); + executeMacro(writer, "renderSectionEnd", parameters); } } @@ -164,49 +185,31 @@ public class MacroScreenRenderer impleme RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_"); autoUpdateLink = rh.makeLink(request, response, autoUpdateTarget); } - StringWriter sr = new StringWriter(); - sr.append("<@renderContainerBegin "); - sr.append("id=\""); - sr.append(containerId); - sr.append("\" style=\""); - sr.append(container.getStyle(context)); - sr.append("\" autoUpdateLink=\""); - sr.append(autoUpdateLink); - sr.append("\" autoUpdateInterval=\""); - sr.append(container.getAutoUpdateInterval()); - sr.append("\" />"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("id", containerId); + parameters.put("style", container.getStyle(context)); + parameters.put("autoUpdateLink", autoUpdateLink); + parameters.put("autoUpdateInterval", container.getAutoUpdateInterval()); + executeMacro(writer, "renderContainerBegin", parameters); } public void renderContainerEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.Container container) throws IOException { - StringWriter sr = new StringWriter(); - sr.append("<@renderContainerEnd/>"); - executeMacro(writer, sr.toString()); + executeMacro(writer, "renderContainerEnd", null); } public void renderLabel(Appendable writer, Map<String, Object> context, ModelScreenWidget.Label label) throws IOException { - String labelText = label.getText(context); - StringWriter sr = new StringWriter(); - sr.append("<@renderLabel "); - sr.append("text=\""); - sr.append(labelText); - sr.append("\" id=\""); - sr.append(label.getId(context)); - sr.append("\" style=\""); - sr.append(label.getStyle(context)); - sr.append("\" />"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("text", label.getText(context)); + parameters.put("id", label.getId(context)); + parameters.put("style", label.getStyle(context)); + executeMacro(writer, "renderLabel", parameters); } public void renderHorizontalSeparator(Appendable writer, Map<String, Object> context, ModelScreenWidget.HorizontalSeparator separator) throws IOException { - StringWriter sr = new StringWriter(); - sr.append("<@renderHorizontalSeparator "); - sr.append("id=\""); - sr.append(separator.getId(context)); - sr.append("\" style=\""); - sr.append(separator.getStyle(context)); - sr.append("\" />"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("id", separator.getId(context)); + parameters.put("style", separator.getStyle(context)); + executeMacro(writer, "renderHorizontalSeparator", parameters); } public void renderLink(Appendable writer, Map<String, Object> context, ModelScreenWidget.Link link) throws IOException { @@ -295,12 +298,6 @@ public class MacroScreenRenderer impleme if (image == null) return ; String src = image.getSrc(context); - String id = image.getId(context); - String style = image.getStyle(context); - String wid = image.getWidth(context); - String hgt = image.getHeight(context); - String border = image.getBorder(context); - String alt = image.getAlt(context); String urlMode = image.getUrlMode(); boolean fullPath = false; @@ -327,46 +324,30 @@ public class MacroScreenRenderer impleme } else { urlString = src; } - StringWriter sr = new StringWriter(); - sr.append("<@renderImage "); - sr.append("src=\""); - sr.append(src); - sr.append("\" id=\""); - sr.append(id); - sr.append("\" style=\""); - sr.append(style); - sr.append("\" wid=\""); - sr.append(wid); - sr.append("\" hgt=\""); - sr.append(hgt); - sr.append("\" border=\""); - sr.append(border); - sr.append("\" alt=\""); - sr.append(alt); - sr.append("\" urlString=\""); - sr.append(urlString); - sr.append("\" />"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("src", src); + parameters.put("id", image.getId(context)); + parameters.put("style", image.getStyle(context)); + parameters.put("wid", image.getWidth(context)); + parameters.put("hgt", image.getHeight(context)); + parameters.put("border", image.getBorder(context)); + parameters.put("alt", image.getAlt(context)); + parameters.put("urlString", urlString); + executeMacro(writer, "renderImage", parameters); } public void renderContentBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Content content) throws IOException { String editRequest = content.getEditRequest(context); - String editContainerStyle = content.getEditContainerStyle(context); String enableEditName = content.getEnableEditName(context); String enableEditValue = (String)context.get(enableEditName); if (Debug.verboseOn()) Debug.logVerbose("directEditRequest:" + editRequest, module); - StringWriter sr = new StringWriter(); - sr.append("<@renderContentBegin "); - sr.append("editRequest=\""); - sr.append(editRequest); - sr.append("\" enableEditValue=\""); - sr.append(enableEditValue); - sr.append("\" editContainerStyle=\""); - sr.append(editContainerStyle); - sr.append("\" />"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("editRequest", editRequest); + parameters.put("enableEditValue", enableEditValue == null ? "" : enableEditValue); + parameters.put("editContainerStyle", content.getEditContainerStyle(context)); + executeMacro(writer, "renderContentBegin", parameters); } public void renderContentBody(Appendable writer, Map<String, Object> context, ModelScreenWidget.Content content) throws IOException { @@ -437,7 +418,6 @@ public class MacroScreenRenderer impleme String expandedContentId = content.getContentId(context); String editMode = "Edit"; String editRequest = content.getEditRequest(context); - String editContainerStyle = content.getEditContainerStyle(context); String enableEditName = content.getEnableEditName(context); String enableEditValue = (String)context.get(enableEditName); String urlString = ""; @@ -457,29 +437,19 @@ public class MacroScreenRenderer impleme urlString = rh.makeLink(request, response, editRequest, false, false, false); } - StringWriter sr = new StringWriter(); - sr.append("<@renderContentEnd "); - sr.append("urlString=\""); - sr.append(urlString); - sr.append("\" editMode=\""); - sr.append(editMode); - sr.append("\" editContainerStyle=\""); - sr.append(editContainerStyle); - sr.append("\" editRequest=\""); - sr.append(editRequest); - sr.append("\" enableEditValue=\""); - sr.append(enableEditValue); - sr.append("\" />"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("urlString", urlString); + parameters.put("editMode", editMode); + parameters.put("editContainerStyle", content.getEditContainerStyle(context)); + parameters.put("editRequest", editRequest); + parameters.put("enableEditValue", enableEditValue); + executeMacro(writer, "renderContentEnd", parameters); } } public void renderContentFrame(Appendable writer, Map<String, Object> context, ModelScreenWidget.Content content) throws IOException { String dataResourceId = content.getDataResourceId(context); String urlString = "/ViewSimpleContent?dataResourceId=" + dataResourceId; - String width = content.getWidth(); - String height = content.getHeight(); - String border = content.getBorder(); String fullUrlString = ""; HttpServletRequest request = (HttpServletRequest) context.get("request"); HttpServletResponse response = (HttpServletResponse) context.get("response"); @@ -488,36 +458,24 @@ public class MacroScreenRenderer impleme RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_"); fullUrlString = rh.makeLink(request, response, urlString, true, false, false); } - StringWriter sr = new StringWriter(); - sr.append("<@renderContentFrame "); - sr.append("fullUrl=\""); - sr.append(fullUrlString); - sr.append("\" width=\""); - sr.append(width); - sr.append("\" height=\""); - sr.append(height); - sr.append("\" border=\""); - sr.append(border); - sr.append("\" />"); - executeMacro(writer, sr.toString()); + + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("fullUrl", fullUrlString); + parameters.put("width", content.getWidth()); + parameters.put("height", content.getHeight()); + parameters.put("border", content.getBorder()); + executeMacro(writer, "renderContentFrame", parameters); } public void renderSubContentBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.SubContent content) throws IOException { - String editRequest = content.getEditRequest(context); - String editContainerStyle = content.getEditContainerStyle(context); String enableEditName = content.getEnableEditName(context); String enableEditValue = (String)context.get(enableEditName); - StringWriter sr = new StringWriter(); - sr.append("<@renderSubContentBegin "); - sr.append(" editContainerStyle=\""); - sr.append(editContainerStyle); - sr.append("\" editRequest=\""); - sr.append(editRequest); - sr.append("\" enableEditValue=\""); - sr.append(enableEditValue); - sr.append("\" />"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("editContainerStyle", content.getEditContainerStyle(context)); + parameters.put("editRequest", content.getEditRequest(context)); + parameters.put("enableEditValue", enableEditValue); + executeMacro(writer, "renderSubContentBegin", parameters); } public void renderSubContentBody(Appendable writer, Map<String, Object> context, ModelScreenWidget.SubContent content) throws IOException { @@ -571,7 +529,6 @@ public class MacroScreenRenderer impleme public void renderSubContentEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.SubContent content) throws IOException { String editMode = "Edit"; String editRequest = content.getEditRequest(context); - String editContainerStyle = content.getEditContainerStyle(context); String enableEditName = content.getEnableEditName(context); String enableEditValue = (String)context.get(enableEditName); String expandedContentId = content.getContentId(context); @@ -596,20 +553,13 @@ public class MacroScreenRenderer impleme } } - StringWriter sr = new StringWriter(); - sr.append("<@renderSubContentEnd "); - sr.append("urlString=\""); - sr.append(urlString); - sr.append("\" editMode=\""); - sr.append(editMode); - sr.append("\" editContainerStyle=\""); - sr.append(editContainerStyle); - sr.append("\" editRequest=\""); - sr.append(editRequest); - sr.append("\" enableEditValue=\""); - sr.append(enableEditValue); - sr.append("\" />"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("urlString", urlString); + parameters.put("editMode", editMode); + parameters.put("editContainerStyle", content.getEditContainerStyle(context)); + parameters.put("editRequest", editRequest); + parameters.put("enableEditValue", enableEditValue); + executeMacro(writer, "renderSubContentEnd", parameters); } @@ -630,7 +580,6 @@ public class MacroScreenRenderer impleme String expandToolTip = ""; String collapseToolTip = ""; String fullUrlString = ""; - boolean padded = screenlet.padded(); String menuString = ""; boolean showMore = false; if (UtilValidate.isNotEmpty(title) || navMenu != null || navForm != null || collapsible) { @@ -665,36 +614,21 @@ public class MacroScreenRenderer impleme } } - StringWriter sr = new StringWriter(); - sr.append("<@renderScreenletBegin "); - sr.append("id=\""); - sr.append(screenlet.getId(context)); - sr.append("\" title=\""); - sr.append(title); - sr.append("\" collapsible="); - sr.append(Boolean.toString(collapsible)); - sr.append(" saveCollapsed="); - sr.append(Boolean.toString(screenlet.saveCollapsed())); - sr.append(" collapsibleAreaId=\""); - sr.append(collapsibleAreaId); - sr.append("\" expandToolTip=\""); - sr.append(expandToolTip); - sr.append("\" collapseToolTip=\""); - sr.append(collapseToolTip); - sr.append("\" fullUrlString=\""); - sr.append(fullUrlString); - sr.append("\" padded="); - sr.append(Boolean.toString(padded)); - sr.append(" menuString=\""); - sr.append(menuString.replaceAll("\"", "\\\\\"")); - sr.append("\" showMore="); - sr.append(Boolean.toString(showMore)); - sr.append(" collapsed="); - sr.append(Boolean.toString(collapsed)); - sr.append(" javaScriptEnabled="); - sr.append(Boolean.toString(javaScriptEnabled)); - sr.append(" />"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("id", screenlet.getId(context)); + parameters.put("title", title); + parameters.put("collapsible", collapsible); + parameters.put("saveCollapsed", screenlet.saveCollapsed()); + parameters.put("collapsibleAreaId", collapsibleAreaId); + parameters.put("expandToolTip", expandToolTip); + parameters.put("collapseToolTip", collapseToolTip); + parameters.put("fullUrlString", fullUrlString); + parameters.put("padded", screenlet.padded()); + parameters.put("menuString", menuString); + parameters.put("showMore", showMore); + parameters.put("collapsed", collapsed); + parameters.put("javaScriptEnabled", javaScriptEnabled); + executeMacro(writer, "renderScreenletBegin", parameters); } public void renderScreenletSubWidget(Appendable writer, Map<String, Object> context, ModelScreenWidget subWidget, ModelScreenWidget.Screenlet screenlet) throws GeneralException, IOException { @@ -716,9 +650,7 @@ public class MacroScreenRenderer impleme } } public void renderScreenletEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.Screenlet screenlet) throws IOException { - StringWriter sr = new StringWriter(); - sr.append("<@renderScreenletEnd/>"); - executeMacro(writer, sr.toString()); + executeMacro(writer, "renderScreenletEnd", null); } protected void renderScreenletPaginateMenu(Appendable writer, Map<String, Object> context, ModelScreenWidget.Form form) throws IOException { @@ -741,7 +673,6 @@ public class MacroScreenRenderer impleme int viewSize = modelForm.getViewSize(context); int listSize = modelForm.getListSize(context); - int lowIndex = modelForm.getLowIndex(context); int highIndex = modelForm.getHighIndex(context); int actualPageSize = modelForm.getActualPageSize(context); @@ -802,73 +733,47 @@ public class MacroScreenRenderer impleme // The current screenlet title bar navigation syling requires rendering // these links in reverse order // Last button - String paginateLastStyle = modelForm.getPaginateLastStyle(); - String paginateLastLabel = modelForm.getPaginateLastLabel(context); String lastLinkUrl = ""; if (highIndex < listSize) { int page = (listSize / viewSize); linkText = prepLinkText + page + anchor; lastLinkUrl = rh.makeLink(request, response, linkText); } - String paginateNextStyle = modelForm.getPaginateNextStyle(); - String paginateNextLabel = modelForm.getPaginateNextLabel(context); String nextLinkUrl = ""; if (highIndex < listSize) { linkText = prepLinkText + (viewIndex + 1) + anchor; // - make the link nextLinkUrl = rh.makeLink(request, response, linkText); } - String paginatePreviousStyle = modelForm.getPaginatePreviousStyle(); - String paginatePreviousLabel = modelForm.getPaginatePreviousLabel(context); String previousLinkUrl = ""; if (viewIndex > 0) { linkText = prepLinkText + (viewIndex - 1) + anchor; previousLinkUrl = rh.makeLink(request, response, linkText); } - String paginateFirstStyle = modelForm.getPaginateFirstStyle(); - String paginateFirstLabel = modelForm.getPaginateFirstLabel(context); String firstLinkUrl = ""; if (viewIndex > 0) { linkText = prepLinkText + 0 + anchor; firstLinkUrl = rh.makeLink(request, response, linkText); } - StringWriter sr = new StringWriter(); - sr.append("<@renderScreenletPaginateMenu "); - sr.append("lowIndex=\""); - sr.append(Integer.toString(lowIndex)); - sr.append("\" actualPageSize=\""); - sr.append(Integer.toString(actualPageSize)); - sr.append("\" ofLabel=\""); - sr.append(ofLabel); - sr.append("\" listSize=\""); - sr.append(Integer.toString(listSize)); - sr.append("\" paginateLastStyle=\""); - sr.append(paginateLastStyle); - sr.append("\" lastLinkUrl=\""); - sr.append(lastLinkUrl); - sr.append("\" paginateLastLabel=\""); - sr.append(paginateLastLabel); - sr.append("\" paginateNextStyle=\""); - sr.append(paginateNextStyle); - sr.append("\" nextLinkUrl=\""); - sr.append(nextLinkUrl); - sr.append("\" paginateNextLabel=\""); - sr.append(paginateNextLabel); - sr.append("\" paginatePreviousStyle=\""); - sr.append(paginatePreviousStyle); - sr.append("\" paginatePreviousLabel=\""); - sr.append(paginatePreviousLabel); - sr.append("\" previousLinkUrl=\""); - sr.append(previousLinkUrl); - sr.append("\" paginateFirstStyle=\""); - sr.append(paginateFirstStyle); - sr.append("\" paginateFirstLabel=\""); - sr.append(paginateFirstLabel); - sr.append("\" firstLinkUrl=\""); - sr.append(firstLinkUrl); - sr.append("\" />"); - executeMacro(writer, sr.toString()); + Map<String, Object> parameters = FastMap.newInstance(); + parameters.put("lowIndex", modelForm.getLowIndex(context)); + parameters.put("actualPageSize", actualPageSize); + parameters.put("ofLabel", ofLabel); + parameters.put("listSize", listSize); + parameters.put("paginateLastStyle", modelForm.getPaginateLastStyle()); + parameters.put("lastLinkUrl", lastLinkUrl); + parameters.put("paginateLastLabel", modelForm.getPaginateLastLabel(context)); + parameters.put("paginateNextStyle", modelForm.getPaginateNextStyle()); + parameters.put("nextLinkUrl", nextLinkUrl); + parameters.put("paginateNextLabel", modelForm.getPaginateNextLabel(context)); + parameters.put("paginatePreviousStyle", modelForm.getPaginatePreviousStyle()); + parameters.put("paginatePreviousLabel", modelForm.getPaginatePreviousLabel(context)); + parameters.put("previousLinkUrl", previousLinkUrl); + parameters.put("paginateFirstStyle", modelForm.getPaginateFirstStyle()); + parameters.put("paginateFirstLabel", modelForm.getPaginateFirstLabel(context)); + parameters.put("firstLinkUrl", firstLinkUrl); + executeMacro(writer, "renderScreenletPaginateMenu", parameters); } } Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java (original) +++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java Wed Aug 11 13:22:40 2010 @@ -577,4 +577,4 @@ public class ModelScreenCondition implem return !sectionsList.containsKey(this.sectionExdr.expandString(context)); } } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl (original) +++ ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl Wed Aug 11 13:22:40 2010 @@ -52,7 +52,7 @@ under the License. <#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble buttons><@makeBlock className value /></#macro> -<#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@makeBlock className value /></#macro> +<#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@makeBlock className value /></#macro> <#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch> <#if currentValue?has_content && firstInList?has_content> Modified: ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl Wed Aug 11 13:22:40 2010 @@ -81,9 +81,9 @@ under the License. </#if> </#macro> -<#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName> +<#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName> <span class="view-calendar"> - <input type="text" name="${name}" <@renderClass className alert /><#rt/> + <input type="text" name="${name}" <#if event?has_content && action?has_content> ${event}="${action}"</#if> <@renderClass className alert /><#rt/> <#if title?has_content> title="${title}"</#if> <#if value?has_content> value="${value}"</#if> <#if size?has_content> size="${size}"</#if><#rt/> Modified: ofbiz/branches/jquery/framework/widget/templates/textFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/textFormMacroLibrary.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/templates/textFormMacroLibrary.ftl (original) +++ ofbiz/branches/jquery/framework/widget/templates/textFormMacroLibrary.ftl Wed Aug 11 13:22:40 2010 @@ -28,7 +28,7 @@ under the License. <#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble buttons><@renderField value /></#macro> -<#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@renderField value /></#macro> +<#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@renderField value /></#macro> <#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch> <#if currentValue?has_content && firstInList?has_content> Modified: ofbiz/branches/jquery/framework/widget/templates/xmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/templates/xmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/jquery/framework/widget/templates/xmlFormMacroLibrary.ftl Wed Aug 11 13:22:40 2010 @@ -44,7 +44,7 @@ under the License. <#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble buttons><@renderField value/></#macro> -<#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@renderField value/></#macro> +<#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@renderField value/></#macro> <#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch> </#macro> Modified: ofbiz/branches/jquery/macros.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/macros.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/macros.xml (original) +++ ofbiz/branches/jquery/macros.xml Wed Aug 11 13:22:40 2010 @@ -18,6 +18,11 @@ specific language governing permissions under the License. --> <project name="Ant - Macros"> + <condition property="antatleast171"> + <antversion atleast="1.7.1"/> + </condition> + <fail unless="antatleast171" message="Please upgrade ant to at least 1.7.1"/> + <dirname property="ofbiz.home.dir" file="${ant.file.Ant - Macros}"/> <macrodef name="iterate"> <attribute name="filelist" default="subdirs"/> Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy Wed Aug 11 13:22:40 2010 @@ -34,4 +34,4 @@ if (!maintHistSeqId && workEffortId) { parameters.fixedAssetId = fixedAssetMaint.fixedAssetId; parameters.maintHistSeqId = fixedAssetMaint.maintHistSeqId; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy Wed Aug 11 13:22:40 2010 @@ -68,4 +68,4 @@ if (intervalMeterTypeId) { context.productMeterTypeDesc = productMeterTypeDesc; scheduleWorkEffort = fixedAssetMaint.getRelatedOne("ScheduleWorkEffort"); -context.scheduleWorkEffort = scheduleWorkEffort; \ No newline at end of file +context.scheduleWorkEffort = scheduleWorkEffort; Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy Wed Aug 11 13:22:40 2010 @@ -81,4 +81,4 @@ context.workEffort = workEffort; context.fixedAsset = fixedAsset; context.maintHistSeqId = maintHistSeqId; context.fixedAssetId = fixedAssetId; -context.workEffortId = workEffortId; \ No newline at end of file +context.workEffortId = workEffortId; Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/widget/LookupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/widget/LookupScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/widget/LookupScreens.xml Wed Aug 11 13:22:40 2010 @@ -47,4 +47,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/LookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/LookupForms.xml (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/LookupForms.xml Wed Aug 11 13:22:40 2010 @@ -30,4 +30,4 @@ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/ProductForms.xml Wed Aug 11 13:22:40 2010 @@ -151,4 +151,4 @@ </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml Wed Aug 11 13:22:40 2010 @@ -90,4 +90,4 @@ under the License. <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field> <field name="classEnumId"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml Wed Aug 11 13:22:40 2010 @@ -189,4 +189,4 @@ under the License. <on-event-update-area event-type="paginate" area-id="search-results" area-target="FixedAssetSearchResults"/> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/LookupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/LookupScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/widget/ismgr/LookupScreens.xml Wed Aug 11 13:22:40 2010 @@ -70,4 +70,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/specialpurpose/ebay/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/entitydef/entitymodel.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/entitydef/entitymodel.xml Wed Aug 11 13:22:40 2010 @@ -87,4 +87,4 @@ under the License. </relation> </entity> </entitymodel> - \ No newline at end of file + Modified: ofbiz/branches/jquery/specialpurpose/ebay/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/servicedef/secas.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/servicedef/secas.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/servicedef/secas.xml Wed Aug 11 13:22:40 2010 @@ -33,4 +33,4 @@ under the License. <condition-field field-name="statusId" operator="not-equals" to-field-name="oldStatusId"/> <action service="setEbayOrderToComplete" mode="sync"/> </eca> -</service-eca> \ No newline at end of file +</service-eca> Modified: ofbiz/branches/jquery/specialpurpose/ebay/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/servicedef/services.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/servicedef/services.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/servicedef/services.xml Wed Aug 11 13:22:40 2010 @@ -164,4 +164,4 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> </service> -</services> \ No newline at end of file +</services> Modified: ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Wed Aug 11 13:22:40 2010 @@ -607,4 +607,4 @@ public class EbayHelper { } return productId; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java Wed Aug 11 13:22:40 2010 @@ -1115,7 +1115,7 @@ public class EbayOrderServices { String city = (String) shippingAddressCtx.get("shippingAddressCityName"); EbayHelper.correctCityStateCountry(dispatcher, shippingAddressCtx, city, state, country); - List<GenericValue> shipInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, shippingAddressCtx.get("shippingAddressStreet1").toString(), + List<GenericValue> shipInfo = PartyWorker.findMatchingPersonPostalAddresses(delegator, shippingAddressCtx.get("shippingAddressStreet1").toString(), (UtilValidate.isEmpty(shippingAddressCtx.get("shippingAddressStreet2")) ? null : shippingAddressCtx.get("shippingAddressStreet2").toString()), shippingAddressCtx.get("city").toString(), shippingAddressCtx.get("stateProvinceGeoId").toString(), shippingAddressCtx.get("shippingAddressPostalCode").toString(), null, shippingAddressCtx.get("countryGeoId").toString(), firstName, null, lastName); if (UtilValidate.isNotEmpty(shipInfo)) { Modified: ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java Wed Aug 11 13:22:40 2010 @@ -822,4 +822,4 @@ public class ImportOrdersFromEbay { } return orderHeader; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/EbayAdvancedSearch.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/EbayAdvancedSearch.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/EbayAdvancedSearch.groovy (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/EbayAdvancedSearch.groovy Wed Aug 11 13:22:40 2010 @@ -67,4 +67,4 @@ context.ebayConfigList = ebayConfigList; context.categoryIds = categoryIds; context.productStoreId = productStoreId; context.prodCatalogList = prodCatalogList; -context.searchCatalogId = currentCatalogId; \ No newline at end of file +context.searchCatalogId = currentCatalogId; Modified: ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy Wed Aug 11 13:22:40 2010 @@ -68,4 +68,4 @@ if (parameters.productStoreId) { context.hideExportOptions = "N"; } } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/eBayOrders.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/eBayOrders.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/eBayOrders.groovy (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/eBayOrders.groovy Wed Aug 11 13:22:40 2010 @@ -19,4 +19,4 @@ if (parameters.orderList) { session.setAttribute("orderList", parameters.orderList); -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/updatedEbayOrders.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/updatedEbayOrders.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/updatedEbayOrders.groovy (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/updatedEbayOrders.groovy Wed Aug 11 13:22:40 2010 @@ -20,4 +20,4 @@ if (session.getAttribute("orderList")) { session.removeAttribute("orderList"); return "success"; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/specialpurpose/ebay/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/widget/CommonScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/widget/CommonScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/widget/CommonScreens.xml Wed Aug 11 13:22:40 2010 @@ -152,4 +152,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/specialpurpose/ebay/widget/EbayForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/widget/EbayForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/widget/EbayForms.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/widget/EbayForms.xml Wed Aug 11 13:22:40 2010 @@ -270,4 +270,4 @@ under the License. <field name="noConditionFind"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/specialpurpose/ebay/widget/EbayScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/widget/EbayScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/widget/EbayScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/widget/EbayScreens.xml Wed Aug 11 13:22:40 2010 @@ -289,4 +289,4 @@ under the License. </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml Wed Aug 11 13:22:40 2010 @@ -206,41 +206,83 @@ <value xml:lang="en">Require eBay Inventory</value> </property> <!-- Selling Manager preferences --> + <property key="EbayAcceptTheBestOffer1"> + <value xml:lang="en">use this percent value to accept the Best Offer if it is greater or equal</value> + </property> + <property key="EbayAcceptTheBestOffer2"> + <value xml:lang="en">% of the above price.</value> + </property> + <property key="EbayActive"> + <value xml:lang="en">Active</value> + </property> + <property key="EbayAddSecondChanceOffer"> + <value xml:lang="en">Add Second Chance Offer</value> + </property> + <property key="EbayAfter"> + <value xml:lang="en">After</value> + </property> + <property key="EbayAutoBestOfferSetting"> + <value xml:lang="en">Best Offer (Buy-It-Now Only)</value> + </property> <property key="EbayAutomationDispute"> <value xml:lang="en">Automation Dispute</value> </property> + <property key="EbayAutoPaymentReceviedEmail"> + <value xml:lang="en">Automatically send email when payment has been received</value> + </property> + <property key="EbayAutoRelistingItems"> + <value xml:lang="en">Auto Relisting Items</value> + </property> + <property key="EbayAutoRelistingItemsDescription"> + <value xml:lang="en">Auto Relisting Items when they are end item.</value> + </property> + <property key="EbayAutoSendItemDispatchEmail"> + <value xml:lang="en">Automatic send item dispatched notification email</value> + </property> + <property key="EbayAutoSendWinBuyerEmail"> + <value xml:lang="en">Automatic send notification email to winning buyer on auction items</value> + </property> + <property key="EbayBasedOn"> + <value xml:lang="en">Best offer based on Price.</value> + </property> + <property key="EbayChangeCategory"> + <value xml:lang="en">Change</value> + </property> + <property key="EbayCombineOrderSetting"> + <value xml:lang="en">Combine Orders Setting</value> + </property> + <property key="EbayContinueListing"> + <value xml:lang="en">Countinue</value> + </property> <property key="EbayDisputeCheckoutNotComplete"> <value xml:lang="en">Create Dispute if checkout has not been completed</value> </property> <property key="EbayDisputeNotPay"> <value xml:lang="en">Create Dispute if checkout has been completed but no payment has been received</value> </property> - <property key="EbayAfter"> - <value xml:lang="en">After</value> + <property key="EbayEditEmailTemplate"> + <value xml:lang="en">Edit Email Template</value> </property> - <property key="EbayReason"> - <value xml:lang="en">Reason</value> + <property key="EbayErrorMessageList"> + <value xml:lang="en">Error Messages List</value> + </property> + <property key="EbayEvaluateOn"> + <value xml:lang="en">Automatically evaluate Best Offers</value> </property> <property key="EbayExplanation"> <value xml:lang="en">Explanation</value> </property> - <property key="EbayAddSecondChanceOffer"> - <value xml:lang="en">Add Second Chance Offer</value> + <property key="EbayIgnoreTheOffer"> + <value xml:lang="en">Ignore the offer if the buyer included any message.</value> </property> - <property key="EbayIsAutoPositiveFeedback"> - <value xml:lang="en">Automatically leave the positive feedback</value> - </property> - <property key="EbaySituations"> - <value xml:lang="en">Situations</value> - </property> - <property key="EbayTxtPaymentReceive"> - <value xml:lang="en">Buyer has paid for this item.</value> + <property key="EbayIncludeMyDefaultCrossPromotionInThisEmail"> + <value xml:lang="en">Include my default cross-promotion in this email</value> </property> - <property key="EbayTxtPaymentReceiveAndPositive"> - <value xml:lang="en">Buyer has paid for this item and left me positive feedback. </value> + <property key="EbayIncludePayNowButtonAndAcceptPaymentMethods"> + <value xml:lang="en">Include the Pay Now button and accepted payment methods</value> </property> - <property key="EbayTxtAutoPositiveFeedbackBuyer"> - <value xml:lang="en">Automated Positive Feedback for Buyers</value> + <property key="EbayIsAutoPositiveFeedback"> + <value xml:lang="en">Automatically leave the positive feedback</value> </property> <property key="EbayIsAutoFeedbackReminder"> <value xml:lang="en">Automatically send a Feedback Reminder email</value> @@ -248,73 +290,67 @@ <property key="EbayIsAutoFeedbackReminderTooltip"> <value xml:lang="en">Automatically send a Feedback Reminder email if feedback has not been received</value> </property> - <property key="EbayIsSendCopyEmailToSeller"> - <value xml:lang="en">Copy and Send to Seller</value> + <property key="EbayIsAutoSendEmail"> + <value xml:lang="en">Automatically send email</value> </property> <property key="EbayIsSendCopyEmailTooltip"> <value xml:lang="en">How many days after shipping you want this email sent?</value> </property> - <property key="EbayIsAutoSendEmail"> - <value xml:lang="en">Automatically send email</value> + <property key="EbayIsSendCopyEmailToSeller"> + <value xml:lang="en">Copy and Send to Seller</value> </property> - <property key="EbayAutoPaymentReceviedEmail"> - <value xml:lang="en">Automatically send email when payment has been received</value> + <property key="EbayListOrderImported"> + <value xml:lang="en">List Orders Imported</value> </property> - <property key="EbayEditEmailTemplate"> - <value xml:lang="en">Edit Email Template</value> + <property key="EbayNoOrderImported"> + <value xml:lang="en">No orders imported found</value> </property> - <property key="EbayIncludePayNowButtonAndAcceptPaymentMethods"> - <value xml:lang="en">Include the Pay Now button and accepted payment methods</value> + <property key="EbayOpenListings"> + <value xml:lang="en">Open Listings</value> </property> - <property key="EbayIncludeMyDefaultCrossPromotionInThisEmail"> - <value xml:lang="en">Include my default cross-promotion in this email</value> + <property key="EbayReason"> + <value xml:lang="en">Reason</value> </property> - <property key="EbayAutoSendWinBuyerEmail"> - <value xml:lang="en">Automatic send notification email to winning buyer on auction items</value> + <property key="EbayRejectGreaterRate1"> + <value xml:lang="en">Reject the offer if it is greater or equal to this percent value.</value> </property> - <property key="EbayCombineOrderSetting"> - <value xml:lang="en">Combine Orders Setting</value> + <property key="EbayRejectGreaterRate2"> + <value xml:lang="en">Reject the offer if it is less than this percent value.</value> </property> - <property key="EbayAutoSendItemDispatchEmail"> - <value xml:lang="en">Automatic send item dispatched notification email</value> + <property key="EbayRejectGreaterRate3"> + <value xml:lang="en">Message:</value> </property> - <property key="EbayContinueListing"> - <value xml:lang="en">Countinue</value> + <property key="EbayRejectLessRate1"> + <value xml:lang="en">Reject the offer if it is less than this percent value.</value> </property> - <property key="EbayChangeCategory"> - <value xml:lang="en">Change</value> + <property key="EbayRejectLessRate2"> + <value xml:lang="en">Message:</value> </property> - <property key="EbayStoreCategory"> - <value xml:lang="en">eBay Store Category</value> + <property key="EbayRejectTheOffer"> + <value xml:lang="en">Reject the offer if it is more than the inventory item's Buy-It-Now Price.</value> </property> <property key="EbaySet"> <value xml:lang="en">Set</value> </property> - <property key="EbayUnsold"> - <value xml:lang="en">unsold</value> + <property key="EbaySituations"> + <value xml:lang="en">Situations</value> </property> - <property key="EbayActive"> - <value xml:lang="en">Active</value> + <property key="EbayStoreCategory"> + <value xml:lang="en">eBay Store Category</value> </property> - <property key="EbayAutoRelistingItems"> - <value xml:lang="en">Auto Relisting Items</value> + <property key="EbayTxtAutoPositiveFeedbackBuyer"> + <value xml:lang="en">Automated Positive Feedback for Buyers</value> </property> - <property key="EbayAutoRelistingItemsDescription"> - <value xml:lang="en">Auto Relisting Items when they are end item.</value> + <property key="EbayTxtPaymentReceive"> + <value xml:lang="en">Buyer has paid for this item.</value> + </property> + <property key="EbayTxtPaymentReceiveAndPositive"> + <value xml:lang="en">Buyer has paid for this item and left me positive feedback. </value> </property> <property key="EbayWaitingToShipping"> <value xml:lang="en">Waiting to shipping</value> </property> - <property key="EbayListOrderImported"> - <value xml:lang="en">List Orders Imported</value> - </property> - <property key="EbayNoOrderImported"> - <value xml:lang="en">No orders imported found</value> - </property> - <property key="EbayOpenListings"> - <value xml:lang="en">Open Listings</value> - </property> - <property key="EbayErrorMessageList"> - <value xml:lang="en">Error Messages List</value> + <property key="unsold"> + <value xml:lang="en">unsold</value> </property> -</resource> \ No newline at end of file +</resource> Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/data/EbayStoreTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/data/EbayStoreTypeData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/data/EbayStoreTypeData.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/data/EbayStoreTypeData.xml Wed Aug 11 13:22:40 2010 @@ -37,7 +37,16 @@ under the License. <Enumeration enumId="EBAY_AUTO_PR_EMAIL" description="Automatic send payment received email when has not been received" enumTypeId="EBAY_AUTO_PREF"/> <Enumeration enumId="EBAY_AUTO_ITEM_DISP" description="Automatic send item dispatched email" enumTypeId="EBAY_AUTO_PREF"/> <Enumeration enumId="EBAY_AUTO_BLK_ITEM" description="Automatic block item that out of stock" enumTypeId="EBAY_AUTO_PREF"/> - + <Enumeration enumId="EBAY_AUTO_BEST_OFFER" description="Automatic best offer enable" enumTypeId="EBAY_AUTO_PREF"/> + <!-- Ebay Automation Price --> + <EnumerationType description="Ebay setting auto price" enumTypeId="EBAY_AUTO_PRICE" hasTable="N" parentTypeId=""/> + <Enumeration enumId="REFAIL_PRICE" description="Refail Price" enumTypeId="EBAY_AUTO_PRICE"/> + <Enumeration enumId="START_PRICE" description="Start Price" enumTypeId="EBAY_AUTO_PRICE"/> + <Enumeration enumId="RESERVE_PRICE" description="Reserve Price" enumTypeId="EBAY_AUTO_PRICE"/> + <Enumeration enumId="BUY_IT_NOW_PRICE" description="Buy-It-Now Price" enumTypeId="EBAY_AUTO_PRICE"/> + <Enumeration enumId="SELLER_COST" description="Seller Cost" enumTypeId="EBAY_AUTO_PRICE"/> + <Enumeration enumId="SECOND_CHANCE_PRICE" description="Second Chance Price" enumTypeId="EBAY_AUTO_PRICE"/> + <Enumeration enumId="STORE_PRICE" description="Store Price" enumTypeId="EBAY_AUTO_PRICE"/> <!-- Automation email --> <Enumeration enumId="EBAY_WIN_BUYER_NOTI" description="Automatically send a Winning Buyer Notification email to your winning buyer(s) after item has sold." enumTypeId="PRDS_EMAIL"/> <Enumeration enumId="EBAY_PAY_RECIEVED" description="Automatically send Payment Received email when payment has been received." enumTypeId="PRDS_EMAIL"/> Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/entitydef/entitymodel.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/entitydef/entitymodel.xml Wed Aug 11 13:22:40 2010 @@ -64,6 +64,7 @@ under the License. <field name="condition1" type="value"/> <field name="condition2" type="value"/> <field name="condition3" type="value"/> + <field name="parentPrefCondId" type="id-ne"></field> <prim-key field="productStoreId"/> <prim-key field="autoPrefEnumId"/> <relation type="one" fk-name="EBY_STR_PREF" rel-entity-name="ProductStore"> @@ -123,4 +124,21 @@ under the License. <key-map field-name="productStoreId"/> </relation> </entity> -</entitymodel> \ No newline at end of file + <entity entity-name="EbayProductStorePrefCond" package-name="org.ofbiz.ebay.store"> + <field name="prefCondId" type="id-ne"/> + <field name="condition" type="long-varchar"></field> + <field name="description" type="long-varchar"></field> + <field name="parentPrefCondId" type="id-ne"></field> + <prim-key field="prefCondId"/> + </entity> + <entity entity-name="EbayUserBestOffer" package-name="org.ofbiz.ebay.store" + title="ebay User Best Offer"> + <field name="itemId" type="value"/> + <field name="userId" type="value"/> + <field name="bestOfferId" type="value"/> + <field name="productStoreId" type="id-ne"/> + <field name="contactStatus" type="value"/> + <prim-key field="itemId"/> + <prim-key field="userId"/> + </entity> +</entitymodel> Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/servicedef/secas.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/servicedef/secas.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/servicedef/secas.xml Wed Aug 11 13:22:40 2010 @@ -39,4 +39,4 @@ under the License. <condition operator="equals" field-name="enabled" value="N"/> <action mode="sync" service="stopEbayAutoPreference"/> </eca> -</service-eca> \ No newline at end of file +</service-eca> Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/servicedef/services.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/servicedef/services.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/servicedef/services.xml Wed Aug 11 13:22:40 2010 @@ -325,7 +325,7 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="true"/> <attribute name="serviceName" mode="IN" type="String" optional="false"/> </service> - <service name="updateEbayProductStorePref" engine="entity-auto" default-entity-name="EbayProductStorePref" invoke="update" auth="true" > + <service name="updateEbayProductStorePref" engine="entity-auto" default-entity-name="EbayProductStorePref" invoke="update" auth="true"> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true" /> <attribute name="enabled" mode="IN" type="String" optional="false" default-value="N"/> @@ -408,21 +408,6 @@ under the License. <attribute name="productListingId" mode="IN" type="String" optional="false"/> <attribute name="attributeMapList" mode="IN" type="java.util.HashMap" optional="false"/> </service> - <service name="getMyeBaySelling" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebaystore.EbayStore" invoke="getMyeBaySelling" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="entriesPerPage" mode="IN" type="String" optional="true"/> - <attribute name="pageNumber" mode="IN" type="String" optional="true"/> - <attribute name="listingType" mode="IN" type="String" optional="true"/> - <attribute name="activeItems" mode="OUT" type="List" optional="true"/> - <attribute name="soldItems" mode="OUT" type="List" optional="true"/> - <attribute name="unsoldItems" mode="OUT" type="List" optional="true"/> - <attribute name="scheduledItems" mode="OUT" type="List" optional="true"/> - <attribute name="activeSize" mode="OUT" type="Integer" optional="true"/> - <attribute name="soldSize" mode="OUT" type="Integer" optional="true"/> - <attribute name="unsoldeSize" mode="OUT" type="Integer" optional="true"/> - <attribute name="scheduledSize" mode="OUT" type="Integer" optional="true"/> - </service> <service name="autoRelistingItems" engine="java" transaction-timeout="7200" location="org.ofbiz.ebaystore.EbayStoreAutoPreferences" invoke="autoRelistingItems" auth="false"> <description>Automatic service to re-listing items when They are end item</description> @@ -441,6 +426,37 @@ under the License. <attribute name="functionName" mode="IN" type="String" optional="false"/> <attribute name="logMessage" mode="IN" type="String" optional="false"/> </service> + <service name="ebayBestOfferPrefCond" engine="java" + location="org.ofbiz.ebaystore.EbayBestOfferAutoPref" invoke="ebayBestOfferPrefCond" auth="true"> + <attribute name="productStoreId" mode="IN" type="String"/> + <attribute name="enabled" mode="IN" type="String" default-value="N" optional="true"></attribute> + <!--<attribute name="userLogin" mode="IN" type="String"></attribute>--> + <attribute name="condition1" mode="IN" type="String" optional="true"></attribute> + <attribute name="condition2" mode="IN" type="String" optional="true"></attribute> + <attribute name="condition3" mode="IN" type="String" default-value="N" optional="true"></attribute> + <attribute name="condition4" mode="IN" type="String" default-value="N" optional="true"></attribute> + <attribute name="condition5" mode="IN" type="String" default-value="N" optional="true"></attribute> + <attribute name="condition6" mode="IN" type="String" optional="true"></attribute> + <attribute name="condition7" mode="IN" type="String" optional="true"></attribute> + <attribute name="condition8" mode="IN" type="String" optional="true"></attribute> + <attribute name="condition9" mode="IN" type="String" default-value="N"></attribute> + <attribute name="condition10" mode="IN" type="String" optional="true"></attribute> + <attribute name="condition11" mode="IN" type="String" optional="true"></attribute> + </service> + <service name="createEbayProductStorePrefCond" engine="entity-auto" default-entity-name="EbayProductStorePrefCond" invoke="create" auth="true" use-transaction="true"> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + </service> + <service name="updateEbayProductStorePrefCond" engine="entity-auto" default-entity-name="EbayProductStorePrefCond" invoke="update" auth="true" use-transaction="true"> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true" /> + <attribute name="condition" mode="IN" type="String" optional="false"/> + </service> + <service name="autoBestOffer" engine="java" transaction-timeout="36000" + location="org.ofbiz.ebaystore.EbayStoreAutoPreferences" invoke="autoBestOffer" auth="false"> + <attribute name="jobId" mode="IN" type="String" optional="false"/> + <attribute name="productStoreId" mode="IN" type="String" optional="false"/> + </service> <service name="getMyeBaySelling" engine="java" transaction-timeout="36000" location="org.ofbiz.ebaystore.EbayStore" invoke="getMyeBaySelling" auth="true"> <attribute name="productStoreId" mode="IN" type="String" optional="false"/> @@ -482,4 +498,39 @@ under the License. <attribute mode="IN" name="_imageData_contentType" optional="true" type="String"/> <attribute mode="IN" name="_imageData_fileName" optional="true" type="String"/> </service> -</services> \ No newline at end of file + <service name="listBestOfferIncludeMessage" engine="java" transaction-timeout="10000" + location="org.ofbiz.ebaystore.EbayStoreCustomerService" invoke="listBestOfferIncludeMessage"> + <description>List customer offer data</description> + <attribute name="userId" mode="IN" type="String"></attribute> + <attribute name="itemId" mode="IN" type="String"></attribute> + <attribute name="bestOfferId" mode="IN" type="String"></attribute> + <attribute name="productStoreId" mode="IN" type="String"></attribute> + <attribute name="email" mode="OUT" type="String" optional="true"></attribute> + <attribute name="message" mode="OUT" type="String" optional="true"></attribute> + <attribute name="price" mode="OUT" type="String" optional="true"></attribute> + <attribute name="quantity" mode="OUT" type="String" optional="true"></attribute> + <attribute name="offerStatus" mode="OUT" type="String" optional="true"></attribute> + <attribute name="itemName" mode="OUT" type="String" optional="true"></attribute> + </service> + <service name="updateContactStatus" engine="java" transaction-timeout="10000" + location="org.ofbiz.ebaystore.EbayStoreCustomerService" invoke="updateContactStatus"> + <description>List customer offer data</description> + <attribute name="userId" mode="INOUT" type="String"></attribute> + <attribute name="itemId" mode="INOUT" type="String"></attribute> + <attribute name="itemName" mode="INOUT" type="String"></attribute> + <attribute name="productStoreId" mode="INOUT" type="String"></attribute> + <attribute name="offerId" mode="INOUT" type="String"></attribute> + <attribute name="price" mode="INOUT" type="String"></attribute> + <attribute name="email" mode="INOUT" type="String"></attribute> + <attribute name="quantity" mode="INOUT" type="String"></attribute> + <attribute name="contactStatus" mode="INOUT" type="String"></attribute> + <attribute name="contactSetting" mode="IN" type="String"></attribute> + </service> + <service name="deleteContactAlert" engine="java" transaction-timeout="10000" + location="org.ofbiz.ebaystore.EbayStoreCustomerService" invoke="deleteContactAlert"> + <description>Delete customer offer data</description> + <attribute name="userId" mode="IN" type="String"></attribute> + <attribute name="itemId" mode="IN" type="String"></attribute> + <attribute name="productStoreId" mode="INOUT" type="String"></attribute> + </service> +</services> Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java Wed Aug 11 13:22:40 2010 @@ -116,4 +116,4 @@ public class EbayAccount { } return result; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java Wed Aug 11 13:22:40 2010 @@ -22,11 +22,10 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.Iterator; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -34,17 +33,17 @@ import javax.servlet.http.HttpSession; import javolution.util.FastList; import javolution.util.FastMap; + import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; -import org.ofbiz.service.ServiceUtil; import com.ebay.sdk.ApiContext; import com.ebay.sdk.ApiException; @@ -54,17 +53,17 @@ import com.ebay.sdk.call.GetCategorySpec import com.ebay.sdk.call.GetSellingManagerInventoryCall; import com.ebay.sdk.call.ReviseSellingManagerProductCall; import com.ebay.sdk.call.VerifyAddItemCall; -import org.apache.axis.types.URI; import com.ebay.soap.eBLBaseComponents.AmountType; -import com.ebay.soap.eBLBaseComponents.BuyerPaymentMethodCodeType; import com.ebay.soap.eBLBaseComponents.CategoryType; import com.ebay.soap.eBLBaseComponents.CountryCodeType; import com.ebay.soap.eBLBaseComponents.CurrencyCodeType; import com.ebay.soap.eBLBaseComponents.DetailLevelCodeType; +import com.ebay.soap.eBLBaseComponents.FeeType; +import com.ebay.soap.eBLBaseComponents.FeesType; import com.ebay.soap.eBLBaseComponents.GetSellingManagerInventoryRequestType; import com.ebay.soap.eBLBaseComponents.GetSellingManagerInventoryResponseType; -import com.ebay.soap.eBLBaseComponents.ItemSpecificsEnabledCodeType; import com.ebay.soap.eBLBaseComponents.ItemType; +import com.ebay.soap.eBLBaseComponents.ListingDesignerType; import com.ebay.soap.eBLBaseComponents.ListingTypeCodeType; import com.ebay.soap.eBLBaseComponents.NameRecommendationType; import com.ebay.soap.eBLBaseComponents.NameValueListArrayType; @@ -76,25 +75,18 @@ import com.ebay.soap.eBLBaseComponents.R import com.ebay.soap.eBLBaseComponents.ReviseSellingManagerProductResponseType; import com.ebay.soap.eBLBaseComponents.SellingManagerProductDetailsType; import com.ebay.soap.eBLBaseComponents.SellingManagerProductType; +import com.ebay.soap.eBLBaseComponents.ShippingDetailsType; import com.ebay.soap.eBLBaseComponents.ShippingServiceDetailsType; +import com.ebay.soap.eBLBaseComponents.ShippingServiceOptionsType; import com.ebay.soap.eBLBaseComponents.ShippingTypeCodeType; import com.ebay.soap.eBLBaseComponents.SiteCodeType; import com.ebay.soap.eBLBaseComponents.StoreCustomCategoryType; import com.ebay.soap.eBLBaseComponents.StorefrontType; import com.ebay.soap.eBLBaseComponents.VATDetailsType; import com.ebay.soap.eBLBaseComponents.ValueRecommendationType; -import com.ebay.soap.eBLBaseComponents.WarningLevelCodeType; -import com.ebay.soap.eBLBaseComponents.ListingDesignerType; -import com.ebay.soap.eBLBaseComponents.ShippingDetailsType; -import com.ebay.soap.eBLBaseComponents.ShippingServiceOptionsType; import com.ebay.soap.eBLBaseComponents.VerifyAddItemRequestType; import com.ebay.soap.eBLBaseComponents.VerifyAddItemResponseType; -import com.ebay.soap.eBLBaseComponents.FeesType; -import com.ebay.soap.eBLBaseComponents.FeeType; -import com.ebay.soap.eBLBaseComponents.InsuranceDetailsType; -import com.ebay.soap.eBLBaseComponents.SalesTaxType; -import com.ebay.soap.eBLBaseComponents.AddItemRequestType; -import com.ebay.soap.eBLBaseComponents.AddItemResponseType; +import com.ebay.soap.eBLBaseComponents.WarningLevelCodeType; public class EbayEvents { @@ -1151,4 +1143,4 @@ public class EbayEvents { } return recommendationMap; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java Wed Aug 11 13:22:40 2010 @@ -382,4 +382,4 @@ public class EbayFeedback { result = ServiceUtil.returnSuccess(); return result; } -} \ No newline at end of file +} |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |