Commit Graph
157 Commits
Author SHA1 Message Date
Taher A. Alkhateeb ac3b7c14da Fixed: Remove all dependencies from OFBiz framework to plugins
(OFBIZ-9322)
   
This is related to commit r1793170 from ofbiz-trunk where data is moved from
ecommerce to accounting and party components.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1793171 13f79535-47bb-0310-9956-ffa450edef68
2017-04-29 07:09:20 +00:00
Taher A. Alkhateeb bdea0f6740 Implemented: Remove dependencies from OFBiz framework to plugins
(OFBIZ-9322)

This is related to a commit in ofbiz-framework r1792866 in which data 
that is removed in here is added to the framework. There is one modification
to the DemoPurchasing.xml file in which we added a UserLoginSecurityGroup which
is moved from DemoOrderPeopleData.xml because it has dependencies on security
data in ecommerce. Other than that, all data is simply deleted.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1792867 13f79535-47bb-0310-9956-ffa450edef68
2017-04-27 11:40:59 +00:00
Jacques Le Roux b6a23201c9 Improved: Demo data for serialized and non-serialised product
(OFBIZ-7766)

Currently, InventoryItemTypeId attribute is empty for all Product entity's demo 
data. In real cases, there are products that are purely serialised 
(like equipments) or purely non-serialised (like liquid). 

Thanks: James Yong

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1775989 13f79535-47bb-0310-9956-ffa450edef68
2016-12-24 19:53:51 +00:00
Jacques Le Roux 3e4ba02b0b Improved: demo data cleanup
(OFBIZ-8623)

There was a duplicate entry for product
specialpurpose/ecommerce/data/DemoRentalProduct.xml

Thanks: Wai for report and patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1766663 13f79535-47bb-0310-9956-ffa450edef68
2016-10-26 10:55:09 +00:00
Mridul Pathak d50b5b7c6f [OFBIZ-7902] Remove system generated fields from data files of ecommerce component. Thanks Suraj Khurana for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1755304 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:08:28 +00:00
Jacques Le Roux ec538f6f01 A patch from Florian Montalbano for "Improve the Marketing Demo data" https://issues.apache.org/jira/browse/OFBIZ-7923
In the following issue : OFBIZ-7922, there was a problem with the pagination of the Marketing Campaign list. Because there is not enough data in the demo, it was more difficult to find this bug.
To help the testing of this component, this adds some Marketing Campaign in the demo data (at least enough to unlock a second page of search).

jleroux: Actually you don't even have to add more data. The size of the list is defined by this property in widget.properties

# Default number of items to be displayed per page in a list form
widget.form.defaultViewSize=20

Locally you can change that by hand, clear caches, et voilà. 

