Commit Graph
27 Commits
Author SHA1 Message Date
James Yong ca5e6b45f1 Improved: Apply multi-block attr to each application (OFBIZ-11706)
For remaining plugin applications.
2020-05-16 13:37:43 +08:00
James Yong a802ae0a02 Improved: Apply multi-block attr to each application (OFBIZ-11706)
For eCommerce application.
2020-05-16 12:31:24 +08:00
Pawan Verma 9a33a3cc1e Implemented: Improve add to compare screen with latest bootstrap framework
(OFBIZ-10968)

Thanks, Nitish Mishra for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1867662 13f79535-47bb-0310-9956-ffa450edef68
2019-09-28 10:14:24 +00:00
Deepak Dixit 44a7af62ed Improved: Improve ecommerce main-decorator
(OFBIZ-10790)
Added two new section in ecommerce main-decorator, now we don't need to pass right/left bar screen name, instead we can include it directly in decoratot-section.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1851135 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 06:15:17 +00:00
Deepak Dixit b3d7080811 Improved: Update markup of Checkout page according to standard markup given by Bootstrap v4.0.s (OFBIZ-10105)
Thanks Mayank for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822389 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 11:16:45 +00:00
Deepak Dixit b3efcef195 Improved: Update markup of Quick Checkout Page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10136)
Thanks Mayank Lambhate for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1821051 13f79535-47bb-0310-9956-ffa450edef68
2018-01-13 08:49:54 +00:00
Deepak Dixit 2e8d588be8 Fixed: Stack trace on E-commerce Home page (OFBIZ-9652)
Updated common template path as now these common template moved to common-theme component.
Thanks Devanshu for your contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1806291 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 12:21:11 +00:00
Jacques Le Roux 4deae05a38 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux a98ac13d9d Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux b20816bfa8 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Deepak Dixit dac494ac6a (OFBIZ-7237) Relocate .groovy files in the specialpurpose/ecommerce component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747786 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 19:35:12 +00:00
Deepak Dixit 840949dfc2 (OFBIZ-7227) Relocate .groovy files in the order component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747769 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 18:36:39 +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 dd5cf2fe5f (OFBIZ-7021) Renamed framework common 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@1744783 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 18:52:54 +00:00
Deepak Dixit 27fb7a69cf (OFBIZ-7021) Renamed order component ftl file name from lower case to upper case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1743881 13f79535-47bb-0310-9956-ffa450edef68
2016-05-15 06:06:11 +00:00
Deepak Dixit b4f65d473b (OFBIZ-6823) relocate .ftl files in the framework/common component
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1740497 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 12:28:46 +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
Jacques Le Roux 95aff0a67d Just stumbled upon it by chance, these changes needed in ecommerce were missing in r1736868 for OFBIZ-6819 (order)
I will double-check all screens changes kept in r1737557 (ie initially committed for subtasks 25 to 32 of OFBIZ-6810) 
From 1st investigation I believe there are no others (at least dependency in specialpurpose from applications, I did not check specialpurpose interdependencies yet...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737608 13f79535-47bb-0310-9956-ffa450edef68
2016-04-03 21:40:33 +00:00
Jacques Le Roux bb041ec5de Fixes "Error on the Split Payment button from the Quick Finalize Order screen" https://issues.apache.org/jira/browse/OFBIZ-6743
Error in trunk:
ERROR rendering error page [/error/error.jsp], but here is the error text: org.ofbiz.webapp.control.RequestHandlerException: No definition found for view with name [checkoutpayment]
Error in stable and old:
org.ofbiz.webapp.control.RequestHandlerException: No definition found for view with name [checkoutpayment]

Vyom Jain added a comment - 22/Nov/15 07:50
This is an issue even in 09.04 and 10.04 code, so it has been there for sometime now.

Scott Gray added a comment - 03/Jan/16 05:43
The view-map was moved to ecommerce in r544053. Probably because the view-map wasn't referenced in the controller.xml for ordermgr. It is actually used though as a view override in component://order/webapp/ordermgr/entry/checkoutoptions.ftl
Just needs to be restored in the controller and have the screen moved back.

jleroux: So I moved back from ecommerce to order (with few adaptations)
* the checkoutpayment.ftl file 
* the order controller view-map
* the screen name checkoutpayment

I tested in both order and ecommerce, works! I will try to backport, let's see...



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1726828 13f79535-47bb-0310-9956-ffa450edef68
2016-01-26 15:43:17 +00:00
Jacques Le Roux 62d9027b13 Since we removed the specialpurpose components (but ecommerce), there was an issue with ordermgr js scripts.
The problem was double. It'd have been easy to add the missing "/js:" patch in allowedPaths in the web.xml of birt component from where the js scripts are now expected to be loaded in trunk.
But then you would need to also copy the js scripst there (in birt component). You could not simply move them because for upcoming branches we also need them in ordermgr component (they were there in images/js) else they would miss again.

This commit rather adds them under a simple ordermgr-js new webapp (simple, ie like framework/images, only to load resources) under commonext: applications/commonext/webapp/ordermgr-js to prevent the duplication maintenance hazards.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1612202 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 07:32:10 +00:00
Jacques Le Roux fbf9f8d1a8 A patch from Ankit Jain "Split Into Multiple Shipment Button is not working in Order Manager quick checkout" https://issues.apache.org/jira/browse/OFBIZ-4866
Split Into Multiple Shipment Button is not working on quick checkout page


jleroux: part the current known issue with Freemarker and findByAnd(), it works well on both sides (Order Manager and eCommerce)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1340415 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 11:13:38 +00:00
Jacques Le Roux 85c8c26c5a A patch from Kiran Gawde "OnePageCheckout doesn't create purchase order for dropShip product" https://issues.apache.org/jira/browse/OFBIZ-4458
Select a item from drop ship supplier.
Perform one page checkout.

Issue: Purchase order for drop ship supplier is not created


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1304567 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 19:34:31 +00:00
Sascha Rodekamp 63ea540270 OnePageCheckout should reuse UpdateCart while first time rendering (https://issues.apache.org/jira/browse/OFBIZ-4436) A patch from Kiran Gawde which reuses the UpdateCart Screen in the OnePageCheckout to avoid code duplication.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1173975 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 07:35:09 +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
Ashish Vijaywargiya 69a6dc4b88 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/specialpurpose@833026 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 10:08:35 +00:00
Jacques Le Roux 97bb3073c9 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/specialpurpose@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
David E. Jones 87b44cef4a 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/specialpurpose@754529 13f79535-47bb-0310-9956-ffa450edef68
2009-03-14 21:32:16 +00:00