Commit Graph
45 Commits
Author SHA1 Message Date
Ashish Vijaywargiya ae79de070e Patch from Parimal Gain (Thanks!). Couple of enhancements are done in it.
-- Error or Success message was not displaying for buziness time theme. Fixed this issue.
-- In case low ATP proper error message was not coming for any product while importing order to the system. It was redirecting the blank page with one line message, that was not verbose enough. Improved error message for this.
-- The leaf category id will be provided in category data so that ebay export works fine.(See the numeric value provided in ProductCategory record).

OFBiz jira is not responding at my end since last 2 hours so committing this patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884869 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 13:32:01 +00:00
Ashish Vijaywargiya 9c5caa3f17 Applied patch from jira issue OFBIZ-3184 - Improvement in Ebay Configuration.
Implemented following points:
1) Created decorator for Ebay Configuration screens
2) Modified list and add Ebay configuration Form
3) Created Find Form
4) Crated menu and sub menu
5) Created Edit Ebay Configuration Screen
6) Modified Ebay Configuration screen with name FindEbayConfiguration

Thanks Parimal for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835306 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:00:36 +00:00
Ashish Vijaywargiya fc45518ad6 Applied patch from jira issue OFBIZ-3149 - Improve Category association in eBay.
Recently multi store support for Ebay has been implemented. For the multi store support we need ProductStore > ProdCatalog > ProductCategory association. For EBay we define specific categories of type EBAY_CATEGORY, only those products that are associated to an EBay category are eligible for eBay export. In the current implementation there is no proper prodCatalogCategoryTypeId which can be used to associate eBay category to ProdCatalog, one way to associate an eBay category to ProdCatalog is as a PCCT_BROWSE_ROOT category, thus we have two categories associated to the catalog as BROWSE_ROOT, the other one is for online store. Technically, this is wrong, a catalog should be associated with only one browse root category. Due to this wrong association the eBay category doesn't show up on the advance search page of EBAY webapp, instead online store's browse root category is shown which may also contain those products which are not meant to be exported to eBay. So this category associations need to be fixed, and following is how this can be resolved:

   1. Create a new ProdCatalogCatagoryType PCCT_EBAY_ROOT
   2. Define a worker method in CatalogWorker to derive the top level (root) ebay category
   3. Now in the advance search form, first look for top level ebay category associated to the selected catalog
          * If found, derive sub category list of the top level ebay category and display, else display the top level ebay category itself
          * If not found, derive the top level browse root category (PCCT_BROWSE_ROOT) and display the sub category list for it

Thanks Parimal Gain for the contribution.
Special thanks to Mridul Pathak (Zone of Sharp Mind :-)) for discussing implementation plans & providing wonderful notes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832713 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 12:05:09 +00:00
Ashish Vijaywargiya 7c2d11d05a Applied patch from jira issue OFBIZ-3132 - Multiple productStore support to googleBase and eBay.
Changes includes following:
1) Created new search form for eBay and GoogleBase - It was not good to update *advancesearch*.ftl file present inside catalog component. Now it will be easy to maintain separate file for future deployments.
2) Restricted productStoreId and prodCatalogId field to search.
3) Added webSite drop-down on "Export to eBay" and "Export to GoogleBase" page.
4) Select webSite to get the webSiteUrl. 

Thanks Parimal for your contribution - this will surely help the community.
Special thanks to Mridul, Rishi, Chirag, Deepak & Me :-) for discussing requirement and also special thanks to Jacopo for the notes and discussion on requirements.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831534 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 12:01:52 +00:00
Bruno Busco 17288a9082 Part of OFBIZ-3067 - Menus and form widget files location
Party and Product components
Moved forms from webapp to widget folder
Removed empty folders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829418 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 17:41:31 +00:00
Bruno Busco 4cf618421d Part of OFBIZ-3067 - Menus and form widget files location
Catalog component
Renamed order/widget/catalog/Menus.xml to order/widget/catalog/CatalogMenus.xml
Renamed order/widget/facility/Menus.xml to order/widget/facility/FacilityMenus.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829314 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 07:14:26 +00:00
Bruno Busco a9c26eb1c1 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826483 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 18:24:32 +00:00
Ashish Vijaywargiya 596c742486 Navigated OrderId link to OrderMgr component.
Also removed default values for productStoreId and webSiteUrl.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818720 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 05:23:54 +00:00
Ashish Vijaywargiya d470781162 Minor Fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816499 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 07:12:27 +00:00
Ashish Vijaywargiya 3541e51cb2 Here comes more improvement on the new eBay order screen.
The checkbox will not be visible for the imported orders.
Tooltip is provided for the eBay Transactions and Orders.

