Commit Graph
69 Commits
Author SHA1 Message Date
Jacques Le Roux c72b29cb1f Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj != null) || (obj.size > 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +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
Ashish Vijaywargiya 6d2fb137cb Adding permission GOOGLEBASE_ADMIN & EBAY_ADMIN and associating it with the group FULLADMIN.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830889 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 10:58:01 +00:00
Marco Risaliti be861590ac Some missing italian translations of googlebase component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829592 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 14:54:35 +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 7f971bac97 Now "product_type" tag will contain only values that are having ProductCategory.productCategoryTypeId = "GOOGLE_BASE_CATEGORY".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822222 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 11:22:02 +00:00
Adrian Crum a4d68934c9 Converted GenericDelegator concrete class references to Delegator interface references.
This commit requires ant clean. Also, external libraries that reference GenericDelegator will need to be updated.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Ashish Vijaywargiya 066d3b6211 Encouraging use of Generics.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818714 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 04:29:10 +00:00
Jacques Le Roux b7a941d4f6 Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Jacques Le Roux a7430a2fc2 A modified patch from Erwan de FERRIERES '"Automatic" sortable table headers" (https://issues.apache.org/jira/browse/OFBIZ-2921) - OFBIZ-2921
I was planning to wait longer, but I can't wait more. I have added a lot of small trivial changes in this patch and they are blocking me to go further on other issues...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Jacopo Cappellato 988b276bbd Fix for issue happening after that Xalan jars have been added to the classpath: namespaces were added to each and every element.
Thanks to Ashish Vijaywargiya for the bug report and tests.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810857 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 09:55:14 +00:00
Ashish Vijaywargiya a974a553e4 Added GUI for GoogleBaseConfig entity - CRUD Operations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809582 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 13:31:27 +00:00
Ashish Vijaywargiya 1c7a068142 Moving screen definition to appropriate location.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809555 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:24:10 +00:00
Ashish Vijaywargiya 6dc9720309 Another update on Google Base.
Following things are done in this commit:

1) Added new entity GoogleBaseConfig and reading the values from there. Also kept option to read configuration values from property file.
2) Added new ProductCategoryType record for Google Base - Thanks Jacopo for your suggestion on this.
3) Prepared data for demo purpose in DemoProduct.xml file - This demo contains the association of few product with Google Category.
4) Also prepared demo data for GoogleBaseConfig entity.
5) Provided option to have default value of webSiteUrl on the GoogleExport form - for this refer productsExportToGoogle.groovy file.

Thanks Pranay for discussing few things with me in b/w this phase of development.

In next Commit I will provide UI for GoogleBaseConfig entity(CRUD operations) so it will be easy for end user to update values in this entity easily instead of moving to webtools and do the needful.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809552 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:06:14 +00:00
Ashish Vijaywargiya 4d5f5bfe32 Done following things on Google Base in this pass:
1) Added the priority tag so Product should be published in 15 - 30 minutes on Google Base instead of waiting for 24 hours.
2) Added ProductType default values - I have put a TODO in code and will work on that thing soon.
The correct product type selection is very important - This helps to enlist product in the resultant list easily or we can say fast.
3) Batch tag was not being created right in the generated string. Fixed that issue.

So the final sring looks like as shown below (Only for single product export): 

<?xml version="1.0" encoding="UTF-8"?>
<feed xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://purl.org/atom/app#" xmlns:batch="http://schemas.google.com/gdata/batch" xmlns:g="http://base.google.com/ns/1.0" xmlns:gm="http://base.google.com/ns-metadata/1.0" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/">
    <entry>
        <batch:operation type="insert"/>
        <app:control>
            <gm:publishing_priority>high</gm:publishing_priority>
        </app:control>
        <title>Round Gizmo</title>
        <content type="xhtml">Round Gizmo</content>
        <g:id>http://demo.ofbiz.org/ecommerce/control/product/~product_id=GZ-2644</g:id>
        <link href="http://demo.ofbiz.org/ecommerce/control/product/~product_id=GZ-2644" rel="alternate" type="text/html"/>
        <g:item_type>products</g:item_type>
        <g:product_type>Electronics</g:product_type>
        <g:product_type>Business &amp; Industrial</g:product_type>
        <g:price>38.40000000000</g:price>
        <g:currency>USD</g:currency>
        <g:target_country>US</g:target_country>
        <g:condition>new</g:condition>
        <g:image_link>http://demo.ofbiz.org/images/products/large/web_browser.png</g:image_link>
    </entry>
