svn commit: r900298 [3/3] - in /ofbiz/trunk: ./ specialpurpose/ebay/ specialpurpose/ebay/config/ specialpurpose/ebay/data/ specialpurpose/ebay/entitydef/ specialpurpose/ebay/lib/ specialpurpose/ebay/script/ specialpurpose/ebay/script/org/ specialpurpos...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r900298 [3/3] - in /ofbiz/trunk: ./ specialpurpose/ebay/ specialpurpose/ebay/config/ specialpurpose/ebay/data/ specialpurpose/ebay/entitydef/ specialpurpose/ebay/lib/ specialpurpose/ebay/script/ specialpurpose/ebay/script/org/ specialpurpos...

hansbak-2
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=900298&r1=900297&r2=900298&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 08:22:00 2010
@@ -153,6 +153,56 @@
         <response name="success" type="view" value="EditEbayConfiguration"/>
         <response name="error" type="view" value="EditEbayConfiguration"/>
     </request-map>
+    
+    <!-- Export categories selected to Ebay store -->
+    <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>
+    
+    <!-- Store output -->
+    <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="loadStoreLogo">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="retrieveAdvancedThemeArray"/>
+        <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>
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
@@ -166,5 +216,12 @@
     <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"/>
+    
+    <!-- store output -->
+    <view-map name="NewEbayAccount" type="screen" page="component://ebay/widget/EbayScreens.xml#NewEbayAccount"/>
+    <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"/>
+    
     <!-- end of view mappings -->
 </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=900298&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/StoreSetting.ftl (added)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/StoreSetting.ftl Mon Jan 18 08:22:00 2010
