Return-Path: 
 <commits-return-13615-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org>
Delivered-To: apmail-ofbiz-commits-archive@www.apache.org
Received: (qmail 98647 invoked from network); 5 Sep 2009 14:19:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 5 Sep 2009 14:19:56 -0000
Received: (qmail 43743 invoked by uid 500); 5 Sep 2009 14:19:56 -0000
Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org
Received: (qmail 43650 invoked by uid 500); 5 Sep 2009 14:19:55 -0000
Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ofbiz.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ofbiz.apache.org>
List-Post: <mailto:commits@ofbiz.apache.org>
List-Id: <commits.ofbiz.apache.org>
Reply-To: dev@ofbiz.apache.org
Delivered-To: mailing list commits@ofbiz.apache.org
Received: (qmail 43641 invoked by uid 99); 5 Sep 2009 14:19:55 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Sep 2009 14:19:55 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Sep 2009 14:19:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 07D9E23888A0; Sat,  5 Sep 2009 14:19:24 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r811652 - in /ofbiz/trunk/specialpurpose/ebay:
 config/EbayUiLabels.xml servicedef/services.xml
 src/org/ofbiz/ebay/ProductsExportToEbay.java
 webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy
 webapp/ebay/find/productsExportToEbay.ftl
Date: Sat, 05 Sep 2009 14:19:23 -0000
To: commits@ofbiz.apache.org
From: ashish@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090905141924.07D9E23888A0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ashish
Date: Sat Sep  5 14:19:23 2009
New Revision: 811652

URL: http://svn.apache.org/viewvc?rev=811652&view=rev
Log:
Now added customXml on the User Interface so that user can change the values passed from there.

Modified:
    ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
    ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml
    ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
    ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy
    ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl

Modified: ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml?rev=811652&r1=811651&r2=811652&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml Sat Sep  5 14:19:23 2009
@@ -97,6 +97,9 @@
         <value xml:lang="th">ส่งการชำระเงินโดยผู้ซื้อ</value>
         <value xml:lang="zh">买家发送的支付</value>
     </property>
+    <property key="FormFieldTitle_customXml">
+        <value xml:lang="en">Custom XML</value>
+    </property>
     <property key="FormFieldTitle_eBayPaymentStatus">
         <value xml:lang="en">eBay Payment Status</value>
         <value xml:lang="fr">Statut de paiement Ebay</value>

Modified: ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml?rev=811652&r1=811651&r2=811652&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml Sat Sep  5 14:19:23 2009
@@ -50,6 +50,7 @@
         <attribute type="String" mode="IN" name="startPrice" optional="true"/>
         <attribute type="String" mode="IN" name="quantity" optional="true"/>
         <attribute type="String" mode="IN" name="productStoreId" optional="true"/>
+        <attribute type="String" mode="IN" name="customXml" optional="true" allow-html="any"/>
     </service>
     <service name="getEbayCategories" engine="java"
              location="org.ofbiz.ebay.ProductsExportToEbay" invoke="getEbayCategories" auth="true">

Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java?rev=811652&r1=811651&r2=811652&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java Sat Sep  5 14:19:23 2009
@@ -424,15 +424,10 @@
     }
 
     private static void setMiscDetails(Document itemDocument, Element itemElem, Map context, GenericDelegator delegator) throws Exception {
-        String productStoreId = (String) context.get("productStoreId");
+        String customXmlFromUI = (String) context.get("customXml");
         String customXml = "";
-        if (UtilValidate.isNotEmpty(productStoreId)) {
-            GenericValue eBayConfig = delegator.findOne("EbayConfig", false, UtilMisc.toMap("productStoreId", productStoreId));
-            if (UtilValidate.isNotEmpty(eBayConfig.getString("customXml"))) {
-                customXml = eBayConfig.getString("customXml");
-            } else {
-                customXml = UtilProperties.getPropertyValue(configFileName, "eBayExport.customXml");
-            }
+        if (UtilValidate.isNotEmpty(customXmlFromUI)) {
+            customXml = customXmlFromUI;
         } else {
             customXml = UtilProperties.getPropertyValue(configFileName, "eBayExport.customXml");   
         }

Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy?rev=811652&r1=811651&r2=811652&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy Sat Sep  5 14:19:23 2009
@@ -40,6 +40,9 @@
 
 webSite = WebSiteWorker.getWebSite(request);
 if (webSite) {
-    context.productStoreId = webSite.productStoreId;;
+    productStoreId = webSite.productStoreId;
+    context.productStoreId = productStoreId;
+    eBayConfig = delegator.findOne("EbayConfig", [productStoreId : productStoreId], false);
+    context.customXml = eBayConfig.customXml;
     context.webSiteUrl = webSite.getString("standardContentPrefix")?:"http://demo.ofbiz.org";
 }

Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl?rev=811652&r1=811651&r2=811652&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl Sat Sep  5 14:19:23 2009
@@ -154,6 +154,13 @@
                 </td>
             </tr>
             <tr>
+                <td align="right" class="label">${uiLabelMap.FormFieldTitle_customXml}</td>
+                <td>&nbsp;</td>
+                <td>
+                    <textarea cols="60" rows="6" wrap="hard" name="customXml">${customXml?if_exists}</textarea>
+                </td>
+            </tr>
+            <tr>
                 <td colspan=2>&nbsp;</td>
                 <td>
                     <input type="submit" value="${uiLabelMap.EbayExportToEbay}" name="submitButton" class="smallSubmit">