Commit Graph
443 Commits
Author SHA1 Message Date
Jacques Le Roux e07ab48fb4 Some cleaning related to is(Not)Empty
* remove duplicate ()
* remove casts no longer needed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885103 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 15:46:52 +00:00
Jacques Le Roux 569a4afeea Some cleaning related to isEmpty
* remove duplicate ()
* remove casts no longer needed

I'm doing these last tasks around isEmpty and isNotEmpty mostly to be sure that nothing has slipped in. Despite I have been very careful, I prefer double check.

+ one typo in ofbizSelenium help (not sure this file is used yet though, seems to be missing some parts which are commented out, for now I guess)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885093 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 14:08:16 +00:00
Jacques Le Roux c72b29cb1f 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@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Jacques Le Roux 5518e9baf8 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
Complete r883492

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883516 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 22:02:05 +00:00
Jacques Le Roux e839974fe7 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.length == 0)
Complete r883507


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883508 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 21:48:18 +00:00
Jacques Le Roux 8ae9319710 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883492 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 20:34:27 +00:00
Adam Heath 820d11eb97 Deprecate UtilCache constructors, and add a create helper function.
This is the first step to making utilCacheTable concurrent, and
non-blocking.  To do so, the constructor has to have no side-effects.
This means it can't modify utilCacheTable itself; this will be moved to
the helper function created above.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883217 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:56:28 +00:00
Ashish Vijaywargiya 70548f0b98 Applied patch from jira issue OFBIZ-3077 - Error for productStoreId when click on productId link from showcart of purchase order.
Steps regenerate error:
1) Hit url: https://localhost:8443/ordermgr/control/orderentry
2) Select purchase order with supplier
3) Add product for order
4) Click on the productId from showcart page

it will generate error as following
org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productdetail: java.lang.NullPointerException: Cannot get property 'productStoreId' on null object (Cannot get property 'productStoreId' on null object)

Notes from Mridul:
As Joe has already stated that we need to do few adjustments in the code based on presence of productStoreId. I would vote for:

   1. Showing all reviews.
   2. Skipping surveys.

The third section, which is the most important one and needs productStoreId is getProductVariantTree service invoked in ProductDetail.groovy (line 232). getProductVariantTree service needs productStoreId to get available inventory. In case of PO's we don't need to check for available inventory at all. Now for being able to use the same code to display product detail page in case of a PO, we will need to make modifications to getProductVariantTree service too, which can be done in two ways:

   1. Add a boolean IN attribute checkInventory to service definition, if its true check the available inventory and if false do not.
   2. A check on productStoreId in the implementation can serve our purpose too.

I like #1 more as it won't eliminate importance of productStoreId in case of a sales order. Looking forward to suggestions from community to handle this situation.

Thanks Amit for the contribution. Mridul Thanks a lot for providing useful notes for the implementation.
Guys, I appreciate your coordination on this!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882618 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 15:54:39 +00:00
Ashish Vijaywargiya 8f887ad408 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@835372 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:54:22 +00:00
Ashish Vijaywargiya d48eee6986 Applied patch from jira issue OFBIZ-3173 - Better supportability for products of type MARKETING_PKG_AUTO in order processing and fulfillment process.
Following points are covered in this patch:
1) Show associated products for product of type "MARKETING_PKG_AUTO" on order items section of show cart page in order manager application.

2) Marketing packages should only shown backordered when ATP of product which compose Marketing packages product are less than quantity added in cart.

3) Pick sheets should show Products of type Marketing Packages along with the products which compose Marketing Packages.

4) Show link of production run created on order items section of Order detail page while placing order for product of type MARKETING_PKG_AUTO.

5) Product of type Marketing Packages should be shown on Verify Pick Screen along with Products they are composed of.

Thanks Divesh for the contribution - this is very nice addition to the trunk.
I would be more then happy to see comments / concern from - Jacopo? Scott? Anil? or others?

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834479 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 14:32:53 +00:00
Ashish Vijaywargiya 5892ec89e9 Applied patch from jira issue OFBIZ-3167 - Add Constraint with respect to eBay root category for product search and change demo data according to the concept.
As we have different productCatalogCategoryType for eBay so add a constraint on searching that if catalog not associated with any PCCT_BROWSE_ROOT type category then also search for PCCT_EBAY_ROOT type category for CatalogConstrain. This will help to manage separate catalog and catalog category association for ebay.

