Commit Graph
100 Commits
Author SHA1 Message Date
Hans Bakker f18bc3256e extend the google base security
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1083691 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 07:37:36 +00:00
Hans Bakker 9b50d58f23 add tagging to googlebase on the url to allow google ananlytics to report on the source
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081673 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 06:48:28 +00:00
Marco Risaliti 35c16f25db Remove some unused variable/import warning in ProductsExportToGoogle
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081531 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 19:33:20 +00:00
Hans Bakker 46cd6a9ccd • Fix any errors on GoogleBaseSearchEvents.java and ProductsExportToGoogle.java file.
• Edit productsExportToGoogle form to constrain the country code that getting it from defaultLocaleString field of ProductStore entity (before it was a combobox that select by user).
• Add the new type of GoodIdentificationType entity that relate to Google Base Id including GOOGLE_ID_en_US, GOOGLE_ID_en_GB, GOOGLE_ID_de for identify each productStore with its language.
• Add the Google Base Auto Update function.
• Add the new filter of GoogleBaseAdvanceSearch including ACTIVE_PRODUCT, GOOGLE_SYNCED and DISCONTINUED_PRODUCT.
• Add allowRecommended option for add the recommended attribute to Google Base such as QUANTITY, COLOR,  YEAR_MADE etc.
• Add the Google Base help.
A contribution of Antwebsystems employees M and Ton2

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081270 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 06:59:16 +00:00
Marco Risaliti 573f9b2a30 Internationalization of java services for googlebase/googlecheckout components (OFBIZ-4091)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1063423 13f79535-47bb-0310-9956-ffa450edef68
2011-01-25 19:43:17 +00:00
Jacques Le Roux ba42a2a674 Since anyway we rely on a form name in renderLookupField, I changed the way Sascha fixed OFBIZ-4068 (see r1056701)
Two reasons to this: 
# we are not sure the descriptionFieldName is alwayd of the form formName_descriptionFieldName
# anyway we need a form name for call_fieldlookup3 and call_fieldlookup2 just above in htmlFormMacroLibrary.ftl. 