</feed>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808331 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 09:04:55 +00:00
Ashish Vijaywargiya 27bd1b0a89 Few more modifications in google base code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808099 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 16:20:35 +00:00
Ashish Vijaywargiya d55b5b5283 More imporvement in Google Base code to support namespace specific tags along with the generated XML feed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808053 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 15:28:10 +00:00
Ashish Vijaywargiya 71b953e08f The google base code was broken.
In the previous code the namespace specific tag support was not present in UtilXml so google base server was not accepting the request coming in the form <item_type>. The correct tag will be <g:item_type>.
Also did minor modification in code to avoid NPE.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@807959 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 10:55:53 +00:00
Adrian Crum ce1660b06a Chinese translation for the specialpurpose folder, provided by Shi Yusen - https://issues.apache.org/jira/browse/OFBIZ-2723.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798580 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 15:59:04 +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
Adam Heath 6b103ddbfe Fix lines that *only* have whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759260 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 17:02:10 +00:00
Adam Heath ee5dbe2e09 Fix purely empty whitespace lines, and remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757100 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:47:49 +00:00
Jacques Le Roux 0e0519e802 All tabs to 4 spaces in *.groovy, *.java, *.xml
Done with Eclipse S/R "\t"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755696 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 18:43:49 +00:00
Bruno Busco a36cb4dd3e Changed WebSiteId parameter description to be more general
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751214 13f79535-47bb-0310-9956-ffa450edef68
2009-03-07 07:19:07 +00:00
Jacques Le Roux f796e230d2 catch( => catch(
}else => } else

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751005 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:55:43 +00:00
Jacques Le Roux 639a784790 while( => while (
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750998 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:38:03 +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
Hans Bakker 05056e0447 improvement with exception handling, double -> bigdecimal, error message improvement. Component now communicates with google again. Todo:google is complaining some data is missng...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745399 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 07:42:59 +00:00
Bruno Busco 87958df45c Added webSiteId definition for every webapp.
This will be used to link online help pages to OFBiz screens.
The webSiteId will also be used to associate VisualThemeSets to webapps.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744502 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 14:35:56 +00:00
Marco Risaliti df3cdb54ff Artifact cleaning on various specialpurpose components after recent changes on xsd files (OFBIZ-2137)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739779 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 15:21:46 +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 925ddc52e3 - Extended Google Base AppBar from CommonAppBarMenu
- Removed redundand inclusion of StyleSheets and JavaScript (already done in GlobalDecorato). The explicit inclusion of the default maincss.css was the cause of the wrong rendering of the Menu with the new bluelight theme.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737492 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 09:07:32 +00:00
Marco Risaliti 1a3edc02f8 A lot of cleaning into MyPage/MyPortal/Pos/ProjectMgr components and some italian translations (Part of OFBIZ-1780)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735131 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 21:03:44 +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
Jacques Le Roux 8d0d32569d French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728914 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 10:04:42 +00:00
Jacques Le Roux d5f99b443a A modified patch from Erik Wegner "Patch for all language files (*Labels.xml) to correct language order, find duplicates or invalid entries" (https://issues.apache.org/jira/browse/OFBIZ-2073) - OFBIZ-2073
I removed some hunks, see https://issues.apache.org/jira/browse/OFBIZ-2073?focusedCommentId=12656651#action_12656651



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726808 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 21:28:06 +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
Jacques Le Roux 1842a5e863 More consistent French translation for User Login and misc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@705926 13f79535-47bb-0310-9956-ffa450edef68
2008-10-18 21:29:17 +00:00
Adam Heath e410552cc9 No longer *copy* the extra support files into the classes dir;
instead, just add them straight to the final jar.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685934 13f79535-47bb-0310-9956-ffa450edef68
2008-08-14 15:08:14 +00:00
Bilgin Ismet Ibryam 8fe911c2a4 Applied the patch from JIRA Issue # OFBIZ-1918 "Unable to go on the find screen of google base component." reported by Ravindra Mandre.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685121 13f79535-47bb-0310-9956-ffa450edef68
2008-08-12 11:34:42 +00:00
Adam Heath b6a1ae5e5e Another minor optimization; no longer need to specify classpathref in
all the build.xml files.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@681935 13f79535-47bb-0310-9956-ffa450edef68
2008-08-02 03:41:46 +00:00