OFBiz › OFBiz - Commits

svn commit: r900410 [3/3] - in /ofbiz/trunk: ./ specialpurpose/ebay/ specialpurpose/ebay/config/ specialpurpose/ebay/data/ specialpurpose/ebay/data/helpdata/ specialpurpose/ebay/entitydef/ specialpurpose/ebay/lib/ specialpurpose/ebay/script/ specialpur...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

hansbak-2

svn commit: r900410 [3/3] - in /ofbiz/trunk: ./ specialpurpose/ebay/ specialpurpose/ebay/config/ specialpurpose/ebay/data/ specialpurpose/ebay/data/helpdata/ specialpurpose/ebay/entitydef/ specialpurpose/ebay/lib/ specialpurpose/ebay/script/ specialpur...

Added: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/store/StoreAccount.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/store/StoreAccount.groovy?rev=900410&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/store/StoreAccount.groovy (added)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/store/StoreAccount.groovy Mon Jan 18 14:36:16 2010
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.base.util.*;
+import javolution.util.FastList;
+import javolution.util.FastMap;
+
+
+
+results = FastList.newInstance();
+ebayAccountList = delegator.findByAnd("PartyRoleAndPartyDetail",["roleTypeId":"EBAY_ACCOUNT"]);
+productStoreRoles = delegator.findByAnd("ProductStoreRole",["roleTypeId":"EBAY_ACCOUNT"]);
+
+if(productStoreRoles!=null && ebayAccountList != null){
+ ebayAccountList.each{ebayAccount->
+ partyId = ebayAccount.partyId;
+ productStoreRoles.each{productStoreRole ->
+ if(partyId.equals(productStoreRole.partyId)){
+ storeMap = FastMap.newInstance();
+ storeMap.partyId = ebayAccount.partyId;
+ storeMap.firstName = ebayAccount.firstName;
+ storeMap.lastName = ebayAccount.lastName;
+ storeMap.productStoreId = productStoreRole.productStoreId;
+ results.add(storeMap);
+ }
+ }
+ }
+ context.put("stores",results);
+}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.base.util.*;
+import javolution.util.FastList;
+import javolution.util.FastMap;
+
+
+
+results = FastList.newInstance();
+ebayAccountList = delegator.findByAnd("PartyRoleAndPartyDetail",["roleTypeId":"EBAY_ACCOUNT"]);
+productStoreRoles = delegator.findByAnd("ProductStoreRole",["roleTypeId":"EBAY_ACCOUNT"]);
+
+if(productStoreRoles!=null && ebayAccountList != null){
+ ebayAccountList.each{ebayAccount->
+ partyId = ebayAccount.partyId;
+ productStoreRoles.each{productStoreRole ->
+ if(partyId.equals(productStoreRole.partyId)){
+ storeMap = FastMap.newInstance();
+ storeMap.partyId = ebayAccount.partyId;
+ storeMap.firstName = ebayAccount.firstName;
+ storeMap.lastName = ebayAccount.lastName;
+ storeMap.productStoreId = productStoreRole.productStoreId;
+ results.add(storeMap);
+ }
+ }
+ }
+ context.put("stores",results);
+}

Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml?rev=900410&r1=900409&r2=900410&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml Mon Jan 18 14:36:16 2010
@@ -1,59 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>