PS: Jacopo -> The resultant screen will look like: http://farm3.static.flickr.com/2465/3931094976_fe6e785e3b_b.jpg

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816498 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 07:09:27 +00:00
Ashish Vijaywargiya 5a91a1308c Provided option to see the list of orders from eBay first and then CSR can import the required orders in the system.
Thanks a lot Mridul & Rishi for discussing the better way to handle this case.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816148 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 11:31:48 +00:00
Ashish Vijaywargiya 35fe74d6e5 Here comes the GUI support for eBay Configurations (CRUD operation for EbayConfig entity).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816060 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 05:43:32 +00:00
Ashish Vijaywargiya 2b501534c2 Here comes the GUI support for eBay Shipping Methods (CRUD operation for EbayShippingMethod entity).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815789 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 14:04:31 +00:00
Ashish Vijaywargiya 5ea1a35422 Now we have GetOrders request working fine so changing old screen to import only single transactions.
This will help to avoid the duplicate order being created in the system with the help of old screen for importing eBay orders.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815248 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 10:11:50 +00:00
Ashish Vijaywargiya 55acacfc14 Another pass on eBay Order Imports using GetOrders request.
Following things are done in this patch:

-- Moved commonly used methods to EbayHelper.java file.
-- Created two main methods "readGetOrdersResponse" & "createShoppingCart" to read xml data coming from Ebay and then create order in OFBiz respectively.
-- Also provided sample response XML data that is being generated from Ebay.
-- Changed the UI in which first it was searching orders and then from the orders list we were importing orders.
Now we have only one screen available in which search criteria for order is provided & on the basis of that search criteria order gets imported in OFBiz.
-- Previous work for importing Orders(Not exactly order - it was transaction) is working fine OOTB. 

Here are few things that I am thinking to do in this area soon:
-- Improve error handling code - code cleanup.
-- Provide scheduled service UI(or prepare demo data for scheduling job) in which the orders will be imported automatically in the system instead of searching and then importing done by end user. - Thinking the best way to handle it.

Thanks Rishi & Sumit for discussing few things/ issues in b/w the development of this pass.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814560 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 10:18:43 +00:00
Ashish Vijaywargiya d824f87f4f Initial pass on new call "GetOrders" (More to come in a day or so) - http://developer.ebay.com/DevZone/XML/docs/Reference/eBay/GetOrders.html. OOTB we have "GetSellersTransactions" call implemented but we have observed something strange in its functionality.
Here are few reason for this implementation:
-- In "GetSellersTransactions" itemId(ProductId in ebay) is provided in the OrderHeader.externalId field which doesn't seems correct.
-- Suppose we have Single Order created in eBay if some one wins the auction and in that order we have 3 order items.
Then "GetSellersTransaction" call creates three orders in OFBiz for all those three items that are associated with Single Ebay order.
In short "GetSellersTransaction" request treat three item as three transactions.
-- "GetOrders" call will return the list of orders on the basis of search criteria and then we will create(Import) the Order in OFBiz from the resultant list of orders.
-- Current implementation for "GetSellersTransactions" will remain as it is in trunk - as we don't know if someone might be using it in their custom projects.

