Commit Graph
42 Commits
Author SHA1 Message Date
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 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 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
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
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
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
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
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
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
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 b8743bc823 updated demo data with supplier order preferences for products. this will allow you to see MRP features more easily
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499885 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 18:31:28 +00:00
Jacques Le Roux dad67935f7 A (large) patch from Scott Gray "Update ASL header" (https://issues.apache.org/jira/browse/OFBIZ-637).
I put also some svn:ignore for shark build and lib diretories and assetmaint/build 

I did some by hand lately, too much to remember. They were files with old header but without copyright. A 1st attempt I suppose, will have to check this after this commit.

I add some problems to commit this patch in one piece because it's so huge (specially with Eclipse I had to turn to Tortoise) !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499486 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 17:15:54 +00:00
Alfred Maxwell Byers 9b0a33c64d This is all the front-end code and data required to implement the blog example in ecommerce.
It also relies on two service files committed earlier - BlogServices.java/xml

Not much attention has been paid to style or layout. We will count on the folks at HotWax Media to add their secret sauce.

The two areas on which the most attention were:

1. Getting the permission scheme to work correctly.
2. Getting the complex content rendering to work. It uses the widget screens as templates.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499264 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 05:17:03 +00:00
David E. Jones b88bd0b131 A few misc cleanups in the feature area; the big change here is to use categoryName, etc as a priority over description, etc though both are still supported; this should have been done a long time ago but when the categoryName field is added it was done poorly
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@498248 13f79535-47bb-0310-9956-ffa450edef68
2007-01-21 05:52:14 +00:00
Jacques Le Roux 8d21162c17 Cosmectics changes (surrounded french and italiano with parenthesis as did Si for english : better looking)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@495900 13f79535-47bb-0310-9956-ffa450edef68
2007-01-13 14:21:54 +00:00
David E. Jones b016b62ce5 Added little demo of 2 content sections included on the policies page
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@493431 13f79535-47bb-0310-9956-ffa450edef68
2007-01-06 07:13:42 +00:00
Jacopo Cappellato 6e6e8abd5a Added demo content for the following (mandatory) InventoryItem fields: currencyUomId, ownerPartyId, unitCost.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@487971 13f79535-47bb-0310-9956-ffa450edef68
2006-12-17 11:56:32 +00:00
Jacques Le Roux 7785b36fad Light corrections in existing products and categories french descriptions.
Actually was good (Si your french is good indeed ;o) but some idiomatics (ç and lumineux, french dont use much "avec lumières" : childish)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@478498 13f79535-47bb-0310-9956-ffa450edef68
2006-11-23 07:26:07 +00:00
Jacopo Cappellato acb83097b4 Small correction to the Italian description for the demo item (hey Si, your Italian is very good :-) and fixed a wrong field name (probably due to "search&replace").
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@478482 13f79535-47bb-0310-9956-ffa450edef68
2006-11-23 06:14:56 +00:00
Si Chen 08c5530006 an example of product name and description i18n. SOMEBODY PLEASE CHECK MY FRENCH AND ITALIAN
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@478365 13f79535-47bb-0310-9956-ffa450edef68
2006-11-22 23:09:30 +00:00
Si Chen b5bd9b45d8 Add a price for the PROD_COST product so it can be purchased
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@478308 13f79535-47bb-0310-9956-ffa450edef68
2006-11-22 19:58:14 +00:00
David E. Jones 222cee013e Added a WebStoreClone WebSite record, and pointed to it from the web.xml file in the new ecomclone webapp
's web.xml file

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@476652 13f79535-47bb-0310-9956-ffa450edef68
2006-11-18 23:07:26 +00:00
Jacques Le Roux a299671636 Suppression of demo categories descriptions to allow i18n at least for the moment in english/italiano/français.
I hope to update and migrate http://ofbizwiki.go-integral.com/Wiki.jsp?page=LocalizedProductDescriptions to Confluence Wiki

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@473691 13f79535-47bb-0310-9956-ffa450edef68
2006-11-11 10:58:13 +00:00
Si Chen 9781139f69 sample data for category-specific product description
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@473113 13f79535-47bb-0310-9956-ffa450edef68
2006-11-09 22:41:54 +00:00
Jacques Le Roux 7f4b4cd901 Primary categories content locale now default to english (was french)
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@473073 13f79535-47bb-0310-9956-ffa450edef68
2006-11-09 21:05:48 +00:00
Si Chen acfd32d85f Default settings for prorateTaxes for demo stores
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@470170 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 01:29:48 +00:00
Jacques Le Roux c3b24d90ca Gift Cards Purchase and Gift Cards Reload categories were reversed
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@468660 13f79535-47bb-0310-9956-ffa450edef68
2006-10-28 08:21:43 +00:00
Jacopo Cappellato 6c6920467f Removed a few empty or unused files and added license header to a few files still without it (found running the aRAT tools from Robert Burrel Donkin).
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@463895 13f79535-47bb-0310-9956-ffa450edef68
2006-10-14 07:28:02 +00:00
David E. Jones f6b6e2ae8c Company party is not in NA role by default
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@463664 13f79535-47bb-0310-9956-ffa450edef68
2006-10-13 12:21:42 +00:00
Jacques Le Roux 142f894ebb This patch definitely corrects the DemoProductCategoriesI18nData.xml loading problems (some data loaded from DemoConfigurator.xml was needed by DemoProductCategoriesI18nData.xml)
To test you only have to suppress demo categories descriptions.
The i10n is only done in italian and french for the moment. BTW, any adding in others languages will be appreciate of course...
In english I have added some "en" at end to differentiate from french and italian (I did not try to translate some words like widgets or gizmos ;o)

Enjoy at last ...

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@454213 13f79535-47bb-0310-9956-ffa450edef68
2006-10-08 21:14:42 +00:00
Jacques Le Roux 1bb832ce55 Si pointed out that there was a seed data problems with the DemoCategoriesI18nData.xml
I moved 
  applications/product/data/DemoCategoriesI18nData.xml 
to
  applications/ecommerce/data/DemoProductCategoriesI18nData.xml 
and it's ok now.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@453883 13f79535-47bb-0310-9956-ffa450edef68
2006-10-07 09:54:13 +00:00
Si Chen 53d8895122 Commissions seed data changed to use commission AgreementType and payable days changed to 30. Never met a company that paid commissions right away myself...
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@453430 13f79535-47bb-0310-9956-ffa450edef68
2006-10-05 23:48:29 +00:00
Si Chen dcad03095c Added Fed Ex to demo shipping data as a store carrier. No integration yet or planned at this point
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@449087 13f79535-47bb-0310-9956-ffa450edef68
2006-09-22 21:01:11 +00:00
David E. Jones 2fcebbefe9 Removed remaining reference to GZ-KIT, was causing data load failure
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424556 13f79535-47bb-0310-9956-ffa450edef68
2006-07-22 11:42:28 +00:00
Si Chen eb8c4149c8 Removed old marketing package auto-explode code which has now been replaced by BOM-based code for new the Marketing Package product type
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424117 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 23:39:46 +00:00
Jacopo Cappellato 0beb411f81 Conversion from MIT to ASL2.0 for the files of the ecommerce component.
Many thanks to Ashish Vijaywargiya for the patch (Apache OFBIZ-87).

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@422407 13f79535-47bb-0310-9956-ffa450edef68
2006-07-16 08:43:30 +00:00
Si Chen 8e58687118 Added ProductStore.storeCreditValidDays to allow per-store BillingAccount.thruDate to be set. The thruDate is set when BillingAccount is created in processCreditReturn. Modified the BillingAccountWorker service that generates list of billing accounts to obey this thruDate. Resolves OFBIZ-86.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421420 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 21:36:16 +00:00
David E. Jones 7c214b8082 Added subscription processing services, which are now enabled by default with an ECA; includes a demo product for a Gizmo Newsletter; also some cleanups of and improvements to the subscription admin UI
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419428 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 03:42:45 +00:00
David E. Jones 94fe6d1cda Initial OFBiz import from revision 7923 of the old svn.ofbiz.org SVN repository.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@418498 13f79535-47bb-0310-9956-ffa450edef68
2006-07-01 19:05:20 +00:00