Commit Graph
263 Commits
Author SHA1 Message Date
Jacopo Cappellato 40757f357b Pretty big enhancements for the accounting processes and demo data:
1) completely refactored the trial balance report: now it is based on GLAccountHistory and no more on GlAccountOrganization records; the main advantage is that now it it possible to run the report per different financial time periods
2) big enhancements to the demo data: data was incomplete or wrong and this was affecting reports and the financial time period closing process
3) several fixes for the financial time period process
More fixes and enhancements will come, but now the closing process works fine and the financial reports make sense.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885256 13f79535-47bb-0310-9956-ffa450edef68
2009-11-29 18:32:31 +00:00
Vikas Mayur 515cc6339e Correction to response type, should have been none else it causes issues in processing Ajax request. Contribution from Pranay Pandey.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885069 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 07:41:41 +00:00
Ashish Vijaywargiya 0b0b66cd30 Order confirmation email gives following content when any party doesn't have userlogin associated with it.
Order Confirmation Notice

NOTE: This is a DEMO store-front. Orders placed here will NOT be billed, and will NOT be fulfilled.
Order not found with ID [WSCO10040], or not allowed to view.

Thanks Akash for the contribution - Good find.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884903 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 16:21:26 +00:00
Ashish Vijaywargiya 94cc212e92 Billing Address form not able to retain its value when we provide the same username on profile page and we select check box "Billing Address Same as shipping address". Thanks Arun for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884875 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 13:45:59 +00:00
Ashish Vijaywargiya ae79de070e Patch from Parimal Gain (Thanks!). Couple of enhancements are done in it.
-- Error or Success message was not displaying for buziness time theme. Fixed this issue.
-- In case low ATP proper error message was not coming for any product while importing order to the system. It was redirecting the blank page with one line message, that was not verbose enough. Improved error message for this.
-- The leaf category id will be provided in category data so that ebay export works fine.(See the numeric value provided in ProductCategory record).

OFBiz jira is not responding at my end since last 2 hours so committing this patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884869 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 13:32:01 +00:00
Ashish Vijaywargiya f93a26c26b Applied patch from jira issue OFBIZ-3264 - OFBiz Change cart item price according to the price role.
Working Area: OnePageCheckout >> ShoppingCart.

Change minicart item price according to the price rule that will change according to the item quantity.
A product have different price as following:
A product feature contain different price rule with different condition for action like
1 product ---> Price $10.00
50 product ----> Price $8.00 (productPriceAction.amount = "-20.0" with productPriceActionTypeId="PRICE_POL").
If we change the quantity on shoppincart in OnePageCheckout the item price is not reflecting in the cart.

For this we need to add an out item price from getShoppingCartData service so that we can update value in the OnePageCheckout shoppingcart.

Thanks Brajesh & Rishi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884780 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 08:24:16 +00:00
Jacques Le Roux 8ed1a3c906 A patch from Aswath Satrasala "DemoRepStore PartyId data not correct" (https://issues.apache.org/jira/browse/OFBIZ-3261) - OFBIZ-3261
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884546 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 13:12:35 +00:00
Jacques Le Roux 0dc3e839ba A patch from Deepak Dixit "checkoutpayment XHTML validation & default payment" (https://issues.apache.org/jira/browse/OFBIZ-2932) - OFBIZ-2932
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884483 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 10:05:09 +00:00
Jacopo Cappellato 7c34d8694c Demo data for a sales invoice that is still not paid; the figures in the balance sheet now are more interesting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883457 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:42:56 +00:00
Jacopo Cappellato 287200a9ca A bunch of enhancements to demo data related to general ledger:
1) the value of inventory in gl now matches the value of inventory items
2) the purchase cost of fixed assets also matches the value in gl
3) fixed several demo accouting transactions with better accounts

