You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/07/05 12:08:02 UTC
svn commit: r960512 [7/7] - in /ofbiz/branches/jquery: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/servicedef/ ...
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=960512&r1=960511&r2=960512&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 Mon Jul 5 10:07:56 2010
@@ -50,6 +50,7 @@ import com.ebay.sdk.ApiContext;
import com.ebay.sdk.ApiException;
import com.ebay.sdk.SdkException;
import com.ebay.sdk.call.AddItemCall;
+import com.ebay.sdk.call.GetCategorySpecificsCall;
import com.ebay.sdk.call.GetSellingManagerInventoryCall;
import com.ebay.sdk.call.ReviseSellingManagerProductCall;
import com.ebay.sdk.call.VerifyAddItemCall;
@@ -59,12 +60,17 @@ import com.ebay.soap.eBLBaseComponents.B
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.GetSellingManagerInventoryRequestType;
import com.ebay.soap.eBLBaseComponents.GetSellingManagerInventoryResponseType;
import com.ebay.soap.eBLBaseComponents.ItemSpecificsEnabledCodeType;
import com.ebay.soap.eBLBaseComponents.ItemType;
import com.ebay.soap.eBLBaseComponents.ListingTypeCodeType;
+import com.ebay.soap.eBLBaseComponents.NameRecommendationType;
+import com.ebay.soap.eBLBaseComponents.NameValueListArrayType;
+import com.ebay.soap.eBLBaseComponents.NameValueListType;
import com.ebay.soap.eBLBaseComponents.PictureDetailsType;
+import com.ebay.soap.eBLBaseComponents.RecommendationsType;
import com.ebay.soap.eBLBaseComponents.ReturnPolicyType;
import com.ebay.soap.eBLBaseComponents.ReviseSellingManagerProductRequestType;
import com.ebay.soap.eBLBaseComponents.ReviseSellingManagerProductResponseType;
@@ -76,6 +82,7 @@ import com.ebay.soap.eBLBaseComponents.S
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;
@@ -642,7 +649,33 @@ public class EbayEvents {
String itemPkCateId = (String) requestParams.get("primaryCateId");
String shippingService = (String) requestParams.get("ShippingService");
String productStoreId = (String) requestParams.get("productStoreId");
-
+
+ // initialize request parameter.
+ Map paramMap = UtilHttp.getParameterMap(request);
+ List<String> nameSpecificList = FastList.newInstance();
+ List<String> valueSpecificList = FastList.newInstance();
+ String nameValueListType = null;
+ String valueListType = null;
+ int rowCount = UtilHttp.getMultiFormRowCount(paramMap);
+ if (rowCount > 1) {
+ for (int i = 0; i < rowCount; i++) {
+ String thisSuffix = UtilHttp.MULTI_ROW_DELIMITER + i; // current suffix after each field id
+ // get the NameSpecifics
+ if (paramMap.containsKey("nameValueListType" + thisSuffix)) {
+ nameValueListType = (String) paramMap.remove("nameValueListType" + thisSuffix);
+ }
+ // get the ValueSpecifics
+ if (paramMap.containsKey("categorySpecifics" + thisSuffix)) {
+ valueListType = (String) paramMap.remove("categorySpecifics" + thisSuffix);
+ }
+
+ if ((UtilValidate.isNotEmpty(nameValueListType)) && (UtilValidate.isNotEmpty(valueListType))){
+ nameSpecificList.add(nameValueListType);
+ valueSpecificList.add(valueListType);
+ }
+ }
+ }
+
try {
ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
Map<String,Object> addItemObject = getAddItemListingObject(request, apiContext);
@@ -677,7 +710,28 @@ public class EbayEvents {
attributeMapList.put("CategoryParentID", item.getPrimaryCategory().getCategoryParentID(0).toString());
attributeMapList.put("LeafCategory", "true");
attributeMapList.put("LSD", "true");
-
+
+ // set Item Specifics.
+ int itemSpecificsSize = nameSpecificList.size();
+ int valueSpecificsSize = valueSpecificList.size();
+ if ((itemSpecificsSize > 0) && (valueSpecificsSize > 0)) {
+ NameValueListArrayType nameValueListArray = new NameValueListArrayType();
+ NameValueListType[] nameValueListTypes = new NameValueListType[nameSpecificList.size()];
+ for (int i = 0; i < itemSpecificsSize; i++) {
+ String name = (String) nameSpecificList.get(i);
+ String value = (String) valueSpecificList.get(i);
+ String[] valueArray = new String[] { value };
+
+ // set Name value list type.
+ NameValueListType listType = new NameValueListType();
+ listType.setName(name);
+ listType.setValue(valueArray);
+ nameValueListTypes[i] = listType;
+ }
+ nameValueListArray.setNameValueList(nameValueListTypes);
+ item.setItemSpecifics(nameValueListArray);
+ }
+
item.setUseTaxTable(false);
item.setDispatchTimeMax(3);
ReturnPolicyType policy = new ReturnPolicyType();
@@ -1052,4 +1106,49 @@ public class EbayEvents {
Debug.logError(e.getMessage(), module);
}
}
+
+ public static Map<String, Map> categorySpecifics(String categoryId, HttpServletRequest request) {
+ Map<String, Map> recommendationMap = FastMap.newInstance();
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
+ LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
+ Map<String,Object> requestParams = UtilHttp.getParameterMap(request);
+ Locale locale = UtilHttp.getLocale(request);
+ String productStoreId = (String) requestParams.get("productStoreId");
+ HttpSession session = request.getSession(true);
+ GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
+
+ try {
+ ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
+ GetCategorySpecificsCall categorySpecifics = new GetCategorySpecificsCall(apiContext);
+ String[] categoryIds = {categoryId};
+ categorySpecifics.setCategoryID(categoryIds);
+ DetailLevelCodeType[] detailLevel = new DetailLevelCodeType[] {
+ DetailLevelCodeType.RETURN_ALL,
+ DetailLevelCodeType.ITEM_RETURN_ATTRIBUTES,
+ DetailLevelCodeType.ITEM_RETURN_DESCRIPTION
+ };
+ categorySpecifics.setDetailLevel(detailLevel);
+ RecommendationsType[] recommend = categorySpecifics.getCategorySpecifics();
+
+ for (int i = 0; i < recommend.length; i++) {
+ NameRecommendationType[] nameRecommend = recommend[i].getNameRecommendation();
+ Map<String, List> nameRecommendationMap = FastMap.newInstance();
+ for (int j = 0; j < nameRecommend.length; j++) {
+ String name = nameRecommend[j].getName();
+ List<String> valueList = FastList.newInstance();
+ ValueRecommendationType[] valueRecommend = nameRecommend[j].getValueRecommendation();
+ for (int k = 0; k < valueRecommend.length; k++) {
+ String value = valueRecommend[k].getValue();
+ valueList.add(value);
+ }
+ nameRecommendationMap.put(name, valueList);
+ }
+ recommendationMap.put("categorySpecifics", nameRecommendationMap);
+ }
+ } catch (Exception e) {
+ Debug.logError(e.getMessage(), module);
+ return null;
+ }
+ return recommendationMap;
+ }
}
\ No newline at end of file
Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original)
+++ ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Mon Jul 5 10:07:56 2010
@@ -19,6 +19,8 @@
package org.ofbiz.ebaystore;
import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -26,6 +28,8 @@ import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
import java.util.Calendar;
import java.util.Date;
import java.util.Iterator;
@@ -37,6 +41,7 @@ import javolution.util.FastList;
import javolution.util.FastMap;
import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.FileUtil;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
@@ -44,6 +49,7 @@ import org.ofbiz.base.util.UtilPropertie
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.common.DataModelConstants;
+
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -66,12 +72,19 @@ import com.ebay.sdk.SdkSoapException;
import com.ebay.sdk.call.*;
import com.ebay.sdk.util.eBayUtil;
import com.ebay.soap.eBLBaseComponents.AmountType;
+import com.ebay.soap.eBLBaseComponents.BestOfferActionCodeType;
+import com.ebay.soap.eBLBaseComponents.BestOfferDetailsType;
+import com.ebay.soap.eBLBaseComponents.BestOfferStatusCodeType;
+import com.ebay.soap.eBLBaseComponents.BestOfferType;
+import com.ebay.soap.eBLBaseComponents.CategoryFeatureType;
import com.ebay.soap.eBLBaseComponents.CheckoutStatusCodeType;
import com.ebay.soap.eBLBaseComponents.CurrencyCodeType;
import com.ebay.soap.eBLBaseComponents.DeleteSellingManagerTemplateRequestType;
import com.ebay.soap.eBLBaseComponents.DeleteSellingManagerTemplateResponseType;
import com.ebay.soap.eBLBaseComponents.DisputeExplanationCodeType;
import com.ebay.soap.eBLBaseComponents.DisputeReasonCodeType;
+import com.ebay.soap.eBLBaseComponents.FeesType;
+import com.ebay.soap.eBLBaseComponents.GalleryTypeCodeType;
import com.ebay.soap.eBLBaseComponents.GetAllBiddersModeCodeType;
import com.ebay.soap.eBLBaseComponents.GetSellingManagerInventoryRequestType;
import com.ebay.soap.eBLBaseComponents.GetSellingManagerInventoryResponseType;
@@ -80,13 +93,19 @@ import com.ebay.soap.eBLBaseComponents.G
import com.ebay.soap.eBLBaseComponents.GetStoreRequestType;
import com.ebay.soap.eBLBaseComponents.GetStoreResponseType;
import com.ebay.soap.eBLBaseComponents.ItemSortTypeCodeType;
+import com.ebay.soap.eBLBaseComponents.ListingDetailsType;
import com.ebay.soap.eBLBaseComponents.ListingTypeCodeType;
import com.ebay.soap.eBLBaseComponents.MerchDisplayCodeType;
+import com.ebay.soap.eBLBaseComponents.NameRecommendationType;
import com.ebay.soap.eBLBaseComponents.OfferType;
import com.ebay.soap.eBLBaseComponents.OrderTransactionArrayType;
import com.ebay.soap.eBLBaseComponents.OrderTransactionType;
import com.ebay.soap.eBLBaseComponents.OrderType;
import com.ebay.soap.eBLBaseComponents.PaginationType;
+import com.ebay.soap.eBLBaseComponents.PhotoDisplayCodeType;
+import com.ebay.soap.eBLBaseComponents.PictureDetailsType;
+import com.ebay.soap.eBLBaseComponents.PictureSourceCodeType;
+import com.ebay.soap.eBLBaseComponents.RecommendationsType;
import com.ebay.soap.eBLBaseComponents.SecondChanceOfferDurationCodeType;
import com.ebay.soap.eBLBaseComponents.SellingManagerProductDetailsType;
import com.ebay.soap.eBLBaseComponents.SellingManagerProductInventoryStatusType;
@@ -125,6 +144,7 @@ import com.ebay.soap.eBLBaseComponents.T
import com.ebay.soap.eBLBaseComponents.TransactionArrayType;
import com.ebay.soap.eBLBaseComponents.TransactionType;
import com.ebay.soap.eBLBaseComponents.UserType;
+import com.ebay.soap.eBLBaseComponents.ValueRecommendationType;
import com.ebay.soap.eBLBaseComponents.VerifyAddSecondChanceItemResponseType;
import java.sql.Timestamp;
@@ -1442,6 +1462,8 @@ public class EbayStore {
String buyerId = (String) context.get("buyerId");
String listingType = (String) context.get("listingType");
List soldItems = FastList.newInstance();
+ double reservPrice = 0;
+ int hitCount = 0;
try {
Map<String, Object> inMap = FastMap.newInstance();
inMap.put("productStoreId", productStoreId);
@@ -1505,6 +1527,12 @@ public class EbayStore {
api.setDetailLevel(detailLevels);
ItemType itemType = api.getItem();
String itemUrl = null;
+
+ entry.put("SKU", itemType.getSKU());
+ if (UtilValidate.isNotEmpty(itemType.getReservePrice())) reservPrice = itemType.getReservePrice().getValue();
+ entry.put("reservePrice", reservPrice);
+ entry.put("hitCount", itemType.getHitCount() != null ? itemType.getHitCount() : 0);
+
if (itemType.getListingDetails() != null) {
itemUrl = itemType.getListingDetails().getViewItemURL();
}
@@ -1892,6 +1920,7 @@ public class EbayStore {
GetMyeBaySellingCall api = new GetMyeBaySellingCall(apiContext);
ItemListCustomizationType itemListType = new ItemListCustomizationType();
itemListType.setInclude(Boolean.TRUE);
+ itemListType.setSort(ItemSortTypeCodeType.ITEM_ID_DESCENDING);
String entriesPerPage = (String) context.get("entriesPerPage");
String pageNumber = (String) context.get("pageNumber");
@@ -1907,6 +1936,8 @@ public class EbayStore {
itemListType.setPagination(page);
if (UtilValidate.isNotEmpty(listingType)) {
itemListType.setListingType(ListingTypeCodeType.valueOf(listingType));
+ } else {
+ itemListType.setListingType(ListingTypeCodeType.FIXED_PRICE_ITEM);
}
DetailLevelCodeType[] detailLevels = new DetailLevelCodeType[] {
DetailLevelCodeType.RETURN_ALL,
@@ -2031,6 +2062,8 @@ public class EbayStore {
static Map<String, Object> schItemToColumns(ItemType item) {
Map<String, Object> cols = FastMap.newInstance();
int i = 0;
+ double reservPrice = 0;
+ int hitCount = 0;
cols.put("itemId", item.getItemID() != null ? item.getItemID() : "");
cols.put("title", item.getTitle() != null ? item.getTitle() : "");
@@ -2046,12 +2079,18 @@ public class EbayStore {
}
cols.put("quantity", quantityStr);
cols.put("listingType", item.getListingType().value());
+ cols.put("SKU", item.getSKU());
+ if (UtilValidate.isNotEmpty(item.getReservePrice())) reservPrice = item.getReservePrice().getValue();
+ cols.put("reservePrice", reservPrice);
+ cols.put("hitCount", item.getHitCount() != null ? item.getHitCount() : 0);
return cols;
}
static Map<String, Object> unsoldItemToColumns(ItemType item) {
Map<String, Object> cols = FastMap.newInstance();
int i = 0;
+ double reservPrice = 0;
+ int hitCount = 0;
cols.put("itemId", item.getItemID() != null ? item.getItemID() : "");
cols.put("title", item.getTitle() != null ? item.getTitle() : "");
@@ -2071,6 +2110,10 @@ public class EbayStore {
}
cols.put("quantity", quantityStr);
cols.put("listingType", item.getListingType().value());
+ cols.put("SKU", item.getSKU());
+ if (UtilValidate.isNotEmpty(item.getReservePrice())) reservPrice = item.getReservePrice().getValue();
+ cols.put("reservePrice", reservPrice);
+ cols.put("hitCount", item.getHitCount() != null ? item.getHitCount() : 0);
return cols;
}
@@ -2191,4 +2234,136 @@ public class EbayStore {
cols.put("sellerPaidStatus", sellerPaidStatus);
return cols;
}
+
+ public Map<String, Object> getEbayStoreProductItem(DispatchContext dctx, Map<String, ? extends Object> context) {
+ Map<String, Object>result = FastMap.newInstance();
+ LocalDispatcher dispatcher = dctx.getDispatcher();
+ GenericValue userLogin = (GenericValue) context.get("userLogin");
+ Delegator delegator = dctx.getDelegator();
+ Locale locale = (Locale) context.get("locale");
+ String productStoreId = (String) context.get("productStoreId");
+ String itemID = (String) context.get("itemId");
+
+ try {
+ Map<String, Object> inMap = FastMap.newInstance();
+ inMap.put("productStoreId", productStoreId);
+ inMap.put("userLogin", userLogin);
+ Map<String, Object> resultUser = dispatcher.runSync("getEbayStoreUser", inMap);
+ String userID = (String) resultUser.get("userLoginId");
+ ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
+ GetItemCall api = new GetItemCall(apiContext);
+
+ DetailLevelCodeType[] detailLevels = new DetailLevelCodeType[] {
+ DetailLevelCodeType.RETURN_ALL,
+ DetailLevelCodeType.ITEM_RETURN_ATTRIBUTES,
+ DetailLevelCodeType.ITEM_RETURN_DESCRIPTION
+ };
+ api.setDetailLevel(detailLevels);
+ api.getItem(itemID);
+
+ // Set item type.
+ ItemType item = api.getReturnedItem();
+ String title = item.getTitle();
+ String description = item.getDescription();
+ String listingType = item.getListingType().value();
+
+ if (item.getPictureDetails() != null) {
+ String url[] = item.getPictureDetails().getPictureURL();
+ if (url.length != 0) {
+ result.put("pictureURL", url[0]);
+ } else {
+ result.put("pictureURL", null);
+ }
+ } else {
+ result.put("pictureURL", null);
+ }
+
+ result.put("title", title);
+ result.put("description", description);
+ AmountType amt = item.getStartPrice();
+ result.put("price", amt != null ? (new Double(amt.getValue()).toString()) : "");
+ result.put("currencyId", amt.getCurrencyID().toString());
+ result.put("listingType", listingType);
+ } catch (Exception e) {
+ return ServiceUtil.returnError(e.getMessage());
+ }
+ return result;
+ }
+
+ public Map<String, Object> reviseEbayStoreProductItem(DispatchContext dctx, Map<String, ? extends Object> context) {
+ Map<String, Object>result = FastMap.newInstance();
+ LocalDispatcher dispatcher = dctx.getDispatcher();
+ GenericValue userLogin = (GenericValue) context.get("userLogin");
+ Delegator delegator = dctx.getDelegator();
+ Locale locale = (Locale) context.get("locale");
+ String productStoreId = (String) context.get("productStoreId");
+ String itemID = (String) context.get("itemId");
+ String listingType = (String) context.get("listingType");
+ String title = (String) context.get("title");
+ String description = (String) context.get("description");
+ String price = (String) context.get("price");
+ String imageFileName = (String) context.get("_imageData_fileName");
+ String currencyId = (String) context.get("currencyId");
+
+ try {
+ Map<String, Object> inMap = FastMap.newInstance();
+ inMap.put("productStoreId", productStoreId);
+ inMap.put("userLogin", userLogin);
+ Map<String, Object> resultUser = dispatcher.runSync("getEbayStoreUser", inMap);
+ String userID = (String) resultUser.get("userLoginId");
+ ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
+ String sandboxEPSURL = "https://api.sandbox.ebay.com/ws/api.dll";
+ apiContext.setEpsServerUrl(sandboxEPSURL);
+ ReviseItemCall api = new ReviseItemCall(apiContext);
+
+ // Set item type.
+ ItemType itemToBeRevised = new ItemType();
+ itemToBeRevised.setItemID(itemID);
+
+ if (UtilValidate.isNotEmpty(title)) {
+ itemToBeRevised.setTitle(title);
+ }
+
+ if (UtilValidate.isNotEmpty(description)) {
+ itemToBeRevised.setDescription(description);
+ }
+
+ // Set startPrice value.
+ AmountType startPrice = new AmountType();
+ if (UtilValidate.isNotEmpty(price)) {
+ startPrice.setValue(Double.parseDouble(price));
+ startPrice.setCurrencyID(CurrencyCodeType.valueOf(currencyId));
+ itemToBeRevised.setStartPrice(startPrice);
+ }
+
+ // Check upload image file.
+ if (UtilValidate.isNotEmpty(imageFileName)) {
+
+ // Upload image to ofbiz path /runtime/tmp .
+ ByteBuffer byteWrap = (ByteBuffer) context.get("imageData");
+ File file = new File(System.getProperty("ofbiz.home"), "runtime" + File.separator + "tmp" + File.separator + imageFileName);
+ FileChannel wChannel = new FileOutputStream(file, false).getChannel();
+ wChannel.write(byteWrap);
+ wChannel.close();
+
+ // Set path file picture to api and set picture details.
+ String [] pictureFiles = {System.getProperty("ofbiz.home") + File.separator + "runtime" + File.separator + "tmp" + File.separator + imageFileName};
+ PictureDetailsType pictureDetails = new PictureDetailsType();
+ pictureDetails.setGalleryType(GalleryTypeCodeType.GALLERY);
+ pictureDetails.setPhotoDisplay(PhotoDisplayCodeType.NONE);
+ pictureDetails.setPictureSource(PictureSourceCodeType.EPS);
+ itemToBeRevised.setPictureDetails(pictureDetails);
+
+ api.setItemToBeRevised(itemToBeRevised);
+ api.uploadPictures(pictureFiles, pictureDetails);
+ FeesType fees = api.reviseItem();
+ } else {
+ api.setItemToBeRevised(itemToBeRevised);
+ FeesType fees = api.reviseItem();
+ }
+ } catch (Exception e) {
+ return ServiceUtil.returnError(e.getMessage());
+ }
+ return ServiceUtil.returnSuccess("Update Item Successfully.");
+ }
}
\ No newline at end of file
Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy (original)
+++ ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy Mon Jul 5 10:07:56 2010
@@ -119,6 +119,20 @@
if (primaryCate) pkCateId = primaryCate.getCategoryID();
}
}
+ categorySpecificObject = EbayEvents.categorySpecifics(pkCateId, request);
+ Map<String, List> categorySpecificMap = categorySpecificObject.get("categorySpecifics");
+ int checkNameSpecific = null;
+ int checkValueSpecific = null;
+ Iterator<String> specificIterator = categorySpecificMap.keySet().iterator();
+ while(specificIterator.hasNext()){
+ String name = specificIterator.next();
+ List<String> valueList = categorySpecificMap.get(name);
+ checkValueSpecific = (valueList) ? 1 : 0 ;
+ }
+ checkNameSpecific = categorySpecificMap.size();
+ String checkSpecific = ((checkNameSpecific > 0) && (checkValueSpecific == 1)) ? "true" : "false";
+ context.checkSpecific = checkSpecific;
+ context.categorySpecifix = categorySpecificObject;
context.stCate1ID = stCate1ID;
context.stCate2ID = stCate2ID;
if (pkCateId) {
Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml Mon Jul 5 10:07:56 2010
@@ -314,13 +314,22 @@
<response name="success" type="request" value="clearExpListing"/>
<response name="error" type="view" value="exportProductListing"/>
</request-map>
-
<!-- Selling Manager -->
<request-map uri="sellingManager">
<security https="true" auth="true"/>
<response name="success" type="view" value="ebayStoreInventory"/>
<response name="error" type="view" value="ebayStoreInventory"/>
</request-map>
+ <request-map uri="getItemProduct">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="GetItemProduct"/>
+ </request-map>
+ <request-map uri="editItemProduct">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="reviseEbayStoreProductItem"/>
+ <response name="success" type="view" value="GetItemProduct"/>
+ <response name="error" type="view" value="GetItemProduct"/>
+ </request-map>
<!-- Active -->
<request-map uri="activeListing">
<security auth="true" https="true"/>
@@ -416,6 +425,7 @@
<view-map name="AutomationPreferences" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#EbayAutomationPreferences"/>
<!-- Selling Manager -->
<view-map name="editEmailTemplate" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#EditEmailTemplate"/>
+ <view-map name="GetItemProduct" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#GetItemProduct"/>
<!-- store Inventory -->
<view-map name="ebayStoreInventory" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#ebayStoreInventory"/>
<view-map name="ebayLoadStoreInventory" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#ebayLoadStoreInventory"/>
@@ -441,5 +451,6 @@
<view-map name="WaitingToShipping" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#WaitingToShipping"/>
<view-map name="ordersImported" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#ordersImported"/>
<view-map name="errorMessageList" type="screen" page="component://ebaystore/widget/EbayStoreScreens.xml#errorMessageList"/>
+
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -54,7 +54,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl Mon Jul 5 10:07:56 2010
@@ -71,7 +71,7 @@ under the License.
if (cateId.indexOf(':')!= -1) {
cateId = cateId.substring(0,cateId.indexOf(':'));
}
- var pars = 'ebayCategoryId='+cateId+'&productStoreId='+productStoreId;
+ var pars = 'ebayCategoryId='+cateId+'&productStoreId='+productStoreId;
var myAjax = new Ajax.Request( url, {
method: 'get',
parameters: pars,
@@ -99,7 +99,7 @@ under the License.
}
function retrieveTemplateByTemGroupId(templateGroupId,productStoreId,pkCategoryId){
- var pars = 'templateGroupId='+templateGroupId+'&productStoreId='+productStoreId+'&pkCategoryId='+pkCategoryId;
+ var pars = 'templateGroupId='+templateGroupId+'&productStoreId='+productStoreId+'&pkCategoryId='+pkCategoryId;
var url = '<@o...@ofbizUrl>';
var myAjax = new Ajax.Request( url, {
method: 'get',
@@ -448,12 +448,38 @@ under the License.
</div>
<!-- item specifices section -->
<#if primaryCate?has_content && primaryCate.getCategoryID()?exists && listingTypes?has_content>
+ <#if checkSpecific == "true">
<div class="screenlet">
<div class="screenlet-title-bar"><ul><li class="h3">Item specifices</li></ul><br class="clear"/></div>
- <div class="screenlet-body">
-
+ <div class="screenlet-body">
+ <table width="50%" height="100%" id="table2" cellspacing="0">
+ <#list categorySpecifix?keys as key>
+ <#assign values = categorySpecifix.get(key)?if_exists/>
+ <#assign i = 0/>
+ <#list values?keys as nameSpecific>
+ <#assign itemSpecifics = values.get(nameSpecific)?if_exists/>
+ <#if itemSpecifics?has_content>
+ <tr>
+ <td class="label">${nameSpecific?if_exists}</td>
+ <input type="hidden" name="nameValueListType_o_${i}" value="${nameSpecific?if_exists}"/>
+ <td>
+ <select id="categorySpecifics" name="categorySpecifics_o_${i}">
+ <option value="" ></option>
+ <#list itemSpecifics as itemSpecific>
+ <option value="${itemSpecific?if_exists}" >${itemSpecific?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ <#assign i = i + 1/>
+ </#if>
+ </#list>
+ </#list>
+ </table>
+ </div>
</div>
</div>
+ </#if>
</#if>
<!-- Setup ad templates section -->
<#if primaryCate?has_content && primaryCate.getCategoryID()?exists && listingTypes?has_content>
@@ -781,4 +807,4 @@ under the License.
</#if-->
</form>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Mon Jul 5 10:07:56 2010
@@ -77,9 +77,12 @@ value="${bsh:billingAccount != null ? or
</row-actions>
<field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field>
<field name="itemId"><display description="${itemId}"/></field>
+ <field name="SKU" title="Product ID"><display/></field>
<field name="title"><display description="${title}"/></field>
<field name="buyer"><display description="${buyer}"/></field>
<field name="listingType"><display description="${listingType}"/></field>
+ <field name="hitCount"><display/></field>
+ <field name="reservePrice"><display/></field>
<field name="quantity"><display description="${quantity}"/></field>
<field name="transactionId"><display description="${transactionId}"/></field>
<field name="totalAmount"><display description="${totalAmount}"/></field>
@@ -469,7 +472,7 @@ value="${bsh:billingAccount != null ? or
<form name="ActiveItemList" type="list" target="doAction" list-name="activeItemList"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" use-row-submit="true" separate-columns="true">
<field name="itemId"><display/></field>
- <field name="SKU"><display/></field>
+ <field name="SKU" title="Product ID"><display/></field>
<field name="title">
<hyperlink target="${viewItemURL}" description="${title}" target-type="plain" target-window="_BLANK"/>
</field>
@@ -480,15 +483,20 @@ value="${bsh:billingAccount != null ? or
<field name="startTime"><display/></field>
<field name="quantity"><display/></field>
<field name="listingType"><display/></field>
+ <field name="EditItem">
+ <hyperlink target="getItemProduct?productStoreId=${parameters.productStoreId}&itemId=${itemId}" description="Edit" target-type="plain" target-window="_BLANK"/>
+ </field>
</form>
<!-- Unsold Listing -->
<form name="UnsoldItemList" type="list" target="doAction" list-name="unsoldItemList"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" use-row-submit="true" separate-columns="true">
<field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field>
<field name="itemId"><display/></field>
+ <field name="SKU" title="Product ID"><display/></field>
<field name="title"><display/></field>
- <field name="quantity"><display/></field>
<field name="price"><display/></field>
+ <field name="hitCount"><display/></field>
+ <field name="reservePrice"><display/></field>
<field name="startTime"><display/></field>
<field name="endTime"><display/></field>
<field name="quantity"><display/></field>
@@ -553,4 +561,17 @@ value="${bsh:billingAccount != null ? or
</field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit/></field>
</form>
+ <form name="EditItemProduct" target="editItemProduct" type="upload" >
+ <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field>
+ <field name="itemId"><hidden value="${parameters.itemId}"/></field>
+ <field name="listingType"><hidden/></field>
+ <field name="pictureURL" title="Picture" use-when="pictureURL==null"><image width="100" value="/images/defaultImage.jpg"></image></field>
+ <field name="pictureURL" title="Picture" use-when="pictureURL!=null"><image width="150"></image></field>
+ <field name="imageData" title="${uiLabelMap.CommonUpload}"><file/></field>
+ <field name="title"><text size="50"/></field>
+ <field name="description" encode-output="true"><textarea/></field>
+ <field name="price"><text/></field>
+ <field name="currencyId" title="Currency Code"><display/></field>
+ <field name="submit" title="${uiLabelMap.CommonUpdate}"><submit/></field>
+ </form>
</forms>
\ No newline at end of file
Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml Mon Jul 5 10:07:56 2010
@@ -460,7 +460,7 @@
<widgets>
<decorator-screen name="EbayActiveListing">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.EbayOpenListings}">
+ <screenlet title="Active to Open Listings">
<include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="ItemOption"/>
<include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="ActiveItemList"/>
</screenlet>
@@ -555,4 +555,31 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+ <screen name="GetItemProduct">
+ <section>
+ <actions>
+ <set field="headerItem" value="ebayStore"/>
+ <service service-name="getEbayStoreProductItem" result-map="result">
+ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+ <field-map field-name="itemId" from-field="parameters.itemId"/>
+ </service>
+ <set field="title" from-field="result.title"/>
+ <set field="description" from-field="result.description"/>
+ <set field="price" from-field="result.price"/>
+ <set field="pictureURL" from-field="result.pictureURL"/>
+ <set field="listingType" from-field="result.listingType"/>
+ <set field="currencyId" from-field="result.currencyId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <decorator-section-include name="body"/>
+ <screenlet title="Edit Product Item" collapsible="true" name="GetItemProduct">
+ <include-form name="EditItemProduct" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoRentalProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoRentalProduct.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoRentalProduct.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoRentalProduct.xml Mon Jul 5 10:07:56 2010
@@ -19,7 +19,7 @@ under the License.
-->
<entity-engine-xml>
- <ProductStore productStoreId="RentalStore" storeName="Open Travel system Demo Site" companyName="Ant Websystems Ltd" title="Ready for your reservation"
+ <ProductStore productStoreId="RentalStore" storeName="Open Travel system Demo Site" companyName="Open Travel Ltd" title="Ready for your reservation"
subtitle="Part of the Open For Business Family of Open Source Software" payToPartyId="Company" daysToCancelNonPay="30" prorateShipping="Y" prorateTaxes="Y" isImmediatelyFulfilled="Y"
inventoryFacilityId="WebStoreWarehouse" oneInventoryFacility="N" checkInventory="N" reserveInventory="N" reserveOrderEnumId="INVRO_FIFO_REC" requireInventory="N"
defaultLocaleString="en_US" defaultCurrencyUomId="EUR" allowPassword="Y" explodeOrderItems="N" retryFailedAuths="Y"
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -60,7 +60,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
+ <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -68,7 +68,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
+ <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Mon Jul 5 10:07:56 2010
@@ -20,13 +20,13 @@ under the License.
<#assign initialLocale = locale.toString()>
<html>
<head>
- <title>Automation Groups - Main</title>
+ <title>Main</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl Mon Jul 5 10:07:56 2010
@@ -49,7 +49,7 @@ under the License.
<#else>
<#assign parentCategoryId = ""/>
</#if>
- <a href="${Static["org.ofbiz.product.category.CatalogUrlServlet"].makeCatalogUrl(request, "", category.productCategoryId, parentCategoryId)}" class="${browseCategoryButtonClass}"><#if categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}</#if></a>
+ <a href="<@ofbizCatalogUrl currentCategoryId=category.productCategoryId previousCategoryId=parentCategoryId/>" class="${browseCategoryButtonClass}"><#if categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}</#if></a>
<#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)>
<#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CommonScreens.xml Mon Jul 5 10:07:56 2010
@@ -42,7 +42,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
- <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
+ <set field="initialLocale" type="String" value="${groovy:parameters?.userLogin?.lastLocale?.substring(0,2)}" default-value="${groovy:locale?.toString()?.substring(0,2)?:'en'}"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/effects.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/validation.js" global="true"/>
@@ -257,7 +257,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
- <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
+ <set field="initialLocale" type="String" value="${groovy:parameters?.userLogin?.lastLocale?.substring(0,2)}" default-value="${groovy:locale?.toString()?.substring(0,2)?:'en'}"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/effects.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/validation.js" global="true"/>
Modified: ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -54,7 +54,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -64,7 +64,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 5 10:07:56 2010
@@ -1,2 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-960493
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 5 10:07:56 2010
@@ -1,2 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-960493
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 5 10:07:56 2010
@@ -1,2 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-960493
Modified: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -54,7 +54,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -54,7 +54,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -54,7 +54,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/js</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/js</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Mon Jul 5 10:07:56 2010
@@ -18,7 +18,7 @@ under the License.
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
-
+<#assign initialLocale = locale.toString()>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
<title>${uiLabelMap.OfbizTitle}</title>
@@ -27,6 +27,7 @@ under the License.
<script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
<script language="javascript" src="/images/calendar_date_select.js" type="text/javascript"></script>
+ <script language="javascript" src="/images/calendarDateSelect/locale/${(parameters.userLogin.lastLocale?substring(0,2))!initialLocale?substring(0,2)!'en'}.js" type="text/javascript"></script>
<script language="javascript" src="/ofbiz/script/effects.js" type="text/javascript"></script>
<script language="javascript" src="/ofbiz/script/search.js" type="text/javascript"></script>
<script language="javascript" src="/ofbiz/script/slides.js" type="text/javascript"></script>
@@ -34,6 +35,6 @@ under the License.
<link rel="stylesheet" href="/ofbiz/images/global.css" type="text/css"/>
<meta content="OFBiz_Thai for Thai user" name="Description"/>
- <meta content="OFBiz, ofbiz support, ofbiz training, Ant websystems, outsource, outsourcing,framework, cheap, competitive, quality, OFBiz, Open Source ERP,Open Source CRM,Open Source E-Commerce,Open Source eCommerce,Open Source POS,Open Source SCM,Open Source MRP,Open Source CMMS,Open Source EAM,web services,workflow,ebusiness,e-business,ecommerce,e-commerce,automation,enterprise software,open source,entity engine,service engine,erp,crm,party,accounting,facility,supply,chain,management,catalog,order,project,task,work effort,financial,ledger,content management,customer,inventory" name="keywords"/>
+ <meta content="Open Source ERP,Open Source CRM,Open Source E-Commerce,Open Source eCommerce,Open Source POS,Open Source SCM,Open Source MRP,Open Source CMMS,Open Source EAM,web services,workflow,ebusiness,e-business,ecommerce,e-commerce,automation,enterprise software,open source,entity engine,service engine,erp,crm,party,accounting,facility,supply,chain,management,catalog,order,project,task,work effort,financial,ledger,content management,customer,inventory" name="keywords"/>
</head>
Modified: ofbiz/branches/jquery/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -60,7 +60,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/script</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/script</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -54,7 +54,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/static:/js</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/static:/js</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/specialpurpose/shark/webapp/shark/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/shark/webapp/shark/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/shark/webapp/shark/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/shark/webapp/shark/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -59,7 +59,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml Mon Jul 5 10:07:56 2010
@@ -59,7 +59,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/branches/jquery/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/bizznesstime/includes/header.ftl?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/branches/jquery/themes/bizznesstime/includes/header.ftl Mon Jul 5 10:07:56 2010
@@ -128,6 +128,14 @@ under the License.
<#include "component://common/webcommon/includes/helplink.ftl" />
<span><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span>
</#if>
+ <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
+ <span id="last-system-msg">
+ <center>${layoutSettings.middleTopHeader?if_exists}</center>
+ <a href="${layoutSettings.middleTopLink1?if_exists}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>
+ <a href="${layoutSettings.middleTopLink2?if_exists}">${layoutSettings.middleTopMessage2?if_exists}</a><br/>
+ <a href="${layoutSettings.middleTopLink3?if_exists}">${layoutSettings.middleTopMessage3?if_exists}</a>
+ </span>
+ </#if>
<div class="wait-spinner" style="background:none; visibility:hidden">
<div id="wait-spinner" style="">
<img src="/images/spinner.gif" alt="" title=""/>
Modified: ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css Mon Jul 5 10:07:56 2010
@@ -1574,6 +1574,17 @@ height:16px;
padding-top: 4px;
}
+#controls span#last-system-msg{
+color:#1C334D;
+padding-left:10px;
+float: right;
+margin-right: 20px;
+}
+
+.last-system-msg a{
+color:#1C334D;
+}
+
/* ========================================================= */
/* ===== JavaScript jQuery widgets ===== */
/* ========================================================== */
Modified: ofbiz/branches/jquery/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/bluelight/includes/header.ftl?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/branches/jquery/themes/bluelight/includes/header.ftl Mon Jul 5 10:07:56 2010
@@ -129,6 +129,16 @@ under the License.
<#if headerImageUrl?exists>
<li class="logo-area"><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>"/></a></li>
</#if>
+ <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
+ <li>
+ <div class="last-system-msg">
+ <center>${layoutSettings.middleTopHeader?if_exists}</center>
+ <a href="${layoutSettings.middleTopLink1?if_exists}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>
+ <a href="${layoutSettings.middleTopLink2?if_exists}">${layoutSettings.middleTopMessage2?if_exists}</a><br/>
+ <a href="${layoutSettings.middleTopLink3?if_exists}">${layoutSettings.middleTopMessage3?if_exists}</a>
+ </div>
+ </li>
+ </#if>
</#if>
<li class="control-area">
<ul id="preferences-menu">
Modified: ofbiz/branches/jquery/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml (original)
+++ ofbiz/branches/jquery/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml Mon Jul 5 10:07:56 2010
@@ -19,7 +19,7 @@ under the License.
-->
<entity-engine-xml>
- <VisualTheme visualThemeId="DROPPINGCRUMBS" visualThemeSetId="BACKOFFICE" description="Dropping Crumbs: Includes a drop down menu embedded in the breadcrumbs bar"/>
+ <VisualTheme visualThemeId="DROPPINGCRUMBS" visualThemeSetId="BACKOFFICE" description="Dropping Crumbs: Evolution of Blue-Light, includes a drop down menu embedded in the breadcrumbs bar"/>
<VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAME" resourceValue="DROPPINGCRUMBS" sequenceId="01"/>
<VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/droppingcrumbs/css/style.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/droppingcrumbs/css/help.css" sequenceId="01"/>
Modified: ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=960512&r1=960511&r2=960512&view=diff
==============================================================================
--- ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Mon Jul 5 10:07:56 2010
@@ -2023,7 +2023,7 @@ Lookups
border-left: 2px solid #999;
border-bottom: 3px solid #999;
position: absolute;
- padding: 3px 1 1 1;
+ padding: 3px 1px 1px 1px;
overflow: visible;
z-index: 110000;
visibility: visible;