This repository has been archived by the owner on May 9, 2020. It is now read-only.
Release12.04 #2
Open
Release12.04 #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
asfgit
pushed a commit
that referenced
this pull request
Oct 20, 2014
…duplicate logic and responsibilities between the start and base components. Before this change the following classloader hierarchy was setup: 1) the "application" classloader for the "start" component 2) one "native lib" classloader for the "base" component 3) one "native lib" classloader for the all the other (non "base") framework/application/specialpurpose/hot-deploy components 4) one "web app" classloader for each of the webapplications After this commit the hierarchy is simplified by merging #2 and #3: a) the "application" classloader for the "start" component b) one "native lib" classloader for the all the framework/application/specialpurpose/hot-deploy components (including the "base" component) c) one "web app" classloader for each of the webapplications This has been achieved by merging the code that was setting up classloader #2 in the start component (for the "base" component) with the code that was setting up the classloader #3 in the base component: now all the code is in the start component. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1633182 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1639863 | jleroux | 2014-11-15 13:14:37 +0100 (sam. 15 nov. 2014) | 3 lignes Following changes for "PortalPage entity definition wrong. ownerUserLoginId field must be id-vlong-ne" https://issues.apache.org/jira/browse/OFBIZ-5110 Fixes other cases as well ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639865 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1636493 | hansbak | 2014-11-04 03:39:56 +0100 (mar. 04 nov. 2014) | 1 ligne use of wrong field name: https://issues.apache.org/jira/browse/OFBIZ-5846 ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639870 13f79535-47bb-0310-9956-ffa450edef68
Applied patch from jira issue - OFBIZ-5766 - Error when adding/modifying a task to a Production Run - field type error. Thanks Guillaume Sigoigne for reporting the issue, Thanks Divesh for providing the patch for this issue. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639883 13f79535-47bb-0310-9956-ffa450edef68
==========================================================================
/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
script, has two methods wich do not follow the necessary method name pattern.
invoiceSequence-enforced
invoiceSequence-restart
As result, the log file contains the following errors:
UtilXml.java:1060:ERROR] XmlFileLoader: File file:/D:/Projects/OFBiz-12.04-AP/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml process error. Line: 77. Error message: cvc-pattern-valid: Value 'invoiceSequence-enforced' is not facet-valid with respect to pattern '[a-zA-Z_]{1}[a-zA-Z0-9_$.]+' for type 'javaClassName'.
UtilXml.java:1060:ERROR] XmlFileLoader: File file:/D:/Projects/OFBiz-12.04-AP/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml process error. Line: 77. Error message: cvc-attribute.3: The value 'invoiceSequence-enforced' of attribute 'method-name' on element 'simple-method' is not valid with respect to its type, 'javaClassName'.
etc.
==========================================================================
Thanks Sergei Biletnikov for reporting the issue, Thanks Pranay for providing the patch for this issue.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639888 13f79535-47bb-0310-9956-ffa450edef68
Applied patch from jira issue - OFBIZ-5470 - List Price gets reset to zero after updating default/base price of existing order items. Thanks Christian for reporting the issue and Thanks Arun for providing the patch for this issue. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639891 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1639873 | ashish | 2014-11-15 13:44:39 +0100 (sam. 15 nov. 2014) | 2 lignes Applied patch from jira issue - OFBIZ-4468 - After login it shows error 'Product not found!'. Thanks Kiran for reporting the issue, Thanks Akash for providing the patch for this issue. ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639911 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1639835 | ashish | 2014-11-15 06:28:30 +0100 (sam. 15 nov. 2014) | 2 lignes Applied patch from jira issue - OFBIZ-5416 - Sales order cart items already assigned to ship groups are incorrectly able to be modified to quantities/prices that break the ProductStoreShipmentMeth rules. Thanks Christian for reporting the issue and Thanks Arun for providing the patch. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639918 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1639840 | ashish | 2014-11-15 07:08:59 +0100 (sam. 15 nov. 2014) | 2 lignes Applied patch from jira issue - OFBIZ-5150 - reserveProductInventory method looses priority attribute in oisgir for non serialized and non requireInventory. Thanks Deepak Agarwal for reporting the issue and Thanks Arun for providing the patch. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639920 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1639841 | ashish | 2014-11-15 08:07:36 +0100 (sam. 15 nov. 2014) | 2 lignes Applied patch from jira issue - OFBIZ-904 - Error when "Inventory Facility Id" is left blank in product store settings. Thanks Michel for creating the issue and Thanks Arun Arun for providing the patch. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639922 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1639846 | ashish | 2014-11-15 09:57:13 +0100 (sam. 15 nov. 2014) | 2 lignes Applied patch from jira issue - OFBIZ-2567 - Entity VirtualProduct missing. Thanks Jan Valkovic for reporting the issue, Thanks Deepak for providing the patch for the same. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639924 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1629391 | adrianc | 2014-10-04 15:30:12 +0200 (sam. 04 oct. 2014) | 1 ligne Fixed a bug in GenericDelegator where stack traces were logged when a sequence name didn't match an entity name. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639932 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1639867 | ashish | 2014-11-15 13:19:44 +0100 (sam. 15 nov. 2014) | 2 lignes Applied patch from jira issue - OFBIZ-4362 - MapKey for CMS content cannot be updated. Thanks Manuela for reporting the bug, Thanks Deepak for providing the patch for this issue. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639934 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1639884 | ashish | 2014-11-15 14:57:48 +0100 (sam. 15 nov. 2014) | 2 lignes Applied patch from jira issue - OFBIZ-4655 - searchCategory is not available in results in keywordsearch.groovy Thanks Kiran for reporting the issue and thanks Deepak for providing the patch for this issue. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639935 13f79535-47bb-0310-9956-ffa450edef68
…y hand) ------------------------------------------------------------------------ r1618354 | ashish | 2014-08-16 15:12:34 +0200 (sam. 16 août 2014) | 1 ligne Applied patch from jira issue - OFBIZ-5455 - images not stored in SystemProperty location. Thanks Pierre for reporting the issue and thanks to ofbiz.us team for providing the fix. ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639938 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1639892 | ashish | 2014-11-15 15:22:21 +0100 (sam. 15 nov. 2014) | 2 lignes Applied patch from jira issue - OFBIZ-5551 - Cannot delete the record When Server Timezone and Application timeZone are different. Thanks SenthilMurugan for reporting the issue and thanks Deepak for providing the patch. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639939 13f79535-47bb-0310-9956-ffa450edef68
This reverts them git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639982 13f79535-47bb-0310-9956-ffa450edef68
This is related with the Poodle vulnerability which requires to use Java 1.7 Thanks to Nicolas Malin's patch for "Poodle-disable sslv3" https://issues.apache.org/jira/browse/OFBIZ-5848 Nicolas adapted the EntityTestSuite to work with Java 1.7 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639986 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1639887 | jleroux | 2014-11-15 15:06:50 +0100 (sam. 15 nov. 2014) | 3 lignes OFBIZ-5822 - Uses a tempTemplateContext instead of templateContext which is used later in the method, thanks to Scott's post on dev ML I will wait to commit the last changes for the Poodle vulnerability in release branches (for running tests with Java 1.7) before backporting, because I used the "new" diamond operator here (1st in OFBiz it seems) ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1639988 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1640288 | jleroux | 2014-11-18 10:20:38 +0100 (mar. 18 nov. 2014) | 9 lignes Updates embedded Tomcat to 7.0.57 - https://issues.apache.org/jira/browse/OFBIZ-5881 Notably related to OFBIZ-5848 (Poodle) changes in Coyote: Add support for TLSv1.1 and TLSv1.2 for APR connector. Based upon a patch by Marcel Šebek. This feature requires Tomcat Native library 1.1.32 or later. (schultz/jfclere) Add Disable SSLv3 by default for JSSE based HTTPS connectors (BIO and NIO). The change also ensures that SSLv2 is disabled for these connectors although SSLv2 should already be disabled by default by the JRE. (markt) Add Disable SSLv3 by default for the APR/native HTTPS connector. (markt) I will test later if we can get rid of forcing TLSv2 in OFBiz ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1640301 13f79535-47bb-0310-9956-ffa450edef68
… (not the same files) ------------------------------------------------------------------------ r1640299 | jleroux | 2014-11-18 11:33:50 +0100 (mar. 18 nov. 2014) | 1 ligne With Tomcat 7.0.57 we no longer need to force the TLS version to v1.2 ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1640305 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1640515 | jleroux | 2014-11-19 11:21:59 +0100 (mer. 19 nov. 2014) | 2 lignes Forgot to commit changes in .classpath and LICENSE when updatig Tomcat from 7.0.55 to 7.0.57 Forgot also to say that there were no changes in framework\base\lib\j2eespecs ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1640517 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1640717 | jleroux | 2014-11-20 11:49:56 +0100 (jeu. 20 nov. 2014) | 1 ligne At r1639887 I forgot to put the content of templateContext in the local tempTemplateContext. Thanks to Deepak for spotting it. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1640719 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1618411 | apatel | 2014-08-16 22:40:20 +0200 (sam. 16 août 2014) | 1 ligne [OFBIZ-4459] call to Quickshipdrop should be make on approved orders. Thanks to Kiran Gawde and ofbiz.us team for contributions. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1641062 13f79535-47bb-0310-9956-ffa450edef68
… hand. Just formatting and I tolerated the 2 neutral changes from ?exists to ?? done by the automatic merge.* ------------------------------------------------------------------------ r1641066 | jleroux | 2014-11-22 15:15:54 +0100 (sam. 22 nov. 2014) | 8 lignes A slightly modified patch from Gareth Carter for "<@htmlTemplate.renderDateTimeField does not parse date string based on input format" https://issues.apache.org/jira/browse/OFBIZ-5850 Commit 1626419 changed htmlFormMacroLibrary.ftl renderDateTimeField to use Date.parse instead of Date.parseExact. https://code.google.com/p/datejs/wiki/APIDocumentation states Date.parse will use current CultureInfo for formats but for parsing ISO yyyy-MM-dd from hidden field, need to use parseExact. I spotted this when CultureInfo was en-GB and selecting 2014-11-01 on any date field (i18n field displays 11/01/2014 instead of 01/11/2014) For November all days after the 12th display correctly jleroux: I simply removed the line added in the block which remove the dot and 000 ms in date/time string. I did not see any reason why this was needed. I modified the comment on this block for faster understanding. ------------------------------------------------------------------------ * Damned, I was sure I wrote the comment about conflicts handling somewhere, but lost it. Here it is finally!** ** What I love in Svn, and I miss in Git, is it forgives your sins, so you can rewrite the log :D. Life is fun! git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1641069 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1641131 | jleroux | 2014-11-22 23:48:44 +0100 (sam. 22 nov. 2014) | 1 ligne A patch from Gareth Carter for "jQuery datetimepicker popup time value is not set correctly from an existing value" https://issues.apache.org/jira/browse/OFBIZ-5883 ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1641133 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1641165 | jleroux | 2014-11-23 09:49:48 +0100 (dim. 23 nov. 2014) | 1 ligne It's not quite clear to me why Date.CultureInfo.formatPatterns.longTime from date.js returns ms (always .000 it seems). I don't know if this would not happen, but anyway I prefer to assign the value to the calendar out of the block which changes the value. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1641169 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1641548 | jleroux | 2014-11-25 10:14:36 +0100 (mar. 25 nov. 2014) | 3 lignes A patch from Deepak Dixit for "EntityListIterator Not Closed for Entity JobSandbox, caught in Finalize" https://issues.apache.org/jira/browse/OFBIZ-5885 EntityListIterator Not Closed for Entity JobSandbox in ServiceUtil.purgeOldJobs method. Need to close the entity list iterator properly. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1641550 13f79535-47bb-0310-9956-ffa450edef68
=== Fixed issue happening during ./ant create-tenant target on some databases (e.g. MySQL) where milliseconds are not stored: the order in which the Component records were selected could be different from the order they were inserted, causing some data loading issues. Also fixed some commented out code. Thanks to Rohit Kaushal for the initial version of the patch and to Arun Patidar for the review and support. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1641812 13f79535-47bb-0310-9956-ffa450edef68
Applied patch from jira issue - OFBIZ-5546 - RAW_MATERIAL return/RMA functionality not supported OOTB. Thanks Harsh for the contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1642419 13f79535-47bb-0310-9956-ffa450edef68
=== OFBIZ-6568: upgraded Groovy to the latest version (2.4.5). [CVE-2016-2170] The infamous Java serialization vulnerability git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1729630 13f79535-47bb-0310-9956-ffa450edef68
=== OFBIZ-6568 With the implementation of @basescript annotations (introduced with Groovy 2.3.0) something was broken in the CompilerConfiguration.setScriptBaseClass method and an error is thrown when our scripts are executed; the workaround is to execute at startup a script containing the @basescript annotation. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1729814 13f79535-47bb-0310-9956-ffa450edef68
…hand) ------------------------------------------------------------------------ r1730882 | jleroux | 2016-02-17 18:29:40 +0100 (mer. 17 févr. 2016) | 10 lignes In framework/base/lib/ updates Xalan from 2.7.1 to 2.7.2 because of CVE-2014-0107 (was fixed at XALANJ-2435) - https://issues.apache.org/jira/browse/OFBIZ-6905 This implies to update also Xerces from 2.9.1 to 2.11.0 and also xml-apis from 2.9.1 to 1.4.01 (2.9.1 was a wrong version number. It was actually part of the Xerces 2.9.1 package but I was unable to find the real version number then at https://xerces.apache.org/xerces2-j/releases.html) Also updates Xalan from 27(?) to 2.7.2 in cmssite/template/docbook/extensions. I rendered https://localhost:8443/cmssite/cms/APACHE_OFBIZ_HTML w/o issues Note: According to the DOM Level 3 specification and DOM Level 2 errata the createElementNS and createAttributeNS methods convert empty string namespaceURI to null. jleroux: though the tests pass I'm not sure all is covered... ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1730888 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1731359 | arunpatidar | 2016-02-20 11:06:07 +0100 (sam. 20 févr. 2016) | 1 ligne [OFBIZ-6910] Set productFeatureTypeId as INOUT in service defination so that calling service can use it for further processing. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1731520 13f79535-47bb-0310-9956-ffa450edef68
…tps://issues.apache.org/jira/browse/OFBIZ-6917 I simply used the version introduced by Adrian at r1647873 which replaces DCL code with lazy-initializer class. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1732313 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1732576 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1732721 | jleroux | 2016-02-28 12:58:10 +0100 (dim. 28 févr. 2016) | 3 lignes A patch from Forrest Rae for "ApplicationDecorator Entity-One Screen Action Incomplete Primary Key" https://issues.apache.org/jira/browse/OFBIZ-6918 ApplicationDecorator entity-one screen action supplies an incomplete primary key. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1732726 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1732721 | jleroux | 2016-02-28 12:58:10 +0100 (dim. 28 févr. 2016) | 3 lignes A patch from Forrest Rae for "ApplicationDecorator Entity-One Screen Action Incomplete Primary Key" https://issues.apache.org/jira/browse/OFBIZ-6918 ApplicationDecorator entity-one screen action supplies an incomplete primary key. ------------------------------------------------------------------------ It turned that r1622246 has not been bacported to R12.04, only R13.07 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1732884 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1733951 | jleroux | 2016-03-07 19:14:53 +0100 (lun. 07 mars 2016) | 3 lignes "Currently the testRemoteSoap test services does not work." - https://issues.apache.org/jira/browse/OFBIZ-6922 This temporarily replaces the demo-trunk.ofbiz.apache.org domain by ofbiz-vm.apache.org:8080 ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1733996 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1734246 | jleroux | 2016-03-09 15:40:33 +0100 (mer. 09 mars 2016) | 3 lignes A patch from Oleg Andreyev for "Incorrect content length in response from HTTP service engine" https://issues.apache.org/jira/browse/OFBIZ-6925 Obvious error that cause deserialization errors on receiving side under some conditions because data extracted from response shorter than it really was sent. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1734250 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1734269 | jleroux | 2016-03-09 16:36:56 +0100 (mer. 09 mars 2016) | 7 lignes A patch from Forrest Rae for "GroovyEngine.serviceInvoker masks Groovy script exceptions in some cases" https://issues.apache.org/jira/browse/OFBIZ-6888 If GroovyEngine.serviceInvoker catches an exception in a Groovy script, it would mask the exception in some cases. An exception's detailMessage can be null. If it is null, the exception won't be properly returned and logged, and that will make spotting problems very difficult. This was the case for me while trying to track down a problem with a java.util.ConcurrentModificationException error in a Groovy script. I suspect that this choice to mask exceptions and only return the message has cause bugs to not be spotted. Disabling this for now in favor of returning a proper exception. GroovyEngine.serviceInvoker() should throw GenericServiceException if error, rather than returning ServiceUtil.returnError(e.getMessage()) ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1734273 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1735244 | chrisg | 2016-03-16 16:38:04 +0100 (mer. 16 mars 2016) | 2 lignes OFBIZ-6936 Fix broken 'run-test-list' target ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1735286 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1735385 | jleroux | 2016-03-17 11:09:53 +0100 (jeu. 17 mars 2016) | 10 lignes Fixes "Credit card details cannot be updated" - https://issues.apache.org/jira/browse/OFBIZ-6920 It seems after OFBIZ-3956, credit card details can no longer be updated, for example, if one wishes to update the expiry date of a credit card results in following "The Following Errors Occurred: Card Number is erroneous". This issue can be replicated here - https://demo-trunk-ofbiz.apache.org/partymgr/control/editcreditcard?paymentMethodId=9015&partyId=DemoCustomer jleroux: The problem was because we are calling createCreditCard map proc from updateCreditCard service after calling updateCreditCard map proc. And when we update the data we don't see the real card number but something like "************1111" I simply copied the needed check from createCreditCard map proc into updateCreditCard map proc but not the isAnyCard call of course. Then it will work, but if the user changes also the card number. If she does it will need to be right, because it will not be checked! I can't see any other ways because we can't use a hidden field with the real card number in, it would be insecure. We could introduce a specific encryption/decryption but it seems a bit too much. Notably because the only reason of changing a card number while this card is still valid would be because the number have been wrongly entered. Then better to delete and create a new one, those data are a bit sensible... ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1735390 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1735773 | deepak | 2016-03-19 14:31:02 +0100 (sam. 19 mars 2016) | 1 ligne (OFBIZ-5918) Fixed NPE for ecommerce/products url, If user enter invalid url ecommerce/products then redirect it to main. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1735815 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1735731 | deepak | 2016-03-19 07:23:40 +0100 (sam. 19 mars 2016) | 5 lignes (OFBIZ-6937) Applied patch from jira issue. ============================================================ Company Check payment method should be shown when issuing chek ============================================================ Thanks Akash Jain for reporting the issue and Mohammad Rehan Khan for patch. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1735817 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1735734 | deepak | 2016-03-19 08:15:24 +0100 (sam. 19 mars 2016) | 5 lignes (OFBIZ-6933) Applied slightly modified patch from jira issue. ============================================================ When we update the Allow order decimal quantity to N for product store and update the unit price of item in shopping cart then its shown error. ============================================================ Thanks Yashwant Dhakad for reporting issue and providing the patch. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1735819 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1735831 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1736434 | jleroux | 2016-03-24 13:12:11 +0100 (jeu. 24 mars 2016) | 7 lignes Fixes "Update XStream lib to prevent XML External Entity (XXE) Processing" - https://issues.apache.org/jira/browse/OFBIZ-6959 The XStream team has released the 1.4.9 stable version in March 15, 2016 This version fixes the XML External Entity (XXE) Processing security issue https://www.owasp.org/index.php/XML_External_Entity_%28XXE%29_Processing Since OFBiz uses the DomDriver, with Java 6 at least in supported releases, OFBiz seems not really vulnerable https://x-stream.github.io/faq.html#Security_XXEVulnerability, but better to be safe than sorry, notably for not OOTB uses... ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1736438 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1736851 | jleroux | 2016-03-28 11:55:17 +0200 (lun. 28 mars 2016) | 25 lignes A patch from James Yong for <<popup fades in and out non-stop when hovers on a product image in list view>> https://issues.apache.org/jira/browse/OFBIZ-6961 Problem ======== Go to https://localhost:8443/ecommerce/gift-cards-GC-100-c When the mouse hovers on a product image in a list view, the popup fades in and out non-stop. Cause ===== The list view has a narrower height than the grid (matrix) view. This causes the popup to overlay on the target and results in the cycling. Quick Fix ============== To illustrate the problem, we change the display to grid view, instead of list view, by append the following to the CatalogDetail.groovy file {quote} context.put("numCol", 3); context.viewSize = 12; {quote} Better Solution =============== Use tooltip from jQuery UI. Works correctly when the products are displayed in list view / grid view. A patch will be provided. jleroux: I checked, there should not be other cases like this ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1736858 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1736854 | jleroux | 2016-03-28 12:10:03 +0200 (lun. 28 mars 2016) | 1 ligne Fixes an issue with css images path in ecommain.css reported by James Yong at https://issues.apache.org/jira/browse/OFBIZ-6961 ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1736862 13f79535-47bb-0310-9956-ffa450edef68
Ensure a ModelField is set for rhs EntityConditionValues that don't already have it, such as the EntityFunction classes git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1736931 13f79535-47bb-0310-9956-ffa450edef68
------------------------------------------------------------------------ r1738235 | jleroux | 2016-04-08 13:54:01 +0200 (ven. 08 avr. 2016) | 7 lignes A patch from Kongrath Suankaewmanee for "Error in entity reference chart for static in webtools" https://issues.apache.org/jira/browse/OFBIZ-6995 I found the error when I try to use entity reference chart for static in webtools, https://localhost:8443/webtools/control/entityref?forstatic=true and choose one from the list of left side and the error appear on right hand side. It's work without error for "Enitity Packages" list but doesn't for "Entities - Alphabetical" list. ------------------------------------------------------------------------ � git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1738239 13f79535-47bb-0310-9956-ffa450edef68
…en only a single condition includes Shipping Method. Thanks Swapnil M Mane for reporting the issue and providing the patch. Applying fix from trunk r1739447. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1739461 13f79535-47bb-0310-9956-ffa450edef68
============================================= Applying patch from jira issue - OFBIZ-7072. DataResource.dataResourceName field should be at least 255 Chars. Thanks Forrest Rae for creating the issue and applying the patch for the same. ============================================= git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1744840 13f79535-47bb-0310-9956-ffa450edef68
Even includes R4.0 :D git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1783210 13f79535-47bb-0310-9956-ffa450edef68
asfgit
pushed a commit
that referenced
this pull request
Mar 5, 2017
=== This is a refactoring of the product promotion engine in order to overcome some limitations that prevented it to select and apply the best set of promotions under special conditions. Example: Consider two promotions: * consider two products: Product A, with price $20, and Product B, with price $40 * Promotion 1: 20% discount on all the products in a category containing Product A and Product B * Promotion 2: 40% discount on Product A When Product A and Product B are both in the cart: * Expected behavior: on Product A the Promotion 2 should be applied i.e. 40% discount, and on Product B Promotion 1 should be applied i.e. 20% discount. ** Summary Product Price Discount Subtotal A $20 $8 (40% discount) $12 B $40 $8 (20% discount) $32 Total Adjustment: $16 * OFBiz behavior (before this fix): Promotion 1 is applied to Product A and Product B; this happens because the total discount of Promotion 1 is greater than the total discount of Promotion 2 and OFBiz applies promotions sorted by discount (desc) ** Summary Product Price Discount Subtotal A $20 $4 (20% discount) $16 B $40 $8 (20% discount) $32 Total Adjustment: $12 The new solution fixes this issue and similar ones. Here are some details about the new algorithm. Overview of the flow: 1) run the promotions one by one in a test run 2) collect the ProductPromoUse information 3) sort them by weight (i.e. the ratio between the discount and the value of the products discounted) 4) execute the ProductPromoUse in the given order In order to understand this solution, and specifically the changes to ProductPromoWorker.java, there is an important concept to consider: one Promotion can generate more than one ProductPromoUseInfo objects. For example if I have 2 units of WG-1111 in the cart (in one cart item) and I have the promotion “20% discount on WG-1111 and GZ-1000” then the system will create TWO ProductPromoUseInfo objects both associated to the same promotion one for each of the 2 units discounted. Similarly if I had two lines: 2 units of WG-1111 and 1 unit of GZ-1000 I would get 3 ProductPromoUseInfo objects 2 objects for WG-1111 and 1 object for GZ-1000 We can sort these ProductPromoUseInfo objects based on their weight (i.e. the ratio between the discount and the value of the products discounted) in desc order and now we have a sorted list of ProductPromoUseInfo objects ready to be executed However we only want to execute each of them once and for this reason we set (in memory, not in the DB) the useLimitPerOrder to 1 in the first ProductPromoUseInfo of a given promotion and then to 2 if the same ProductPromoUseInfo is associated to the same promotion etc... in this way the end result is that the system will generate, as we desire, ONE ProductPromoUseInfo only for each of the ProductPromoUseInfo in the list. Here is an example: we have 2 promotions: PROMO A PROMO B After test run: ProductPromoUseInfo - PROMO A - #1 - weight 0.3 ProductPromoUseInfo - PROMO A - #2 - weight 0.3 ProductPromoUseInfo - PROMO B - #1 - weight 0.4 After sorting: ProductPromoUseInfo - PROMO B - #1 - weight 0.4 ProductPromoUseInfo - PROMO A - #1 - weight 0.3 ProductPromoUseInfo - PROMO A - #2 - weight 0.3 Based on this we create a list (sortedExplodedProductPromoList) of ProductPromo: PROMO B - with useLimitPerOrder=1 PROMO A - with useLimitPerOrder=1 PROMO A - with useLimitPerOrder=2 When we apply these to the cart we get the following results: PROMO B - with useLimitPerOrder=1 APPLIED PROMO A - with useLimitPerOrder=1 APPLIED PROMO A - with useLimitPerOrder=2 NOT APPLIED (because PROMO B used the item) git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1554381 13f79535-47bb-0310-9956-ffa450edef68
asfgit
pushed a commit
that referenced
this pull request
Oct 6, 2019
=== This is a refactoring of the product promotion engine in order to overcome some limitations that prevented it to select and apply the best set of promotions under special conditions. Example: Consider two promotions: * consider two products: Product A, with price $20, and Product B, with price $40 * Promotion 1: 20% discount on all the products in a category containing Product A and Product B * Promotion 2: 40% discount on Product A When Product A and Product B are both in the cart: * Expected behavior: on Product A the Promotion 2 should be applied i.e. 40% discount, and on Product B Promotion 1 should be applied i.e. 20% discount. ** Summary Product Price Discount Subtotal A $20 $8 (40% discount) $12 B $40 $8 (20% discount) $32 Total Adjustment: $16 * OFBiz behavior (before this fix): Promotion 1 is applied to Product A and Product B; this happens because the total discount of Promotion 1 is greater than the total discount of Promotion 2 and OFBiz applies promotions sorted by discount (desc) ** Summary Product Price Discount Subtotal A $20 $4 (20% discount) $16 B $40 $8 (20% discount) $32 Total Adjustment: $12 The new solution fixes this issue and similar ones. Here are some details about the new algorithm. Overview of the flow: 1) run the promotions one by one in a test run 2) collect the ProductPromoUse information 3) sort them by weight (i.e. the ratio between the discount and the value of the products discounted) 4) execute the ProductPromoUse in the given order In order to understand this solution, and specifically the changes to ProductPromoWorker.java, there is an important concept to consider: one Promotion can generate more than one ProductPromoUseInfo objects. For example if I have 2 units of WG-1111 in the cart (in one cart item) and I have the promotion “20% discount on WG-1111 and GZ-1000” then the system will create TWO ProductPromoUseInfo objects both associated to the same promotion one for each of the 2 units discounted. Similarly if I had two lines: 2 units of WG-1111 and 1 unit of GZ-1000 I would get 3 ProductPromoUseInfo objects 2 objects for WG-1111 and 1 object for GZ-1000 We can sort these ProductPromoUseInfo objects based on their weight (i.e. the ratio between the discount and the value of the products discounted) in desc order and now we have a sorted list of ProductPromoUseInfo objects ready to be executed However we only want to execute each of them once and for this reason we set (in memory, not in the DB) the useLimitPerOrder to 1 in the first ProductPromoUseInfo of a given promotion and then to 2 if the same ProductPromoUseInfo is associated to the same promotion etc... in this way the end result is that the system will generate, as we desire, ONE ProductPromoUseInfo only for each of the ProductPromoUseInfo in the list. Here is an example: we have 2 promotions: PROMO A PROMO B After test run: ProductPromoUseInfo - PROMO A - #1 - weight 0.3 ProductPromoUseInfo - PROMO A - #2 - weight 0.3 ProductPromoUseInfo - PROMO B - #1 - weight 0.4 After sorting: ProductPromoUseInfo - PROMO B - #1 - weight 0.4 ProductPromoUseInfo - PROMO A - #1 - weight 0.3 ProductPromoUseInfo - PROMO A - #2 - weight 0.3 Based on this we create a list (sortedExplodedProductPromoList) of ProductPromo: PROMO B - with useLimitPerOrder=1 PROMO A - with useLimitPerOrder=1 PROMO A - with useLimitPerOrder=2 When we apply these to the cart we get the following results: PROMO B - with useLimitPerOrder=1 APPLIED PROMO A - with useLimitPerOrder=1 APPLIED PROMO A - with useLimitPerOrder=2 NOT APPLIED (because PROMO B used the item) git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1554381 13f79535-47bb-0310-9956-ffa450edef68
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.