<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://product/webapp/catalog/WEB-INF/controller.xml"/>
-
+
<description>eBay Component Site Configuration File</description>
-
+
<request-map uri="main">
<security https="true" auth="true"/>
<response name="success" type="view" value="main"/>
</request-map>
-
+
<request-map uri="ProductsExportToEbay">
<security https="true" auth="true"/>
<response name="success" type="view" value="ProductsExportToEbay"/>
</request-map>
-
+
<request-map uri="PostProductsToEbay">
<security https="true" auth="true"/>
<event type="service" path="" invoke="exportToEbay"/>
<response name="success" type="view" value="ProductsExportToEbay"/>
<response name="error" type="view" value="ProductsExportToEbay"/>
</request-map>
-
+
<request-map uri="ManageOrdersFromEbay">
<security https="true" auth="true"/>
<response name="success" type="view" value="ManageOrdersFromEbay"/>
<response name="failure" type="view" value="ManageOrdersFromEbay"/>
</request-map>
-
+
<request-map uri="ImportOrdersSearchFromEbay">
<security https="true" auth="true"/>
<event type="service" path="" invoke="importOrdersSearchFromEbay"/>
<response name="success" type="view" value="ManageOrdersFromEbay"/>
<response name="failure" type="view" value="ManageOrdersFromEbay"/>
</request-map>
-
+
<request-map uri="ImportOrderFromEbay">
<security https="true" auth="true"/>
<event type="service-multi" path="" invoke="importOrderFromEbay"/>
@@ -61,7 +61,7 @@
<response name="error" type="view" value="ManageOrdersFromEbay"/>
<response name="failure" type="view" value="ManageOrdersFromEbay"/>
</request-map>
-
+
<request-map uri="setEbayOrderToComplete">
<security https="true" auth="true"/>
<event type="service" invoke="setEbayOrderToComplete"/>
@@ -124,14 +124,14 @@
<response name="success" type="view" value="FindEbayOrders"/>
<response name="failure" type="view" value="FindEbayOrders"/>
</request-map>
-
+
<request-map uri="GetEbayOrders">
<security https="true" auth="true"/>
<event type="service" invoke="getEbayOrders"/>
<response name="success" type="view" value="EbayOrders"/>
<response name="failure" type="view" value="EbayOrders"/>
</request-map>
-
+
<request-map uri="importEbayOrders">
<security https="true" auth="true"/>
<event type="service-multi" invoke="importEbayOrders"/>
@@ -139,7 +139,7 @@
<response name="failure" type="view" value="FindEbayOrders"/>
<response name="error" type="view" value="FindEbayOrders"/>
</request-map>
-
+
<request-map uri="updatedEbayOrders">
<security https="true" auth="true"/>
<event type="groovy" path="component://ebay/webapp/ebay/WEB-INF/actions/find/" invoke="updatedEbayOrders.groovy"/>
@@ -147,14 +147,70 @@
<response name="failure" type="view" value="FindEbayOrders"/>
<response name="error" type="view" value="FindEbayOrders"/>
</request-map>
-
+
<request-map uri="EditEbayConfiguration">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditEbayConfiguration"/>
<response name="error" type="view" value="EditEbayConfiguration"/>
</request-map>
+
+ 
+ <request-map uri="exportCategoryEbayStore">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="exportCategoryEbayStore"/>
+ <response name="error" type="view" value="exportCategoryEbayStore"/>
+ </request-map>
+
+ <request-map uri="exportCategoriesSelectedToEbayStore">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="exportCategoriesSelectedToEbayStore"/>
+ <response name="success" type="view" value="exportCategoryEbayStore"/>
+ <response name="error" type="view" value="exportCategoryEbayStore"/>
+ </request-map>
+ 
+ <request-map uri="newEbayAccount">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="NewEbayAccount"/>
+ </request-map>
+ <request-map uri="createEbayAccount">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createEbayAccount"/>
+ <response name="error" type="view" value="NewEbayAccount"/>
+ <response name="success" type="view" value="EditEbayConfiguration"/>
+ </request-map>
+ <request-map uri="ebayAccount">
+ <security https="true" auth="true"/>
+ <response name="error" type="view" value="EbayAccount"/>
+ <response name="success" type="view" value="EbayAccount"/>
+ </request-map>
+
+ 
+ <request-map uri="ebayStores">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ebayStores"/>
+ <response name="error" type="view" value="ebayStores"/>
+ </request-map>
+ <request-map uri="getStoreDetail">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="getEbayStoreOutput"/>
+ <response name="success" type="view" value="ebayStoreDetail"/>
+ <response name="error" type="view" value="ebayStoreDetail"/>
+ </request-map>
+ <request-map uri="editEbayStoreDetail">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="setEbayStoreInput"/>
+ <response name="success" type="view" value="ebayStoreDetail"/>
+ <response name="error" type="view" value="ebayStoreDetail"/>
+ </request-map>
+ <request-map uri="retrieveThemeColorSchemeByThemeId">
+ <security https="true" auth="true"/>
+ <event type="java" path="org.ofbiz.ebay.EbayStoreOptions" invoke="retrieveThemeColorSchemeByThemeId"/>
+ <response name="success" type="view" value="ebayStoreDetail"/>
+ <response name="error" type="view" value="ebayStoreDetail"/>
+ </request-map>
+

-
+

<view-map name="main" type="screen" page="component://ebay/widget/EbayScreens.xml#advancedsearch"/>
<view-map name="advancedsearch" type="screen" page="component://ebay/widget/EbayScreens.xml#advancedsearch"/>
@@ -166,5 +222,14 @@
<view-map name="FindEbayConfigurations" type="screen" page="component://ebay/widget/EbayScreens.xml#FindEbayConfigurations"/>
<view-map name="EbayShippingMethods" type="screen" page="component://ebay/widget/EbayScreens.xml#EbayShippingMethods"/>
<view-map name="EditEbayConfiguration" type="screen" page="component://ebay/widget/EbayScreens.xml#EditEbayConfiguration"/>
+ <view-map name="exportCategoryEbayStore" type="screen" page="component://ebay/widget/EbayScreens.xml#exportCategoryEbayStore"/>
+
+
+ 
+ <view-map name="ebayStores" type="screen" page="component://ebay/widget/EbayScreens.xml#ebayStores"/>
+ <view-map name="ebayStoreDetail" type="screen" page="component://ebay/widget/EbayScreens.xml#ebayStoreDetail"/>
+ 
+ <view-map name="NewEbayAccount" type="screen" page="component://ebay/widget/EbayScreens.xml#NewEbayAccount"/>
+ <view-map name="EbayAccount" type="screen" page="component://ebay/widget/EbayScreens.xml#EbayAccount"/>

</site-conf>