Now the Balance Sheet looks in much better shape (but there is still a lot to do).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883445 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:18:01 +00:00
Jacques Le Roux bda8112975 A patch from Luís Alfredo Harriss Maranesi " Brazilian Portuguese Translation for Ecommerce" (https://issues.apache.org/jira/browse/OFBIZ-3219) - OFBIZ-3219
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881855 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 18:05:48 +00:00
Scott Gray 115101cc2c Added missing PaymentGatewayResponse record for the authorization on DEMO10090
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881226 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 10:23:20 +00:00
Scott Gray 85b3cdc2ee Increased the demo order DEMO10090 item quantity for GZ-2644 to 2, a little bit more useful for testing because a promotion gives the first one away leaving the invoice a little bland
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881081 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 01:22:52 +00:00
Scott Gray b548075ca6 Tidy up the modifyAmount field, I guess this data was created when we were using doubles
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880984 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 21:56:59 +00:00
Ashish Vijaywargiya 76c426670d Applied patch from jira issue OFBIZ-2984 - HTML cleanup for Product Detail page.
In this patch table are removed for non tabular data and used div, and add CSS code for layout issue that created due to this cleanup.

Thanks Rohit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835861 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 14:38:35 +00:00
Marco Risaliti 7b55229221 An error message that now can be translated
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835571 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 21:39:10 +00:00
Ashish Vijaywargiya 1fff46444e Applied patch from jira issue - OFBIZ-2999 - Fix layout of profile pages.
Layout of profile pages (new pages) is not displayed properly.

Thanks Deepak for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835375 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 13:13:34 +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 9752748bf4 Applied patch from jira issue: OFBIZ-3098 - Improvement in input validation of 1st step (shopping cart) on onePageCheckout page.
On onePageCheckout page in Shopping Cart(step1), if we enter any character(not numeric value) in quantity text box, then this text box become empty and show 'required' validation message, It should show "Please enter a valid number in this field."

Step to reproduce:-
1) Add item in cart.
2) Move on onePageCheckout page.
3) Enter any character in item quantity text box.
4) Then it show validation message "required".

Thanks Amit and Rohit for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834493 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 15:14:14 +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 0664a96244 Applied improved patch from jira issue OFBIZ-3165 - Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page.
Following points are covered in this patch:

1) Removed hard-coded product ids for Gift certificates products from GiftCertificates.ftl and added new category type called "GIFT_CARD_CATEGORY" and related demo data, also added groovy script for fetching logic to address this issue.

2) Also handled hard-coded surveyId in AddGiftCertificates.groovy

3) Added user friendly messages if required data is not available .

