Commit Graph
62 Commits
Author SHA1 Message Date
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 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
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
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
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
Hans Bakker f982ac8e17 add a popular categories section to the ecommerce frontpage which is generated from the data warehouse of real orders. Also adjusted the sales reports from the data warehouse by week/month/year. Demo data included is for display only
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1055774 13f79535-47bb-0310-9956-ffa450edef68
2011-01-06 07:37:45 +00:00
Hans Bakker 0eb6c5f372 several improvements and completion of the email contactlist subscribe and unsubscribe functions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1052447 13f79535-47bb-0310-9956-ffa450edef68
2010-12-24 04:37:20 +00:00
Jacques Le Roux e2bcb4b858 A patch from Sascha Rodekamp "Update the Datepicker to version 0.9.1" (https://issues.apache.org/jira/browse/OFBIZ-4056) - OFBIZ-4056
Updates the timepicker. Seems that it's more stable and they fixed a few issues. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1049151 13f79535-47bb-0310-9956-ffa450edef68
2010-12-14 16:39:30 +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 734cea79c3 Fix several xml files that had DOS line endings; converted them to UNIX,
so that on fresh checkouts they will be auto-converted to native.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1040833 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 00:15:17 +00:00
Hans Bakker 74621b9a77 replacing an empty blog summary with text did not work and moving labels from ecommerce to content because used in both components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1036332 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 07:28:45 +00:00
Hans Bakker 533b60733d blog summary could not be updated, in the same process move the editarticle form from ecommerce to content because also used there.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1036329 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 06:29:25 +00:00
Hans Bakker 5968c964b2 some more error correction for the update blog in ecommerce
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1022048 13f79535-47bb-0310-9956-ffa450edef68
2010-10-13 09:34:48 +00:00
Hans Bakker 31f00a501c make the blog more presentable and it looks it is now working again. Nice implementation by Al Beyers This blog is a nice demo to show the possibilities of the ofbiz content component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1001622 13f79535-47bb-0310-9956-ffa450edef68
2010-09-27 08:32:11 +00:00
Scott Gray 1a13c650e9 Fix for OFBIZ-3434, rss feeds need any parameters to be included in the url and not posted in a form
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@996079 13f79535-47bb-0310-9956-ffa450edef68
2010-09-11 05:53:12 +00:00
Scott Gray 232845bda6 Fix target typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@996078 13f79535-47bb-0310-9956-ffa450edef68
2010-09-11 05:53:06 +00:00
Jacques Le Roux 45229b0aa5 Improvement on r960336. Fix a problem reported by Scott on dev ML.
I tested locally, and I think I have done it right this time


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@960491 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 09:10:19 +00:00
Jacques Le Roux f089ea9488 Improvement on r960336 (should fix a problem reported by Scott on dev ML.)
I tested locally, but I'm not quite sure it's sufficient


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@960401 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 21:23:47 +00:00
Jacques Le Roux d5d5f100a1 Closes "Allow to open a layer lookup from a layer lookup recursively" (https://issues.apache.org/jira/browse/OFBIZ-3693) - OFBIZ-3693
This commit removes all remaining <presentation="window">

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@946073 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 07:36:02 +00:00
Jacques Le Roux 0789b813ed We still have a problem with the find button in recursive cases (ie LookupWorkEffort and LookupContent).
It's not related to previous patches committed but an issue which is remaining and we have to face now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@944647 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 14:13:03 +00:00
Jacques Le Roux f1b9924030 A patch from Chris Snow "ecommerce screen shows error after loading only seed data" (https://issues.apache.org/jira/browse/OFBIZ-2798) - OFBIZ-2798
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@935089 13f79535-47bb-0310-9956-ffa450edef68
2010-04-16 22:05:50 +00:00
Ashish Vijaywargiya 584df31323 Applied patch from jira issue - OFBIZ-3635 - Contact list unsubscription email notification.
Thanks Chandan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@930842 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 11:25:08 +00:00
Hans Bakker d33797ef25 correct some content blog errors
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@890253 13f79535-47bb-0310-9956-ffa450edef68
2009-12-14 09:51:41 +00:00
Jacques Le Roux 3cf59cfd23 Complete calendar i18n initialization
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@887454 13f79535-47bb-0310-9956-ffa450edef68
2009-12-04 23:38:25 +00:00
Jacques Le Roux 304b86dee0 Fix a bug introduced with r886143 (when a language.js was missing no default was given)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@886723 13f79535-47bb-0310-9956-ffa450edef68
2009-12-03 09:45:33 +00:00
Jacques Le Roux 97da7a3c5d A patch from Sascha Rodekamp " Colors and localisation for the calendar" (https://issues.apache.org/jira/browse/OFBIZ-1825) - OFBIZ-1825
Simple and clear implementation!


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@886143 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 13:54:17 +00:00
Ashish Vijaywargiya 0b8ce2c91f Applied patch from jira issue - OFBIZ-3249 - Shopping cart on checkout page does not gets update when a gift item is added in cart after applying coupon code.
Patch for update cart on one page checkout page when a gift item a added in cart after applying valid coupon code.

Steps to test:

1. Create a new product promo for 'Gift With Purchase' action with require coupon code.

2. Go to ecommerce -> main

3. Purchase X product and go for one page checkout page.

4. Enter coupon code

5 If this coupon code is valid according to condition given in promotion then a you will get Y product as gift in cart with 0.0 price.

Thanks Arun for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@885425 13f79535-47bb-0310-9956-ffa450edef68
2009-11-30 13:41:56 +00:00
Ashish Vijaywargiya 48db96466f Applied patch from jira issue OFBIZ-3186 - Layered Navigation of Categories.
Layered navigation in an Ecommerce application allows the user to filter the product listing based on categories, features and price ranges. The user can apply multiple filters to the given product listing. He can narrow or expand his search and try different filter combinations so as to find the desired product.

I have implemented Layered Navigation in OFBiz ecommerce with following filters:

   1. Sub Categories: This filter is shown whenever there are sub-categories present under the top-level category or current selected category. Count of products within the category is shown against each category, works with multilevel deep category hierarchy. Selecting a sub category will show products within that category and filters will be updated accordingly for the new product list.
   2. Features: Feature filters are grouped by Feature Types. Count of products that has the feature associated as standard, selectable or distinguishing is shown against that feature. Current Implementation has feature filters for ProductFeatureType="COLOR".
   3. List Price Range: This filter will always show. When applied filters product based on List Price Range. Current implementation is done by listing static price ranges at code level.

The above implementation is completely based on the OOTB Product Search functionality with few additional methods in ProductSearchSession to derive count against different type of filters.

This is collaborative contribution from Mridul Pathak, Jacopo Cappellato & Scott Gray.
Thanks Guys for such a nice contribution - I am sure community will love seeing the existence of "Layered Navigation" in OFBiz trunk.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@835372 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:54:22 +00:00
Ashish Vijaywargiya 69a6dc4b88 Applied patch from jira issue OFBIZ-3159 - Move geoAutoCompleter.js from ecommerce to ordermgr.
geoAutoCompleter.js currently resides in specialpurpose/ecommerce component. But now it is also used in OrderViewScreen.xml#OrderHeaderView screen. First of all we can't have dependency of ordermgr on ecommerce component. Secondly, if I am developing a custom ecommerce application with mount point /ecommerce, thus overriding specialpurpose/ecommerce webapp, and copying the geoAutoCompleter.js to my custom application (to customize) in a directory structure other than that of specialpurpose/ecommerce, then the JS file is not loaded in OrderHeaderView screen due to change of location. The only reason is the dependency stated above. Hence this change is vital.

While doing this change, all the references to geoAutoCompleter.js will need to be updated too.

Thanks Arpit for the contribution.
Special thanks to Mridul for providing notes for the implementation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@833026 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 10:08:35 +00:00
Bruno Busco ade6d37f48 Part of OFBIZ-3067 - Menus and form widget files location
Ecommerce, Webtools and hhfacility components
Moved forms from webapp to widget folder
Removed empty folders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@829443 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 20:20:18 +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 07092df1f6 Applied patch from jira issue OFBIZ-3024 - Implement contact us functionality for unregistered user.
Thanks Awdesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@823849 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 13:07:50 +00:00
Vikas Mayur 80777b03ed Reverting changes done in rev. 814553 as discussed on dev mailing list. Now the conventional profile screens are default again.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@816469 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 04:49:22 +00:00
Vikas Mayur 82f58f559e Changed the new profiles pages added a year back as the default one.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@814553 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 10:08:27 +00:00
Jacques Le Roux 6f5c73cc35 A patch from Eric DE MAULDE "Translation error into OrderConfirmNotice screen" (https://issues.apache.org/jira/browse/OFBIZ-2925) - OFBIZ-2925
When OrderConfirmNotice screen call OrderNoticeEmail.ftl orderheader.ftl has some uiLabelMap variable without source to translate
+ a space in OrderUiLabels.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@813672 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 06:25:39 +00:00
Scott Gray 684156d029 Wherever possible changed ELI queries to limit the result set to the actual rows required of the query, should improve time
and memory performance if a cursor isn't being used on large result sets quite a bit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@808820 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 08:58:10 +00:00
Hans Bakker 5b3910f726 in error deleted ftl files by me, now moved from ordermgr to ecommerce. Reported by Ruth in OFBIZ-2853
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@806914 13f79535-47bb-0310-9956-ffa450edef68
2009-08-23 00:34:24 +00:00
Scott Gray 0243174f43 OFBIZ-2625 Ability to perform product comparisons in ecommerce and during order entry in ordermgr.
Compares things like name, price, description, long description, brand name and standard, distinguishing and optional features.

Could do with some styling and would be nice to add customer ratings in there as well.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@797259 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 23:28:32 +00:00
Hans Bakker 84fc413306 rename Request files to CustRequest files as discussed in the mailing list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@795304 13f79535-47bb-0310-9956-ffa450edef68
2009-07-18 03:30:19 +00:00
Anil Patel 2217640e67 cleaned mark. Moved list of anon checkout is in file by itself. This makes it easy to use login.ftl file in custom ecommerce components.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@792436 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 07:56:02 +00:00
Ashish Vijaywargiya 22a0391718 Fixed Typo in file name.
Thanks Vivek for reporting it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@792129 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 13:09:49 +00:00
Hans Bakker e8b3a3f3c0 introduce a 'gift enable' with default = Y in the order.properties file and pos, ecommerce and ordermgr itself use it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@790517 13f79535-47bb-0310-9956-ffa450edef68
2009-07-02 09:25:14 +00:00
Ashish Vijaywargiya a516f11c1c Applied patch from jira issue OFBIZ-2573 (On the Product Detail Page Images with alternate views.)
I have done following changes in this patch.

-- Changed the ID field as it was using 10000 or 20000. It can create issue while creating new record in those entities. So we should either create Alpha-numeric value or value less then 10000 for primary keys.
-- I have changed the location of images in data file and kept it into /images/products/additional/web_browser2.png folder. That place looks more appropriate place for such images.

Thanks Arpit Singh Pandya for your patch.
Special thanks to Arun Patidar for discussing things with Arpit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@782536 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 05:58:52 +00:00
Anil Patel 38bd6a9e4c Removed funny use of label used for adding style to page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@782476 13f79535-47bb-0310-9956-ffa450edef68
2009-06-07 22:41:12 +00:00
Anil Patel 33b80f397f Moved html body element start and end out of header and footer templates files. Added generic sections for body section of page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@778991 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 04:31:12 +00:00
Jacques Le Roux 2693f9eddb Fix following Chris Howe's message in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +00:00
Jacques Le Roux 97bb3073c9 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/specialpurpose@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux 08ae117fe5 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Jacques Le Roux 4fb56aa2f7 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/specialpurpose@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Jacques Le Roux dcb93aece2 Was missing in previous commit (Eclipse edit trap)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@762146 13f79535-47bb-0310-9956-ffa450edef68
2009-04-05 20:09:08 +00:00