buildbot exception in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a build exception on builder ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1618 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] cf083f2cbee5985a26f357afdaa1d4988459879f Blamelist: James Yong BUILD FAILED: exception javadoc upload test-results part 1 Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Improved: multi-block attribute for html-template tag (OFBIZ-11686)
This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new cf083f2 Improved: multi-block attribute for html-template tag
(OFBIZ-11686)
cf083f2 is described below
commit cf083f2cbee5985a26f357afdaa1d4988459879f
Author: James Yong
AuthorDate: Mon Aug 10 09:23:50 2020 +0800
Improved: multi-block attribute for html-template tag (OFBIZ-11686)
Improved documentation. No code change.
---
.../java/org/apache/ofbiz/widget/model/HtmlWidget.java | 17 +++--
.../ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java | 16
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
index 10a6ca1..a3ec19f 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
@@ -187,6 +187,19 @@ public class HtmlWidget extends ModelScreenWidget {
}
}
+/**
+ * Render html template when multi-block=true.
+ * We use stack to store the string writer because a freemarker template
may also render a sub screen widget
+ * by using ${screens.render()}. So before rendering
the sub screen widget, ScreenRenderer
+ * class will check for the existence of the stack and retrieve the
correct string writer.
+ * The following tags are removed from the final rendering:
+ * 1. External and inline javascript tags
+ * 2. Css link tags
+ * @param writer
+ * @param locationExdr
+ * @param context
+ * @throws IOException
+ */
public static void renderHtmlTemplateWithMultiBlock(Appendable writer,
FlexibleStringExpander locationExdr,
Map
context) throws IOException {
String location = locationExdr.expandString(context);
@@ -197,7 +210,6 @@ public class HtmlWidget extends ModelScreenWidget {
stringWriterStack = new Stack<>();
}
stringWriterStack.push(stringWriter);
-// we use stack because a freemarker template may render a sub screen
widget
context.put(MultiBlockHtmlTemplateUtil.MULTI_BLOCK_WRITER,
stringWriterStack);
renderHtmlTemplate(stringWriter, locationExdr, context);
stringWriterStack.pop();
@@ -210,7 +222,7 @@ public class HtmlWidget extends ModelScreenWidget {
Document doc = Jsoup.parseBodyFragment(data);
-// extract scripts
+// extract js script tags
Elements scriptElements = doc.select("script");
if (scriptElements != null && scriptElements.size() > 0) {
StringBuilder scripts = new StringBuilder();
@@ -253,6 +265,7 @@ public class HtmlWidget extends ModelScreenWidget {
MultiBlockHtmlTemplateUtil.addScriptLinkForFoot(request, url);
}
}
+// extract css link tags
Elements csslinkElements = doc.select("link");
if (csslinkElements != null && csslinkElements.size() > 0) {
for (org.jsoup.nodes.Element link : csslinkElements) {
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
index 702ca83..2a6f6e5 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
@@ -40,6 +40,18 @@ import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.select.Elements;
+/**
+ * Utility to support different handling of code blocks in an html template:
+ * 1. external script tags with data-import="head" are removed from the
rendered template and merged with
+ *layoutSetting.javaScripts. This helps to keep page-specific external
script tags to the html-template that needs it.
+ *In future when the javascript library allows, we can use import module
functionality of the browser instead of
+ *special handling at the server side.
+ * 2. link tags are removed from the rendered template and merged with
layoutSetting.styleSheets.
+ *This helps to keep page-specific link tags to the html-template that
needs it.
+ * 3. Inline javascript tags are turned into external javascript tags for
better compliance of Content Security Policy.
+ *These external javascript tags are placed at the bottom of the html
page. The scripts are retrieved via the getJs
+ *request handler.
+ */
public final class MultiBlockHtmlTemplateUtil {
private static final String MODULE =
[ofbiz-framework] branch trunk updated: Improved: Convert getInvoicePaymentInfoListByDueDateOffset service from mini-lang to groovy DSL (OFBIZ-11486)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4ff22b4 Improved: Convert getInvoicePaymentInfoListByDueDateOffset
service from mini-lang to groovy DSL (OFBIZ-11486)
4ff22b4 is described below
commit 4ff22b46dc12dbc57a37e1fd6c587c7d3efba0c0
Author: Jacques Le Roux
AuthorDate: Sun Aug 9 20:14:10 2020 +0200
Improved: Convert getInvoicePaymentInfoListByDueDateOffset service from
mini-lang to groovy DSL (OFBIZ-11486)
Thanks: Devanshu Vyas for report, Nitish Mishra for the patch
---
.../groovyScripts/payment/PaymentServices.groovy | 43 ++
.../minilang/payment/PaymentServices.xml | 39
.../accounting/servicedef/services_payment.xml | 4 +-
3 files changed, 45 insertions(+), 41 deletions(-)
diff --git
a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
index 40ab002..3918b99 100644
--- a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
+++ b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
@@ -319,6 +319,49 @@ def massChangePaymentStatus() {
}
return serviceResult
}
+def getInvoicePaymentInfoListByDueDateOffset(){
+
+filteredInvoicePaymentInfoList = []
+
+Timestamp asOfDate = UtilDateTime.getDayEnd(UtilDateTime.nowTimestamp(),
(long) parameters.daysOffset);
+
+exprList = [EntityCondition.makeCondition("invoiceTypeId",
EntityOperator.EQUALS, parameters.invoiceTypeId),
+EntityCondition.makeCondition("statusId",
EntityOperator.NOT_EQUAL, "INVOICE_CANCELLED"),
+EntityCondition.makeCondition("statusId",
EntityOperator.NOT_EQUAL, "INVOICE_PAID")
+]
+if (parameters.partyId) {
+exprList.add(EntityCondition.makeCondition("partyId",
EntityOperator.EQUALS, parameters.partyId))
+}
+if (parameters.partyIdFrom) {
+exprList.add(EntityCondition.makeCondition("partyIdFrom",
EntityOperator.EQUALS, parameters.partyIdFrom))
+}
+
+condition = EntityCondition.makeCondition(exprList, EntityOperator.AND);
+
+invoices =
from("Invoice").where(condition).orderBy("invoiceDate").queryList();
+
+if (invoices) {
+for (GenericValue invoice : invoices) {
+getInvoicePaymentInfoListInMap = [:]
+getInvoicePaymentInfoListInMap.put("invoice", invoice);
+getInvoicePaymentInfoListInMap.put("userLogin", userLogin);
+serviceResult = run service: 'getInvoicePaymentInfoList', with:
getInvoicePaymentInfoListInMap
+if (ServiceUtil.isError(serviceResult)) return result
+invoicePaymentInfoList = serviceResult.invoicePaymentInfoList;
+if (invoicePaymentInfoList) {
+invoicePaymentInfoList.each { invoicePaymentInfo ->
+if
(invoicePaymentInfo.outstandingAmount.compareTo(BigDecimal.ZERO) > 0 &&
invoicePaymentInfo.dueDate.before(asOfDate)) {
+filteredInvoicePaymentInfoList.add(invoicePaymentInfo);
+}
+}
+}
+}
+}
+
+result = success()
+result.invoicePaymentInfoList = filteredInvoicePaymentInfoList
+return result
+}
def getPaymentGroupReconciliationId() {
paymentGroupMember = from("PaymentGroupMember").where("paymentGroupId",
parameters.paymentGroupId).queryFirst()
diff --git a/applications/accounting/minilang/payment/PaymentServices.xml
b/applications/accounting/minilang/payment/PaymentServices.xml
index 4d7bc1e..7040268 100644
--- a/applications/accounting/minilang/payment/PaymentServices.xml
+++ b/applications/accounting/minilang/payment/PaymentServices.xml
@@ -228,45 +228,6 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/applications/accounting/servicedef/services_payment.xml
b/applications/accounting/servicedef/services_payment.xml
index 5579568..3353bd8 100644
--- a/applications/accounting/servicedef/services_payment.xml
+++ b/applications/accounting/servicedef/services_payment.xml
@@ -133,8 +133,8 @@ under the License.
-
+
[ofbiz-framework] branch trunk updated: Improved: Convert cancelCheckRunPayments service from mini-lang to groovy DSL (OFBIZ-11494)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new cc61673 Improved: Convert cancelCheckRunPayments service from
mini-lang to groovy DSL (OFBIZ-11494)
cc61673 is described below
commit cc6167319863a3ae2c8b6670fb5ff5bf8add6d2a
Author: Jacques Le Roux
AuthorDate: Sun Aug 9 20:07:51 2020 +0200
Improved: Convert cancelCheckRunPayments service from mini-lang to groovy
DSL (OFBIZ-11494)
Thanks: Devanshu Vyas for report, Yogesh Naroliya for the patch
---
.../groovyScripts/payment/PaymentServices.groovy | 21 +
.../minilang/payment/PaymentServices.xml | 26 --
.../accounting/servicedef/services_payment.xml | 4 ++--
3 files changed, 23 insertions(+), 28 deletions(-)
diff --git
a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
index b3b6b6a..40ab002 100644
--- a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
+++ b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
@@ -439,3 +439,24 @@ def getPayments() {
result.payments = payments
return result
}
+
+def cancelCheckRunPayments() {
+paymentGroupMemberAndTransList =
from("PmtGrpMembrPaymentAndFinAcctTrans").where("paymentGroupId",
parameters.paymentGroupId).queryList()
+if (paymentGroupMemberAndTransList) {
+paymentGroupMemberAndTrans =
EntityUtil.getFirst(paymentGroupMemberAndTransList)
+if ("FINACT_TRNS_APPROVED" !=
paymentGroupMemberAndTrans.finAccountTransStatusId) {
+for (GenericValue paymentGroupMemberAndTrans :
paymentGroupMemberAndTransList) {
+payment = from("Payment").where("paymentId",
paymentGroupMemberAndTrans.paymentId).queryOne()
+Map voidPaymentMap =
dispatcher.getDispatchContext().makeValidContext("voidPayment", "IN", payment)
+result = runService("voidPayment", voidPaymentMap)
+if (ServiceUtil.isError(result)) return result
+Map expirePaymentGroupMemberMap =
dispatcher.getDispatchContext().makeValidContext("expirePaymentGroupMember",
"IN", paymentGroupMemberAndTrans)
+result = runService("expirePaymentGroupMember",
expirePaymentGroupMemberMap)
+if (ServiceUtil.isError(result)) return result
+}
+} else {
+return error(UtilProperties.getMessage("AccountingErrorUiLabels",
"AccountingCheckIsAlreadyIssued", locale))
+}
+}
+return success()
+}
diff --git a/applications/accounting/minilang/payment/PaymentServices.xml
b/applications/accounting/minilang/payment/PaymentServices.xml
index eb05f11..4d7bc1e 100644
--- a/applications/accounting/minilang/payment/PaymentServices.xml
+++ b/applications/accounting/minilang/payment/PaymentServices.xml
@@ -388,32 +388,6 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/applications/accounting/servicedef/services_payment.xml
b/applications/accounting/servicedef/services_payment.xml
index 5a4d03a..5579568 100644
--- a/applications/accounting/servicedef/services_payment.xml
+++ b/applications/accounting/servicedef/services_payment.xml
@@ -196,8 +196,8 @@ under the License.
-
+
Cancel all payments for payment group
[ofbiz-plugins] branch trunk updated: Fixed: Unable to add product to cart in ecommence (OFBIZ-11899)
This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2989420 Fixed: Unable to add product to cart in ecommence
(OFBIZ-11899)
2989420 is described below
commit 29894202949bedf8b8870f969dc4ee5284e9fc2f
Author: James Yong
AuthorDate: Sun Aug 9 22:09:25 2020 +0800
Fixed: Unable to add product to cart in ecommence (OFBIZ-11899)
Incorrect markup in ConfigProductDetail.ftl affected jsoup (when
multi-block=true) to parse and output the file correctly. Let me know if not
fixed.
Thanks: Jacques for reporting
---
ecommerce/template/catalog/ConfigProductDetail.ftl | 5 +
ecommerce/widget/CatalogScreens.xml| 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ecommerce/template/catalog/ConfigProductDetail.ftl
b/ecommerce/template/catalog/ConfigProductDetail.ftl
index 385d837..8096c3f 100644
--- a/ecommerce/template/catalog/ConfigProductDetail.ftl
+++ b/ecommerce/template/catalog/ConfigProductDetail.ftl
@@ -339,10 +339,7 @@ ${virtualJavaScript!}
-
-
-
-
+
<#-- check to see if introductionDate hasn't passed yet -->
<#if product.introductionDate?? &&
nowTimestamp.before(product.introductionDate)>
diff --git a/ecommerce/widget/CatalogScreens.xml
b/ecommerce/widget/CatalogScreens.xml
index a4ddeef..e162984 100644
--- a/ecommerce/widget/CatalogScreens.xml
+++ b/ecommerce/widget/CatalogScreens.xml
@@ -325,7 +325,7 @@ under the License.
-
+
[ofbiz-tools] branch master updated: Improved: Implemented: Documented: Completed: Reverted: Fixed: (OFBIZ-)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
The following commit(s) were added to refs/heads/master by this push:
new f978291 Improved: Implemented: Documented: Completed: Reverted:
Fixed: (OFBIZ-)
f978291 is described below
commit f9782913e827ca69fe9d3d7024834696d73d1b41
Author: Jacques Le Roux
AuthorDate: Sun Aug 9 12:23:12 2020 +0200
Improved:
Implemented:
Documented:
Completed:
Reverted:
Fixed:
(OFBIZ-)
Explanation
Thanks:
---
wiki-files/README.html | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/wiki-files/README.html b/wiki-files/README.html
index 8bea81b..284d39b 100644
--- a/wiki-files/README.html
+++ b/wiki-files/README.html
@@ -447,6 +447,12 @@ body.book #toc,body.book #preamble,body.book
h1.sect0,body.book .sect1>h2{page-b
http://www.apache.org/licenses/LICENSE-2.0;>https://img.shields.io/badge/License-Apache%202.0-blue.svg; alt="License
Apache%202.0 blue">
+If you are reading this file in AsciiDoc format you may want to see it in
+https://ci.apache.org/projects/ofbiz/site/trunk/readme/html5/README.html;>HTML
+or https://ci.apache.org/projects/ofbiz/site/trunk/readme/pdf/README.pdf;>PDF
format
+
+
+
Welcome to Apache OFBiz! A powerful top level Apache
software project. OFBiz
is an Enterprise Resource Planning (ERP) System written in Java and houses a
large set of libraries, entities, services and features to run all aspects of
@@ -1130,6 +1136,11 @@ parameters are passed:
Testing tasks
+
+
+
+
+tag::testingtasks[]
Execute all unit tests
@@ -1221,7 +1232,7 @@ verbose:
gradlew "ofbiz --test component=entity --test suitename=entitytests"
--debug-jvm
-
+end::testingtasks[]
Miscellaneous tasks
@@ -1316,8 +1327,6 @@ and then from that directory you can run either
bin/ofbiz shell scr
-
-
OFBiz plugin system
@@ -1684,7 +1693,7 @@ Secure Sockets Extension) API
-Last updated 2020-07-08 10:34:37 +0200
+Last updated 2020-08-08 17:08:57 +0200
[ofbiz-framework] branch trunk updated: Improved: Updated tasks.checkstyleMain.maxErrors to 10184 ~(-1925)
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new af15eba Improved: Updated tasks.checkstyleMain.maxErrors to 10184
~(-1925)
af15eba is described below
commit af15eba5ff5025f0731d9beb7c1aa0c9a1580b66
Author: Suraj Khurana
AuthorDate: Sun Aug 9 13:23:08 2020 +0530
Improved: Updated tasks.checkstyleMain.maxErrors to 10184 ~(-1925)
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 6eabb95..dc6d26c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -287,7 +287,7 @@ checkstyle {
// the sum of errors found last time it was changed after using the
// ‘checkstyle’ tool present in the framework and in the official
// plugins.
-tasks.checkstyleMain.maxErrors = 12110
+tasks.checkstyleMain.maxErrors = 10184
// Currently there are a lot of errors so we need to temporarily
// hide them to avoid polluting the terminal output.
showViolations = false
[ofbiz-framework] branch trunk updated: Improved: Added override property in DesignForExtension module to avoid unnecessary design for extension checkstyle error messages for overrided methods. (OFBIZ
This is an automated email from the ASF dual-hosted git repository. surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new d70bb87 Improved: Added override property in DesignForExtension module to avoid unnecessary design for extension checkstyle error messages for overrided methods. (OFBIZ-11941) Thanks Jacques for you inputs. d70bb87 is described below commit d70bb8763e5009fe0eb13661c41c8f23f8d706a8 Author: Suraj Khurana AuthorDate: Sun Aug 9 13:19:03 2020 +0530 Improved: Added override property in DesignForExtension module to avoid unnecessary design for extension checkstyle error messages for overrided methods. (OFBIZ-11941) Thanks Jacques for you inputs. --- config/checkstyle/checkstyle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index a8d4f7d..5132539 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -123,7 +123,7 @@ under the License. + value="After, AfterClass, Before, BeforeClass, Test, Property, Override"/>
[ofbiz-framework] branch trunk updated: Improved: Updated tasks.checkstyleMain.maxErrors to 12110 ~(-110)
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4634c19 Improved: Updated tasks.checkstyleMain.maxErrors to 12110
~(-110)
4634c19 is described below
commit 4634c198b273dc8d7d586dc4cf53f9345aae1967
Author: Suraj Khurana
AuthorDate: Sun Aug 9 13:16:09 2020 +0530
Improved: Updated tasks.checkstyleMain.maxErrors to 12110 ~(-110)
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index b14d365..6eabb95 100644
--- a/build.gradle
+++ b/build.gradle
@@ -287,7 +287,7 @@ checkstyle {
// the sum of errors found last time it was changed after using the
// ‘checkstyle’ tool present in the framework and in the official
// plugins.
-tasks.checkstyleMain.maxErrors = 12223
+tasks.checkstyleMain.maxErrors = 12110
// Currently there are a lot of errors so we need to temporarily
// hide them to avoid polluting the terminal output.
showViolations = false
[ofbiz-framework] branch trunk updated: Improved: Corrected max parameter number allowed checkstyle rule, also added proeprty for ignoring overridden methods. (OFBIZ-11931) Thanks Jacques for your inp
This is an automated email from the ASF dual-hosted git repository. surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 6df66ff Improved: Corrected max parameter number allowed checkstyle rule, also added proeprty for ignoring overridden methods. (OFBIZ-11931) Thanks Jacques for your inputs. 6df66ff is described below commit 6df66ff7a71136b0975bbf48b28967969df154df Author: Suraj Khurana AuthorDate: Sun Aug 9 12:43:59 2020 +0530 Improved: Corrected max parameter number allowed checkstyle rule, also added proeprty for ignoring overridden methods. (OFBIZ-11931) Thanks Jacques for your inputs. --- config/checkstyle/checkstyle.xml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 26d362e..a8d4f7d 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -70,7 +70,11 @@ under the License. - + + + + +
[ofbiz-plugins] branch trunk updated: Improved: Can't enter decimals when ordering on ecommerce (OFBIZ-11899)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8822462 Improved: Can't enter decimals when ordering on ecommerce
(OFBIZ-11899)
8822462 is described below
commit 882246204e8e28f9ad8589c0a9eaab78c9527e25
Author: Jacques Le Roux
AuthorDate: Sun Aug 9 08:41:25 2020 +0200
Improved: Can't enter decimals when ordering on ecommerce (OFBIZ-11899)
I found the reason of this regression. It's due to
https://gitbox.apache.org/repos/asf?p=ofbiz-plugins.git;h=a802ae0
This reverts Suraj's workaround and the change in ConfigProductDetail.ftl by
commit a802ae0. I'll ask James to fix the root of the issue in OFBIZ-11706.
---
ecommerce/template/catalog/ConfigProductDetail.ftl | 16 +---
ecommerce/widget/CatalogScreens.xml| 2 +-
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/ecommerce/template/catalog/ConfigProductDetail.ftl
b/ecommerce/template/catalog/ConfigProductDetail.ftl
index 44427f8..385d837 100644
--- a/ecommerce/template/catalog/ConfigProductDetail.ftl
+++ b/ecommerce/template/catalog/ConfigProductDetail.ftl
@@ -47,15 +47,9 @@ ${virtualJavaScript!}
}
function addItem() {
-var addForm = jQuery('#addFormId');
-var formData = addForm.serializeArray();
-var quantity = formData.find(function(item){
-return "quantity" == item.name;
-})
-var configForm = jQuery('#configFormId');
-configForm.attr("action", addForm.attr("action"));
-configForm.find("[name='quantity']").val(quantity.value);
-configForm.submit();
+document.configform.action = document.addform.action;
+document.configform.quantity.value = document.addform.quantity.value;
+document.configform.submit();
}
function verifyConfig() {
document.configform.submit();
@@ -310,7 +304,7 @@ ${virtualJavaScript!}
+name="addform">
<#assign inStock = true>
<#-- Variant Selection -->
<#if product.isVirtual?? && "Y" == product.isVirtual?upper_case>
@@ -372,7 +366,7 @@ ${virtualJavaScript!}
[${uiLabelMap.EcommerceProductNotConfigured}]
<#else>
-
+
${uiLabelMap.OrderAddToCart}
diff --git a/ecommerce/widget/CatalogScreens.xml
b/ecommerce/widget/CatalogScreens.xml
index e162984..a4ddeef 100644
--- a/ecommerce/widget/CatalogScreens.xml
+++ b/ecommerce/widget/CatalogScreens.xml
@@ -325,7 +325,7 @@ under the License.
-
+
