Commit Graph
27 Commits
Author SHA1 Message Date
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 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
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
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
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
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
Ashish Vijaywargiya c9bb3989f8 Demo Data for Ebay - if we have configuration settings in advance then with the help of this data we can directly test product export to ebay.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813464 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 14:52:07 +00:00
Ashish Vijaywargiya 6dc9720309 Another update on Google Base.
Following things are done in this commit:

1) Added new entity GoogleBaseConfig and reading the values from there. Also kept option to read configuration values from property file.
2) Added new ProductCategoryType record for Google Base - Thanks Jacopo for your suggestion on this.
3) Prepared data for demo purpose in DemoProduct.xml file - This demo contains the association of few product with Google Category.
4) Also prepared demo data for GoogleBaseConfig entity.
5) Provided option to have default value of webSiteUrl on the GoogleExport form - for this refer productsExportToGoogle.groovy file.

Thanks Pranay for discussing few things with me in b/w this phase of development.

In next Commit I will provide UI for GoogleBaseConfig entity(CRUD operations) so it will be easy for end user to update values in this entity easily instead of moving to webtools and do the needful.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809552 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:06:14 +00:00
Ashish Vijaywargiya cefbaaa7c9 By default this data will remain commented.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@807094 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 06:16:30 +00:00
Ashish Vijaywargiya 092e8d40c8 First pass on Orbital Gateway: http://download.chasepaymentech.com/
Following things are covered in this implementation: 

1) Services written for ccAuth, ccAuthCapture, ccAuthRelease, ccAuthRefund, ccCapture.
2) Instead of property files we have kept commonly used values in the entity - for this created new entity - PaymentGatewayOrbital.
3) The initialisation of "Configurator"(which is a class that is being used for the initialisation of configuration settings - like user credentials and many more things). For now configurator takes only file by name "linehandler.properties". So I have created new files by this name. 
4) Also added demo data in ecommerce files so it can be used if someone want to use it for gateway purpose. 
5) For now we have excluded the compilation of this gateway - I will provide an end user document for this soon so anybody would be able to configure it easily.

This is collaborative effort from me and following guys.

Scott Gray: Discussed so many things with me in the b/w this implementation. There were some security settings issue with jdk installation - Scott helped me in that area.
Anil  Patel & Tim Ruppert: Initial implementation plan discussed with Anil and there were so many things that I had discussed with Anil & Tim in b/w. Thanks Tim for encouraging us to put this gateway on OFBiz trunk so it could be used by larger audience.
Mridul & Sumit: I have asked these guys to see the results / outcome of implementation and asked them to provide their comments/ thoughts. 

Thanks a lot guys for your help - it was simply awesome. 

Suggestions and comments are most welcome - I will wait for them.
Thank you!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@806643 13f79535-47bb-0310-9956-ffa450edef68
2009-08-21 17:00:55 +00:00
Scott Gray 4423593ef8 Initial implementation of the standard PayPal Express Checkout (i.e. not using Payflow Pro) OFBIZ-934
There are still a couple of issues preventing the checkout from being 100% functional:
1. I'm having trouble getting Instant Update API to work correctly which is used by PayPal to retrieve shipping estimates from OFBiz
2. The shipping option label and name parameters aren't working as documented and means I'm currently stuck presenting the shipping option id (partyId@shipmentMethodTypeId) to the user

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803151 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 15:20:32 +00:00
Scott Gray 89d209123f Add a re-auth payment setting for express checkout/paypal payments
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796662 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 10:45:42 +00:00
Joseph Eckard 125126b6db Changes to ShoppingCart & order entry to allow PO entry without requiring a ProductStore; updated seed data to remove productStoreId from the OrderEntry website
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795883 13f79535-47bb-0310-9956-ffa450edef68
2009-07-20 15:52:05 +00:00
Ashish Vijaywargiya 170aa8100a Adding more data to test role based permissions on catalog manager.
For testing this you can login by user ltdadmin & ltdadmin1.
And then can update records in consecutive tabs present in the EditProduct screen.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795728 13f79535-47bb-0310-9956-ffa450edef68
2009-07-20 09:40:55 +00:00
Scott Gray 3f2d963f91 Initial implementation of the Payflow Pro version of PayPal's Express Checkout OFBIZ-934
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@793866 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 11:43:21 +00:00
Vikas Mayur 0f1ffdf0f8 Added a field to ProductStore to specify Store Credit Account type (FIN_ACCOUNT or BILLING_ACCOUNT) for refund return. For Demo ProductStore it is default to Financial Account.
The work flow is based on following steps:
1) If for a return both finAccountId and billingAccountId are supplied, then preference goes to the setting on Product Store. A warning message is shown so that the 
   user know which account is used.
2) If a finAcccountId is supplied then first billing account with -ve amount are searched and if it is found then amount is credit to the billing account else it goes to 
   financial account.
3) If a billingAccountId is supplied then it is used to credit the refund amount.
4) If none of them is supplied, then preference again goes to the setting on Product Store.

Patch applied from Mridul Pathak, part of OFBIZ-2502 (https://issues.apache.org/jira/browse/OFBIZ-2502)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@781804 13f79535-47bb-0310-9956-ffa450edef68
2009-06-04 17:32:02 +00:00
Vikas Mayur 79fae570d0 Adding back the feature to show/hide out of stock products on site. This new implementation is configurable through a new field showOutOfStockProducts (by default equal to Y) on
ProductStore. A new field lastInventoryCount on ProductFacility is also added and it is a mirror of availableToPromiseTotal of a product at a certain point of time and is 
being updated every hour by a schedule service to reflect the current value of inventory count in the system.
If showOutOfStockProducts is equals to N and for a particular product lastInventoryCount is <= zero, then this particular product will not be shown on the site. If the inventory
count becomes +ve again then the product will be again available on the site, in minimum one hour time but could possibly take long depending on the inventory levels.

Patch from Ratnesh Upadhyay, part of OFBIZ-2480 (https://issues.apache.org/jira/browse/OFBIZ-2480).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778451 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 16:37:23 +00:00
Marco Risaliti 1353949a92 Integration of new RBS WorldPay Select Junior and support of new Payment Gateway Config entity (OFBIZ-2498)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777203 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 17:57:48 +00:00
David E. Jones 70f8da92bb Moved logo and icon images back to images component and removed from everywhere else; all references to these should be to there only now; fixes issue with logo in ecommerce and other little things
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766426 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 06:12:55 +00:00
Marco Risaliti 157b52c1d2 PayPal IPN use the new Payment Gateway Config features (OFBIZ-2286)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764327 13f79535-47bb-0310-9956-ffa450edef68
2009-04-12 21:11:42 +00:00
David E. Jones 298fbb94ef Fixed issue with data loading I caused when moving this record from the ecommerce component to the order component; reported on the ml by gil portenseigne
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764074 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 22:03:14 +00:00
David E. Jones bc073306e7 Added/moved some missing WebSite data needed for selecting themes, etc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763828 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 22:12:11 +00:00
Marco Risaliti a657adadf8 Move payment.properties to PaymentGatewayConfig entities (OFBIZ-2269)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763782 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 19:45:31 +00:00
Jacques Le Roux b9c3ddef08 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@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux a5042291f7 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@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
David E. Jones 80858bb5c1 Moved ecommerce from applications to specialpurpose, as discussed on the dev mailing list; component and build files updates, tested clean build/install/run
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754529 13f79535-47bb-0310-9956-ffa450edef68
2009-03-14 21:32:16 +00:00