Now if we would like to have the same on demos we would need to have this property in the DB and use EntityUtilProperties.getPropertyNumber() to retrieve where it's done at the moment. Unfortunately EntityUtilProperties.getPropertyNumber() simply uses for the moment UtilProperties.getPropertyNumber() so it means more work than adding those data. But once done, it's for all (though you would still have to replace the calls where UtilProperties is used instead of EntityUtilProperties. I don't remember if we have an umbrella task ans subtasks for that. It seems though a long term work, because we have much properties likely to benefit from this possibility.

Another KISS option: maybe simply testing locally is sufficient ;)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1754657 13f79535-47bb-0310-9956-ffa450edef68
2016-07-31 12:18:16 +00:00
Nicolas Malin c2bd2a7f11 Create demo PartyStatus data for existing parties for special purpose component, thanks to Suraj Khurana for the submission through OFBIZ-7672
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1753795 13f79535-47bb-0310-9956-ffa450edef68
2016-07-22 14:10:14 +00:00
Mridul Pathak 4c874ff77e [OFBIZ-7008] Support to add condition for Geo Location in Promo Engine. Adding back the code reverted in r1739637 as the tests were failing. Thanks Vishal Chhabria for providing the updated patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1748186 13f79535-47bb-0310-9956-ffa450edef68
2016-06-13 12:02:27 +00:00
Deepak Dixit 05df1480b4 (OFBIZ-7021) Corrected path for Content.ftl in DemoContent.xml file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1746097 13f79535-47bb-0310-9956-ffa450edef68
2016-05-30 08:58:30 +00:00
Jacques Le Roux 289fc3f589 Implements "Use only HTTPS in OFBiz" - https://issues.apache.org/jira/browse/OFBIZ-6849
All tests passes and the normal use of OFBiz seems to work

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1745525 13f79535-47bb-0310-9956-ffa450edef68
2016-05-25 18:02:23 +00:00
Deepak Dixit 583f209423 (OFBIZ-7021) Renamed and moved data template to correct location for ecommerce component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1745483 13f79535-47bb-0310-9956-ffa450edef68
2016-05-25 13:31:26 +00:00
Deepak Dixit 374449d47e (OFBIZ-7021) Renamed specialpurpose ecommerce component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1744942 13f79535-47bb-0310-9956-ffa450edef68
2016-05-21 13:43:11 +00:00
Deepak Dixit bf1908152b (OFBIZ-7021) Renamed content component ftl file name from lower case to upper case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1742457 13f79535-47bb-0310-9956-ffa450edef68
2016-05-05 18:11:54 +00:00
Jacques Le Roux bfa06e0065 Things got totally wrong with r1742196 which contained much more than expected.
This reverts things which should not have been committed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1742197 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 21:03:11 +00:00
Jacques Le Roux becdb02a08 "Continue the work on the form widget grid element" - https://issues.apache.org/jira/browse/OFBIZ-7029
Completes in screens the changes done in forms at r1741873. I then replaced few form lists by grids, where it was possible to do it with regexp.
Also complete StatsForms.xml to use only grids and "searchList" form in ecommerce ContentForms to NOT use grid (not called in screen)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1742196 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 20:50:10 +00:00
Deepak Dixit 6d65904ec1 (OFBIZ-6821) relocate .ftl files in the specialpurpose/ecommerce component
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1740485 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 11:42:03 +00:00
Deepak Dixit a29b597838 (OFBIZ-6811) Renamed ecommerce/templates to ecommerce/tempalte to make it consistent.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1740483 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 11:22:42 +00:00
Michael Brohl f71d844c94 Applied patch for OFBIZ-6793: Have configuration options for the ecommerce component.
Thanks Pierre Smits for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1739982 13f79535-47bb-0310-9956-ffa450edef68
2016-04-19 18:52:41 +00:00
Mridul Pathak 84a61bef83 Reverting r1739457 as tests does not pass.
[OFBIZ-7008] Support to add condition for Geo Location in Promo Engine.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1739637 13f79535-47bb-0310-9956-ffa450edef68
2016-04-17 19:07:21 +00:00
Mridul Pathak 768622529a [OFBIZ-7008] Support to add condition for Geo Location in Promo Engine. Thanks Vishal Chhabria for contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1739457 13f79535-47bb-0310-9956-ffa450edef68
2016-04-16 13:25:59 +00:00
Jacques Le Roux e5bd917be1 Fixes "Failed to load contentForum.css" - https://issues.apache.org/jira/browse/OFBIZ-6956
Got the following error when accessing ecommerce main page
"NetworkError: 404 Not Found - https://127.0.0.1:8443/contentimages/contentForum.css"

jleroux: contentimages webapp path was wrongly used there instead of simply content. I replaced all occurrences


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1736628 13f79535-47bb-0310-9956-ffa450edef68
2016-03-25 18:02:16 +00:00
Jacques Le Roux 23d9786ef9 A patch from Amit Gadaley for "Exclusion of Manufacturing components leads to load errors" https://issues.apache.org/jira/browse/OFBIZ-6757
Pierre Smits: When loading data into OFBiz without the manufacturing component the process ends unsuccessful.

Deepak: Entity related error should be fixed under OFBIZ-6760, apart from it there are dependency of ecommerce demo data on manufacturing demo data. 