While at it, I also removed all question marks in ${uiLabelMap.ProductIncludeSubCategories}? occurrences, it's already in the labels

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1056731 13f79535-47bb-0310-9956-ffa450edef68
2011-01-08 16:30:15 +00:00
Jacques Le Roux b37b73cfc1 A patch from Sascha Rodekamp "Find button is not working in the 'googlebase' application" (https://issues.apache.org/jira/browse/OFBIZ-4068) - OFBIZ-4068
Rohit reported a bug in the jQuery implementation (ecommerce):
The find button is not working in the 'googlebase' application. The 'googlebase' application has a page using which u can to search for product to be submitted to google base. the find button is not submitting the page at all.

Sascha: This issue was related to the Lookup Call. The Form in Google Base hadn't a 'name' tag, so the form could not be found. I changed the target by name to a target by Id call (which is better anyways).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1056701 13f79535-47bb-0310-9956-ffa450edef68
2011-01-08 13:14:19 +00:00
Scott Gray d1d8905fef Remove unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1044931 13f79535-47bb-0310-9956-ffa450edef68
2010-12-12 21:31:27 +00:00
Jacques Le Roux c008c6ccb3 Merges the jQuery branch back to the trunk
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1044503 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 20:40:08 +00:00
Adam Heath 4447acce3e Fix several final newline problems, in files I will be changing in the
near future.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1044226 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 07:20:05 +00:00
Hans Bakker 8c3ebac579 change all @yahoo.com to @example.com Suggestion from Scott
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1040914 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 09:38:00 +00:00
Adam Heath 5b3b7e0c99 Finally created a script to find and fix tons of missing final newlines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@982870 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 04:46:48 +00:00
Adam Heath 0f8f2093e3 Fix a bunch of no final newline issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Jacques Le Roux e263a69b74 A patch from BJ Freeman "complete web.xml for error reporting" (https://issues.apache.org/jira/browse/OFBIZ-3820) - OFBIZ-3820
BJ: when there is an error, the control servlet looks for an error path in <param-name>allowedPaths</param-name>
it does not find one throwing an exception which buries the orginal error.
instead of changing the code it is just easier to add the /error: path.
then the real error gets reported correctly.

JLR: This will maybe help to better understand some errors on demo servers, and can't hurt

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@954135 13f79535-47bb-0310-9956-ffa450edef68
2010-06-12 20:47:08 +00:00
Jacques Le Roux 0d6f2776e4 <author>None</author> is totally useless and we don't need an author OOTB
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@949101 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28 05:41:23 +00:00
Jacques Le Roux be88f832a2 Not sure why, but my regexp S/R in the commit r948846 boke some formatting. I also removed some useless other stuff in this commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@948852 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:45:59 +00:00
Jacques Le Roux ef2a1c044c We don't need
<copyright>Copyright 2001-.* The Apache Software Foundation</copyright>
<copyright><year>.*</year><holder>Apache Foundation</holder></copyright>
<copyright><year>.*</year><holder>Apache Foundation.</holder></copyright>
<owner>Copyright 2001-.* The Apache Software Foundation</owner>

Less to update every year!

Thanks to BJ 1st effort at "update files from 2009 to 2010" (https://issues.apache.org/jira/browse/OFBIZ-3783) - OFBIZ-3783

Note: there are been a lot of efforts in 2009: there are plenty of data dated from this year!

I hope I did not broke anything (should not, but of course I did not try all changes...) Anyway, this can be easily reverted...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@948846 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:23:22 +00:00
Ashish Vijaywargiya 8635812742 Reverting my commit r938446 based on the comments received on mailing list. For now I am keeping old email address in place (i.e ofbiztest@yahoo.com) keeping in mind that email will not go in spam folder. If others think test@example.com will also behave same then please go ahead commit the changes.
Very soon I will revert my changes on release10.04 branch.
Thanks to everybody who has provided their comments!  

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@940814 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 11:57:35 +00:00
Ashish Vijaywargiya 783f38ef79 Changing email address ofbiztest@yahoo.com -> ofbiztesting@gmail.com - this was creating too much problem since long in development effort.
Following points were there in my mind before doing this change.

-- AFAIK ofbiztest@yahoo.com email doesn't exists.
-- Bounce email issue if you have enabled Javamail container. This drastically slow down your system performance. 
-- Now anyone can use ofbiztesting@gmail.com account settings for Sendmail, Javamail container etc.
-- Send mail service triggered again and again with failure message on console if any of the email not found bccAddress inside ProductStoreEmailSettings entity. Again slow speed of your development machine.
-- Please let me know where to share the password of this account? Dev list?


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@938446 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 13:17:45 +00:00
Bruno Busco cd91a8ced8 A patch from Blas Rodriguez Somoza
OFBIZ-3678 - XHTML validation errors round 2 (specialpurpose/googlebase)
https://issues.apache.org/jira/browse/OFBIZ-3678

XHTML validation errors

    * Uppercase tags or attributes.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@934187 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 20:38:57 +00:00
Jacques Le Roux a7b8bf52d9 A patch from Bob Morley "Resolve java warnings exposed in Eclipse (googlebase & googlecheckout part of OFBIZ-3100)" https://issues.apache.org/jira/browse/OFBIZ-3597 - OFBIZ-3597
I just replaced a few tabs



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@932855 13f79535-47bb-0310-9956-ffa450edef68
2010-04-11 09:06:03 +00:00
Bruno Busco 14e3a7fe56 A patch from Blas Rodriguez Somoza
OFBIZ-3615 - XHTML validation errors (specialpurpose_googlebase)
https://issues.apache.org/jira/browse/OFBIZ-3615

XHTML validation errors

    * attributes without values (checked)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@932726 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 14:13:58 +00:00
Jacques Le Roux 14bf0f757c Closes "Using Widgets html form templates in FTL files" (https://issues.apache.org/jira/browse/OFBIZ-3541) - OFBIZ-3541
This concerns the lookups which are now rendered the same in ftl files and widget forms

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@931854 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 10:19:38 +00:00
Vikas Mayur ab3dfaf2a5 Special Purpose application should not have OFBTOOLS permission in the component base permission set. Not sure of shark component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@930839 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 11:14:54 +00:00
Vikas Mayur fcb6b06595 Catalog Tab Bars using FTL were replaced by menu widget in r705940. Removing the FTL tab bar occurrence which was probably not removed while replacing it
with menu widget.  


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@930837 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 10:48:54 +00:00
Adam Heath 62ede2cc16 Fix lots of bad xhtml tags, need to have a space before the ending /.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@923545 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 01:56:41 +00:00
Adam Heath 585863454b Fix trailing whitespace, and mixed tab/space at the beginning of lines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@899812 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 21:00:23 +00:00
Adam Heath 59dabfc7e6 Remove most docs targets, they are all the same anyways.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@894031 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:28:48 +00:00
Adam Heath 79268b7635 Convert all javadoc calls to use fileset instead of sourcepath; this
allows excludes to be processed correctly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@894030 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:24:20 +00:00
Adam Heath e98eaeed80 Add a classes target to common.xml, and switch most build.xml to use it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@894024 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:16:56 +00:00
Adam Heath aff93c1ef4 Switch all javac15 to javac16.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@894022 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:12:04 +00:00
Jacques Le Roux 0698881e24 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/specialpurpose@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Ashish Vijaywargiya d318ef345c 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/specialpurpose@832713 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 12:05:09 +00:00
Ashish Vijaywargiya 4726c94d5d 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/specialpurpose@831534 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 12:01:52 +00:00
Ashish Vijaywargiya 1768027485 Adding permission GOOGLEBASE_ADMIN & EBAY_ADMIN and associating it with the group FULLADMIN.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@830889 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 10:58:01 +00:00
Marco Risaliti 4d0f3e6917 Some missing italian translations of googlebase component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@829592 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 14:54:35 +00:00
Bruno Busco b9f046b665 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/specialpurpose@829418 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 17:41:31 +00:00
Bruno Busco ab6126aaa0 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/specialpurpose@829314 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 07:14:26 +00:00
Bruno Busco d2b7b4dbdd Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@826483 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 18:24:32 +00:00
Ashish Vijaywargiya 1017225414 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/specialpurpose@822222 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 11:22:02 +00:00
Adrian Crum acfba61db1 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/specialpurpose@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Ashish Vijaywargiya a391bc4d7a Encouraging use of Generics.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@818714 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 04:29:10 +00:00
Jacques Le Roux 908f1a521f Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Jacques Le Roux 3585b3ea94 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/specialpurpose@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Jacopo Cappellato aaa4cfe1fc 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/specialpurpose@810857 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 09:55:14 +00:00
Ashish Vijaywargiya 39649df8b0 Added GUI for GoogleBaseConfig entity - CRUD Operations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@809582 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 13:31:27 +00:00
Ashish Vijaywargiya 058e9bd76c Moving screen definition to appropriate location.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@809555 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:24:10 +00:00
Ashish Vijaywargiya 9aa6627c3a 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/specialpurpose@809552 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:06:14 +00:00
Ashish Vijaywargiya 4edd8d70bb 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/specialpurpose@808331 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 09:04:55 +00:00
Ashish Vijaywargiya 19b36cca1b Few more modifications in google base code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@808099 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 16:20:35 +00:00