Added: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/StoreSetting.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/StoreSetting.ftl?rev=900410&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/StoreSetting.ftl (added)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/StoreSetting.ftl Mon Jan 18 14:36:16 2010
@@ -0,0 +1,490 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<script language="Javascript" type="text/javascript">
+ function countAreaChars(areaName,limit,charleft)
+ {
+ if (areaName.value.length>limit){
+ areaName.value=areaName.value.substring(0,limit);
+ }else{
+ charleft.innerHTML = (limit - areaName.value.length) + " charactors left.";
+ }
+ }
+ function retrieveThemeColorSchemeByThemeId(url,themeId,productStoreId){
+ var pars = 'themeId='+themeId+'&productStoreId='+productStoreId;
+ var myAjax = new Ajax.Request( url, {
+ method: 'get',
+ parameters: pars,
+ onLoading: function loading(){
+ $('loading').innerHTML = ' Please wait...';
+ },
+ onComplete: function retrieveThemeColorSchemeByThemeId(originalRequest){
+ if(originalRequest.responseJSON!=null){
+ var resp = eval("("+originalRequest.responseText+")");
+ if(resp.storeColorPrimary!=null)$('storePrimaryColor').value = resp.storeColorPrimary;
+ if(resp.storeColorAccent!=null)$('storeSecondaryColor').value = resp.storeColorAccent;
+ if(resp.storeColorSecondary!=null)$('storeAccentColor').value = resp.storeColorSecondary;
+
+ if(resp.storeFontTypeFontFaceValue!=null) selectOption($('storeNameFont'),resp.storeFontTypeFontFaceValue);
+ if(resp.storeFontTypeNameFaceColor!=null)$('storeNameFontColor').value = resp.storeFontTypeNameFaceColor;
+ if(resp.storeFontTypeSizeFaceValue!=null) selectOption($('storeNameFontSize'), resp.storeFontTypeSizeFaceValue);
+
+ if(resp.storeFontTypeTitleColor!=null)$('storeTitleFontColor').value = resp.storeFontTypeTitleColor;
+ if(resp.storeFontTypeFontTitleValue!=null)selectOption($('storeTitleFont'),resp.storeFontTypeFontTitleValue);
+ if(resp.storeFontSizeTitleValue!=null)selectOption($('storeTitleFontSize'),resp.storeFontSizeTitleValue);
+
+ if(resp.storeFontTypeDescColor!=null)$('storeDescFontColor').value = resp.storeFontTypeDescColor;
+ if(resp.storeFontTypeFontDescValue!=null) selectOption($('storeDescFont'),resp.storeFontTypeFontDescValue);
+ if(resp.storeDescSizeValue!=null) selectOption($('storeDescFontSize'),resp.storeDescSizeValue);
+ }
+ $('loading').innerHTML = '';
+ }
+ } );
+ }
+ function selectOption(myselect,val){
+ for (var i=0; i<myselect.options.length; i++){
+ if ( myselect.options[i].value == val){
+ myselect.options[i].selected=true;
+ break;
+ }
+
+ }
+ }
+ function switchTheme(url,themeId,productStoreId){
+ var size = document.StoreSettingForm.storeThemeType.length;
+ var selectTheme = '';
+ for(i=0;i<size;i++){
+ if(document.StoreSettingForm.storeThemeType[i].checked){
+ selectTheme = document.StoreSettingForm.storeThemeType[i].value;
+ break;
+ }
+ }
+ if(selectTheme=='Basic'){
+ //retrieve basic theme by ajax then print new select list
+ document.StoreSettingForm.storeAdvancedTheme.disabled = true;
+ document.StoreSettingForm.storeAdvancedThemeColor.disabled = true;
+
+ document.StoreSettingForm.storeBasicTheme.disabled = false;
+ document.StoreSettingForm.storePrimaryColor.disabled = false;
+ document.StoreSettingForm.storeSecondaryColor.disabled = false;
+ document.StoreSettingForm.storeAccentColor.disabled = false;
+
+ document.StoreSettingForm.storeNameFont.disabled = false;
+ document.StoreSettingForm.storeNameFontSize.disabled = false;
+ document.StoreSettingForm.storeNameFontColor.disabled = false;
+
+ document.StoreSettingForm.storeTitleFont.disabled = false;
+ document.StoreSettingForm.storeTitleFontSize.disabled = false;
+ document.StoreSettingForm.storeTitleFontColor.disabled = false;
+
+ document.StoreSettingForm.storeDescFont.disabled = false;
+ document.StoreSettingForm.storeDescFontSize.disabled = false;
+ document.StoreSettingForm.storeDescFontColor.disabled = false;
+ document.StoreSettingForm.themeType.value = "Basic";
+ }else if(selectTheme=='Advanced'){
+ document.StoreSettingForm.themeType.value = "Advanced";
+ document.StoreSettingForm.storeBasicTheme.disabled = true;
+ document.StoreSettingForm.storePrimaryColor.disabled = true;
+ document.StoreSettingForm.storeSecondaryColor.disabled = true;
+ document.StoreSettingForm.storeAccentColor.disabled = true;
+
+ document.StoreSettingForm.storeNameFont.disabled = true;
+ document.StoreSettingForm.storeNameFontSize.disabled = true;
+ document.StoreSettingForm.storeNameFontColor.disabled = true;
+
+ document.StoreSettingForm.storeTitleFont.disabled = true;
+ document.StoreSettingForm.storeTitleFontSize.disabled = true;
+ document.StoreSettingForm.storeTitleFontColor.disabled = true;
+
+ document.StoreSettingForm.storeDescFont.disabled = true;
+ document.StoreSettingForm.storeDescFontSize.disabled = true;
+ document.StoreSettingForm.storeDescFontColor.disabled = true;
+
+ document.StoreSettingForm.storeAdvancedTheme.disabled = false;
+ document.StoreSettingForm.storeAdvancedThemeColor.disabled = false;
+ }
+ }
+</script>
+
+ <#if parameters.ebayStore?has_content>
+ <#assign ebayStore = parameters.ebayStore?if_exists>
+ <#--${ebayStore}-->
+ <form name="StoreSettingForm" id="StoreSettingForm" method="post" action="<@ofbizUrl>editEbayStoreDetail</@ofbizUrl>" style="margin: 0;">
+ <input type="hidden" name="themeType" value="${themeType?if_exists}"/>
+ <input type="hidden" name="storeUrl" value="${ebayStore.storeUrl?if_exists}"/>
+ <input type="hidden" name="storeLogoId" value="${ebayStore.storeLogoId?if_exists}"/>
+ <input type="hidden" name="storeLogoName" value="${ebayStore.storeLogoName?if_exists}"/>
+ <input type="hidden" name="productStoreId" value="${parameters.productStoreId?if_exists}"/>
+ <fieldset>
+ <table cellspacing="0" class="basic-table">
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreName} :</td>
+ <td valign="middle">
+ <input type="text" name="storeName" value="${ebayStore.storeName?if_exists}" onKeyDown="countAreaChars(document.StoreSettingForm.storeName,35,document.getElementById('charsleft1'));"
+ onKeyUp="countAreaChars(document.StoreSettingForm.storeName,35,document.getElementById('charsleft1'));">
+ <div id="charsleft1"></div>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreDesc} :</td>
+ <td valign="middle">
+ <textarea rows="4" cols="80" name="storeDesc"
+ onKeyDown="countAreaChars(document.StoreSettingForm.storeDesc,300,document.getElementById('charsleft2'));"
+ onKeyUp="countAreaChars(document.StoreSettingForm.storeDesc,300,document.getElementById('charsleft2'));">${ebayStore.storeDesc?if_exists}</textarea>
+ <div id="charsleft2"></div>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreURL} :</td>
+ <td valign="middle">
+ <a href="${ebayStore.storeUrl?if_exists}" target="_blank">${ebayStore.storeUrl?if_exists}</a>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreLogoURL} :</td>
+ <td valign="middle">
+ <input type="text" name="storeLogoURL" size="50" value="${ebayStore.storeLogoURL?if_exists}"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle"></td>
+ <td valign="middle">
+ <div onClick="javascript:switchTheme();">
+ <input type="radio" name="storeThemeType" <#if themeType?if_exists == "Basic">checked</#if> value="Basic" default> Basic Theme
+ <input type="radio" name="storeThemeType" <#if themeType?if_exists == "Advanced">checked</#if> value="Advanced"> Advanced Theme
+ </div>
+ </td>
+ </tr>
+
+ <#-- advance Theme -->
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreAdvancedTheme} :</td>
+ <td valign="middle">
+ <select id="storeAdvancedTheme" name="storeAdvancedTheme" >
+ <#if storeAdvanceThemeOptList?has_content>
+ <#list storeAdvanceThemeOptList as storeAdvanceThemeOpt>
+ <option value="${storeAdvanceThemeOpt.storeThemeId?if_exists}"
+ <#if ebayStore.storeThemeId.equals(storeAdvanceThemeOpt.storeThemeId?if_exists)>selected</#if>>
+ ${storeAdvanceThemeOpt.storeThemeName?if_exists}</option>
+ </#list>
+ </#if>
+ </select>
+ </td>
+ </tr>
+ <#if storeAdvancedThemeColorOptList?has_content>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreAdvancedThemeColor} :</td>
+ <td valign="middle">
+ <select name="storeAdvancedThemeColor">
+ <#list storeAdvancedThemeColorOptList as storeAdvancedThemeColorOpt>
+ <option value="${storeAdvancedThemeColorOpt.storeColorSchemeId?if_exists}"
+ <#if ebayStore.storeColorSchemeId.equals(storeAdvancedThemeColorOpt.storeColorSchemeId?if_exists)>selected</#if>>
+ ${storeAdvancedThemeColorOpt.storeColorName?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ </#if>
+
+ <#-- Basic Theme -->
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreBasicTheme} :</td>
+ <td valign="middle">
+ <#assign currentStoreThemeIdAndSchemeId = ebayStore.storeThemeId?string+"-"+ebayStore.storeColorSchemeId?string>
+ <select id="storeBasicTheme" name="storeBasicTheme" onChange="javascript:retrieveThemeColorSchemeByThemeId('<@ofbizUrl>retrieveThemeColorSchemeByThemeId</@ofbizUrl>',this.value,'${parameters.productStoreId?if_exists}');">
+ <#if storeThemeOptList?has_content>
+ <#list storeThemeOptList as storeThemeOpt>
+ <#assign storeThemeIdAndSchemeId = storeThemeOpt.storeThemeId+"-"+storeThemeOpt.storeColorSchemeId>
+ <option value="${storeThemeIdAndSchemeId?if_exists}"
+ <#if currentStoreThemeIdAndSchemeId == storeThemeIdAndSchemeId?if_exists>selected</#if>>
+ ${storeThemeOpt.storeColorSchemeName?if_exists}
+ </option>
+ </#list>
+ </#if>
+ </select>
+ <div id="loading"></div>
+ </td>
+ </tr>
+
+ <tr>
+ <td align="right" valign="middle"></td>
+ <td valign="middle"><b>${uiLabelMap.EbayStoreStoreColorTheme}</b>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStorePrimaryColor} :</td>
+ <td valign="middle">
+ #<input type="text" id="storePrimaryColor" name="storePrimaryColor" size="10" value="${ebayStore.storeColorPrimary?if_exists}"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreSecondColor} :</td>
+ <td valign="middle">
+ #<input type="text" id="storeSecondaryColor" name="storeSecondaryColor" size="10" value="${ebayStore.storeColorSecondary?if_exists}"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreAccentColor} :</td>
+ <td valign="middle">
+ #<input type="text" id="storeAccentColor" name="storeAccentColor" size="10" value="${ebayStore.storeColorAccent?if_exists}"/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" valign="middle"></td>
+ <td valign="middle"><b>${uiLabelMap.EbayStoreStoreChangeFont}</b>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" valign="middle"></td>
+ <td valign="middle">
+ <table width="450" >
+ <tr>
+ <td><b>Font</b></td>
+ <td><b>Font size</b></td>
+ <td><b>Font color</b></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreName} :</td>
+ <td valign="middle">
+ <#if storeFontTheme?exists>
+ <#if ebayStore.storeNameColor?exists>
+ <#assign storeFontColor = ebayStore.storeNameColor?if_exists>
+ <#else>
+ <#assign storeFontColor = storeFontTheme.storeFontTypeNameFaceColor?if_exists>
+ </#if>
+ <table width="450">
+ <tr>
+ <td>
+ <select id="storeNameFont" name="storeNameFont">
+ <#list storeFontTheme.storeFontTypeFontFaceList as storeFontTypeFontFace>
+ <option <#if storeFontTypeFontFace.storeFontValue?if_exists.equals(ebayStore.storeNameFontFace?if_exists) >selected</#if> value="${storeFontTypeFontFace.storeFontName?if_exists}">${storeFontTypeFontFace.storeFontName?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ <td>
+ <select id="storeNameFontSize" name="storeNameFontSize">
+ <#list storeFontTheme.storeFontTypeSizeFaceList as storeFontTypeSizeFace>
+ <option <#if storeFontTypeSizeFace.storeFontSizeValue?if_exists.equals(ebayStore.storeNameFontFaceSize?if_exists) >selected</#if> value="${storeFontTypeSizeFace.storeFontSizeName?if_exists}">${storeFontTypeSizeFace.storeFontSizeName?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ <td>
+ #<input id="storeNameFontColor" type="text" size="10" name="storeNameFontColor" value="${storeFontColor?if_exists}"/>
+ </td>
+ </tr>
+ </table>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreSectionTitle} :</td>
+ <td valign="middle">
+ <#if storeFontTheme?exists>
+ <#if ebayStore.storeTitleColor?exists>
+ <#assign storeTitleColor = ebayStore.storeTitleColor?if_exists>
+ <#else>
+ <#assign storeTitleColor = storeFontTheme.storeFontTypeTitleColor?if_exists>
+ </#if>
+ <table width="450">
+ <tr>
+ <td>
+ <select id="storeTitleFont" name="storeTitleFont">
+ <#list storeFontTheme.storeFontTypeFontTitleList as storeFontTypeFontTitle>
+ <option <#if storeFontTypeFontTitle.storeFontValue?if_exists.equals(ebayStore.storeTitleFontFace?if_exists) >selected</#if> value="${storeFontTypeFontTitle.storeFontName?if_exists}">${storeFontTypeFontTitle.storeFontName?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ <td>
+ <select id="storeTitleFontSize" name="storeTitleFontSize">
+ <#list storeFontTheme.storeFontSizeTitleList as storeFontSizeTitle>
+ <option <#if storeFontSizeTitle.storeFontSizeValue?if_exists.equals(ebayStore.storeTitleFontFaceSize?if_exists) >selected</#if> value="${storeFontSizeTitle.storeFontSizeName?if_exists}">${storeFontSizeTitle.storeFontSizeName?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ <td>
+ #<input id="storeTitleFontColor" type="text" size="10" name="storeTitleFontColor" value="${storeTitleColor?if_exists}"/>
+ </td>
+ </tr>
+ </table>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreDesc} :</td>
+ <td valign="middle">
+ <#if storeFontTheme?exists>
+ <#if ebayStore.storeDescColor?exists>
+ <#assign storeDescColor = ebayStore.storeDescColor?if_exists>
+ <#else>
+ <#assign storeDescColor = storeFontTheme.storeFontTypeDescColor?if_exists>
+ </#if>
+ <table width="450">
+ <tr>
+ <td>
+ <select id="storeDescFont" name="storeDescFont">
+ <#list storeFontTheme.storeFontTypeFontDescList as storeFontTypeFontDesc>
+ <option <#if storeFontTypeFontDesc.storeFontValue?if_exists.equals(ebayStore.storeDescFontFace?if_exists) >selected</#if> value="${storeFontTypeFontDesc.storeFontName?if_exists}">${storeFontTypeFontDesc.storeFontName?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ <td>
+ <select id="storeDescFontSize" name="storeDescFontSize">
+ <#list storeFontTheme.storeDescSizeList as storeDescSize>
+ <option <#if storeDescSize.storeFontSizeValue?if_exists.equals(ebayStore.storeDescSizeCode?if_exists) >selected</#if> value="${storeDescSize.storeFontSizeName?if_exists}">${storeDescSize.storeFontSizeName?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ <td>
+ #<input id="storeDescFontColor" type="text" size="10" name="storeDescFontColor" value="${storeDescColor?if_exists}"/>
+ </td>
+ </tr>
+ </table>
+ </#if>
+ </td>
+ </tr>
+
+
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreHeaderDisplay} :</td>
+ <td valign="middle">
+ <select id="storeCustomHeaderLayout" name="storeCustomHeaderLayout">
+ <#list ebayStore.storeCustomHeaderLayoutList as storeCustomHeaderLayout>
+ <option <#if storeCustomHeaderLayout.storeCustomHeaderLayoutValue?if_exists.equals(ebayStore.storeCustomHeaderLayout?if_exists) >selected</#if> value="${storeCustomHeaderLayout.storeCustomHeaderLayoutName?if_exists}">${storeCustomHeaderLayout.storeCustomHeaderLayoutValue?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle"></td>
+ <td valign="middle">
+ <textarea rows="8" cols="40" name="storeCustomHeader">
+ ${ebayStore.storeCustomHeader?if_exists}</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreHeaderStyle} :</td>
+ <td valign="middle">
+ <select id="storeHeaderStyle" name="storeHeaderStyle">
+ <#list ebayStore.storeHeaderStyleList as storeHeaderStyle>
+ <option <#if storeHeaderStyle.storeHeaderStyleValue?if_exists.equals(ebayStore.storeHeaderStyle?if_exists) >selected</#if> value="${storeHeaderStyle.storeHeaderStyleName?if_exists}">${storeHeaderStyle.storeHeaderStyleValue?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ <#--tr>
+ <td class="label" align="right" valign="middle">Home Page :</td>
+ <td valign="middle">
+ <input type="text" id="homePage" name="homePage" value="${ebayStore.storeHomePage?if_exists}"/>
+ </td>
+ </tr-->
+
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreItemListDesplay} :</td>
+ <td valign="middle">
+ <select id="storeItemLayout" name="storeItemLayout">
+ <#list ebayStore.storeItemLayoutList as storeItemLayout>
+ <option <#if storeItemLayout.storeItemLayoutValue?if_exists.equals(ebayStore.storeItemLayoutSelected?if_exists) >selected</#if> value="${storeItemLayout.storeItemLayoutName?if_exists}">${storeItemLayout.storeItemLayoutValue?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreItemSortOrder} :</td>
+ <td valign="middle">
+ <select id="storeItemSortOrder" name="storeItemSortOrder">
+ <#list ebayStore.storeItemSortOrderList as storeItemSortOrder>
+ <option <#if storeItemSortOrder.storeItemSortLayoutValue?if_exists.equals(ebayStore.storeItemSortOrderSelected?if_exists) >selected</#if> value="${storeItemSortOrder.storeItemSortLayoutName?if_exists}">${storeItemSortOrder.storeItemSortLayoutValue?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+
+ <#--tr>
+ <td class="label" align="right" valign="middle">Custom Listing Header Display :</td>
+ <td valign="middle">
+ <select id="storeCustomListingHeaderDisplay" name="storeCustomListingHeaderDisplay">
+ <#list ebayStore.storeCustomListingHeaderDisplayList as storeCustomListingHeaderDisplay>
+ <option <#if storeCustomListingHeaderDisplay.storeCustomHeaderLayoutValue?if_exists.equals(ebayStore.storeCustomListingHeaderDisplayValue?if_exists) >selected</#if> value="${storeCustomListingHeaderDisplay.storeCustomHeaderLayoutValue?if_exists}">${storeCustomListingHeaderDisplay.storeCustomHeaderLayoutValue?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ </tr-->
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreMerchDisplay} :</td>
+ <td valign="middle">
+ <select id="storeMerchDisplay" name="storeMerchDisplay">
+ <#list ebayStore.storeMerchDisplayList as storeMerchDisplay>
+ <option <#if storeMerchDisplay.merchDisplayCodeValue?if_exists.equals(ebayStore.storeMerchDisplay?if_exists) >selected</#if> value="${storeMerchDisplay.merchDisplayCodeName?if_exists}">${storeMerchDisplay.merchDisplayCodeValue?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreSubscriptionLevel} :</td>
+ <td valign="middle">
+ <select id="storeMerchDisplay" name="storeSubscriptionDisplay">
+ <#list ebayStore.storeSubscriptionLevelList as storeSubscriptionLevel>
+ <option <#if storeSubscriptionLevel.storeSubscriptionLevelCodeValue?if_exists.equals(ebayStore.storeSubscriptionLevel?if_exists) >selected</#if> value="${storeSubscriptionLevel.storeSubscriptionLevelCodeName?if_exists}">${storeSubscriptionLevel.storeSubscriptionLevelCodeValue?if_exists}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="label" align="right" valign="middle"></td>
+ <td valign="middle">
+ <input type="submit" value="${uiLabelMap.CommonSubmit}" name="submitButton" class="smallSubmit">
+ </td>
+ </tr>
+ </table>
+ <script language="Javascript" type="text/javascript">
+ document.getElementById('charsleft1').innerHTML = (35 - document.StoreSettingForm.storeName.value.length) + " charactors left.";
+ document.getElementById('charsleft2').innerHTML = (300 - document.StoreSettingForm.storeDesc.value.length) + " charactors left.";
+ </script>
+ </fieldset>
+ </form>
+ </#if>
+
+
+ <script language="Javascript" type="text/javascript">
+
+ <#if themeType?if_exists == "Basic">
+ document.StoreSettingForm.storeAdvancedTheme.disabled = true;
+ document.StoreSettingForm.storeAdvancedThemeColor.disabled = true;
+ <#elseif themeType?if_exists == "Advanced">
+ document.StoreSettingForm.storeBasicTheme.disabled = true;
+ document.StoreSettingForm.storePrimaryColor.disabled = true;
+ document.StoreSettingForm.storeSecondaryColor.disabled = true;
+ document.StoreSettingForm.storeAccentColor.disabled = true;
+
+ document.StoreSettingForm.storeNameFont.disabled = true;
+ document.StoreSettingForm.storeNameFontSize.disabled = true;
+ document.StoreSettingForm.storeNameFontColor.disabled = true;
+
+ document.StoreSettingForm.storeTitleFont.disabled = true;
+ document.StoreSettingForm.storeTitleFontSize.disabled = true;
+ document.StoreSettingForm.storeTitleFontColor.disabled = true;
+
+ document.StoreSettingForm.storeDescFont.disabled = true;
+ document.StoreSettingForm.storeDescFontSize.disabled = true;
+ document.StoreSettingForm.storeDescFontColor.disabled = true;
+ </#if>
+</script>