4) Added missing license header in GiftCertificates.ftl

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834042 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 12:53:03 +00:00
Jacques Le Roux bf71e5ec52 A slightly modified patch from Patrick Antivackis "A way to generate no cache header for the views" (https://issues.apache.org/jira/browse/OFBIZ-3091) - OFBIZ-3091
Patrick : The goal of this improvement is to allow at the view level, through setup in the controller.xml file, to generate no-cache http headers. Example is included for the showcart view of the ecommerce application.
JLR : I have commented out Patrick's example in controller and put a comment about its usage

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833096 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 17:38:42 +00:00
Jacopo Cappellato c8546fe174 Removed some unused import statements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833076 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 16:37:12 +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 fa60ccd7b4 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@833026 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 10:08:35 +00:00
Jacques Le Roux a5126b34e7 A patch from Rohit Jain " Add About Us link in eCommerced footer" (https://issues.apache.org/jira/browse/OFBIZ-3129) - OFBIZ-3129
Rohit : There Should be a link with name "About us" that will be shown detail for ofbiz.
Jacques : Not sure it's very helpful OOTB (there is already the same link from "Powered by OFBiz'), but may be used by third parties.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832402 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 12:28:16 +00:00
Ashish Vijaywargiya 174724c16b Adding missing Quote (") - Patch from Akash Jain (Thanks!)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832393 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 11:16:42 +00:00
Vikas Mayur 9812011ab1 Form enclosing missed in earlier commit, sorry about that.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831889 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 13:02:57 +00:00
Vikas Mayur d3e230bd8d Attempt to fix a secured URL in ftl.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831881 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 12:45:25 +00:00
Jacques Le Roux 04715e0f5a A sligtly modified patch from Eric De Maulde "checkoutpayment XHTML validation" (https://issues.apache.org/jira/browse/OFBIZ-2932) - OFBIZ-2932
I removed the default payment and re-added a line removed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831547 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 14:23:51 +00:00
Ashish Vijaywargiya d4d72a0ca8 Applied patch from jira issue OFBIZ-3095 - Getting error "Number Format Exception" on OnePageCheckout.
Thanks Surya & Rishi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830199 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 14:24:47 +00:00
Jacques Le Roux 061b06acf1 Please gents, no words sentences, thanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829875 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 17:41:41 +00:00
Jacques Le Roux aedeb6ca51 Changes method="POST" to method="post", from Scott's comment about XHTML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829660 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 21:38:47 +00:00
Marco Risaliti 2103fd75ab Some missing italian translations of ecommerce component, sorting the label keys
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829585 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 14:35:35 +00:00
Bruno Busco c3ac175016 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@829443 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 20:20:18 +00:00
Jacques Le Roux cae1363635 A patch from Aswath Satrasala "customer registration email problem when using component:// syntax" (https://issues.apache.org/jira/browse/OFBIZ-2631) - OFBIZ-2631
sendGenericNotificationEmail will not work, because the URI has the screen element part also and hence UtilURL or FlexibleLocation will not be able to resolve URI.
I searched other examples and created the patch based on PARTY_REGIS_CONFIRM


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829376 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 14:28:13 +00:00
Jacques Le Roux ade7709f7b Reverts a change done in r806206, definitively fix "Error during Registration (new customer)" reported by Abdullah Shaikh at (https://issues.apache.org/jira/browse/OFBIZ-3076) - OFBIZ-3076
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829320 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 08:05:41 +00:00
Jacques Le Roux 02172216e7 Fix a bug "Error during Registration (new customer)" reported by Abdullah Shaikh at (https://issues.apache.org/jira/browse/OFBIZ-3076) - OFBIZ-3076
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829316 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 07:51:50 +00:00
Jacques Le Roux 915861fc8f A patch from Abdullah Shaikh "cancel order in ecommerce, customer facing page" (https://issues.apache.org/jira/browse/OFBIZ-2408) - OFBIZ-2408
Part of "Main task for securing URLs in Freemarker templates files"


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828971 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 09:29:08 +00:00
Bruno Busco a9c26eb1c1 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826483 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 18:24:32 +00:00
Scott Gray 2ca6d08602 Add some missing demo shipment data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826348 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 02:30:00 +00:00
Ashish Vijaywargiya 727f1ac5ef Applied patch from jira issue OFBIZ-3033 - Improvement in Product Review implementation.
1) Make createProductReview service definition more generic, so that it can take all nopk fields as IN parameters.
2) Change field value in "productreview.ftl" because field "postedAnonymous" is not a boolean type in ProductReview entity.
3) Make the service implementation more generic so that, it can be used for unregistered users also.
4) Put checks on pendingReviews.ftl to handle case of anonymous user.

Thanks Awdesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824675 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 10:32:49 +00:00
Ashish Vijaywargiya 727b73ced1 Applied patch from Awdesh Singh Parihar.
Renamed the recently added service from "sendContactUsInfoEmailToCompany" to "sendContactUsEmailToCompany".
As "info" word didn't look appropriate in service name - Thanks Vikas and Anil for providing your precious comment.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824655 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 09:52:15 +00:00
Ashish Vijaywargiya f793c1fa95 Applied patch from jira issue OFBIZ-3021 - Improvement in contact us functionality.
On submission of contact us form (https://demo.ofbiz.org/ecommerce/control/contactus) , communication event record will be created but no value set in field "Party Id To" .

To Resolve this issue : -
1) Get company partyId from ProductStore .
2) Pass company partyId in hidden parameters with name partyIdTo.

Thanks Awdesh for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823855 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 13:34:43 +00:00
Ashish Vijaywargiya c06bfc234a 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@823849 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 13:07:50 +00:00
Jacques Le Roux 57cbb35705 Avoid to have Paypal button encroachs the title bar
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823301 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:07:20 +00:00
Scott Gray 63f66f5384 Remove a duplicated demo OrderStatus record
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822251 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 12:44:30 +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
Bruno Busco 62652236c1 Cleanup of the screenlet title in all FTL files.
Removed all occurrences of <div class="screenlet-header"><div class="boxhead"></div></div>
Replaced with the new
<div class="screenlet-title-bar"><div class="h3"></div></div>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821476 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 08:04:35 +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