svn commit: r985102 - in /ofbiz/trunk/specialpurpose/ebaystore: entitydef/entitymodel.xml src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java

[hansbak-2]

Author: hansbak
Date: Fri Aug 13 06:23:30 2010
New Revision: 985102

URL: http://svn.apache.org/viewvc?rev=985102&view=rev
Log:
change field name 'condition' because is a reserved word

Modified:
    ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml
    ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
    ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java

Modified: ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml?rev=985102&r1=985101&r2=985102&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml Fri Aug 13 06:23:30 2010
@@ -126,7 +126,7 @@ under the License.
     </entity>
     <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="acceptanceCondition" type="long-varchar"></field>
         <field name="description" type="long-varchar"></field>
         <field name="parentPrefCondId" type="id-ne"></field>
         <prim-key field="prefCondId"/>

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java?rev=985102&r1=985101&r2=985102&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java Fri Aug 13 06:23:30 2010
@@ -43,37 +43,37 @@ public class EbayBestOfferAutoPref {
             String condition11 = (String) context.get("condition11");
             try {
                 Map ebayCondition1 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition1.put("condition", condition1);
+                ebayCondition1.put("acceptanceCondition", condition1);
 
                 Map ebayCondition2 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition2.put("condition", condition2);
+                ebayCondition2.put("acceptanceCondition", condition2);
 
                 Map ebayCondition3 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition3.put("condition", condition3);
+                ebayCondition3.put("acceptanceCondition", condition3);
 
                 Map ebayCondition4 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition4.put("condition", condition4);
+                ebayCondition4.put("acceptanceCondition", condition4);
 
                 Map ebayCondition5 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition5.put("condition", condition5);
+                ebayCondition5.put("acceptanceCondition", condition5);
 
                 Map ebayCondition6 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition6.put("condition", condition6);
+                ebayCondition6.put("acceptanceCondition", condition6);
 
                 Map ebayCondition7 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition7.put("condition", condition7);
+                ebayCondition7.put("acceptanceCondition", condition7);
 
                 Map ebayCondition8 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition8.put("condition", condition8);
+                ebayCondition8.put("acceptanceCondition", condition8);
 
                 Map ebayCondition9 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition9.put("condition", condition9);
+                ebayCondition9.put("acceptanceCondition", condition9);
 
                 Map ebayCondition10 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition10.put("condition", condition10);
+                ebayCondition10.put("acceptanceCondition", condition10);
 
                 Map ebayCondition11 = UtilMisc.toMap("userLogin", userLogin);
-                ebayCondition11.put("condition", condition11);
+                ebayCondition11.put("acceptanceCondition", condition11);
 
             GenericValue productStorePref = delegator.findByPrimaryKey("EbayProductStorePref", UtilMisc.toMap("productStoreId", productStoreId, "autoPrefEnumId", "EBAY_AUTO_BEST_OFFER"));
             if (UtilValidate.isEmpty(productStorePref)) {
@@ -165,7 +165,7 @@ public class EbayBestOfferAutoPref {
                     Map ebayPrefCond = UtilMisc.toMap("userLogin", userLogin);
                     for (int i = 0; i < productPref.size(); i++) {
                         ebayPrefCond.put("prefCondId",productPref.get(i).getString("prefCondId"));
-                        ebayPrefCond.put("condition",condition[i]);
+                        ebayPrefCond.put("acceptanceCondition",condition[i]);
                         dispatcher.runSync("updateEbayProductStorePrefCond",ebayPrefCond);
                     }
                 }

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=985102&r1=985101&r2=985102&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java Fri Aug 13 06:23:30 2010
@@ -1175,17 +1175,17 @@ public class EbayStoreAutoPreferences {
             String parentPrefCondId = ebayProductStorePref.getString("parentPrefCondId");
             List<GenericValue> ebayProductStorePrefCond = delegator.findByAnd("EbayProductStorePrefCond", UtilMisc.toMap("parentPrefCondId", parentPrefCondId));
             //Parameters
-            String priceType = ebayProductStorePrefCond.get(0).getString("condition");
-            String acceptBestOfferValue = ebayProductStorePrefCond.get(1).getString("condition");
-            String rejectOffer = ebayProductStorePrefCond.get(2).getString("condition");
-            String ignoreOfferMessage = ebayProductStorePrefCond.get(3).getString("condition");
-            String rejectGreaterEnable = ebayProductStorePrefCond.get(4).getString("condition");
-            String greaterValue = ebayProductStorePrefCond.get(5).getString("condition");
-            String lessValue = ebayProductStorePrefCond.get(6).getString("condition");
-            String rejectGreaterMsg = ebayProductStorePrefCond.get(7).getString("condition");
-            String rejectLessEnable = ebayProductStorePrefCond.get(8).getString("condition");
-            String lessThanValue = ebayProductStorePrefCond.get(9).getString("condition");
-            String rejectLessMsg = ebayProductStorePrefCond.get(10).getString("condition");
+            String priceType = ebayProductStorePrefCond.get(0).getString("acceptanceCondition");
+            String acceptBestOfferValue = ebayProductStorePrefCond.get(1).getString("acceptanceCondition");
+            String rejectOffer = ebayProductStorePrefCond.get(2).getString("acceptanceCondition");
+            String ignoreOfferMessage = ebayProductStorePrefCond.get(3).getString("acceptanceCondition");
+            String rejectGreaterEnable = ebayProductStorePrefCond.get(4).getString("acceptanceCondition");
+            String greaterValue = ebayProductStorePrefCond.get(5).getString("acceptanceCondition");
+            String lessValue = ebayProductStorePrefCond.get(6).getString("acceptanceCondition");
+            String rejectGreaterMsg = ebayProductStorePrefCond.get(7).getString("acceptanceCondition");
+            String rejectLessEnable = ebayProductStorePrefCond.get(8).getString("acceptanceCondition");
+            String lessThanValue = ebayProductStorePrefCond.get(9).getString("acceptanceCondition");
+            String rejectLessMsg = ebayProductStorePrefCond.get(10).getString("acceptanceCondition");
             //case parameter to double type
             BigDecimal acceptPercentValue = new BigDecimal(acceptBestOfferValue);
             BigDecimal greaterPercentValue = new BigDecimal(greaterValue);