Thanks Parimal for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833054 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 14:55:15 +00:00
Ashish Vijaywargiya fc45518ad6 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@832713 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 12:05:09 +00:00
Jacques Le Roux bab4d17071 This allows to print localized descriptions in the POS.
Also some unrelated generics changes in PosTransaction.java

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830874 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 09:39:04 +00:00
Jacques Le Roux a3b51e146f A patch from Patrick Antivackis "PriceServices.calculateProductPrice should not process or return obsolete PriceRules" (https://issues.apache.org/jira/browse/OFBIZ-3096) - OFBIZ-3096
This patch is a 1st step and add only a filterByDate to the PriceRules obtained after the call to the makeProducePriceRuleList function 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830528 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 13:28:58 +00:00
Scott Gray 78dca4234f Deprecated getVirtualvariantMethod due the camel casing typo in the method name, bothers me every time I see it. Added replacement method with corrected name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828903 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 00:42:16 +00:00
Scott Gray 2963c58a36 Prevent an NPE when a primaryOrderId hasn't been supplied, also set partyIdFrom using the facility.ownerPartyId in this situation.
(This bug was exposed using the unit tests)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826206 13f79535-47bb-0310-9956-ffa450edef68
2009-10-17 09:38:02 +00:00
Adrian Crum 9ee18d37c5 Updated client code to use the new Delegator factory method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823633 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 17:44:24 +00:00
Ashish Vijaywargiya b55b1f44ba Oops ..... I got build failed error due to custom changes in UpsServices.java.
Sorry to bother you guys on this - but yes the service for Ups Transit time will be soon in OFBiz trunk. :)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821699 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 06:53:25 +00:00
Ashish Vijaywargiya c9239cb9df Recent changes done by Adrian for GenericDelegator -> Delegator.
The build was failing due to changes missed from UpsServices.java file.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821697 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 06:42:34 +00:00
Adrian Crum 7fa08f9079 Replaced GenericDelegator.getGenericDelegator(...) calls with new factory method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821649 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 01:53:50 +00:00
Adrian Crum a4d68934c9 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@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Scott Gray 97ddcd9bb1 Missed to the UtilMisc generics weirdness again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821243 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 04:29:12 +00:00
Scott Gray ee3a4b1342 Fix a generics related compilation error introduced by my last commit (r821238)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821239 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 04:16:21 +00:00
Ashish Vijaywargiya 9a637fcd02 Reverted changes of previous commit.
This can create problem for the projects in which "prodSearchExcludeVariants" field is not been set in past so the not-empty check will allow variant product to be included on the search.

