svn commit: r905876 [1/7] - in /ofbiz/trunk: applications/commonext/documen
Locked
svn commit: r905876 [1/7] - in /ofbiz/trunk: applications/commonext/documen
 
|
Author: hansbak
Date: Wed Feb 3 03:16:07 2010 New Revision: 905876 URL: http://svn.apache.org/viewvc?rev=905876&view=rev Log: move the java api functions from the existing ebay component to the new ebaystore component: no functional changes Added: ofbiz/trunk/specialpurpose/ebaystore/data/ ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreHelpData.xml ofbiz/trunk/specialpurpose/ebaystore/data/EbayStorePortletData.xml ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreScheduledJobs.xml ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityData.xml ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/ ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_AutoPref.xml ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_BlockItemOutStock.xml ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_EbayStore.xml ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_ExportCategoriesToEbay.xml ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_Feedback.xml ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_LeaveFeedback.xml ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_NewEbayAccount.xml ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_ProductInventory.xml ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_ReserveProduct.xml ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_StoreSetting.xml ofbiz/trunk/specialpurpose/ebaystore/documents/ ofbiz/trunk/specialpurpose/ebaystore/documents/EbayStore.xml ofbiz/trunk/specialpurpose/ebaystore/entitydef/ ofbiz/trunk/specialpurpose/ebaystore/entitydef/entitymodel.xml ofbiz/trunk/specialpurpose/ebaystore/lib/ (props changed) - copied from r905541, ofbiz/trunk/specialpurpose/ebay/lib/ ofbiz/trunk/specialpurpose/ebaystore/script/ ofbiz/trunk/specialpurpose/ebaystore/script/org/ ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/ ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayServices.xml ofbiz/trunk/specialpurpose/ebaystore/servicedef/ ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml ofbiz/trunk/specialpurpose/ebaystore/src/ ofbiz/trunk/specialpurpose/ebaystore/src/org/ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetEbayJobsandbox.groovy ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/RetrieveStoreOptions.groovy ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/feedback/ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/feedback/LeaveFeedback.ftl ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayInventoryForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Removed: ofbiz/trunk/specialpurpose/ebay/data/EbayPortletData.xml ofbiz/trunk/specialpurpose/ebay/data/EbayScheduledJobs.xml ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_AutoPref.xml ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_BlockItemOutStock.xml ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_EbayStore.xml ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_ExportCategoriesToEbay.xml ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_Feedback.xml ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_LeaveFeedback.xml ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_NewEbayAccount.xml ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductInventory.xml ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_ReserveProduct.xml ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_StoreSetting.xml ofbiz/trunk/specialpurpose/ebay/lib/ ofbiz/trunk/specialpurpose/ebay/script/org/ofbiz/ebay/ebay/EbayServices.xml ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayAccount.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayEvents.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayFeedback.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayStore.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayStoreInventoryServices.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayStoreOptions.java Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml ofbiz/trunk/specialpurpose/build.xml ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml ofbiz/trunk/specialpurpose/ebay/data/EbayHelpData.xml ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml ofbiz/trunk/specialpurpose/ebaystore/ (props changed) ofbiz/trunk/specialpurpose/ebaystore/build.xml ofbiz/trunk/specialpurpose/ebaystore/config/EbayStore.properties ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml ofbiz/trunk/specialpurpose/ebaystore/ofbiz-component.xml ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml (original) +++ ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml Wed Feb 3 03:16:07 2010 @@ -52,6 +52,7 @@ <xi:include href="../../../applications/humanres/documents/Humanres.xml"/> <xi:include href="../../../specialpurpose/myportal/documents/MyPortal.xml"/> <xi:include href="../../../specialpurpose/ebay/documents/Ebay.xml"/> + <xi:include href="../../../specialpurpose/ebay/documents/EbayStore.xml"/> <appendix> <title>New features recently added</title> Modified: ofbiz/trunk/specialpurpose/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/build.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/build.xml (original) +++ ofbiz/trunk/specialpurpose/build.xml Wed Feb 3 03:16:07 2010 @@ -29,6 +29,7 @@ oagis/build.xml, googlebase/build.xml, ebay/build.xml, + ebaystore/build.xml, projectmgr/build.xml, ldap/build.xml, crowd/build.xml, Modified: ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml Wed Feb 3 03:16:07 2010 @@ -572,156 +572,5 @@ <value xml:lang="th">รายà¸à¸²à¸£à¸ªà¸´à¸à¸à¹à¸²à¸ªà¹à¸à¸à¸¢à¹à¸²à¸à¸à¸¹à¸à¸à¹à¸à¸à¸à¸¶à¸à¸à¸µà¹à¸à¸¢à¹</value> <value xml:lang="zh">产åæç»è¢«æ£ç¡®åéå°äºeBay</value> </property> - <property key="EbayExportAllCategoryToEbayStore"> - <value xml:lang="en">Export categories to eBay store</value> - <value xml:lang="th">สà¹à¸à¸à¸à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¹à¸²à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¸à¸µà¹à¸à¸¢à¹</value> - </property> - <property key="EbayExportToEbayStore"> - <value xml:lang="en">Export To eBay Store</value> - <value xml:lang="th">à¸à¸²à¸£à¸ªà¹à¸à¸à¸à¸à¹à¸à¸¢à¸±à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹</value> - </property> - <property key="EbayStore"> - <value xml:lang="en">Ebay Store</value> - <value xml:lang="th">à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹</value> - </property> - <property key="EbayStores"> - <value xml:lang="en">Ebay Stores</value> - <value xml:lang="th">รายà¸à¸·à¹à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹</value> - </property> - <property key="EbayStoreSetting"> - <value xml:lang="en">Ebay Store Setting</value> - <value xml:lang="th">รายà¸à¸·à¹à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹</value> - </property> - <property key="EbayStoreLoadSuccess"> - <value xml:lang="en">Load Ebay Store success.</value> - <value xml:lang="th">à¹à¸«à¸¥à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸¢</value> - </property> - <property key="EbayStoreSaveSuccess"> - <value xml:lang="en">Save ebay setting success.</value> - <value xml:lang="th">à¸à¸±à¸à¸à¸¶à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸¢</value> - </property> - - <property key="EbayStoreStoreName"> - <value xml:lang="en">Store Name</value> - <value xml:lang="th">à¸à¸·à¹à¸à¸£à¹à¸²à¸à¸à¹à¸²</value> - </property> - <property key="EbayStoreStoreDesc"> - <value xml:lang="en">Store Description</value> - <value xml:lang="th">รายละà¹à¸à¸µà¸¢à¸à¸£à¹à¸²à¸à¸à¹à¸²</value> - </property> - <property key="EbayStoreStoreURL"> - <value xml:lang="en">Store URL</value> - <value xml:lang="th">URL</value> - </property> - <property key="EbayStoreStoreLogoURL"> - <value xml:lang="en">Logo URL</value> - <value xml:lang="th">à¹à¸¥à¹à¸ url</value> - </property> - <property key="EbayStoreStoreAdvancedTheme"> - <value xml:lang="en">Store Advanced Theme</value> - <value xml:lang="th">Theme สำà¹à¸£à¹à¸à¸£à¸¹à¸</value> - </property> - <property key="EbayStoreStoreAdvancedThemeColor"> - <value xml:lang="en">Store Advanced Theme Color</value> - <value xml:lang="th">à¹à¸¥à¸·à¸à¸à¸ªà¸µà¸à¸à¸ Theme</value> - </property> - <property key="EbayStoreStoreBasicTheme"> - <value xml:lang="en">Store Basic Theme</value> - <value xml:lang="th">à¸à¸µà¸¡à¹à¸à¸à¸à¸£à¸£à¸¡à¸à¸²</value> - </property> - - <property key="EbayStoreStoreColorTheme"> - <value xml:lang="en">Change Color</value> - <value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¸ªà¸µ</value> - </property> - <property key="EbayStoreStorePrimaryColor"> - <value xml:lang="en">Primary color</value> - <value xml:lang="th">สีหลัà¸</value> - </property> - <property key="EbayStoreStoreSecondColor"> - <value xml:lang="en">Secondary color</value> - <value xml:lang="th">สีรà¸à¸</value> - </property> - <property key="EbayStoreStoreAccentColor"> - <value xml:lang="en">Accent color</value> - <value xml:lang="th">Accent color</value> - </property> - <property key="EbayStoreStoreChangeFont"> - <value xml:lang="en">Change Fonts</value> - <value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¸à¸±à¸§à¸à¸±à¸à¸©à¸£</value> - </property> - <property key="EbayStoreStoreSectionTitle"> - <value xml:lang="en">Section title</value> - <value xml:lang="th">สà¹à¸§à¸à¸à¸à¸ title</value> - </property> - <property key="EbayStoreStoreHeaderDisplay"> - <value xml:lang="en">Store Header Display</value> - <value xml:lang="th">Store header</value> - </property> - <property key="EbayStoreStoreHeaderStyle"> - <value xml:lang="en">Store Header Style</value> - <value xml:lang="th">Store header Style</value> - </property> - <property key="EbayStoreStoreItemListDesplay"> - <value xml:lang="en">Store Item List Display</value> - <value xml:lang="th"></value> - </property> - <property key="EbayStoreStoreItemSortOrder"> - <value xml:lang="en">Store Item Sort Order</value> - <value xml:lang="th"></value> - </property> - <property key="EbayStoreStoreMerchDisplay"> - <value xml:lang="en">Store Merch Display</value> - <value xml:lang="th"></value> - </property> - <property key="EbayStoreStoreSubscriptionLevel"> - <value xml:lang="en">Store Subscription Level</value> - <value xml:lang="th"></value> - </property> - - <property key="EbayPersonalInformation"> - <value xml:lang="en">Personal Information</value> - </property> - <property key="EbayAccountInformation"> - <value xml:lang="en">Account Information</value> - </property> - <property key="EbayUserPreference"> - <value xml:lang="en">User Preference</value> - </property> - <property key="EbayAutomationRelistItems"> - <value xml:lang="en">Automation Re-list Items</value> - </property> - - <property key="EbayBoughtLeaveFeedback"> - <value xml:lang="en">Bought</value> - </property> - - <property key="EbayFeedback"> - <value xml:lang="en">Feedback</value> - <value xml:lang="th">à¸à¸¥à¸à¸à¸à¸£à¸±à¸</value> - </property> - <property key="EbayFeedbackStore"> - <value xml:lang="en">Feedback Store</value> - </property> - <property key="EbayLeaveFeedback"> - <value xml:lang="en">Leave Feedback</value> - </property> - <property key="EbaySoldLeaveFeedback"> - <value xml:lang="en">Sold</value> - </property> - <property key="EbayBlockItemOutOfStock"> - <value xml:lang="en">Block items out of stock</value> - </property> - - <!-- ebay inventory --> - <property key="EbayReserveProductFrom"> - <value xml:lang="en">Reserve Product From</value> - </property> - <property key="EbayReserveProductInventory"> - <value xml:lang="en">Reserve Product Inventory</value> - </property> - <property key="EbayUpdateInventory"> - <value xml:lang="en">Update To Ebay Inventory</value> - </property> </resource> Modified: ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml Wed Feb 3 03:16:07 2010 @@ -36,33 +36,4 @@ <EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="ShippingMethodStandard" productStoreId="9000" amount="10.00" carrierPartyId="UPS" shipmentMethodTypeId="GROUND"/> <EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="StandardInternational" productStoreId="9000" amount="0.00" carrierPartyId="USPS" shipmentMethodTypeId="INT_EXPRESS"/> <EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="LocalDelivery" productStoreId="9000" amount="0.00" carrierPartyId="_NA_" shipmentMethodTypeId="STANDARD"/> - - - <!-- Ebay Store Demo Data --> - <RoleType roleTypeId="EBAY_ACCOUNT" hasTable="N" description="eBay Account"/> - <Party partyId="esandbox10543" partyTypeId="PERSON"/> - <Person partyId="esandbox10543" firstName="Demo ebay account" lastName="USA"/> - <PartyRole partyId="esandbox10543" roleTypeId="EBAY_ACCOUNT"/> - <UserLogin userLoginId="esandbox10543" partyId="esandbox10543" currentPassword="{SHA}bbf272ce445e1c48d94096afdba6a7888c1df1fe"/> - <ProductStore productStoreId="esandbox10543_store" storeName="OFBiz Ebay Store-USA" companyName="Apache Ofbiz" title="Test esandbox10543 store" - subtitle="Part of the Open For Business Family of Open Source Software" payToPartyId="esandbox10543" daysToCancelNonPay="30" prorateShipping="Y" prorateTaxes="Y" - inventoryFacilityId="WebStoreWarehouse" oneInventoryFacility="Y" checkInventory="Y" reserveInventory="Y" balanceResOnOrderCreation="Y" reserveOrderEnumId="INVRO_FIFO_REC" requireInventory="N" - defaultLocaleString="en_US" defaultCurrencyUomId="USD" defaultSalesChannelEnumId="EBAY_SALES_CHANNEL" allowPassword="Y" explodeOrderItems="N" retryFailedAuths="Y" reqReturnInventoryReceive="N" - headerApprovedStatus="ORDER_APPROVED" itemApprovedStatus="ITEM_APPROVED" digitalItemApprovedStatus="ITEM_APPROVED" headerDeclinedStatus="ORDER_REJECTED" - itemDeclinedStatus="ITEM_REJECTED" headerCancelStatus="ORDER_CANCELLED" itemCancelStatus="ITEM_CANCELLED" orderNumberPrefix="WS" - authDeclinedMessage="There has been a problem with your method of payment. Please try a different method or call customer service." - authFraudMessage="Your order has been rejected and your account has been disabled due to fraud." - authErrorMessage="Problem connecting to payment processor; we will continue to retry and notify you by email." - storeCreditValidDays="90" storeCreditAccountEnumId="FIN_ACCOUNT" - visualThemeId="EC_DEFAULT" prodSearchExcludeVariants="Y" autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y" showOutOfStockProducts="Y"/> - <ProductStoreRole partyId="esandbox10543" roleTypeId="EBAY_ACCOUNT" productStoreId="esandbox10543_store" fromDate="2010-01-01 16:19:47.058"/> - <ProductStoreCatalog productStoreId="esandbox10543_store" prodCatalogId="eBayCatalog" fromDate="2010-01-01 16:19:47.058"/> - <ProductStoreFacility productStoreId="esandbox10543_store" facilityId="WebStoreWarehouse" fromDate="2010-01-01 16:19:47.058"/> - - <WebSite webSiteId="EBAY" siteName="eBay" standardContentPrefix="http://demo.ofbiz.org" productStoreId="esandbox10543_store"/> - <EbayConfig productStoreId="esandbox10543_store" devId="f3586481-93c7-4aaf-ab87-d383d56b71b1" appId="antwebc0f-9bf9-4829-998b-e5e8fb773ac" certId="7f363bc0-11d6-489a-a54d-4a44de82f790" compatibilityLevel="643" siteId="0" xmlGatewayUri="https://api.sandbox.ebay.com/ws/api.dll" apiServerUrl="https://api.sandbox.ebay.com/wsapi" webSiteId="EBAY"> - <token><![CDATA[AgAAAA**AQAAAA**aAAAAA**PC5MSw**nY+sHZ2PrBmdj6wVnY+sEZ2PrA2dj6wJnY+lCZiGoA2dj6x9nY+seQ**0jgBAA**AAMAAA**YxqcpdWbgFwYg1G+3AhOonR2/yllz3IJ5VoJyU75texuETwabGgsN4f6OfeBGWejUx10heCKG7wcM4JI+Fqk8Zg64L51JL3/Vm7dYo8VHd8wfixWIdMmhheYFwOdBtxcTb93NLeJa6uxvBJYrSS7O0RcQ3KPhOVJvt7KfVT009o2/02tuX7vbMoHV+Meszli4eVAnB9Fbt6ag2nq46+2/AzMIO4rZE23ozLfh6c4W+QkD6BcaFzLmhVE+7Ni9y7y26QHfUUdjBOEF6ewLpZJsSIoQZC9y4J/yF15Ann9NiamtmFj5IeX4uNIKegEt8EwFSqtpxjgVngcAmMaM8/hk9uQVnFKHTjhK3koUrT7zu/+tk2twJfGF9odb+/5uTVJZ8Lywl/LwEdadv2wjpTdQqHF2bV84cSRhOKrlsYr9xFqgqNDpnmCFXkQKGhycWzMzxcBmiRT5VXJfBjbTGGdmfAf7TVcoU/4C3F3kvzEJhcxU9WbMvj58TmW+VvYS7oy4kOyTiyr3alkz/+HJYGIuttnkzqsIVIPaSXyyuFNWQmQL+0GlJ1n7EoKCevuVsTYgayQEN39TPeXg8ADmf5Pf19BlPxRFNkKvANxE0k3ac+whUwpkfBgx6lApOcwKQMXioi7NrN3MROL/1qrO2+N5sl4kr9nbuvEk9mPDJnmNdB7lzgoESo+se3ZmY9KJ6v08uQ02N1/SjHtmeiojayaR/DqeJiFSoAnU4winzA5GQGNjzEHUpSf1Kj+IZudhT9r]]></token> - <customXml><![CDATA[<custom-xml><Currency>USD</Currency><UseTaxTable>false</UseTaxTable><DispatchTimeMax>3</DispatchTimeMax><ReturnPolicy><ReturnsAcceptedOption>ReturnsNotAccepted</ReturnsAcceptedOption></ReturnPolicy><ShippingDetails><ShippingType>Flat</ShippingType><ShippingServiceOptions><ShippingService>UPS2ndDay</ShippingService><ShippingServicePriority>1</ShippingServicePriority><ShippingServiceCost>5</ShippingServiceCost><ShippingServiceAdditionalCost>2</ShippingServiceAdditionalCost><ShippingSurcharge>1</ShippingSurcharge></ShippingServiceOptions></ShippingDetails></custom-xml>]]></customXml> - </EbayConfig> - </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/ebay/data/EbayHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/data/EbayHelpData.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/data/EbayHelpData.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/data/EbayHelpData.xml Wed Feb 3 03:16:07 2010 @@ -83,58 +83,4 @@ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_EbayOrders" contentTypeId="DOCUMENT" contentName="Ebay orders import" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_EbayOrders" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_EbayOrders" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_FindEbayOrders"/> - <!-- ebay store --> - - <DataResource dataResourceId="EBAY_ebayStores" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_EbayStore.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="EBAY_ebayStores" contentTypeId="DOCUMENT" contentName="EBay store" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ebayStores" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_ebayStores" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_ebayStores"/> - - <DataResource dataResourceId="EBAY_NewEbayAccount" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_NewEbayAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="EBAY_NewEbayAccount" contentTypeId="DOCUMENT" contentName="EBay store new ebay Account" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_NewEbayAccount" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_NewEbayAccount" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_NewEbayAccount"/> - - <DataResource dataResourceId="EBAY_StoreSetting" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_StoreSetting.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="EBAY_StoreSetting" contentTypeId="DOCUMENT" contentName="EBay store setting" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_StoreSetting" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_StoreSetting" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_ebayStoreDetail"/> - - <DataResource dataResourceId="EBAY_ExpCatToEbay" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_ExportCategoriesToEbay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="EBAY_ExpCatToEbay" contentTypeId="DOCUMENT" contentName="EBay export categories to store" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ExpCatToEbay" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_ExpCatToEbay" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_exportCategoryEbayStore"/> - - <!-- ebay feedback --> - <DataResource dataResourceId="EBAY_LeaveFeedback" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_LeaveFeedback.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="EBAY_LeaveFeedback" contentTypeId="DOCUMENT" contentName="EBay Leave Feedback" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_LeaveFeedback" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_LeaveFeedback" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_LeaveFeedback"/> - - <DataResource dataResourceId="EBAY_Feedback" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_Feedback.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="EBAY_Feedback" contentTypeId="DOCUMENT" contentName="EBay Feedback" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_Feedback" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_Feedback" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_Feedback"/> - - <DataResource dataResourceId="EBAY_AutoPref" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_AutoPref.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="EBAY_AutoPref" contentTypeId="DOCUMENT" contentName="EBay Automation Preferences" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_AutoPref" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_AutoPref" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_AutomationPreferences"/> - - <!-- block out of stock --> - <DataResource dataResourceId="EBAY_BlockItem" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_BlockItemOutStock.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="EBAY_BlockItem" contentTypeId="DOCUMENT" contentName="Block item that out of stock on eBay" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_BlockItem" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_BlockItem" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_blockItemOutOfStock"/> - - <!-- ebay product inventory --> - <DataResource dataResourceId="EBAY_ProdInventory" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductInventory.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="EBAY_ProdInventory" contentTypeId="DOCUMENT" contentName="handle ebay store inventory by ofbiz inventory" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ProdInventory" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_ProdInventory" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_ebayStoreInventory"/> - - <DataResource dataResourceId="EBAY_reserveProd" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_ReserveProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="EBAY_reserveProd" contentTypeId="DOCUMENT" contentName="reserve product from ofbiz inventory" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_reserveProd" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_reserveProd" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_reserveEbayProductInventory"/> </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml Wed Feb 3 03:16:07 2010 @@ -25,12 +25,4 @@ <EnumerationType description="Ebay Ship Types" enumTypeId="EBAY_SHIP_TYPE" hasTable="N" parentTypeId=""/> <Enumeration description="Flat Rate Shipping" enumCode="FLAT_RATE" enumId="EBAY_FLAT_RATE" sequenceId="01" enumTypeId="EBAY_SHIP_TYPE"/> - - <Enumeration description="Flat Rate Shipping" enumCode="FLAT_RATE" enumId="EBAY_FLAT_RATE" sequenceId="01" enumTypeId="EBAY_SHIP_TYPE"/> - - <RoleType roleTypeId="COMMENTATOR" hasTable="N" description="Commentator"/> - <RoleType roleTypeId="EBAY_ORGANIZATION" hasTable="N" description="eBay Organization"/> - - <EnumerationType description="Inventory Reservation For Ebay Store" enumTypeId="EBAY_INV_RESERVE" hasTable="N" parentTypeId=""/> - <Enumeration description="ebay inventory reserve" enumCode="EBAY_INV" enumId="EBAY_INV_RES" sequenceId="01" enumTypeId="EBAY_INV_RESERVE"/> </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml Wed Feb 3 03:16:07 2010 @@ -51,7 +51,6 @@ <field name="compatibilityLevel" type="id"></field> <field name="siteId" type="id"></field> <field name="xmlGatewayUri" type="value"></field> - <field name="apiServerUrl" type="value"></field> <field name="customXml" type="very-long"></field> <field name="webSiteId" type="id-ne"></field> <prim-key field="productStoreId"/> @@ -89,31 +88,6 @@ <key-map field-name="shipmentMethodTypeId"/> </relation> </entity> - - <entity entity-name="EbayProductStoreInventory" - package-name="org.ofbiz.ebay.store" - title="Ebay store product inventory and status of listing"> - <field name="productStoreId" type="id-ne"></field> - <field name="facilityId" type="id-ne"></field> - <field name="productId" type="id-ne"></field> - <field name="folderId" type="id-ne"></field> - <field name="ebayProductId" type="numeric"></field> - <field name="quantityReserved" type="fixed-point"></field> - <field name="availableToPromiseListing" type="fixed-point"></field> - <field name="scheduled" type="fixed-point"></field> - <field name="activeListing" type="fixed-point"></field> - <field name="sold" type="fixed-point"></field> - <field name="unSold" type="fixed-point"></field> - <field name="successRatio" type="floating-point"></field> - <field name="avgSellingPrice" type="floating-point"></field> - <field name="reservedDate" type="date-time"></field> - <prim-key field="productStoreId"/> - <prim-key field="facilityId"/> - <prim-key field="productId"/> - <relation type="one" fk-name="EBYPSI_PRD_STRE" rel-entity-name="ProductStore"> - <key-map field-name="productStoreId"/> - </relation> - </entity> - + </entitymodel> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml Wed Feb 3 03:16:07 2010 @@ -23,16 +23,15 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd"> <resource-loader name="main" type="component"/> <classpath type="dir" location="config"/> - <classpath type="jar" location="lib/*"/> <classpath type="jar" location="build/lib/*"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/EbaySecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayHelpData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayPortletData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoEbayData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/EbayScheduledJobs.xml"/> + <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> Modified: ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml Wed Feb 3 03:16:07 2010 @@ -164,207 +164,4 @@ <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <service name="createEbayAccount" engine="simple" - location="component://ebay/script/org/ofbiz/ebay/ebay/EbayServices.xml" invoke="createEbayAccount" auth="true"> - <attribute name="salutation" mode="IN" type="String" optional="true"/> - <attribute name="firstName" mode="IN" type="String" optional="false"/> - <attribute name="middleName" mode="IN" type="String" optional="true"/> - <attribute name="lastName" mode="IN" type="String" optional="false"/> - <attribute name="gender" mode="IN" type="String" optional="true"/> - <attribute name="userLoginId" mode="IN" type="String" optional="false"/> - <attribute name="currentPassword" mode="IN" type="String" optional="false"/> - <attribute name="currentPasswordVerify" mode="IN" type="String" optional="false"/> - <attribute name="statusId" mode="IN" type="String" optional="true"/> - <attribute name="productStoreId" mode="OUT" type="String" optional="false"/> - </service> - - <service name="exportCategoriesSelectedToEbayStore" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="exportCategoriesSelectedToEbayStore" auth="true"> - <description>Export categories in store to eBay store</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="prodCatalogId" type="String" mode="IN" optional="false"/> - </service> - - <!-- Store output --> - <service name="getEbayStoreOutput" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="getEbayStoreOutput" auth="true"> - <description>get ebay store description</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="ebayStore" type="Map" mode="OUT" optional="true"/> - </service> - <service name="retrievePredesignedLogoOption" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="retrievePredesignedLogoOption" auth="true"> - <description>get ebay store logos description</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="storeLogoOptList" type="List" mode="OUT" optional="true"/> - </service> - <service name="retrieveBasicThemeArray" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="retrieveBasicThemeArray" auth="true"> - <description>get ebay store Basic theme Array description</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="storeThemeList" type="List" mode="OUT" optional="true"/> - </service> - <service name="retrieveAdvancedThemeArray" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="retrieveAdvancedThemeArray" auth="true"> - <description>get ebay store Advanced theme Array description</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="storeThemeList" type="List" mode="OUT" optional="true"/> - <attribute name="storeAdvancedThemeColorOptList" type="List" mode="OUT" optional="true"/> - </service> - <service name="retrieveStoreFontTheme" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="retrieveStoreFontTheme" auth="true"> - <description>get ebay store Advanced theme Array description</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="advanceFontTheme" type="Map" mode="OUT" optional="true"/> - </service> - <service name="setEbayStoreInput" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayStore" invoke="setEbayStoreInput" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="themeType" mode="IN" type="String" optional="false"/> - <attribute name="storeName" mode="IN" type="String" optional="false"/> - <attribute name="storeDesc" mode="IN" type="String" optional="false"/> - <attribute name="storeUrl" mode="IN" type="String" optional="false"/> - <attribute name="storeLogoId" mode="IN" type="String" optional="true"/> - <attribute name="storeLogoName" mode="IN" type="String" optional="true"/> - <attribute name="storeLogoURL" mode="IN" type="String" optional="true"/> - <attribute name="storeAdvancedTheme" mode="IN" type="String" optional="true"/> - <attribute name="storeAdvancedThemeColor" mode="IN" type="String" optional="true"/> - <attribute name="storeBasicTheme" mode="IN" type="String" optional="true"/> - <attribute name="storePrimaryColor" mode="IN" type="String" optional="true"/> - <attribute name="storeSecondaryColor" mode="IN" type="String" optional="true"/> - <attribute name="storeAccentColor" mode="IN" type="String" optional="true"/> - <attribute name="storeNameFont" mode="IN" type="String" optional="true"/> - <attribute name="storeNameFontSize" mode="IN" type="String" optional="true"/> - <attribute name="storeNameFontColor" mode="IN" type="String" optional="true"/> - <attribute name="storeTitleFont" mode="IN" type="String" optional="true"/> - <attribute name="storeTitleFontSize" mode="IN" type="String" optional="true"/> - <attribute name="storeTitleFontColor" mode="IN" type="String" optional="true"/> - <attribute name="storeDescFont" mode="IN" type="String" optional="true"/> - <attribute name="storeDescFontSize" mode="IN" type="String" optional="true"/> - <attribute name="storeDescFontColor" mode="IN" type="String" optional="true"/> - <attribute name="storeCustomHeaderLayout" mode="IN" type="String" optional="false"/> - <attribute name="storeCustomHeader" mode="IN" type="String" optional="false"/> - <attribute name="storeHeaderStyle" mode="IN" type="String" optional="false"/> - <attribute name="storeItemLayout" mode="IN" type="String" optional="false"/> - <attribute name="storeItemSortOrder" mode="IN" type="String" optional="false"/> - <attribute name="storeMerchDisplay" mode="IN" type="String" optional="false"/> - <attribute name="storeSubscriptionDisplay" mode="IN" type="String" optional="false"/> - <attribute name="ebayStore" type="Map" mode="OUT" optional="true"/> - </service> - <!-- ebay account --> - <service name="getEbayStoreUser" engine="java" location="org.ofbiz.ebay.EbayStore" invoke="getEbayStoreUser" auth="true" transaction-timeout="3600"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="userLoginId" mode="OUT" type="String" optional="true"/> - </service> - <service name="getEbayUser" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayAccount" invoke="getEbayUser" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="email" mode="OUT" type="String" optional="true"/> - <attribute name="registrationAddress" mode="OUT" type="Map" optional="true"/> - <attribute name="status" mode="OUT" type="String" optional="true"/> - </service> - <service name="getEbayAccount" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayAccount" invoke="getEbayAccount" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="accountList" mode="OUT" type="List" optional="true"/> - </service> - <service name="getEbayUserPreference" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayAccount" invoke="getEbayUserPreference" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="userPreferenceList" mode="OUT" type="List" optional="true"/> - </service> - <!-- eBay Feedback --> - <service name="loadFeedback" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayFeedback" invoke="loadFeedback" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - </service> - <service name="getItemsAwaitingFeedback" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayFeedback" invoke="getItemsAwaitingFeedback" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="itemsAwaitingFeedback" mode="OUT" type="List" optional="true"/> - </service> - <service name="leaveFeedback" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayFeedback" invoke="leaveFeedback" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="transactionId" mode="IN" type="String" optional="false"/> - <attribute name="itemId" mode="IN" type="String" optional="false"/> - <attribute name="targetUser" mode="IN" type="String" optional="false"/> - <attribute name="commentingUser" mode="IN" type="String" optional="false"/> - <attribute name="role" mode="IN" type="String" optional="false"/> - <attribute name="commentType" mode="IN" type="String" optional="false"/> - <attribute name="commentText" mode="IN" type="String" optional="false"/> - <attribute name="ratingItem" mode="IN" type="String" optional="true"/> - <attribute name="ratingComm" mode="IN" type="String" optional="true"/> - <attribute name="ratingShip" mode="IN" type="String" optional="true"/> - <attribute name="ratingShipHand" mode="IN" type="String" optional="true"/> - <attribute name="AqItemAsDescribedId" mode="IN" type="String" optional="true"></attribute> - </service> - <service name="getEbayActiveItems" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayStore" invoke="getEbayActiveItems" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="activeItems" mode="OUT" type="List" optional="true"/> - </service> - <service name="getEbaySoldItems" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayStore" invoke="getEbaySoldItems" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="soldItems" mode="OUT" type="List" optional="true"/> - </service> - <service name="automaticEbayRelistSoldItems" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayStore" invoke="automaticEbayRelistSoldItems" auth="true"> - </service> - <service name="createEbayAutomaticRelistItems" engine="entity-auto" default-entity-name="JobSandbox" invoke="create"> - <description>create eBay automatic re-list items</description> - <auto-attributes mode="IN" include="pk"/> - <auto-attributes mode="IN" optional="true" include="nonpk"/> - </service> - <service name="updateEbayAutomaticRelistItems" engine="entity-auto" default-entity-name="JobSandbox" invoke="update"> - <description>create eBay automatic re-list items</description> - <auto-attributes mode="IN" include="pk"/> - <auto-attributes mode="IN" optional="true" include="nonpk"/> - </service> - <!-- block out of stock items --> - <service name="getSellingInventory" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="getSellingInventory" auth="true"> - <attribute name="productStoreId" mode="IN" type="String" optional="false"/> - <attribute name="itemBlocked" type="Map" mode="OUT" optional="true"/> - </service> - <!-- ebay inventory --> - <service name="reserveEbayStoreInventory" engine="simple" - location="component://ebay/script/org/ofbiz/ebay/ebay/EbayServices.xml" invoke="reserveEbayStoreInventory"> - <description>Reserve Inventory in a Product Store</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"></attribute> - <attribute name="productId" type="String" mode="IN" optional="false"></attribute> - <attribute name="facilityId" type="String" mode="IN" optional="false"></attribute> - <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"></attribute> - <attribute name="quantityNotReserved" type="BigDecimal" mode="OUT" optional="false"></attribute> - </service> - <service name="reserveEbayProductInventoryByStoreFacility" engine="simple" - location="component://ebay/script/org/ofbiz/ebay/ebay/EbayServices.xml" invoke="reserveEbayProductInventory" auth="true"> - <description>Reserve Inventory for a Product By Facility - If requireInventory is Y the quantity not reserved is returned, if N then a negative - availableToPromise will be used to track quantity ordered beyond what is in stock. - </description> - <attribute name="productId" type="String" mode="IN" optional="false"/> - <attribute name="facilityId" type="String" mode="IN" optional="false"/> - <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> - <attribute name="reservedDatetime" type="Timestamp" mode="IN" optional="true"/> - <attribute name="requireInventory" type="String" mode="IN" optional="false"/> - <attribute name="reserveOrderEnumId" type="String" mode="IN" optional="true"/> - <attribute name="sequenceId" type="Long" mode="IN" optional="true"/> - <attribute name="quantityNotReserved" type="BigDecimal" mode="OUT" optional="false"/> - </service> - <service name="updateEbayStoreInventory" engine="java" transaction-timeout="3600" - location="org.ofbiz.ebay.EbayStoreInventoryServices" invoke="updateEbayStoreInventory" auth="true"> - <description>update Inventory on ebay store inventory</description> - <attribute name="productStoreId" type="String" mode="INOUT" optional="false"></attribute> - <attribute name="productId" type="String" mode="IN" optional="false"></attribute> - <attribute name="folderId" type="String" mode="INOUT" optional="false"></attribute> - <attribute name="facilityId" type="String" mode="INOUT" optional="false"></attribute> - </service> - <service name="getFolderInEbayStoreInventory" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStoreInventoryServices" invoke="getFolderInEbayStoreInventory" auth="true"> - <description>get ebay folder in ebay store inventory</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="folderId" type="String" mode="OUT" optional="false"></attribute> - </service> </services> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Wed Feb 3 03:16:07 2010 @@ -57,13 +57,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import com.ebay.sdk.ApiAccount; -import com.ebay.sdk.ApiContext; -import com.ebay.sdk.ApiCredential; -import com.ebay.sdk.ApiLogging; -import com.ebay.soap.eBLBaseComponents.SiteCodeType; - - public class EbayHelper { private static final String configFileName = "ebayExport.properties"; private static final String module = EbayHelper.class.getName(); @@ -614,72 +607,4 @@ } return productId; } - - public static ApiContext getApiContext(String productStoreId,Locale locale, Delegator delegator){ - Map<String, Object> context = FastMap.newInstance(); - context.put("locale", locale); - context.put("productStoreId", productStoreId); - Map<String, Object> config = buildEbayConfig(context, delegator); - ApiCredential apiCredential = new ApiCredential(); - ApiLogging apiLogging = new ApiLogging(); - apiLogging.setEnableLogging(false); - apiLogging.setLogExceptions(false); - apiLogging.setLogSOAPMessages(false); - - String devID = (String)config.get("devId"); - String appID = (String)config.get("appID"); - String certID = (String)config.get("certID"); - String token = (String)config.get("token"); - String apiServerUrl = (String)config.get("apiServerUrl"); - - if(token != null){ - apiCredential.seteBayToken(token); - }else if(devID != null && appID != null && certID != null){ - ApiAccount apiAccount = new ApiAccount(); - apiAccount.setApplication(appID); - apiAccount.setCertificate(certID); - apiAccount.setDeveloper(devID); - apiCredential.setApiAccount(apiAccount); - } - ApiContext apiContext = new ApiContext(); - apiContext.setApiCredential(apiCredential); - apiContext.setApiServerUrl(apiServerUrl); - apiContext.setApiLogging(apiLogging); - apiContext.setErrorLanguage("en_US"); - return apiContext; - } - - public static SiteCodeType getSiteCodeType(String productStoreId,Locale locale, Delegator delegator){ - Map<String, Object> context = FastMap.newInstance(); - context.put("locale", locale); - context.put("productStoreId", productStoreId); - Map<String, Object> config = buildEbayConfig(context, delegator); - String siteId = (String)config.get("siteID"); - if(siteId.equals("0")) return SiteCodeType.US; - if(siteId.equals("2")) return SiteCodeType.CANADA; - if(siteId.equals("3")) return SiteCodeType.UK; - if(siteId.equals("15")) return SiteCodeType.AUSTRALIA; - if(siteId.equals("16")) return SiteCodeType.AUSTRIA; - if(siteId.equals("23")) return SiteCodeType.BELGIUM_FRENCH; - if(siteId.equals("71")) return SiteCodeType.FRANCE; - if(siteId.equals("77")) return SiteCodeType.GERMANY; - if(siteId.equals("100")) return SiteCodeType.E_BAY_MOTORS; - if(siteId.equals("101")) return SiteCodeType.ITALY; - if(siteId.equals("123")) return SiteCodeType.BELGIUM_DUTCH; - if(siteId.equals("146")) return SiteCodeType.NETHERLANDS; - if(siteId.equals("189")) return SiteCodeType.SPAIN; - if(siteId.equals("193")) return SiteCodeType.SWITZERLAND; - if(siteId.equals("196")) return SiteCodeType.TAIWAN; - if(siteId.equals("201")) return SiteCodeType.HONG_KONG; - if(siteId.equals("203")) return SiteCodeType.INDIA; - if(siteId.equals("205")) return SiteCodeType.IRELAND; - if(siteId.equals("207")) return SiteCodeType.MALAYSIA; - if(siteId.equals("210")) return SiteCodeType.CANADA_FRENCH; - if(siteId.equals("211")) return SiteCodeType.PHILIPPINES; - if(siteId.equals("212")) return SiteCodeType.POLAND; - if(siteId.equals("216")) return SiteCodeType.SINGAPORE; - if(siteId.equals("218")) return SiteCodeType.SWEDEN; - if(siteId.equals("223")) return SiteCodeType.CHINA; - return SiteCodeType.US; - } } 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=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml Wed Feb 3 03:16:07 2010 @@ -153,127 +153,6 @@ <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> - <!-- new ebay account in ofbiz --> - <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> - - <!-- 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="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> - <!-- Feedback --> - <request-map uri="Feedback"> - <security https="true" auth="true"/> - <response name="success" type="view" value="Feedback"/> - </request-map> - <request-map uri="LeaveFeedback"> - <security https="true" auth="true"/> - <response name="success" type="view" value="LeaveFeedback"/> - </request-map> - <request-map uri="sendLeaveFeedback"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.ebay.EbayEvents" invoke="sendLeaveFeedback"/> - <response name="success" type="view" value="LeaveFeedback"/> - <response name="error" type="view" value="LeaveFeedback"/> - </request-map> - - - <!-- Automation Preferences --> - <request-map uri="automationPreferences"> - <security auth="true" https="true"/> - <response name="success" type="view" value="AutomationPreferences"/> - </request-map> - <request-map uri="createEbayAutomaticRelistItems"> - <security auth="true" https="true"/> - <event type="service" invoke="createEbayAutomaticRelistItems"/> - <response name="success" type="view" value="AutomationPreferences"/> - <response name="error" type="view" value="AutomationPreferences"/> - </request-map> - <request-map uri="updateEbayAutomaticRelistItems"> - <security auth="true" https="true"/> - <event type="service" invoke="updateEbayAutomaticRelistItems"/> - <response name="success" type="view" value="AutomationPreferences"/> - <response name="error" type="view" value="AutomationPreferences"/> - </request-map> - <!-- Block item out of stock --> - <request-map uri="blockItemOutOfStock"> - <security https="true" auth="true"/> - <response name="success" type="view" value="blockItemOutOfStock"/> - <response name="error" type="view" value="blockItemOutOfStock"/> - </request-map> - <request-map uri="runBlockItemOutOfStock"> - <security https="true" auth="true"/> - <event type="service" invoke="getSellingInventory"/> - <response name="success" type="view" value="blockItemOutOfStock"/> - <response name="error" type="view" value="blockItemOutOfStock"/> - </request-map> - <!-- Store inventory --> - <request-map uri="ebayStoreInventory"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ebayStoreInventory"/> - </request-map> - <request-map uri="reserveEbayProductInventory"> - <security https="true" auth="true"/> - <response name="success" type="view" value="reserveEbayProductInventory"/> - </request-map> - <request-map uri="reserveProductInventory"> - <security https="true" auth="true"/> - <event type="service" invoke="reserveEbayStoreInventory"/> - <response name="success" type="view" value="reserveEbayProductInventory"/> - </request-map> - <request-map uri="updateEbayStoreInventory"> - <security https="true" auth="true"/> - <event type="service-multi" invoke="updateEbayStoreInventory"/> - <response name="success" type="view" value="ebayLoadStoreInventory"/> - </request-map> - <!-- end of request mappings --> <!-- View Mappings --> @@ -287,28 +166,5 @@ <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="ebayStores" type="screen" page="component://ebay/widget/EbayScreens.xml#ebayStores"/> - <view-map name="ebayStoreDetail" type="screen" page="component://ebay/widget/EbayScreens.xml#ebayStoreDetail"/> - <!-- ebay account --> - <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"/> - - <!-- feedback --> - <view-map name="FeedbackStore" type="screen" page="component://ebay/widget/EbayScreens.xml#FeedbackStore"/> - <view-map name="Feedback" type="screen" page="component://ebay/widget/EbayScreens.xml#Feedback"/> - <view-map name="LeaveFeedback" type="screen" page="component://ebay/widget/EbayScreens.xml#LeaveFeedback"/> - - <!-- AutomationPreferences --> - <view-map name="AutomationPreferences" type="screen" page="component://ebay/widget/EbayScreens.xml#EbayAutomationPreferences"/> - <!-- block out of stock --> - <view-map name="blockItemOutOfStock" type="screen" page="component://ebay/widget/EbayScreens.xml#blockItemOutOfStock"/> - <!-- store Inventory --> - <view-map name="ebayStoreInventory" type="screen" page="component://ebay/widget/EbayScreens.xml#ebayStoreInventory"/> - <view-map name="ebayLoadStoreInventory" type="screen" page="component://ebay/widget/EbayScreens.xml#ebayLoadStoreInventory"/> - <view-map name="reserveEbayProductInventory" type="screen" page="component://ebay/widget/EbayScreens.xml#reserveEbayProductInventory"/> <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml Wed Feb 3 03:16:07 2010 @@ -41,6 +41,30 @@ </section> </screen> + <screen name="permission-decorator"> + <section> + <actions> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <if-has-permission permission="EBAY" action="_VIEW"/> + </condition> + <widgets> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.EbayViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="CommonProductDecorator"> <section> <actions> @@ -94,52 +118,6 @@ </widgets> </section> </screen> - - <screen name="permission-decorator"> - <section> - <actions> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <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> - <label style="h3">${uiLabelMap.EbayViewPermissionError}</label> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="CommonEbayConfigDecorator"> <section> <actions> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml?rev=905876&r1=905875&r2=905876&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml Wed Feb 3 03:16:07 2010 @@ -24,7 +24,6 @@ <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}" > @@ -56,87 +55,4 @@ <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="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-item name="inventory" title="${uiLabelMap.ProductProduct} ${uiLabelMap.ProductInventory}"> - <link target="ebayStoreInventory"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - </link> - </menu-item> - <menu-item name="blockItemOutOfStock" title="${uiLabelMap.EbayBlockItemOutOfStock}"> - <link target="blockItemOutOfStock"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - </link> - </menu-item> - <menu-item name="feedback" title="${uiLabelMap.EbayFeedback}"> - <link target="Feedback"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - </link> - </menu-item> - <menu-item name="automationPreferences" title="Automation Preferences"> - <link target="automationPreferences"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - </link> - </menu-item> - </menu> - <menu name="EbayFeedbackTabBar" selected-menuitem-context-field-name="eBayTabButtonItem" type="simple" - default-selected-style="selected" menu-container-style="button-bar button-style-2"> - <menu-item name="Feedback"> - <condition> - <not><if-empty field="parameters.productStoreId"/></not> - </condition> - <link target="Feedback" text="${uiLabelMap.EbayFeedback}"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - </link> - </menu-item> - <menu-item name="LeaveFeedback"> - <condition> - <not><if-empty field="parameters.productStoreId"/></not> - </condition> - <link target="LeaveFeedback" text="${uiLabelMap.EbayLeaveFeedback}"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - </link> - </menu-item> - </menu> - <menu name="EbayFeedbackSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" - menu-container-style="button-bar button-style-2" selected-menuitem-context-field-name="role"> - <menu-item name="all" title="${uiLabelMap.CommonAll}"> - <link target="LeaveFeedback"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - <parameter param-name="role" value="all"/> - </link> - </menu-item> - <menu-item name="seller" title="${uiLabelMap.EbayBoughtLeaveFeedback}"> - <link target="LeaveFeedback"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - <parameter param-name="role" value="seller"/> - </link> - </menu-item> - <menu-item name="buyer" title="${uiLabelMap.EbaySoldLeaveFeedback}"> - <link target="LeaveFeedback"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - <parameter param-name="role" value="buyer"/> - </link> - </menu-item> - </menu> </menus> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |