Commit Graph
160 Commits
Author SHA1 Message Date
David E. Jones ad4a7ca28c Some small cleanups and an enhancement for the ListPriceRangeConstraint parameters in ProductSearchSession to be more flexible, especially with a single parameter for both low and high values
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@512564 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 02:14:51 +00:00
David E. Jones 9b76fb8688 Implemented the rest of the ListPriceRangeConstraint ProductSearch constraint
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@512532 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 00:51:04 +00:00
Jacopo Cappellato 37ec41dee7 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@511769 13f79535-47bb-0310-9956-ffa450edef68 2007-02-26 10:11:32 +00:00
Jacopo Cappellato 56fa69ae48 Pretty important change to data model to allow more flexible shipping rules per store:
the primary key of the entity ProductStoreShipmentMeth is no more composed by:
  productStoreId
  shipmentMethodTypeId
  partyId
  roleTypeId

but by one (new) pk field :
productStoreShipMethId

Also modified existing business rules and demo data to reflect this change.
OFBIZ-735


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@511250 13f79535-47bb-0310-9956-ffa450edef68
2007-02-24 11:07:08 +00:00
David E. Jones a623cca834 Added an option configured on the ProductStore to not require a shipping address when purchasing only digital products, ie no physical products; this is supported right now only in the long anonymous checkout process
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510976 13f79535-47bb-0310-9956-ffa450edef68
2007-02-23 15:11:50 +00:00
David E. Jones 6a37368ca0 Some comments, small changes based on recent fix of ProductCategoryLink
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510964 13f79535-47bb-0310-9956-ffa450edef68
2007-02-23 14:48:26 +00:00
David E. Jones 09f3debcf3 Added some demo data for CAT_ID type links
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510932 13f79535-47bb-0310-9956-ffa450edef68
2007-02-23 12:51:33 +00:00
Andrew Zeneski 6963eeb1b9 added CMS event; and default-request (to CMS)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510690 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 22:19:30 +00:00
Andrew Zeneski 244a719331 added some misc templates for content; BlogMisc data not the best name for this file, but already had templates in there.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510679 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 22:05:25 +00:00
David E. Jones 3b8a546c21 Added pcategory parameter, and also changed to use the /~= style to be search engine friendly
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510529 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 14:20:54 +00:00
David E. Jones 67db2debf7 Fixed wrong type ID in an if statement, removed unnecessary boolean for category
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510505 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 13:39:57 +00:00
David E. Jones ce9a5ae648 Changed ProductCategoryLink template to use information from the category from the new link type if there is not corresponding detail on the PCL record
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510487 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 13:05:13 +00:00
David E. Jones aa4cc8b069 Added another ProductCategoryLink type for linking to other categories
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510455 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 10:06:22 +00:00
Si Chen 42d04cdcc1 Added back missing purchasing term types and demo data for them
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510118 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 17:50:18 +00:00
Jacopo Cappellato 7aebfc0579 Commented out demo data that was causing problems due to fk exception.
This is a temp fix: the best solution is to add the two new TemTypes to the seed data file of the party component; however I don't know exactly the meaning of these new types, so I'm leaving this to Si.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509998 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 13:18:14 +00:00
Jacques Le Roux d896af12af Commented out product.bsh part wich had the same erroneous snippet trying to come back to the same page when login or changing language.
Added a comment from David's advice to use the same metho than add to cart in all concerned files (category.bsh prodcut.bsh and main.bsh)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509990 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 12:56:41 +00:00
David E. Jones 2d6086b7b7 Commented out code that attempts to go back to the same category on language change, but really doesn't go back to the same page AND it messes of the main page which IMO is not acceptable; if this is important it should be done that SAME way we go back to the same page on an add-to-cart
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509955 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 10:00:24 +00:00
David E. Jones 397cb385be Last commit for fixing the prod cat link category ID thingy wasn't adequate, cleaned up the categorydetail.bsh script and simplified what is done in the field mapping in the query in the screen def
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509953 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 09:44:22 +00:00
David E. Jones 2530ab76c3 Fixed issue with getting productCategoryId for prod cat links; those pages are a bit weird
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509945 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 09:31:09 +00:00
David E. Jones 9ee12476d4 Small formatted change, more consolidated text
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509934 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 08:19:49 +00:00
David E. Jones fb54b0a92b Added cache and filter by date to the ProductCategoryLinks query
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509888 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 04:35:11 +00:00
Si Chen ae71a53459 set weight uom to lb for demo warehouse
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509680 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 17:44:11 +00:00
Si Chen 9b93a0cf9e Demo data for text purchasing terms
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509679 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 17:43:37 +00:00
Andrew Zeneski f850e8b08c Content Permission & Service Refactoring: A number of big changes to content services including new permission services. This is the first pass with detailed testing on blogs in ecommerce. Tested low level screens as well.
This is the first pass, there are still a number of references to old permission checking, some services need to be refactored, some replaced with better practices. This is a work in progress. 

This first pass includes the removal of special BLOG_ roles and status. Replaced with a generic CONTENT_ and CTNT_. Also adds new ECAs to base createContent service which creates OWNER role as well as associations when passed a contentIdTo or contentIdFrom (and TYPE). This will probably replace the persistContentAndAssoc service which is used in many places. Some have been updated in the revision, others will follow.

Most code which calls the older permission services are found in .java files. Almost all simple methods have been converted to have the permission in the service def and the code removed from the implementation. Java methods still need to be addressed.

The older permission service will output a warning in logs with a stack trace to help track down places where this service is still being called. This is not an error, but may show in logs for the time being.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509321 13f79535-47bb-0310-9956-ffa450edef68
2007-02-19 19:53:06 +00:00
Andrew Zeneski cb78874335 added dojo reference and widget info
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509314 13f79535-47bb-0310-9956-ffa450edef68
2007-02-19 19:46:59 +00:00
Andrew Zeneski c3b8edcef5 updated dojo reference
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509313 13f79535-47bb-0310-9956-ffa450edef68
2007-02-19 19:46:37 +00:00
David E. Jones e6815b0ca9 Added ProductCategoryLink screenlet, included from the categorydetail screen; this is based on the work by Ashish in Jira #OFBIZ-737, but includes a number of cleanups and a bit of a re-write to use more of the ProductCategoryLink entity's data; also added some demo data for testing and demonstration
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509167 13f79535-47bb-0310-9956-ffa450edef68
2007-02-19 11:40:46 +00:00
David E. Jones fdc8e2a9e5 Changed footers for new ofbiz url
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508871 13f79535-47bb-0310-9956-ffa450edef68
2007-02-18 05:45:07 +00:00
Jacques Le Roux d8682aaea5 Deals with the problem reported by Baga Raj in https://issues.apache.org/jira/browse/OFBIZ-724 "After choosing Sidedeepcategory and then getting loged in it shows the error like - Product Category Not Found for this Id!"
in a standard way using _PREVIOUS_PARAM_ as recommended by David.
However I kept the category_id session attribute to deal with languages changes. 