jleroux: Duplicating those data (present in Manufacturing) into ecommerce is indeed a smart solution. If they are already loaded (like OOTB) they will not be loaded twice. If they are not there they will be loaded. 
Conclusion: sometimes duplication is smart (especially with OFBiz data) and this is a good way to introduce independency between components...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1731665 13f79535-47bb-0310-9956-ffa450edef68
2016-02-22 15:49:05 +00:00
Ashish Vijaywargiya abbae0ecb6 Applied patch from OFBIZ-6777 - Product weight field enhancements
================================
There are three sets of dimensions in the Product entity.
(productHeight, shippingHeight), (productWidth, shippingWidth), (productDepth, shippingDepth) but in case of weight, there is another set of dimension field weight and productWeight which are inconsistent in nature.
Fix this thing and correct all instances of this in the framework.
=================================
Thanks Suraj for reporting the issue and providing the patch for the same. Thanks Jacopo and Pierre for discussing the issue with Suraj.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1720900 13f79535-47bb-0310-9956-ffa450edef68
2015-12-19 11:32:08 +00:00
Arun Patidar da04c7ce72 [OFBIZ-6171] Applied patch from Pierre Smits for replacing 'Open for Business' references with 'Apache OFBiz'.Thanks Pierre for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1706589 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 14:15:21 +00:00
Pranay Pandey 8c58b8ab65 Updating agreementTermId (<10000) for AgreementTerm in demo data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1687448 13f79535-47bb-0310-9956-ffa450edef68
2015-06-25 08:52:21 +00:00
Jacques Le Roux 9675ca8673 We have the same now in OrderQuoteDemoData.xml.
It would be better if we have most of the demo product data in product or maybe in order component. Because almost all what can be done concerning ordering in ecommerce can also be done in order manager from which anyway ecommerce depends on

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1662093 13f79535-47bb-0310-9956-ffa450edef68
2015-02-24 20:14:20 +00:00
Jacques Le Roux 7384aaf3d4 This reapplies r1519245: The path /content/images/ was used in some places (only for contentForum.css it seems) but no mount point was associated, here is a fix
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1658621 13f79535-47bb-0310-9956-ffa450edef68
2015-02-10 06:04:39 +00:00
Jacques Le Roux bf170f843a Reverts r1652814, it makes a number of tests to fail
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1652923 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 06:43:25 +00:00
Jacques Le Roux 5cc43c7179 "Gift card reload service not working OOTB" https://issues.apache.org/jira/browse/OFBIZ-5914
Introduces inventory data for GC-002 to have the amount field showing at ecommerce/gift-card-reload-GC-002-p. This field depends on ProductFacility.lastInventoryCount column

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1652814 13f79535-47bb-0310-9956-ffa450edef68
2015-01-18 17:41:13 +00:00
Jacopo Cappellato f5556274fc OFBIZ-5896 This commits fixes a regression I introduced with rev. 1635232 (this actually reverts that commit) and provides a different and better fix for the error affecting the "Did you know?" screenlet.
ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod was not using the passed contentId in condition list, and also was not using the ContentAssocDataResourceViewFrom/To view entity to get the result. Thanks to Deepak Dixit for the patch.
Misc minor cleanups (removed commented out code) and some small formatting fixes.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1643061 13f79535-47bb-0310-9956-ffa450edef68
2014-12-03 07:17:12 +00:00
Ashish Vijaywargiya b706afcf04 Applied patch from jira issue - OFBIZ-5890 - There is incomplete set of ShipmentMethodType and CarrierShipmentMethod data. Also carrierServiceCode is not present for all CarrierShipmentMethod records.
======================================================
There is incomplete set of ShipmentMethodType an CarrierShipmentMethod data. Also carrierServiceCode is not present for all CarrierShipmentMethod records.

Add all shiiping options along with carrierServiceCode for carriers FEDEX, UPS, USPS and DHL.
======================================================
Thanks Arun for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1642413 13f79535-47bb-0310-9956-ffa450edef68
2014-11-29 10:20:25 +00:00
Jacopo Cappellato 92bc7d9bc3 Fixes for the "Did you know?" screenlet in ecommerce that was throwing errors after Scott's recent fix to a content related method (the fix has exposed the data issues).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1635232 13f79535-47bb-0310-9956-ffa450edef68
2014-10-29 18:02:51 +00:00
Ashish Vijaywargiya 484d5dbbde Applied patch from jira issue - OFBIZ-1524 - Improve the way CreditCard.cardType field is managed.
Thanks Akash Jain for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1626425 13f79535-47bb-0310-9956-ffa450edef68
2014-09-20 12:16:37 +00:00
Jacques Le Roux c442295b2c Introduces few VAT data, to be used later (coming)
Introduces PartyClientTaxId which is mandatory in some country (France for instance: http://vosdroits.service-public.fr/professionnels-entreprises/F31808.xhtml)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1614555 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 06:18:42 +00:00
Jacques Le Roux 41fe4811d9 A (slightly modified) patch from Yvan Cauchy for "Trigger for service to run upon subscription expiry" https://issues.apache.org/jira/browse/OFBIZ-5333
We are also proposing to add the following fields:

    ProductSubscriptionResource.gracePeriodOnExpiry
    ProductSubscriptionResource.gracePeriodOnExpiryUomId
    Subscription.gracePeriodOnExpiry
    Subscription.gracePeriodOnExpiryUomId

This will allow the runServiceOnSubscriptionExpiry to trigger the service in SubscriptionResource.serviceNameOnExpiry only after

nowTimeStamp >= Subscription.thruDate + Subscription.gracePeriodOnExpiry.

This provides flexibility in managing the triggering of the deprovisioning service, similar to the flexibility in automatic subscription extensions enabled by Subscription.canclAutmExtTime for runSubscriptionAutoReorders. 

jleroux: 
I replaced tabs by spaces
Will commit the change in serviceResult.ftl apart
Slightly reformatted SubscriptionServices.runServiceOnSubscriptionExpiry()
Slightly reformatted and added comment in services_subscription.xml for the 2 new services


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1597235 13f79535-47bb-0310-9956-ffa450edef68
2014-05-24 04:37:16 +00:00
Jacques Le Roux cb518c8b3d Comment on how to create a SALES_AGREEMENT
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1585685 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 11:25:22 +00:00
Jacques Le Roux 4fb20b5faf Adds a new AGR_SALES SALES_AGREEMENT between the Company party and the DemoCustomer party (in the role of CUSTOMER).
This comes handy when testing sale orders agreements in order manager. Note that it changes the price of GZ-1000 product to USD$10

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1585679 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 10:35:12 +00:00
Jacques Le Roux 26739445a0 Closes https://issues.apache.org/jira/browse/OFBIZ-5521 as not a problem
It was my bad, I was simply stupid on this, reverts r1519245


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1562767 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 10:33:26 +00:00
Jacques Le Roux aea1a88d8c This should fix the tests (reported by Hans on dev ML)
In r1538162, I used an already possessed inventoryItemId

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1539690 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 15:45:06 +00:00
Jacques Le Roux 136d1e4ef3 I could not resist to add the ASL2 license :)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1538162 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 09:53:34 +00:00
Jacques Le Roux 5bc1c70d79 The path /content/images/ was used in some places (only for contentForum.css it seems) but no mount point was associated, here is a fix
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1519245 13f79535-47bb-0310-9956-ffa450edef68
2013-09-01 08:18:47 +00:00
Jacques Le Roux 4967140110 This should fix https://issues.apache.org/jira/browse/OFBIZ-2574 "Not possible to show the shipment information (packaging slip) in the purchase order approvement screen"
See Purchase Order #DEMO10090 in the Order Managaer application, where the order are to be approved.