Modified: ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml?rev=900410&r1=900409&r2=900410&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml Mon Jan 18 14:36:16 2010
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>


<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
-
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
<screen name="main-decorator">
<section>
<actions>
@@ -45,7 +45,7 @@
<section>
<actions>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-
+
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-field="product"/>
<set field="productName" from-field="product.productName"/>
@@ -67,7 +67,7 @@
<label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label>
<image src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/>
</container>
-
+

<container style="button-bar">
<link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
@@ -82,7 +82,7 @@
</container>
</widgets>
</section>
-
+
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -94,7 +94,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="permission-decorator">
<section>
<actions>
@@ -107,6 +107,27 @@
<if-has-permission permission="EBAY" action="_VIEW"/>
</condition>
<widgets>
+ <container>
+ <section>
+ <condition>
+ <not><if-empty field="parameters.productStoreId"/></not>
+ </condition>
+ <actions>
+ <service service-name="getEbayStoreUser" result-map="result">
+ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+ </service>
+ <set field="userLoginId" from-field="result.userLoginId"/>
+ <entity-one value-field="ebayUser" entity-name="UserLogin">
+ <field-map field-name="userLoginId" from-field="result.userLoginId"/>
+ </entity-one>
+ <set field="parameters.partyId" from-field="ebayUser.partyId" global="true"/>
+ </actions>
+ <widgets>
+ <label text="${uiLabelMap.EbayAccount} : ${userLoginId}" style="h1"></label>
+ <include-menu name="EbayStoreFunctionTabBar" location="component://ebay/widget/EbayMenus.xml"/>
+ </widgets>
+ </section>
+ </container>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -118,7 +139,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="CommonEbayConfigDecorator">
<section>
<actions>
@@ -148,7 +169,7 @@
</fail-widgets>
</section>
</decorator-section>
- </decorator-screen>
+ </decorator-screen>
</widgets>
</section>
</screen>