Thanks Scott for your comment.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820249 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 11:18:03 +00:00
Ashish Vijaywargiya c61050097c Putting the default value for prodSearchExcludeVariants=Y in ProductStore entity. (This is what at present happening OOTB)
Also I had put a not-empty check so if someone forgot to put this value in demo data then by default it will include variant products.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820204 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 08:03:27 +00:00
Scott Gray f8103a3c49 Bug fix: ProductFeatureAppl doesn't have a description field to sort by
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819770 13f79535-47bb-0310-9956-ffa450edef68
2009-09-28 23:49:56 +00:00
Jacques Le Roux 9d85843af5 Fix an issue when importing Promo Codes From File
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819275 13f79535-47bb-0310-9956-ffa450edef68
2009-09-27 08:57:11 +00:00
Scott Gray 22b5c0ae0b Add a new ProductWorker method that determines the standard features of a variant that would qualify it for selection from its virtual product, a reverse lookup of sorts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815592 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 02:50:26 +00:00
Scott Gray 96dd60965e Added date filtering to getProductFeatureByApplTypeId and cleaned up the method a little
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815581 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 00:58:07 +00:00
Jacopo Cappellato a38f8202aa New util method to find out if a "type" record has a given ancestor.
The method is also used to clean the code related to the two existing marketing package types (that have now in common the same parent).
This will make the framework more flexible because you will be able to create a new product subtype and the system will treat them as its parent type; then you can add custom code to treat it in the special way (if needed). This pattern can be extended in other areas of the system, starting from product types (right now it is also applied to marketing packages).
Thanks to Mridul Pathak for the patch - OFBIZ-2902

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813413 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 13:02:33 +00:00
Adrian Crum 74ea95889c Reverted rev 802567.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812692 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 20:56:14 +00:00
Adam Heath 555ac33fc8 More generics fixing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812328 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 02:48:09 +00:00
Jacques Le Roux 8696a908d9 A patch from Eric DE MAULDE "Image scaling quality" (https://issues.apache.org/jira/browse/OFBIZ-2552) - OFBIZ-2552
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@811707 13f79535-47bb-0310-9956-ffa450edef68
2009-09-05 20:29:43 +00:00
Ashish Vijaywargiya fa228e3f7e Applied patch from jira issue OFBIZ-2886 Add support on advanced search functionality (Internal Name, Product Name field & noCondition find option is provided for searching).
Thanks Amit & Rishi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810434 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 09:33:31 +00:00
Scott Gray c34d3c114e Fix paging bug in product search as reported by Amit Sharma
Also switched the party search result set type back to scroll insensitive

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809785 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 00:35:24 +00:00
Scott Gray f3757103b4 Fixed problem preventing the correct number of records being determined when setting maxRows for the product search query, reported by Amit Sharma
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809585 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 13:33:22 +00:00
Scott Gray 12566c26b9 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@808820 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 08:58:10 +00:00
Jacques Le Roux 7befd1d25e no tabs but 4 spaces in code files (*.ftl, *.gro*, *.java, *.xml)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804935 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 11:01:25 +00:00
Jacques Le Roux 4c442ee379 Some fusiness
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804895 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 08:20:38 +00:00
Ashish Vijaywargiya 9f6a2df0d0 Applied patch from jira issue - OFBIZ-2822 - Fix for adding alternate images from catalog manager.
Thanks Vivek & Mridul for fixing this bug and providing patch for the same.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803002 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 06:30:41 +00:00
Adrian Crum 6786aa4dbc Refactored GenericDelegator:
1. Converted GenericDelegator to an interface. We already have DelegatorInterface, but it isn't being used anywhere. Removed DelegatorInterface.java.

2. Extracted the static, cached data from the GenericDelegator implementation and put it in its own class - DelegatorData. The GenericDelegator implementation holds a reference to the DelegatorData instance. This makes it possible to have per-thread instances of GenericDelegator.

3. Replaced the ThreadLocal variables with regular variables. ThreadLocal variables are no longer needed. Client code doesn't need to be concerned with pushing and popping the GenericDelegator state.

This commit paves the way for the forthcoming ExecutionContext.

User modifications will have to replace GenericDelegator.getGenericDelegator(...) with DelegatorFactory.getGenericDelegator(...). Also, replace the push code with the new setXxx methods, and remove the pop code. If modifications used DelegatorInterface, replace that with GenericDelegator.

Aside from those changes, this commit is backwards compatible.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802567 13f79535-47bb-0310-9956-ffa450edef68
2009-08-09 18:04:26 +00:00
Jacopo Cappellato f3b5e63912 Added ability to define 'alternate content' for different party roles, in a similar way that alternate contents can be defined for different locales.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@801691 13f79535-47bb-0310-9956-ffa450edef68
2009-08-06 16:08:03 +00:00
Vikas Mayur c8c115926f Improvements in Verify Pick screen. If user specify product country of origin while verifying the order then this will be saved in Product.originGeoId field and next time
if a different order comes for verification and does have the same product then the country of origin will automatically populate on verify order screen.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@801675 13f79535-47bb-0310-9956-ffa450edef68
2009-08-06 15:34:10 +00:00
Scott Gray 4851c2da00 Some fixes to the usps priority mail international rate estimate service
First pass implementation of a usps priority mail international shipping label service

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@800198 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 04:57:57 +00:00
Scott Gray 17aaa50948 Added support for international USPS rate estimates, completely untested at this stage
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799511 13f79535-47bb-0310-9956-ffa450edef68
2009-07-31 03:44:46 +00:00
Vikas Mayur 0ece45f2bf User can only verify and weigh approved items. Items in any other status will not show up on Verify Pick screen and Packing (Weigh Package Only) Screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798831 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 09:59:17 +00:00
Scott Gray e3ab7ca8c3 Implemented a services to keep track of products purchased together by creating ProductAssoc records of type ALSO_BOUGHT.
These associated products are then shown to the customer on the product pages as "Customers who bought this item also bought: ..." sorted by popularity.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798500 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 12:13:28 +00:00
Scott Gray 68f180a494 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@797259 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 23:28:32 +00:00
Vikas Mayur 625f05db82 Misc. cleanup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797165 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 17:42:36 +00:00
Vikas Mayur b31acbf1da Fixed NumberFormatException
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797161 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 17:39:42 +00:00