I quickly tried to come back to a product page if opened but I finally kept as it is (come back to the product's category page).
I open a trivial Jira issue for this case as I feel that I will need something like that in some future.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508502 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 17:26:00 +00:00
Si Chen f8ea6ab67b Changing the service code for USPS Standard to Parcel from Priority, as Priority service only works with their web API for certain container types
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508288 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 02:54:45 +00:00
Jacques Le Roux 1d80d744b1 Revert previous commit (using session attribute) at demand of David E. J. Should better use _PREVIOUS_PARAMS_ instead... Will try tomorrow...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@507737 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 23:14:11 +00:00
Jacques Le Roux 2ea56a815c From an idea and a kind of patch (word .doc :o) from Baga Raj in https://issues.apache.org/jira/browse/OFBIZ-724
"After choosing Sidedeepcategory and then getting loged in it shows the error like - Product Category Not Found for this Id!"

After some refactoring I applied his "patch" and extended it to deal with changes of languages case. 
So now you can change the lanquages and keep the same category/product page open.

I can't see any problems. But please if you see an obvious one tell me, I will soon revert. Thanks

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@507698 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 21:25:18 +00:00
Jacques Le Roux dd19700a8b A patch from Chris Howe "Using hardwired /images instead of <@ofbizContentUrl> in .ftl files" (https://issues.apache.org/jira/browse/OFBIZ-111).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@507435 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 08:28:54 +00:00
Andrew Zeneski a123a875a5 implemented blog rss feed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@507366 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 02:57:07 +00:00
Andrew Zeneski a92fd90788 blog cleanups
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@507302 13f79535-47bb-0310-9956-ffa450edef68
2007-02-13 23:27:03 +00:00
David E. Jones c0245d3808 Changed requestParameters to parameters in a bunch of places, as that is the one that should nearly always be usedfor consistency, and to support the request to session etc defaulting pattern; also removed a number of statements to manually create the Map instead of using the one always created by the Screen Widget
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@506575 13f79535-47bb-0310-9956-ffa450edef68
2007-02-12 18:50:26 +00:00
Jacopo Cappellato ca160784dc Applied patch from Chris Howe to replace all relative path form resource names with their component:// equivalent when an HtmlFormWrapper object is created.
OFBIZ-711

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@505886 13f79535-47bb-0310-9956-ffa450edef68
2007-02-11 11:08:33 +00:00
Scott Gray 88b3cc0cba Removed a redundant request map from the ecommerce controller, the event method doesn't exist and the request isn't called anywhere.
Reported by Andrew Sykes, OFBIZ-702

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@505202 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 06:55:07 +00:00
David E. Jones 26528d60c1 Fixed issue where the categoryName was not being used, ie just the description was shown (or not shown if it wasn't there, as the seed is
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@505134 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 02:07:02 +00:00
Si Chen 9b18eb6b63 Support for FedEx subscription and ship requests via FedEx Ship Manager Direct API
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@504996 13f79535-47bb-0310-9956-ffa450edef68
2007-02-08 18:41:20 +00:00
Jacques Le Roux 947a743f59 Reported by Eriks Dobelis in "Using hardwired /images instead of <@ofbizContentUrl> in .ftl files"
Changes from Chris Howe's comment : https://issues.apache.org/jira/browse/OFBIZ-111#action_12459252

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502282 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 16:52:24 +00:00
Jacques Le Roux a8d958052f The application part from a Shi Yusen's patch "zh properties in progress" (https://issues.apache.org/jira/browse/OFBIZ-617).
I will create a new patch attached to Jira issue OFBIZ-617 for framework part. A commiter with enough rights will just have to commit it (patch reviewed and OK)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502130 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 05:54:40 +00:00
Jacques Le Roux aa76149958 While reviewing a patch from Shi Yusen "zh properties in progress" (https://issues.apache.org/jira/browse/OFBIZ-617) I found this file without an ASL2 header. It was recently added by Al(rev. 499264)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502129 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 05:51:14 +00:00
Jacopo Cappellato 666ef96d99 Quick fix for issue OFBIZ-672: if you login to the ecommerce area of ofbiz and view an order using the URL you can view any order made by other users by changing the order number in the URL.
I've not tested  my fix well also with orders created by anonymous users, so any review and test is appreciated: however I think that for now it's better to have it committed.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@501733 13f79535-47bb-0310-9956-ffa450edef68
2007-01-31 05:11:24 +00:00
Jacques Le Roux 88c23a44e2 Derived from an Ismail Cansiz's patch for "Bug in displaying order items when using old style calcTax service" (https://issues.apache.org/jira/browse/OFBIZ-667)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@501521 13f79535-47bb-0310-9956-ffa450edef68
2007-01-30 19:03:41 +00:00
Scott Gray a492da6cdd Fixed demo shipping data problem where multiple ShippingCostEstimates are sharing a single QuantityBreak, which prevents the ShippingCostEstimates from being deleted via the UI
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@500942 13f79535-47bb-0310-9956-ffa450edef68
2007-01-29 05:40:46 +00:00
Scott Gray 8fa02e3c13 UPS Shipping options no longer show ($1.00) when an estimate is unavailable, OFBIZ-141 reported by Tim Ruppert
(This is also a test for my first commit) 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@500739 13f79535-47bb-0310-9956-ffa450edef68
2007-01-28 03:10:19 +00:00
Si Chen a64963163c removed duplicate demo data which was breaking build
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@500431 13f79535-47bb-0310-9956-ffa450edef68
2007-01-27 00:30:50 +00:00
Si Chen a47b49eb8a trying to get the build to work after my new seed data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@500427 13f79535-47bb-0310-9956-ffa450edef68
2007-01-27 00:20:58 +00:00
Jacques Le Roux 2fb06cde7c Last remaining files with old ASL2 header. I believe there are now not anymore files.
So I will close the related Jira issue (https://issues.apache.org/jira/browse/OFBIZ-637)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499939 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 20:01:05 +00:00