Added: ofbiz/trunk/specialpurpose/ebay/widget/EbayAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayAccountForms.xml?rev=900410&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayAccountForms.xml (added)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayAccountForms.xml Mon Jan 18 14:36:16 2010
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+ <form name="EbayPersonalInformationForm" type="single" default-map-name="results.registrationAddress" default-table-style="basic-table">
+ <field name="firstName"><display/></field>
+ <field name="lastName"><display/></field>
+ <field name="cityName"><display/></field>
+ <field name="country"><display/></field>
+ <field name="stateOrProvince"><display/></field>
+ <field name="postalCode"><display/></field>
+ <field name="street"><display/></field>
+ <field name="street1"><display/></field>
+ <field name="street2"><display/></field>
+ <field name="phone"><display/></field>
+ <field name="email"><display description="${results.email}"/></field>
+ <field name="status"><display description="${results.status}"/></field>
+ </form>
+</forms>
\ No newline at end of file

Added: ofbiz/trunk/specialpurpose/ebay/widget/EbayAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayAccountScreens.xml?rev=900410&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayAccountScreens.xml (added)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayAccountScreens.xml Mon Jan 18 14:36:16 2010
@@ -0,0 +1,36 @@
+
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+ <screen name="EbayPersonalInformation">
+ <section>
+ <actions>
+ <service service-name="getEbayUser" result-map="results">
+ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+ </service>
+ </actions>
+ <widgets>
+ <screenlet name="" title="${uiLabelMap.EbayPersonalInformation}">
+ <include-form location="component://ebay/widget/EbayAccountForms.xml" name="EbayPersonalInformationForm"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+</screens>

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=900410&r1=900409&r2=900410&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Mon Jan 18 14:36:16 2010
@@ -175,6 +175,7 @@
<field name="compatibilityLevel"><text default-value="${ebayConfig.compatibilityLevel}" size="5"/></field>
<field name="siteId"><text default-value="${ebayConfig.siteId}" size="5"/></field>
<field name="xmlGatewayUri"><text size="40"/></field>
+ <field name="apiServerUrl"><text size="40"/></field>
<field name="customXml"><textarea cols="60" rows="5"/></field>
<field name="webSiteId" title="${uiLabelMap.ProductWebSite}">
<drop-down>
@@ -269,4 +270,60 @@
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
+ <form name="ListCurrentStores" type="single" target="exportCategoriesSelectedToEbayStore"
+ header-row-style="header-row" default-table-style="basic-table">
+ <actions>
+ <entity-and entity-name="ProductStoreCatalog" list="storeCatalog">
+ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+ </entity-and>
+ </actions>
+ <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field>
+ <field name="prodCatalogId">
+ <drop-down>
+ <list-options list-name="storeCatalog" key-name="prodCatalogId" description="${prodCatalogId}"/>
+ 
+ </drop-down>
+ </field>
+ <field name="location"><text size="40"></text></field>
+ <field name="paymentMethods" title="Default Payment Methods">
+ <drop-down>
+ <option key="paymentPayPal" description="${uiLabelMap.FormFieldTitle_paymentPayPal}"/>
+ <option key="paymentVisaMC" description="${uiLabelMap.FormFieldTitle_paymentVisaMC}"/>
+ <option key="paymentAmEx" description="${uiLabelMap.FormFieldTitle_paymentAmEx}"/>
+ <option key="paymentDiscover" description="${uiLabelMap.FormFieldTitle_paymentDiscover}"/>
+ <option key="paymentMOCC" description="${uiLabelMap.FormFieldTitle_paymentMOCC}"/>
+ <option key="paymentPersonalCheck" description="${uiLabelMap.FormFieldTitle_paymentPersonalCheck}"/>
+ <option key="paymentCCAccepted" description="${uiLabelMap.FormFieldTitle_paymentCCAccepted}"/>
+ <option key="paymentCashInPerson" description="${uiLabelMap.FormFieldTitle_paymentCashInPerson}"/>
+ <option key="paymentCashOnPickup" description="${uiLabelMap.FormFieldTitle_paymentCashOnPickup}"/>
+ <option key="paymentCOD" description="${uiLabelMap.FormFieldTitle_paymentCOD}"/>
+ <option key="paymentCODPrePayDelivery" description="${uiLabelMap.FormFieldTitle_paymentCODPrePayDelivery}"/>
+ <option key="paymentMoneyXferAccepted" description="${uiLabelMap.FormFieldTitle_paymentMoneyXferAccepted}"/>
+ </drop-down>
+ </field>
+ <field name="listingDuration">
+ <drop-down>
+ <option key="Days_1" description="1 ${uiLabelMap.CommonDay}"/>
+ <option key="Days_3" description="3 ${uiLabelMap.CommonDays}"/>
+ <option key="Days_7" description="7 ${uiLabelMap.CommonDays}"/>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.EbayExportToEbayStore}"><submit button-type="button"/></field>
+ </form>
+ <form name="NewEbayAccount" type="single" target="createEbayAccount">
+ <auto-fields-service service-name="createEbayAccount"/>
+ <field name="statusId"><hidden value="PARTY_ENABLED"/></field>
+ <field name="gender">
+ <drop-down allow-empty="true">
+ <option key="M" description="${uiLabelMap.CommonMale}"/>
+ <option key="F" description="${uiLabelMap.CommonFemale}"/>
+ </drop-down>
+ </field>
+ <field name="currentPassword"><password/></field>
+ <field name="currentPasswordVerify"><password/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
+ </form>
</forms>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml?rev=900410&r1=900409&r2=900410&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml Mon Jan 18 14:36:16 2010
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>