@@ -0,0 +1,393 @@
+<#--
+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($('selectStoreNameFont'),resp.storeFontTypeFontFaceValue);
+                                if(resp.storeFontTypeNameFaceColor!=null)$('storeNameFontColor').value = resp.storeFontTypeNameFaceColor;
+                                if(resp.storeFontTypeSizeFaceValue!=null) selectOption($('selectStoreNameFontSize'), resp.storeFontTypeSizeFaceValue);
+
+                                if(resp.storeFontTypeTitleColor!=null)$('storeTitleFontColor').value = resp.storeFontTypeTitleColor;
+                                if(resp.storeFontTypeFontTitleValue!=null)selectOption($('selectStoreTitleFont'),resp.storeFontTypeFontTitleValue);
+                                if(resp.storeFontSizeTitleValue!=null)selectOption($('selectStoreTitleFontSize'),resp.storeFontSizeTitleValue);
+
+                                if(resp.storeFontTypeDescColor!=null)$('storeDescFontColor').value = resp.storeFontTypeDescColor;
+                                if(resp.storeFontTypeFontDescValue!=null) selectOption($('selectStoreDescFont'),resp.storeFontTypeFontDescValue);
+                                if(resp.storeDescSizeValue!=null) selectOption($('selectStoreDescFontSize'),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;
+             }
+            
+        }
+    }
+</script>
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <h3>Basic Information </h3>
+  </div>
+  <div class="screenlet-body">
+  <#if parameters.ebayStore?has_content>
+    <#assign ebayStore = parameters.ebayStore?if_exists>
+    <#--${ebayStore}-->
+    <form name="StoreSettingForm" id="StoreSettingForm" method="post" action="#" style="margin: 0;">
+      <fieldset>
+        <table cellspacing="0" class="basic-table">
+            <tr>
+              <td class="label" align="right" valign="middle">Store Name :</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">Store Description :</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">Store URL:</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">Logo URL (http://):</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">Store Theme :</td>
+              <td valign="middle">
+                <#assign currentStoreThemeIdAndSchemeId = ebayStore.storeThemeId?string+"-"+ebayStore.storeColorSchemeId?string>
+                <select name="selectedTheme" onChange="javascript:retrieveThemeColorSchemeByThemeId('<@ofbizUrl>retrieveThemeColorSchemeByThemeId</@ofbizUrl>',this.value,'${parameters.productStoreId?if_exists}');">
+                   <#if storeThemeOptList?has_content>
+                       <#list storeThemeOptList as storeThemeOpt>
+                                <#if themeType?if_exists == "Basic">
+                                    <#assign storeThemeIdAndSchemeId = storeThemeOpt.storeThemeId+"-"+storeThemeOpt.storeColorSchemeId>
+                                    <option value="${storeThemeIdAndSchemeId?if_exists}"
+                                        <#if currentStoreThemeIdAndSchemeId == storeThemeIdAndSchemeId?if_exists>selected</#if>>
+                                        ${storeThemeOpt.storeColorSchemeName?if_exists}
+                                    </option>
+                                <#else>
+                                    <option value="${storeThemeOpt.storeThemeId?if_exists}"
+                                    <#if ebayStore.storeThemeId.equals(storeThemeOpt.storeThemeId?if_exists)>selected</#if>>
+                                    ${storeThemeOpt.storeThemeName?if_exists}</option>
+                                </#if>
+                        </#list>
+                   </#if>
+                </select>
+                <div id="loading"></div>
+              </td>
+            </tr>
+            <#if storeAdvancedThemeColorOptList?has_content>
+            <tr>
+              <td class="label" align="right" valign="middle">Store Theme Color :</td>
+              <td valign="middle">
+                <select name="selectedThemeColorScheme">
+                        <#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>
+            <#if !storeAdvancedThemeColorOptList?has_content>
+            <tr>
+              <td  align="right" valign="middle"></td>
+              <td valign="middle"><b>Change color</b>
+              </td>
+            </tr>
+            <tr>
+              <td class="label" align="right" valign="middle">Primary color :</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">Secondary color :</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">Accent color :</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>Change Fonts</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">Store name</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="selectStoreNameFont" name="selectStoreNameFont">
+                                    <#list storeFontTheme.storeFontTypeFontFaceList as storeFontTypeFontFace>
+                                        <option <#if storeFontTypeFontFace.storeFontValue?if_exists.equals(ebayStore.storeNameFontFace?if_exists) >selected</#if> value="${storeFontTypeFontFace.storeFontValue?if_exists}">${storeFontTypeFontFace.storeFontName?if_exists}</option>
+                                    </#list>
+                                </select>
+                            </td>
+                            <td>
+                                <select id="selectStoreNameFontSize" name="selectStoreNameFontSize">
+                                    <#list storeFontTheme.storeFontTypeSizeFaceList as storeFontTypeSizeFace>
+                                        <option <#if storeFontTypeSizeFace.storeFontSizeValue?if_exists.equals(ebayStore.storeNameFontFaceSize?if_exists) >selected</#if> value="${storeFontTypeSizeFace.storeFontSizeValue?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">Section title</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="selectStoreTitleFont" name="selectStoreTitleFont">
+                                    <#list storeFontTheme.storeFontTypeFontTitleList as storeFontTypeFontTitle>
+                                        <option <#if storeFontTypeFontTitle.storeFontValue?if_exists.equals(ebayStore.storeTitleFontFace?if_exists) >selected</#if> value="${storeFontTypeFontTitle.storeFontValue?if_exists}">${storeFontTypeFontTitle.storeFontName?if_exists}</option>
+                                    </#list>
+                                </select>
+                            </td>
+                            <td>
+                                <select id="selectStoreTitleFontSize" name="selectStoreTitleFontSize">
+                                    <#list storeFontTheme.storeFontSizeTitleList as storeFontSizeTitle>
+                                        <option <#if storeFontSizeTitle.storeFontSizeValue?if_exists.equals(ebayStore.storeTitleFontFaceSize?if_exists) >selected</#if> value="${storeFontSizeTitle.storeFontSizeValue?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">Store description</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="selectStoreDescFont" name="selectStoreDescFont">
+                                    <#list storeFontTheme.storeFontTypeFontDescList as storeFontTypeFontDesc>
+                                        <option <#if storeFontTypeFontDesc.storeFontValue?if_exists.equals(ebayStore.storeDescFontFace?if_exists) >selected</#if> value="${storeFontTypeFontDesc.storeFontValue?if_exists}">${storeFontTypeFontDesc.storeFontName?if_exists}</option>
+                                    </#list>
+                                </select>
+                            </td>
+                            <td>
+                                <select id="selectStoreDescFontSize" name="selectStoreDescFontSize">
+                                    <#list storeFontTheme.storeDescSizeList as storeDescSize>
+                                        <option <#if storeDescSize.storeFontSizeValue?if_exists.equals(ebayStore.storeDescSizeCode?if_exists) >selected</#if> value="${storeDescSize.storeFontSizeValue?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>
+            </#if>
+            
+            <tr>
+              <td class="label" align="right" valign="middle">Store Header Display :</td>
+              <td valign="middle">
+                    <select id="selectStoreCustomHeaderLayout" name="selectStoreCustomHeaderLayout">
+                        <#list ebayStore.storeCustomHeaderLayoutList as storeCustomHeaderLayout>
+                               <option <#if storeCustomHeaderLayout.storeCustomHeaderLayoutValue?if_exists.equals(ebayStore.storeCustomHeaderLayout?if_exists) >selected</#if> value="${storeCustomHeaderLayout.storeCustomHeaderLayoutValue?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">Store Header Style :</td>
+              <td valign="middle">
+                    <select id="selectStoreHeaderStyle" name="selectStoreHeaderStyle">
+                        <#list ebayStore.storeHeaderStyleList as storeHeaderStyle>
+                               <option <#if storeHeaderStyle.storeHeaderStyleValue?if_exists.equals(ebayStore.storeHeaderStyle?if_exists) >selected</#if> value="${storeHeaderStyle.storeHeaderStyleValue?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">Store Item List Display :</td>
+              <td valign="middle">
+                    <select id="selectStoreItemLayout" name="selectStoreItemLayout">
+                        <#list ebayStore.storeItemLayoutList as storeItemLayout>
+                               <option <#if storeItemLayout.storeItemLayoutValue?if_exists.equals(ebayStore.storeItemLayoutSelected?if_exists) >selected</#if> value="${storeItemLayout.storeItemLayoutValue?if_exists}">${storeItemLayout.storeItemLayoutValue?if_exists}</option>
+                        </#list>
+                    </select>
+              </td>
+            </tr>
+            <tr>
+              <td class="label" align="right" valign="middle">Store Item Sort Order :</td>
+              <td valign="middle">
+                    <select id="selectStoreItemSortOrder" name="selectStoreItemSortOrder">
+                        <#list ebayStore.storeItemSortOrderList as storeItemSortOrder>
+                               <option <#if storeItemSortOrder.storeItemSortLayoutValue?if_exists.equals(ebayStore.storeItemSortOrderSelected?if_exists) >selected</#if> value="${storeItemSortOrder.storeItemSortLayoutValue?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">Store Merch Display :</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.merchDisplayCodeValue?if_exists}">${storeMerchDisplay.merchDisplayCodeValue?if_exists}</option>
+                        </#list>
+                    </select>
+              </td>
+            </tr>
+            <tr>
+              <td class="label" align="right" valign="middle">Store Subscription Level :</td>
+              <td valign="middle">
+                    <select id="storeMerchDisplay" name="storeMerchDisplay">
+                        <#list ebayStore.storeSubscriptionLevelList as storeSubscriptionLevel>
+                               <option <#if storeSubscriptionLevel.storeSubscriptionLevelCodeValue?if_exists.equals(ebayStore.storeSubscriptionLevel?if_exists) >selected</#if> value="${storeSubscriptionLevel.storeSubscriptionLevelCodeValue?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.CommonEdit}" 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>
+  
+  </div>
+ </div>
+
\ No newline at end of file