Also did miscellaneous cleanup.
Thanks Jacopo for providing your notes for this implementation & also discussing issues in b/w development - as always your notes were awesome.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813444 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 13:58:33 +00:00
Ashish Vijaywargiya ceea618353 Cleanup - Moved the screens definition to appropriate location.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812948 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 13:25:25 +00:00
Ashish Vijaywargiya 763c933850 Following things are done in this commit.
-- Moved eBay configuration settings to a new entity - EbayConfig. Property file configuration support also exists in current code.
-- Also prepared the demo data for this new entity.
-- For default webSiteUrl prepared demo data in WebSite entity so we can show default value on the form.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@811645 13f79535-47bb-0310-9956-ffa450edef68
2009-09-05 13:32:12 +00:00
Jacopo Cappellato 094d1b184f A bunch of enhancements and cleanups for the eBay component; added ability to:
* export product images to eBay Action
* export a description based on content (a new product content type has been added for this purpose)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809539 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 11:24:43 +00:00
Jacopo Cappellato 19b6b4b814 Fixes for error messages in the logs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@801069 13f79535-47bb-0310-9956-ffa450edef68
2009-08-05 06:00:38 +00:00
Jacques Le Roux 999bd7c577 Fix following Chris Howe's message in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux 76f5ca6638 Secure URLs, we don't need to duplicate in from-field when param-name is the same
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Jacques Le Roux e8426631e8 Securing URLs, link element in screens and menus : 22th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761214 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:14:40 +00:00
Jacques Le Roux 2ae583d0a1 Securing URLs, link element in screens and menus : 10th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760787 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 05:50:07 +00:00
Jacques Le Roux 40f5281303 20th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759680 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 13:33:53 +00:00
Jacques Le Roux bb2d8d5bad 19th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759667 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 11:14:57 +00:00
Hans Bakker 041ccc0a7d rename applicationext component to commonext
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748388 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 04:05:47 +00:00
Hans Bakker 5192a24e48 introduction of a common component for applications. moved the 2 lines containing party info to this component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748144 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 13:36:51 +00:00
Jacques Le Roux 08915956a1 <if-empty field-name= => <if-empty field=
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739739 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 11:07:47 +00:00
Jacques Le Roux 290534059d <entity-one entity-name=(.*)value-name => <entity-one entity-name=$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739732 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 10:27:43 +00:00
Bruno Busco 9fb84beba6 Extended WorkEffort and Ebay AppBar from CommonAppBarMenu
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739705 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 07:31:55 +00:00
Hans Bakker ff7759b530 show the component name at the login screen for all components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@734074 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 08:47:35 +00:00
Bilgin Ismet Ibryam 4ec9a7dfc5 A patch from Bruno Busco "Replacement of FTL TabBars with menus widgets in catalog application" OFBIZ-1950.
The patch contains also a style change, which works fine with FF3 and IE7.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@705940 13f79535-47bb-0310-9956-ffa450edef68
2008-10-19 00:22:57 +00:00
Marco Risaliti ac14458aed Same changes to eBay application after that some groovy files has been converted.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@684640 13f79535-47bb-0310-9956-ffa450edef68
2008-08-11 05:49:47 +00:00
Adam Heath 2617681b51 Remove svn:executable on a bunch of stuff.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@684389 13f79535-47bb-0310-9956-ffa450edef68
2008-08-10 00:53:43 +00:00
Jacopo Cappellato 099743dda4 Fixed bug reported by Sam Hamilton in the dev ml.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@674166 13f79535-47bb-0310-9956-ffa450edef68
2008-07-05 09:12:39 +00:00
Marco Risaliti 888e14c705 Applied patch from JIRA Issue #1633.
Possibility to choose the product descriptions during the duplication of product.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@628297 13f79535-47bb-0310-9956-ffa450edef68
2008-02-16 13:53:59 +00:00
Adrian Crum 68c1dbbaf9 Second sweep through the maincss.css style sheet. Changed the head1, head2, and head3 style names to h1, h2, and h3. Updated affected styles in ftl and xml files.
The ecommerce component is excluded from this commit.

These changes shouldn't break any layout. If you spot something wrong, let me know and I'll fix it.

I won't make any more maincss.css changes for a little while. I'll let the dust settle from these two commits, then I'll go through the file and physically remove the deprecated styles.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@627051 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 19:30:09 +00:00
Marco Risaliti 2b97140df8 Fix a small bug into eBay application on Edit Product during product searching.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@618320 13f79535-47bb-0310-9956-ffa450edef68
2008-02-04 16:37:31 +00:00
Marco Risaliti 96fda14e23 All the eBay forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1614)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@618314 13f79535-47bb-0310-9956-ffa450edef68
2008-02-04 16:16:27 +00:00
Adrian Crum 91dff14f8f Oops, forgot to save a file before committing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604258 13f79535-47bb-0310-9956-ffa450edef68
2007-12-14 18:59:25 +00:00
Adrian Crum 8cc27f578b Minor UI fixups in the eBay component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604257 13f79535-47bb-0310-9956-ffa450edef68
2007-12-14 18:55:02 +00:00
Marco Risaliti e849b5a08d Forgot to removed some tabs in space (Part of issue OFBIZ-1441)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@603325 13f79535-47bb-0310-9956-ffa450edef68
2007-12-11 18:33:20 +00:00
Marco Risaliti 0f65ed6a03 Integration with eBay in specialpurpose application (Part of issue OFBIZ-1441)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@603323 13f79535-47bb-0310-9956-ffa450edef68
2007-12-11 18:31:25 +00:00