<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
<menu name="EbayAppBar" title="${uiLabelMap.EbayApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
@@ -24,6 +24,7 @@
<menu-item name="export" title="${uiLabelMap.EbayExportToEbay}"><link target="advancedsearch"/></menu-item>
<menu-item name="importOrders" title="${uiLabelMap.EbayImportSingleTransactionFromEbay}"><link target="ManageOrdersFromEbay"/></menu-item>
<menu-item name="eBayOrders" title="${uiLabelMap.EbayEBayOrders}"><link target="eBayOrders"/></menu-item>
+ <menu-item name="ebayStore" title="${uiLabelMap.EbayStore}"><link target="ebayStores"></link></menu-item>
</menu>
<menu name="EbayConfigTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="find" title="${uiLabelMap.CommonFind}" >
@@ -47,7 +48,7 @@
</menu-item>
</menu>
<menu name="EbayConfigSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
- menu-container-style="button-bar button-style-2">
+ menu-container-style="button-bar button-style-2">
<menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}">
<condition>
<not><if-empty field="ebayConfig"/></not>
@@ -55,4 +56,27 @@
<link target="EditEbayConfiguration"/>
</menu-item>
</menu>
-</menus>
+ <menu name="EbaySubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ menu-container-style="button-bar button-style-2">
+ <menu-item name="NewEbayAccount" title="New Ebay Account">
+ <link target="newEbayAccount"/>
+ </menu-item>
+ </menu>
+ <menu name="EbayStoreFunctionTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="ebayAccount" title="${uiLabelMap.EbayAccount}">
+ <link target="ebayAccount">
+ <parameter param-name="productStoreId" value="${parameters.productStoreId}"/>
+ </link>
+ </menu-item>
+ <menu-item name="ebayStoreSetting" title="${uiLabelMap.EbayStore}">
+ <link target="getStoreDetail">
+ <parameter param-name="productStoreId" value="${parameters.productStoreId}"/>
+ </link>
+ </menu-item>
+ <menu-item name="ebayExportAllCategoryToEbayStore" title="${uiLabelMap.EbayExportAllCategoryToEbayStore}">
+ <link target="exportCategoryEbayStore">
+ <parameter param-name="productStoreId" value="${parameters.productStoreId}"/>
+ </link>
+ </menu-item>
+ </menu>
+</menus>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=900410&r1=900409&r2=900410&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Mon Jan 18 14:36:16 2010
@@ -288,4 +288,108 @@
</section>
</screen>

+ <screen name="exportCategoryEbayStore">
+ <section>
+ <actions>
+ <set field="titleProperty" value="EbayExportAllCategoryToEbayStore"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="tabButtonItem" value="ebayExportAllCategoryToEbayStore"/>
+ <set field="productStoreId" value="${parameters.productStoreId}"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.EbayExportAllCategoryToEbayStore}">
+ <include-form name="ListCurrentStores" location="component://ebay/widget/EbayForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ebayStores">
+ <section>
+ <actions>
+ <set field="titleProperty" value="${uiLabelMap.EbayStore}"/>
+ <set field="headerItem" value="ebayStore"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-menu name="EbaySubTabBar" location="component://ebay/widget/EbayMenus.xml"/>
+ <screenlet title="Ebay Accounts">
+ <include-form name="EbayAccountList" location="component://ebay/widget/EbayStoreForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ebayStoreDetail">
+ <section>
+ <actions>
+ <set field="titleProperty" value="${uiLabelMap.EbayStoreSetting}"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="tabButtonItem" value="ebayStoreSetting"/>
+
+ <script location="component://ebay/webapp/ebay/WEB-INF/actions/store/RetrieveStoreOptions.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.EbayStoreSetting}">
+ <platform-specific>
+ <html><html-template location="component://ebay/webapp/ebay/store/StoreSetting.ftl"/></html>
+ </platform-specific>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ 
+ <screen name="NewEbayAccount">
+ <section>
+ <actions>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="tabButtonItem" value="NewEbayAccount"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="New Ebay Account">
+ <include-form name="NewEbayAccount" location="component://ebay/widget/EbayForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EbayAccount">
+ <section>
+ <actions>
+ <entity-one value-field="portalPage" entity-name="PortalPage">
+ <field-map field-name="portalPageId" value="EbayAccount"/>
+ </entity-one>
+ <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
+ <field-map field-name="portalPageId" value="EbayAccount"/>
+ <order-by field-name="columnSeqId"/>
+ </entity-and>
+ <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
+ <field-map field-name="portalPageId" value="EbayAccount"/>
+ <order-by field-name="columnSeqId"/>
+ <order-by field-name="sequenceNum"/>
+ </entity-and>
+ <set field="tabButtonItem" value="ebayAccount"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file

Added: ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml?rev=900410&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml (added)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml Mon Jan 18 14:36:16 2010
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+ <form name="EbayStoreList" type="single" list-name="ebayStoreList" target="getStoreDetail"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <field name="productStoreId" title="${uiLabelMap.ProductProductStore}" >
+ <drop-down current="selected" >
+ <list-options list-name="ebayStoreList" description="${storeName} [${productStoreId}]" key-name="productStoreId"/>
+ </drop-down>
+ </field>
+ <field name="submitButton" ><submit button-type="button"/></field>
+ </form>
+ <form name="EbayAccountList" type="single" list-name="ebayAccountList" target="getStoreDetail"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <script location="component://ebay/webapp/ebay/WEB-INF/actions/store/StoreAccount.groovy"/>
+ </actions>
+ <field name="productStoreId" title="Account" >
+ <drop-down current="selected">
+ <list-options list-name="stores" description="${firstName} ${lastName}" key-name="productStoreId"/>
+ </drop-down>
+ </field>
+ <field name="submitButton" ><submit button-type="button"/></field>
+ </form>
+</forms>
\ No newline at end of file