Commit Graph
2422 Commits
Author SHA1 Message Date
Erwan de Ferrieres b83e9a7077 Better consistency in EbayForms, all websiteId are now displayed like ' []'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1094438 13f79535-47bb-0310-9956-ffa450edef68
2011-04-18 09:58:27 +00:00
Jacques Le Roux bee192150d A patch from Ankit Jain "Some misc issues in ebay and ebayStore component."(https://issues.apache.org/jira/browse/OFBIZ-4118
On the Ebay Configuration search page (https://localhost:8443/ebaystore/control/FindEbayConfigurations) a default value "EBAY_STORE" is shown selected and after search the same value is shown instead of the value we selected before clicking on find and same case on on Edit Ebay Configuration page (https://localhost:8443/ebaystore/control/EditEbayConfiguration?productStoreId=9000).

The attached patch fixed this problem also fixed the website data.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1094281 13f79535-47bb-0310-9956-ffa450edef68
2011-04-18 06:55:29 +00:00
Ashish Vijaywargiya bc5a872795 Bug fix. In case of EXT_OFFLINE payment "ORDER_CREATED" status must be included to filter-out the list for fetching the userlogin object.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1091694 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 08:14:34 +00:00
Sascha Rodekamp d922ef1295 Update - jQuery UI to version 1.8.11. The current jQuery UI Version is build on jQuery version 1.5.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1088549 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 10:42:28 +00:00
Hans Bakker 400e5d1554 error in product detail as reported by mark wheeler fixed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1088525 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 09:36:55 +00:00
Sascha Rodekamp b5c2bc2c9d Update - Update to jQuery Version 1.5.2, the new version fixes some bugs in the library.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1088502 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 08:36:05 +00:00
Sascha Rodekamp 7da19e4b7b BUG - PROJECTADMIN cannot create projects in projectmgr (https://issues.apache.org/jira/browse/OFBIZ-3201).
I add a new permission check to the ProjectMenu.xml to check weather the user have PROJECTMGR_ADMIN rights or not. If not he should not be able to create new Projects. 
That means that users which are in the security group PROJECTADMIN aren't allowed to create new projects by default. Because they are responsable for there own projects and not for creating new once. Maybe the name of the Permission group is a little bit confusing. The PROJECTADMIN is not the admin from the project module he is more a Project manager (an admin for his own projects).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1087680 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 12:23:12 +00:00
Hans Bakker c61b5295ae Updates to the image management system:
- Fixed the resize function can resize any format flie
- Fixed share image screen to get host from contentURL (if it has content)
- Fixed product detail screen in ecommerce
- Create the function for set default image to product content screen


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1087599 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 06:49:06 +00:00
Sascha Rodekamp 99b7a40632 Bug - Unable to create project task contents as admin (https://issues.apache.org/jira/browse/OFBIZ-3952). Apllied Jeremys modified patch. Just add an extra permission check for the PROJECT_ADMIN permission.
Orig.Msg.
When editing a task in the project manager application you cannot add content from the content tab if you have admin privileges. The permission is incorrectly labeled as "PROJECTMGR_ROLE_ADMIN" when it should be "PROJECTMGR_ADMIN."


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1087596 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 06:38:01 +00:00
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
Sascha Rodekamp 02e1dc0cd0 Update - Update the jQuery library to version 1.5.1. A few changes were necessary for this step. I updated the jQuery flot library to the current release, because the old one doesn't work with the new jQuery version, i also updated the jsTree Plugin to make it work with the new jQuery Version.
Note in jQuery 1.5 the implementation of the ajax function has been changed.

For more Information have a look at: http://blog.jquery.com/2011/01/31/jquery-15-released/


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1082916 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 13:37:29 +00:00
Erwan de Ferrieres a5d84f24c1 Adding Timestamp type for field comparison
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1082862 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 10:14:00 +00:00
Sascha Rodekamp da61ddc627 Update - Update to jQuery 1.4.4, Fix a bug in the fieldlookup.js to make it work with the new jQuery lib. This patch is to orepare the update to jQuery version 1.5.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1082227 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 17:25:15 +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
Marco Risaliti 9dddaebcc5 Revert rev. 1081099
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081516 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 19:10:12 +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 2bdbfd122f Remove a warning in WebPosEvents (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081101 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 12:46:32 +00:00
Marco Risaliti 8335300073 Remove some warning in pos component (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081099 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 12:43:16 +00:00
Marco Risaliti 165610f857 Remove some warning in webpos component (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081089 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 12:12:18 +00:00
Marco Risaliti 9595d3dec9 Remove some reduntant cast warning in crowd component (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081088 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 12:09:49 +00:00
Marco Risaliti 0109c58301 Remove some reduntant cast warning in ebaystore component (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081080 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 11:39:36 +00:00
Marco Risaliti e7d6a78e40 Remove some reduntant cast warning in ebay component (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081078 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 11:36:21 +00:00
Jacques Le Roux 0a4450d88c Forgot this in r1081020 (I was too fast when I commented out webpos. I know now some persons are using it.)
Still an issue in Login.ftl, will see that later...

 [java] Expression posTerminals is undefined on line 55, column 24 in component://webpos/webapp/webpos/Login.ftl.
 [java] The problematic instruction:
 [java] ----------
 [java] ==> list posTerminals as posTerminal [on line 55, column 17 in component://webpos/webapp/webpos/Login.ftl]



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081022 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 00:29:01 +00:00
Jacques Le Roux d67f39b5b1 I was too fast when I commented out webpos. I know now some persons are using it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1081020 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 00:01:11 +00:00
Erwan de Ferrieres 255bedd0f8 tabs to spaces and some reindentation in Various.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1076546 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03 07:22:50 +00:00
Hans Bakker 339103a0ba issue https://issues.apache.org/jira/browse/OFBIZ-4194: reorder of product images and extension of the <@ofbizcontenturl macro. A contribution of Antwebsystems employee Tukkata
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1076507 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03 02:52:31 +00:00
Jacques Le Roux 20835affa2 Removes blanks at EOL
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1076116 13f79535-47bb-0310-9956-ffa450edef68
2011-03-02 06:42:15 +00:00
Erwan de Ferrieres 13d0fa5ade Correcting a sentence which had no meaning
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1075997 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 19:47:27 +00:00
Erwan de Ferrieres 36afa3ddd7 Adding French version for the OFBiz website
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1075511 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 20:02:31 +00:00
Erwan de Ferrieres bee3c8ba35 no need to display link to EN page as we are already in it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1075509 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 20:01:24 +00:00
Erwan de Ferrieres 34e686c917 Reverting some changes done last year, which were wrong (uiLabels instead of content), and separating NL from EN data for the integrated OFBiz website
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1075416 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 16:42:38 +00:00
Jacques Le Roux 193ebc27b6 Fix issues when rendering as templates subContents in Content Manager
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1074624 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 16:54:33 +00:00
Sascha Rodekamp 62fc742239 Update - Remove the obsolete jQuery UI Libs from the ecommerce common screen. (http://markmail.org/message/dbogfc7ope76hosv). Sam noticed that all jQuery UI Libs in the ecommerce application are not needed. To improve performance of site loading we decided to remove the obsolete libs.
Orig. Msg.:
Was just running round the ecommerce site when I noticed that both
jquery-1.4.2.min.js and jquery-ui-1.8.6.custom.min.js are served when loading
/ecommerce/ pages? Isn't that rather excessive and only jquery-1.4.2.min.js
should be called? 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1073901 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 19:39:25 +00:00
Jacques Le Roux f01f21bd71 Fix a typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1073782 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 15:28:41 +00:00
Jacques Le Roux 815b944afb Adds a div at EOF, thanks to Mike at OFBIZ-4184
I figured out the problem with the footer appearing in
the center (below product) on ProductDetail. There was a </div>
missing at the very bottom of:

OFBIZ_HOME/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl

</div>
</div> <----- ADD additional closing DIV.

Product detail now correctly renders.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1073639 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 08:38:05 +00:00
Hans Bakker 034f45c272 Image management: make image file location and url configurable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1071878 13f79535-47bb-0310-9956-ffa450edef68
2011-02-18 04:12:43 +00:00
Sascha Rodekamp 89049f9c83 Bug Fix - "In IE under, myportal module, registration, when only refreshes the verification code" (https://issues.apache.org/jira/browse/OFBIZ-3962) - We forgot to migrate the code form dojo to jQuery, after that the bug is solved - Thanks Wang Suozhu for reporting.
Orig. Msg.:
In IE under, myportal module, registration, when only refreshes the verification code

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1071338 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 18:06:40 +00:00
Erwan de Ferrieres f47b530ef1 OFBIZ-4170 : a bug was present in the timepicker plugin and values under 01:05:10 couldn't be selected
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1069542 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10 19:45:22 +00:00
Marco Risaliti 3d1fbdbc8a Removed a warning into EbaySellingManagerForms that required a date and a wrong comment in the heading of the file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1068551 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 20:19:57 +00:00
Marco Risaliti c7fd5c6a16 Remove all compilation warnings of ebaystore component, there was a lot of unused variable that has been removed (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1068548 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 20:15:48 +00:00
Jacques Le Roux eba045ce05 A patch from Stephen Rufle "Checkout Shipping Options" (https://issues.apache.org/jira/browse/OFBIZ-4162) - OFBIZ-4162
When the user selects a shipping option and moves to the next step and then comes back to the "Shipping Options" step the previously selected value is not selected on the screen. This is because in the ftl a comparison is made between shippingMethod and chosenShippingMethod. chosenShippingMethod is being escaped so the values will never match. The solution is to use wrapString on chosenShippingMethod.

# Add a product to the cart
# login as any user I used "admin"
# Checkout Step "Shipping Address" (Step 1: Where shall we ship it?)
    * Click Next
# Checkout Step "Shipping Options" (Step 2: How shall we ship it?)
    * Choose "UPS Air"
    * Click Next
# Checkout Step "Payment Options" (Step 3: How shall you pay?)
    * Click "Browser" back button, in my code had a request that directed back a step, but this shows the issue
# ISSUE: Now "UPS Air" is no longer selected, after my patch it will be

JLR: this was only with modified code, but it makes sense and can't hurt. I will not backport though

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1068286 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 08:04:36 +00:00
Marco Risaliti 2edf34dd98 Remove all compilation warnings of ShoppingCart/ShoppingCartItem and related invoked methods (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1068103 13f79535-47bb-0310-9956-ffa450edef68
2011-02-07 20:29:21 +00:00
Hans Bakker 2e3623ed66 Correction on rev 1067073. removing of unrequired fields, change the order of the seed/demo data, so hopefully buidbot is ok again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1067141 13f79535-47bb-0310-9956-ffa450edef68
2011-02-04 10:43:45 +00:00
Erwan de Ferrieres 8097cc2176 Adding more descriptions on the roles and statuses for project management
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1067135 13f79535-47bb-0310-9956-ffa450edef68
2011-02-04 10:32:51 +00:00
Hans Bakker 601d571079 several enhancements on the product image management system including adding the proper permissions to the fulladmin security group to be able to approve images
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1067073 13f79535-47bb-0310-9956-ffa450edef68
2011-02-04 03:21:17 +00:00
David E. Jones cb2c200bb9 Fixed EbayStoreHelper to not user to field that was removed from the JobManager that did not support multiple delegators, and instead use the delegator name
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1066465 13f79535-47bb-0310-9956-ffa450edef68
2011-02-02 13:49:46 +00:00
Erwan de Ferrieres 37c884acc5 Better French uilabels for projectmgr, adding the missing FormFieldTitle_firstResource
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1065796 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 21:23:36 +00:00
Ashish Vijaywargiya 2a44268261 Bug fix. Changed the year of expiration in demo data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1065550 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 10:49:35 +00:00
Jacques Le Roux 2a4b2cce47 A patch from Arun Patidar "Some misc issues in ebayStore component." (https://issues.apache.org/jira/browse/OFBIZ-4118) - OFBIZ-4118
Attaching patch fixes following issues in ebayStore component
1. Now user can export more than one product to ebay by selecting more than one product and processing them one by one.
2 Show error messages to user in case of any exception.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1064751 13f79535-47bb-0310-9956-ffa450edef68
2011-01-28 16:02:02 +00:00