Commit Graph
82 Commits
Author SHA1 Message Date
Hans Bakker 339103a0ba issue https://issues.apache.org/jira/browse/OFBIZ-4194: reorder of product images and extension of the <@ofbizcontenturl macro. A contribution of Antwebsystems employee Tukkata
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1076507 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03 02:52:31 +00:00
Hans Bakker 034f45c272 Image management: make image file location and url configurable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1071878 13f79535-47bb-0310-9956-ffa450edef68
2011-02-18 04:12:43 +00:00
Hans Bakker 601d571079 several enhancements on the product image management system including adding the proper permissions to the fulladmin security group to be able to approve images
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1067073 13f79535-47bb-0310-9956-ffa450edef68
2011-02-04 03:21:17 +00:00
Ashish Vijaywargiya 2a44268261 Bug fix. Changed the year of expiration in demo data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1065550 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 10:49:35 +00:00
Hans Bakker f982ac8e17 add a popular categories section to the ecommerce frontpage which is generated from the data warehouse of real orders. Also adjusted the sales reports from the data warehouse by week/month/year. Demo data included is for display only
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1055774 13f79535-47bb-0310-9956-ffa450edef68
2011-01-06 07:37:45 +00:00
Hans Bakker 02ab5da288 also add alternative packaging on non variant products and include demo data for that
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1052458 13f79535-47bb-0310-9956-ffa450edef68
2010-12-24 06:53:27 +00:00
Hans Bakker 0eb6c5f372 several improvements and completion of the email contactlist subscribe and unsubscribe functions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1052447 13f79535-47bb-0310-9956-ffa450edef68
2010-12-24 04:37:20 +00:00
Hans Bakker 8423bb4ed8 add demo product which is ordered when it is sold
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1051018 13f79535-47bb-0310-9956-ffa450edef68
2010-12-20 08:32:37 +00:00
Jacques Le Roux c008c6ccb3 Merges the jQuery branch back to the trunk
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1044503 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 20:40:08 +00:00
Hans Bakker 8c3ebac579 change all @yahoo.com to @example.com Suggestion from Scott
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1040914 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 09:38:00 +00:00
Hans Bakker c897f8d9d6 allow single pieces and boxes with a numkber of pieces share the same inventory location but can however be sold at optionally different prices. More explanation will be given in the new feature list of december 2010. Contribution of tukkata.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1040908 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 09:26:47 +00:00
Scott Gray 0bcec4f14b OFBIZ_FILE dataResourceType doesn't resolve component style locations, using LOCAL_FILE instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@996055 13f79535-47bb-0310-9956-ffa450edef68
2010-09-11 03:33:53 +00:00
Ashish Vijaywargiya 606a6e6837 Applied patch from jira issue - OFBIZ-3924 - Bug on creating Communication event for order return emails(return accept, return complete and return cancel).
Bug on creating Communication event for order return emails(return accept, return complete and return cancel). Attached return pdf along with return emails.

Thanks Anurag for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@993387 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 15:03:20 +00:00
Jacques Le Roux 5bf4e22865 Fix a bug reported in this thread http://markmail.org/message/2f6ryfm6fvvrvx74
"Cost calculation is still broken and no shipping costs are returned."

Note that nothing still is calculated for Fedex. I'm not quite sure if it's related, but Fedex has changed/is changing how things work. The API is deprecated, replaced by web services and will be totally unusable in May 2012

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@985856 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 10:14:45 +00:00
Scott Gray b894e3ec1f Removed references to a service provider's company name from the project
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@960405 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 21:50:21 +00:00
Ashish Vijaywargiya 8635812742 Reverting my commit r938446 based on the comments received on mailing list. For now I am keeping old email address in place (i.e ofbiztest@yahoo.com) keeping in mind that email will not go in spam folder. If others think test@example.com will also behave same then please go ahead commit the changes.
Very soon I will revert my changes on release10.04 branch.
Thanks to everybody who has provided their comments!  

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@940814 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 11:57:35 +00:00
Ashish Vijaywargiya 783f38ef79 Changing email address ofbiztest@yahoo.com -> ofbiztesting@gmail.com - this was creating too much problem since long in development effort.
Following points were there in my mind before doing this change.

-- AFAIK ofbiztest@yahoo.com email doesn't exists.
-- Bounce email issue if you have enabled Javamail container. This drastically slow down your system performance. 
-- Now anyone can use ofbiztesting@gmail.com account settings for Sendmail, Javamail container etc.
-- Send mail service triggered again and again with failure message on console if any of the email not found bccAddress inside ProductStoreEmailSettings entity. Again slow speed of your development machine.
-- Please let me know where to share the password of this account? Dev list?


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@938446 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 13:17:45 +00:00
Ashish Vijaywargiya 48957724cd Applied patch from jira issue: OFBIZ-3633 - Minimum order quantity.
It will work as follows;
We will set the special type price as 'MINIMUM_ORDER_PRICE' for a Product in ProductPrice entity. On the basis of it we will get the minimum order quantity of the product on the basis of this price and sale price.
Will get the minimum order quantity for product by division. For example we have selling price of product P1 is $10.00 and its MINIMUM_ORDER_PRICE is $100.00 then minimum order quantity for the product will be --> 100/10 ==> 10.

To achieve the above ;
write a getMinimumOrderQuantity() method in ShoppingCart.java which takes the itemBasePrice and productId as in parameter, and call it where we add, update the cart items and change the quantity to minmumOrderQuantity if it is less then minimum.

Thanks Deepak & Rishi for the contribution and others for providing valuable comments / suggestions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@936228 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 09:36:40 +00:00
Ashish Vijaywargiya 584df31323 Applied patch from jira issue - OFBIZ-3635 - Contact list unsubscription email notification.
Thanks Chandan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@930842 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 11:25:08 +00:00
Jacopo Cappellato a9f16533d3 Implemented first version of FIFO and LIFO costing methods in accounting:
1) added new fields to InventoryItem/InventoryItemDetail to keep track of the units posted to INVENTORY accounts according to the costing methods in use
2)  added new field to AcctgTransEntry to keep track of the inventoryItemId that was used to get the cost according to LIFO/FIFO etc... strategy
3) modified existing demo data to support the new costing strategies; enabled by default the LIFO strategy for Company accounting (it was average cost before)
4) code that implements LIFO/FIFO for inventory receipts and sales shipments


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@926090 13f79535-47bb-0310-9956-ffa450edef68
2010-03-22 14:02:46 +00:00
Ashish Vijaywargiya e71921f775 Moving data to appropriate location. I don't know much about the original thought of keeping this data in ProductTypeData.xml file and considering that it was done mistakenly.
If anyone else think otherwise then please comment.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@910174 13f79535-47bb-0310-9956-ffa450edef68
2010-02-15 08:15:24 +00:00
Ashish Vijaywargiya 4154f7c98e Adding missing demo data for WebAnalyticsConfig entity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@898293 13f79535-47bb-0310-9956-ffa450edef68
2010-01-12 11:56:53 +00:00
Jacopo Cappellato 0f25a9cacb Added example of cost component calc entry associated to a finished product to compute general overhead costs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@892911 13f79535-47bb-0310-9956-ffa450edef68
2009-12-21 18:14:09 +00:00
Adrian Crum 3c12bf8de4 Fixed a bug in the demo data that was causing a primary key violation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@888941 13f79535-47bb-0310-9956-ffa450edef68
2009-12-09 20:10:51 +00:00
Jacopo Cappellato 5730cb0915 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/specialpurpose@885256 13f79535-47bb-0310-9956-ffa450edef68
2009-11-29 18:32:31 +00:00
Ashish Vijaywargiya 899afdcbb8 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/specialpurpose@884869 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 13:32:01 +00:00
Jacques Le Roux 345dc5fec8 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/specialpurpose@884546 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 13:12:35 +00:00
Jacopo Cappellato 7dca64921c 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/specialpurpose@883457 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:42:56 +00:00
Jacopo Cappellato 81848c64da 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/specialpurpose@883445 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:18:01 +00:00
Scott Gray 3a52eda35d Added missing PaymentGatewayResponse record for the authorization on DEMO10090
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@881226 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 10:23:20 +00:00
Scott Gray 9196c2d4ad 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/specialpurpose@881081 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 01:22:52 +00:00
Scott Gray 5b0008a019 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/specialpurpose@880984 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 21:56:59 +00:00
Ashish Vijaywargiya b3bad1e4b3 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/specialpurpose@834479 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 14:32:53 +00:00
Ashish Vijaywargiya 43bbd13e94 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/specialpurpose@834042 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 12:53:03 +00:00
Ashish Vijaywargiya e1c675c215 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/specialpurpose@833054 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 14:55:15 +00:00
Jacques Le Roux a1cd779b69 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/specialpurpose@829376 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 14:28:13 +00:00
Scott Gray 8dbce2d3b8 Add some missing demo shipment data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@826348 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 02:30:00 +00:00
Ashish Vijaywargiya 07092df1f6 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/specialpurpose@823849 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 13:07:50 +00:00
Scott Gray a93abcc382 Remove a duplicated demo OrderStatus record
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@822251 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 12:44:30 +00:00
Ashish Vijaywargiya ee30fdc99d 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/specialpurpose@820204 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 08:03:27 +00:00
Jacques Le Roux 09ba8f623f Fix a bug reported by Evan Fowler on user ML
Looking under WebStore' CMS in admin's Content/WebSites tabs, the browser seems to crash when trying to run the scripts to load the CMS. The exact error, when testing it in both Firefox and Safari, show a script that has stopped responding and the CMS trees fail to load and display.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@818150 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 16:02:03 +00:00
Ashish Vijaywargiya db75ec2e9d 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/specialpurpose@813464 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 14:52:07 +00:00
Jacques Le Roux c3665dc60f It's better without it, and anyway should have been English (my bad, for years now :o)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@812955 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 13:38:06 +00:00
Ashish Vijaywargiya cc10f24b36 Improved the eBay code for OrderImport - as it was broken due to missing ShipmentMethodType values.
Now I am able to import order successfully in ebay component.
Thanks Jacopo for discussing things with me in this Ebay component(like workflow and many more) and providing useful notes in achieving the goals.
My previous contribution in Ebay area was based on Jacopo's notes - more to come in a day or so.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@812777 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 05:24:43 +00:00
Ashish Vijaywargiya 9aa6627c3a 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/specialpurpose@809552 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:06:14 +00:00
Ashish Vijaywargiya 8edff1f6d6 By default this data will remain commented.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@807094 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 06:16:30 +00:00
Ashish Vijaywargiya 64655ce147 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/specialpurpose@806643 13f79535-47bb-0310-9956-ffa450edef68
2009-08-21 17:00:55 +00:00
Ashish Vijaywargiya eabb945069 Sample data that contains a SO and PO in completed status along with their Accounting entries for shipment, Invoice and Payment.
Thanks Surya & Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@804975 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 13:17:02 +00:00
Hans Bakker ff91c46026 several adjustments to the help system, now using contentId to select and use underscore in contentId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@804881 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 07:15:41 +00:00
Hans Bakker dc65f9bba2 add the possibility of adding sales tax to an invoice using the same functions as is used for an order. moved most tax demo data from ecommerce to accounting. fixed product entry on an invoiceitem
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@804105 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 07:43:30 +00:00