Try to click on the link; 
Shipments    Nbr 9998  Packing Slip 

----------------------------------------------
Then the following error is shown:
----------------------------------------------------------
The Following Errors Occurred:

Problems with the response writer/output stream: org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen [component://product/widget/facility/ShipmentScreens.xml#PackingSlip.fo]: java.lang.IllegalArgumentException: Operator must be EQUALS or NOT_EQUAL when right/rhs argument is NULL (Operator must be EQUALS or NOT_EQUAL when right/rhs argument is NULL )
-----------------------------------------------------------

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1512376 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 16:19:16 +00:00
Hans Bakker 0a4255df2c update junit test related to r1505303 , reported by Jacopo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1505645 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 09:56:57 +00:00
Hans Bakker 55e0fd94b8 remove not existing fields in demo data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1485975 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 08:50:51 +00:00
Scott Gray 5243297b54 Moved ebay demo data from ecommerce to the ebay component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1422684 13f79535-47bb-0310-9956-ffa450edef68
2012-12-16 20:37:46 +00:00
Jacques Le Roux be731f9439 A slightly modified patch from Nicolas Malin "change serviceName by customMethod on Content " https://issues.apache.org/jira/browse/OFBIZ-5020
When you used a content as template, the content.serviceName value used to call the context populate service before rendering.
I propose to replace serviceName field by customMethodId and use customMethod pattern for more flexibility.
serviceName field is kept for backward compatibility

Thanks to Scott and Adrian for support


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1379937 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 09:46:20 +00:00
Jacques Le Roux 1eb308773e A patch from Sumit Pandit for "Order view page - picking slip is throwing exception." https://issues.apache.org/jira/browse/OFBIZ-2810
At https://localhost:8443/ordermgr/control/orderview?orderId=DEMO10091 , In shipping panel at shipment row when click on "Packing Slip" it is throwing an exception in rendering the PDF.

Vikas: This is related to the demo order data for purchase order which is not set up correctly. For more information please refer to OFBIZ-1782
Sumit: Found an issue with demo data.
How to verify -
    Go to order detail page -
    https://localhost:8443/ordermgr/control/orderview?orderId=DEMO10091

    Then in shipment information section click on "Packing Slip" -
    https://localhost:8443/facility/control/PackingSlip.pdf?shipmentId=9999&externalLoginKey=EL564429820623

    Issue cause -
    Missing created date in Data.

    Resolution -
    Find patch in attachment.

jleroux: I crossed this recently and thought that the button should not show until packed. But it was rather coded to show "ERROR: No packages found for this shipment" in the PDF. I think it would be better to not show the button, but it's ok with me.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1364052 13f79535-47bb-0310-9956-ffa450edef68
2012-07-21 09:06:03 +00:00
Hans Bakker 4760bea839 Add a find/approve/reject function for product reviews
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1359479 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 04:53:20 +00:00
Hans Bakker 96d7c6ae2f add account activation email type to product store which can be used for the to be approved registrations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1341341 13f79535-47bb-0310-9956-ffa450edef68
2012-05-22 08:03:02 +00:00
Jacques Le Roux 3e364b2048 Adrian suggested to removes all class="tabletext": <<That style was removed from the stylesheet in 2007. All references to it should be removed.>>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1340386 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 09:35:12 +00:00