Propchange: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/StoreSetting.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/StoreSetting.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/StoreSetting.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml?rev=900298&r1=900297&r2=900298&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml Mon Jan 18 08:22:00 2010
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-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.
+    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.
 -->
 
 <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>
-
+                                        
                                         <!-- add Create Product and View Product (in ecommerce) links -->
                                         <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,16 @@
                                 <if-has-permission permission="EBAY" action="_VIEW"/>
                             </condition>
                             <widgets>
+                                <container>
+                                    <section>
+                                        <condition>
+                                            <not><if-empty field="parameters.productStoreId"/></not>
+                                        </condition>
+                                        <widgets>
+                                            <include-menu name="EbayStoreFunctionTabBar"  location="component://ebay/widget/EbayMenus.xml"/>
+                                        </widgets>
+                                    </section>
+                                </container>
                                 <decorator-section-include name="body"/>
                             </widgets>
                             <fail-widgets>
@@ -118,7 +128,7 @@
             </widgets>
         </section>
     </screen>
-
+    
     <screen name="CommonEbayConfigDecorator">
         <section>
             <actions>
@@ -148,7 +158,7 @@
                             </fail-widgets>
                         </section>
                     </decorator-section>
-               </decorator-screen>
+                </decorator-screen>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=900298&r1=900297&r2=900298&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Mon Jan 18 08:22:00 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>
-</forms>
\ No newline at end of file
+
+    <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}"/>
+                <!--entity-options entity-name="ProdCatalog" description="${catalogName}" key-field-name="prodCatalogId">
+                    <entity-order-by field-name="catalogName"/>
+                    </entity-options-->
+            </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>

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml?rev=900298&r1=900297&r2=900298&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml Mon Jan 18 08:22:00 2010
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-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.
+    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.
 -->
 <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,22 @@
             <link target="EditEbayConfiguration"/>
         </menu-item>
     </menu>
+    <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="ebayStores" title="${uiLabelMap.EbayStores}">
+            <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>

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=900298&r1=900297&r2=900298&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Mon Jan 18 08:22:00 2010
@@ -288,4 +288,78 @@
         </section>
     </screen>
 
-</screens>
\ No newline at end of file
+    <screen name="exportCategoryEbayStore">
+    <section>
+        <actions>
+            <set field="titleProperty" value="EbayExportAllCategoryToEbayStore"/>
+            <set field="headerItem" value="exportCategoriesEbayStore"/>
+            <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="ebayStores"/>
+            </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="${uiLabelMap.EbayStores}">
+                            <include-form name="EbayAccountList" location="component://ebay/widget/EbayStoreForms.xml"/>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="NewEbayAccount">
+        <section>
+            <actions>
+                <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="ebayStoreDetail">
+        <section>
+            <actions>
+                <set field="titleProperty" value="${uiLabelMap.EbayStoreSetting}"/>
+                <set field="headerItem" value="ebayStoresSetting"/>
+                <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>
+  
+</screens>

Added: ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml?rev=900298&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml (added)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml Mon Jan 18 08:22:00 2010
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+
+value="${bsh:billingAccount != null ? org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/>
+-->
+
+<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

Propchange: ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml