buildbot success in on ofbizBranch18Framework
The Buildbot has detected a restored build on builder ofbizBranch18Framework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizBranch18Framework/builds/366 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch18FrameworkCommit' triggered this build Build Source Stamp: [branch release18.12] e5860cc11b8925dcbddbd2afd3b4b2825bd61760 Blamelist: Jacques Le Roux Build succeeded! Sincerely, -The Buildbot
buildbot success in on ofbizBranch17Framework
The Buildbot has detected a restored build on builder ofbizBranch17Framework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizBranch17Framework/builds/503 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch17FrameworkCommit' triggered this build Build Source Stamp: [branch release17.12] 8dc864ff71edebc66ed4af5adb77765369bf7133 Blamelist: Jacques Le Roux Build succeeded! Sincerely, -The Buildbot
[ofbiz-framework] 02/02: Fixed: Unable to create event in SFA component (OFBIZ-9901)
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit e5860cc11b8925dcbddbd2afd3b4b2825bd61760 Author: Jacques Le Roux AuthorDate: Sat Jul 25 19:18:45 2020 +0200 Fixed: Unable to create event in SFA component (OFBIZ-9901) The tests failed because CAL_OWNER instead of CONTACT was necessary Conflicts handled by hand in WorkEffortTests.xml --- .../workeffort/minilang/test/WorkEffortTests.xml | 23 +++--- .../workeffort/testdef/data/WorkEffortTestData.xml | 4 ++-- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/applications/workeffort/minilang/test/WorkEffortTests.xml b/applications/workeffort/minilang/test/WorkEffortTests.xml index a93e7a7..a83a1de 100644 --- a/applications/workeffort/minilang/test/WorkEffortTests.xml +++ b/applications/workeffort/minilang/test/WorkEffortTests.xml @@ -22,7 +22,7 @@ under the License. xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> - + @@ -39,7 +39,7 @@ under the License. - + @@ -560,21 +560,4 @@ under the License. - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/applications/workeffort/testdef/data/WorkEffortTestData.xml b/applications/workeffort/testdef/data/WorkEffortTestData.xml index 6aa37e0..660d5ff 100644 --- a/applications/workeffort/testdef/data/WorkEffortTestData.xml +++ b/applications/workeffort/testdef/data/WorkEffortTestData.xml @@ -38,7 +38,7 @@ under the License. - + @@ -79,4 +79,4 @@ under the License. - \ No newline at end of file +
[ofbiz-framework] branch release18.12 updated (b5ae3a5 -> e5860cc)
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a change to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git. from b5ae3a5 Fixed: Unable to create event in SFA component (OFBIZ-9901) When creating event for the party other than the loggedin user, the party should be in CAL_OWNER role to be added to event. Added appropriate check in service along with the error message. Thanks Rubia Elza Joshep for reporting the issue and Aditi Patidar for providing the patch new 30c0d6d Fixed: One page checkout is broken because of ordermgr::getAssociatedStateList (OFBIZ-11838) new e5860cc Fixed: Unable to create event in SFA component (OFBIZ-9901) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../webapp/ordermgr-js/geoAutoCompleter.js | 2 +- .../workeffort/minilang/test/WorkEffortTests.xml | 23 +++--- .../workeffort/testdef/data/WorkEffortTestData.xml | 4 ++-- 3 files changed, 6 insertions(+), 23 deletions(-)
[ofbiz-framework] 02/02: Fixed: Unable to create event in SFA component (OFBIZ-9901)
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 8dc864ff71edebc66ed4af5adb77765369bf7133 Author: Jacques Le Roux AuthorDate: Sat Jul 25 19:24:50 2020 +0200 Fixed: Unable to create event in SFA component (OFBIZ-9901) The tests failed because CAL_OWNER instead of CONTACT was necessary Handled by hand, cherry-pick was impossible --- applications/workeffort/minilang/test/WorkEffortTests.xml | 6 +++--- applications/workeffort/testdef/data/WorkEffortTestData.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/workeffort/minilang/test/WorkEffortTests.xml b/applications/workeffort/minilang/test/WorkEffortTests.xml index a93e7a7..eadae7a 100644 --- a/applications/workeffort/minilang/test/WorkEffortTests.xml +++ b/applications/workeffort/minilang/test/WorkEffortTests.xml @@ -22,7 +22,7 @@ under the License. xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> - + @@ -39,7 +39,7 @@ under the License. - + @@ -577,4 +577,4 @@ under the License. - \ No newline at end of file + diff --git a/applications/workeffort/testdef/data/WorkEffortTestData.xml b/applications/workeffort/testdef/data/WorkEffortTestData.xml index 6aa37e0..660d5ff 100644 --- a/applications/workeffort/testdef/data/WorkEffortTestData.xml +++ b/applications/workeffort/testdef/data/WorkEffortTestData.xml @@ -38,7 +38,7 @@ under the License. - + @@ -79,4 +79,4 @@ under the License. - \ No newline at end of file +
[ofbiz-framework] 01/02: Fixed: One page checkout is broken because of ordermgr::getAssociatedStateList (OFBIZ-11838)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 1662e5b42ef5ee36dc2aa68544615340056b68de
Author: Jacques Le Roux
AuthorDate: Sat Jul 25 14:05:21 2020 +0200
Fixed: One page checkout is broken because of
ordermgr::getAssociatedStateList (OFBIZ-11838)
On orderview screen at the ordermgr, when a user tries to change the status
of
the order, in OrderInfo.ftl, we are calling "changeOrderStatus" request as
<@ofbizUrl>changeOrderStatus/orderview
Hence when the request is done, it is rewriting URL to
https://localhost:8443/ordermgr/control/changeOrderStatus/orderview.
When js functions running in the backend like "getAssociatedStateList" are
called, they are getting the wrong URL to send a request to. This was
causing
the issue.
For now, there are two different fixes that can handle both problems which
are
mentioned in OFBIZ-2562 and OFBIZ-11838.
1.
To change the request mapping for "changeOrderStatus" and add
request-redirect
to "orderview" screen. Change the actions in the forms in OrderInfo.ftl to
call "changeOrderStatus" request only and then remove code in
"getAssociatedStateList" js function to rewrite URL.
2.
To add .length to the existing URL rewrite code written in
"getAssociatedStateList" js function as
if (jQuery('#orderViewed').length) {
requestToSend = "/ordermgr/control/getAssociatedStateList"
}
Thanks: Pritam Kute!
I picked the 2nd solution
---
applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
b/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
index c9ae960..95a55e4 100644
--- a/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
+++ b/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
@@ -81,7 +81,7 @@ function setKeyAsParameter(event, ui) {
function getAssociatedStateList(countryId, stateId, errorId, divId) {
var countryGeoId = jQuery("#" + countryId).val();
var requestToSend = "getAssociatedStateList";
-if (jQuery('#orderViewed')) {
+if (jQuery('#orderViewed').length) {
requestToSend = "/ordermgr/control/getAssociatedStateList"
}
jQuery.ajax({
[ofbiz-framework] 01/02: Fixed: One page checkout is broken because of ordermgr::getAssociatedStateList (OFBIZ-11838)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 30c0d6d7af060e33e7c5c8d1214310968be137c7
Author: Jacques Le Roux
AuthorDate: Sat Jul 25 14:05:21 2020 +0200
Fixed: One page checkout is broken because of
ordermgr::getAssociatedStateList (OFBIZ-11838)
On orderview screen at the ordermgr, when a user tries to change the status
of
the order, in OrderInfo.ftl, we are calling "changeOrderStatus" request as
<@ofbizUrl>changeOrderStatus/orderview
Hence when the request is done, it is rewriting URL to
https://localhost:8443/ordermgr/control/changeOrderStatus/orderview.
When js functions running in the backend like "getAssociatedStateList" are
called, they are getting the wrong URL to send a request to. This was
causing
the issue.
For now, there are two different fixes that can handle both problems which
are
mentioned in OFBIZ-2562 and OFBIZ-11838.
1.
To change the request mapping for "changeOrderStatus" and add
request-redirect
to "orderview" screen. Change the actions in the forms in OrderInfo.ftl to
call "changeOrderStatus" request only and then remove code in
"getAssociatedStateList" js function to rewrite URL.
2.
To add .length to the existing URL rewrite code written in
"getAssociatedStateList" js function as
if (jQuery('#orderViewed').length) {
requestToSend = "/ordermgr/control/getAssociatedStateList"
}
Thanks: Pritam Kute!
I picked the 2nd solution
---
applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
b/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
index 8ec97bb..6359edf 100644
--- a/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
+++ b/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
@@ -81,7 +81,7 @@ function setKeyAsParameter(event, ui) {
function getAssociatedStateList(countryId, stateId, errorId, divId) {
var countryGeoId = jQuery("#" + countryId).val();
var requestToSend = "getAssociatedStateList";
-if (jQuery('#orderViewed')) {
+if (jQuery('#orderViewed').length) {
requestToSend = "/ordermgr/control/getAssociatedStateList"
}
jQuery.ajax({
[ofbiz-framework] branch trunk updated: Fixed: Unable to create event in SFA component (OFBIZ-9901)
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 077625c Fixed: Unable to create event in SFA component (OFBIZ-9901) 077625c is described below commit 077625c5a6e86e38152bd3021b144cef510e25dd Author: Jacques Le Roux AuthorDate: Sat Jul 25 19:18:45 2020 +0200 Fixed: Unable to create event in SFA component (OFBIZ-9901) The tests failed because CAL_OWNER instead of CONTACT was necessary --- applications/workeffort/minilang/test/WorkEffortTests.xml | 6 +++--- applications/workeffort/testdef/data/WorkEffortTestData.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/workeffort/minilang/test/WorkEffortTests.xml b/applications/workeffort/minilang/test/WorkEffortTests.xml index fe05f6c..8ebed2f 100644 --- a/applications/workeffort/minilang/test/WorkEffortTests.xml +++ b/applications/workeffort/minilang/test/WorkEffortTests.xml @@ -22,7 +22,7 @@ under the License. xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> - + @@ -39,7 +39,7 @@ under the License. - + @@ -544,4 +544,4 @@ under the License. - \ No newline at end of file + diff --git a/applications/workeffort/testdef/data/WorkEffortTestData.xml b/applications/workeffort/testdef/data/WorkEffortTestData.xml index 2a90b07..bb77b9a 100644 --- a/applications/workeffort/testdef/data/WorkEffortTestData.xml +++ b/applications/workeffort/testdef/data/WorkEffortTestData.xml @@ -38,7 +38,7 @@ under the License. - + @@ -80,4 +80,4 @@ under the License. - \ No newline at end of file +
[ofbiz-framework] branch release17.12 updated (ca62bd6 -> 8dc864f)
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a change to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git. from ca62bd6 Fixed: Unable to create event in SFA component (OFBIZ-9901) When creating event for the party other than the loggedin user, the party should be in CAL_OWNER role to be added to event. Added appropriate check in service along with the error message. Thanks Rubia Elza Joshep for reporting the issue and Aditi Patidar for providing the patch new 1662e5b Fixed: One page checkout is broken because of ordermgr::getAssociatedStateList (OFBIZ-11838) new 8dc864f Fixed: Unable to create event in SFA component (OFBIZ-9901) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js | 2 +- applications/workeffort/minilang/test/WorkEffortTests.xml | 6 +++--- applications/workeffort/testdef/data/WorkEffortTestData.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
[ofbiz-framework] branch trunk updated: In previous commit 2b041186909982f37b6a32688fe910d65b6d0fad for
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 1542844 In previous commit 2b041186909982f37b6a32688fe910d65b6d0fad for 1542844 is described below commit 1542844add7c5ac179c064b7c86627c7bc0c8bb5 Author: Jacques Le Roux AuthorDate: Sat Jul 25 16:59:30 2020 +0200 In previous commit 2b041186909982f37b6a32688fe910d65b6d0fad for Revert "Improved: Convert voidPayment service from mini-lang to groovy DSL (OFBIZ-11487)" This reverts commit faa59b325fc50fc58b578c2b5d9b6d50d21b2478. I wrongly put back 2 files not part of faa59b325 commit CostTests.xml ProductPriceTests.xml This removes them --- .../product/minilang/product/test/CostTests.xml| 90 -- .../minilang/product/test/ProductPriceTests.xml| 66 2 files changed, 156 deletions(-) diff --git a/applications/product/minilang/product/test/CostTests.xml b/applications/product/minilang/product/test/CostTests.xml deleted file mode 100644 index f7ddc68..000 --- a/applications/product/minilang/product/test/CostTests.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - -http://www.w3.org/2001/XMLSchema-instance; -xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/applications/product/minilang/product/test/ProductPriceTests.xml b/applications/product/minilang/product/test/ProductPriceTests.xml deleted file mode 100644 index 335207a..000 --- a/applications/product/minilang/product/test/ProductPriceTests.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - -http://www.w3.org/2001/XMLSchema-instance; -xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
buildbot failure in on ofbizBranch18Framework
The Buildbot has detected a new failure on builder ofbizBranch18Framework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizBranch18Framework/builds/365 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf947_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch18FrameworkCommit' triggered this build Build Source Stamp: [branch release18.12] b5ae3a5b710ed225bbbeccc9a641e4469c9fa9de Blamelist: Aditya Sharma BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
buildbot failure in on ofbizBranch17Framework
The Buildbot has detected a new failure on builder ofbizBranch17Framework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizBranch17Framework/builds/502 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch17FrameworkCommit' triggered this build Build Source Stamp: [branch release17.12] ca62bd6cef357d33f6770fd7e693e3dd97630525 Blamelist: Aditya Sharma BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Revert "Improved: Convert voidPayment service from mini-lang to groovy DSL (OFBIZ-11487)"
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 2b04118 Revert "Improved: Convert voidPayment service from mini-lang
to groovy DSL (OFBIZ-11487)"
2b04118 is described below
commit 2b041186909982f37b6a32688fe910d65b6d0fad
Author: Jacques Le Roux
AuthorDate: Sat Jul 25 16:05:53 2020 +0200
Revert "Improved: Convert voidPayment service from mini-lang to groovy DSL
(OFBIZ-11487)"
This reverts commit faa59b325fc50fc58b578c2b5d9b6d50d21b2478.
It introduced 3 errors in testIntegration, in:
testGlPostingOnCancelCheckRun
testGlPostingsOnVoidPayment
testVoidPayment
---
.../groovyScripts/payment/PaymentServices.groovy | 42 --
.../minilang/payment/PaymentServices.xml | 47 +++
.../accounting/servicedef/services_payment.xml | 4 +-
.../product/minilang/product/test/CostTests.xml| 90 ++
.../minilang/product/test/ProductPriceTests.xml| 66
5 files changed, 205 insertions(+), 44 deletions(-)
diff --git
a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
index 50e44e1..b3b6b6a 100644
--- a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
+++ b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
@@ -319,48 +319,6 @@ def massChangePaymentStatus() {
}
return serviceResult
}
-def voidPayment() {
-GenericValue payment = from("Payment").where("paymentId",
parameters.paymentId).queryOne()
-finAccountTransId = payment.finAccountTransId
-transStatusId = 'FINACT_TRNS_CANCELED'
-statusId = transStatusId
-if (!payment) {
-return error(UtilProperties.getResourceBundleMap("AccountingUiLabels",
locale)?.AccountingNoPaymentsfound)
-}
-paymentId = parameters.paymentId
-Map paymentStatusCtx = [:]
-paymentStatusCtx.paymentId = paymentId
-paymentStatusCtx.statusId = 'PMNT_VOID'
-run service: 'setPaymentStatus', with: paymentStatusCtx
-paymentApplications = from("PaymentApplication").where('paymentId',
paymentId).queryList()
-if (paymentApplications) {
-paymentApplications.each{ paymentApplication ->
-updateInvoiceCtx = from("Invoice").where('invoiceId',
paymentApplication.invoiceId).queryOne()
-if (updateInvoiceCtx.statusId == 'INVOICE_PAID') {
-Map invoiceStatusCtx =
dispatcher.getDispatchContext().makeValidContext('setInvoiceStatus',
ModelService.IN_PARAM, updateInvoiceCtx)
-invoiceStatusCtx.paidDate = ''
-invoiceStatusCtx.statusId = 'INVOICE_READY'
-run service: 'setInvoiceStatus', with: invoiceStatusCtx
-}
-Map removePaymentApplicationCtx = [:]
-removePaymentApplicationCtx.paymentApplicationId =
paymentApplication.paymentApplicationId
-run service: 'removePaymentApplication', with:
removePaymentApplicationCtx
-}
-acctgTransPaymentList = from('AcctgTrans').where('invoiceId', '',
'paymentId', paymentId).queryList()
-acctgTransPaymentList.each{ acctgTransPayment ->
-Map copyAcctgTransCtx = [:]
-copyAcctgTransCtx.fromAcctgTransId = acctgTransPayment.acctgTransId
-copyAcctgTransCtx.revert = 'Y'
-acctgTransId = run service: 'copyAcctgTransAndEntries', with:
copyAcctgTransCtx
-if (acctgTransPayment.isPosted == 'Y') {
-Map postAcctgTransMap = [:]
-postAcctgTransMap.acctgTransId = acctgTransId
-run service: 'postAcctgTrans', with: postAcctgTransMap
-}
-}
-}
-return success()
-}
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 157ee84..eb05f11 100644
--- a/applications/accounting/minilang/payment/PaymentServices.xml
+++ b/applications/accounting/minilang/payment/PaymentServices.xml
@@ -267,6 +267,53 @@ under the License.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[ofbiz-framework] branch release17.12 updated: Fixed: Unable to create event in SFA component (OFBIZ-9901) When creating event for the party other than the loggedin user, the party should be in CAL_OW
This is an automated email from the ASF dual-hosted git repository.
adityasharma pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release17.12 by this push:
new ca62bd6 Fixed: Unable to create event in SFA component (OFBIZ-9901)
When creating event for the party other than the loggedin user, the party
should be in CAL_OWNER role to be added to event. Added appropriate check in
service along with the error message. Thanks Rubia Elza Joshep for reporting
the issue and Aditi Patidar for providing the patch
ca62bd6 is described below
commit ca62bd6cef357d33f6770fd7e693e3dd97630525
Author: Aditya Sharma
AuthorDate: Sat Jul 25 18:48:39 2020 +0530
Fixed: Unable to create event in SFA component (OFBIZ-9901)
When creating event for the party other than the loggedin user, the party
should be in CAL_OWNER role to be added to event. Added appropriate check in
service along with the error message.
Thanks Rubia Elza Joshep for reporting the issue and Aditi Patidar for
providing the patch
---
applications/party/config/PartyErrorUiLabels.xml | 3 +++
.../minilang/workeffort/WorkEffortSimpleServices.xml | 16
2 files changed, 19 insertions(+)
diff --git a/applications/party/config/PartyErrorUiLabels.xml
b/applications/party/config/PartyErrorUiLabels.xml
index 93240b7..57a970b 100644
--- a/applications/party/config/PartyErrorUiLabels.xml
+++ b/applications/party/config/PartyErrorUiLabels.xml
@@ -731,6 +731,9 @@
无法新建已存在的会员角色
無法新建已存在的團體角色
+
+Party id: ${partyId} should be in role:
${roleDescription}
+
Akteur Rolle kann nicht erstellt werden
(Lesefehler).
could not create party role read
diff --git
a/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
b/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
index 0e41b58..89afdbe 100644
--- a/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
+++ b/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
@@ -22,6 +22,22 @@ under the License.
xmlns="http://ofbiz.apache.org/Simple-Method;
xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method
http://ofbiz.apache.org/dtds/simple-methods.xsd;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[ofbiz-framework] branch release18.12 updated: Fixed: Unable to create event in SFA component (OFBIZ-9901) When creating event for the party other than the loggedin user, the party should be in CAL_OW
This is an automated email from the ASF dual-hosted git repository.
adityasharma pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new b5ae3a5 Fixed: Unable to create event in SFA component (OFBIZ-9901)
When creating event for the party other than the loggedin user, the party
should be in CAL_OWNER role to be added to event. Added appropriate check in
service along with the error message. Thanks Rubia Elza Joshep for reporting
the issue and Aditi Patidar for providing the patch
b5ae3a5 is described below
commit b5ae3a5b710ed225bbbeccc9a641e4469c9fa9de
Author: Aditya Sharma
AuthorDate: Sat Jul 25 18:53:50 2020 +0530
Fixed: Unable to create event in SFA component (OFBIZ-9901)
When creating event for the party other than the loggedin user, the party
should be in CAL_OWNER role to be added to event. Added appropriate check in
service along with the error message.
Thanks Rubia Elza Joshep for reporting the issue and Aditi Patidar for
providing the patch
---
applications/party/config/PartyErrorUiLabels.xml | 3 +++
.../minilang/workeffort/WorkEffortSimpleServices.xml | 16
2 files changed, 19 insertions(+)
diff --git a/applications/party/config/PartyErrorUiLabels.xml
b/applications/party/config/PartyErrorUiLabels.xml
index b01c812..1b9392c 100644
--- a/applications/party/config/PartyErrorUiLabels.xml
+++ b/applications/party/config/PartyErrorUiLabels.xml
@@ -762,6 +762,9 @@
无法新建已存在的会员角色
無法新建已存在的團體角色
+
+Party id: ${partyId} should be in role:
${roleDescription}
+
Akteur Rolle kann nicht erstellt werden
(Lesefehler).
could not create party role read
diff --git
a/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
b/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
index 67d18f5..8b76d7c 100644
--- a/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
+++ b/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
@@ -22,6 +22,22 @@ under the License.
xmlns="http://ofbiz.apache.org/Simple-Method;
xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method
http://ofbiz.apache.org/dtds/simple-methods.xsd;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[ofbiz-framework] branch trunk updated: Fixed: Unable to create event in SFA component (OFBIZ-9901) When creating event for the party other than the loggedin user, the party should be in CAL_OWNER rol
This is an automated email from the ASF dual-hosted git repository.
adityasharma 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 6804a9d Fixed: Unable to create event in SFA component (OFBIZ-9901)
When creating event for the party other than the loggedin user, the party
should be in CAL_OWNER role to be added to event. Added appropriate check in
service along with the error message. Thanks Rubia Elza Joshep for reporting
the issue and Aditi Patidar for providing the patch
6804a9d is described below
commit 6804a9dac3a9c8e9c0c4678661e7918dc50cf6eb
Author: Aditya Sharma
AuthorDate: Sat Jul 25 18:48:39 2020 +0530
Fixed: Unable to create event in SFA component (OFBIZ-9901)
When creating event for the party other than the loggedin user, the party
should be in CAL_OWNER role to be added to event. Added appropriate check in
service along with the error message.
Thanks Rubia Elza Joshep for reporting the issue and Aditi Patidar for
providing the patch
---
applications/party/config/PartyErrorUiLabels.xml | 3 +++
.../minilang/workeffort/WorkEffortSimpleServices.xml | 16
2 files changed, 19 insertions(+)
diff --git a/applications/party/config/PartyErrorUiLabels.xml
b/applications/party/config/PartyErrorUiLabels.xml
index b352887..0fe95e7 100644
--- a/applications/party/config/PartyErrorUiLabels.xml
+++ b/applications/party/config/PartyErrorUiLabels.xml
@@ -828,6 +828,9 @@
无法新建已存在的会员角色
無法新建已存在的團體角色
+
+Party id: ${partyId} should be in role:
${roleDescription}
+
Akteur Rolle kann nicht erstellt werden
(Lesefehler).
could not create party role read
diff --git
a/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
b/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
index 7c47e60..cf65e6e 100644
--- a/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
+++ b/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
@@ -22,6 +22,22 @@ under the License.
xmlns="http://ofbiz.apache.org/Simple-Method;
xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method
http://ofbiz.apache.org/dtds/simple-methods.xsd;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[ofbiz-framework] branch trunk updated: Fixed: One page checkout is broken because of ordermgr::getAssociatedStateList (OFBIZ-11838)
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 fc865c4 Fixed: One page checkout is broken because of
ordermgr::getAssociatedStateList (OFBIZ-11838)
fc865c4 is described below
commit fc865c458a16a681183c25297d0f395027a36625
Author: Jacques Le Roux
AuthorDate: Sat Jul 25 14:05:21 2020 +0200
Fixed: One page checkout is broken because of
ordermgr::getAssociatedStateList (OFBIZ-11838)
On orderview screen at the ordermgr, when a user tries to change the status
of
the order, in OrderInfo.ftl, we are calling "changeOrderStatus" request as
<@ofbizUrl>changeOrderStatus/orderview
Hence when the request is done, it is rewriting URL to
https://localhost:8443/ordermgr/control/changeOrderStatus/orderview.
When js functions running in the backend like "getAssociatedStateList" are
called, they are getting the wrong URL to send a request to. This was
causing
the issue.
For now, there are two different fixes that can handle both problems which
are
mentioned in OFBIZ-2562 and OFBIZ-11838.
1.
To change the request mapping for "changeOrderStatus" and add
request-redirect
to "orderview" screen. Change the actions in the forms in OrderInfo.ftl to
call "changeOrderStatus" request only and then remove code in
"getAssociatedStateList" js function to rewrite URL.
2.
To add .length to the existing URL rewrite code written in
"getAssociatedStateList" js function as
if (jQuery('#orderViewed').length) {
requestToSend = "/ordermgr/control/getAssociatedStateList"
}
Thanks: Pritam Kute!
I picked the 2nd solution
---
applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
b/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
index 8ec97bb..6359edf 100644
--- a/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
+++ b/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
@@ -81,7 +81,7 @@ function setKeyAsParameter(event, ui) {
function getAssociatedStateList(countryId, stateId, errorId, divId) {
var countryGeoId = jQuery("#" + countryId).val();
var requestToSend = "getAssociatedStateList";
-if (jQuery('#orderViewed')) {
+if (jQuery('#orderViewed').length) {
requestToSend = "/ordermgr/control/getAssociatedStateList"
}
jQuery.ajax({
[ofbiz-framework] branch trunk updated: Improved: Convert CostTests.xml to Groovy(OFBIZ-11859)
This is an automated email from the ASF dual-hosted git repository.
pawan 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 5799c7e Improved: Convert CostTests.xml to Groovy(OFBIZ-11859)
5799c7e is described below
commit 5799c7e5e46f9915fcb0a8160b8f5e3f9644603f
Author: Pawan Verma
AuthorDate: Sat Jul 25 17:25:42 2020 +0530
Improved: Convert CostTests.xml to Groovy(OFBIZ-11859)
Thanks, Akash for report and Anushi for the Patch.
---
.../product/minilang/product/test/CostTests.xml| 90 --
.../org/apache/ofbiz/product/CostTests.groovy | 73 ++
applications/product/testdef/CostTests.xml | 2 +-
3 files changed, 74 insertions(+), 91 deletions(-)
diff --git a/applications/product/minilang/product/test/CostTests.xml
b/applications/product/minilang/product/test/CostTests.xml
deleted file mode 100644
index f7ddc68..000
--- a/applications/product/minilang/product/test/CostTests.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-http://www.w3.org/2001/XMLSchema-instance;
-xmlns="http://ofbiz.apache.org/Simple-Method;
xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method
http://ofbiz.apache.org/dtds/simple-methods.xsd;>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git
a/applications/product/src/main/groovy/org/apache/ofbiz/product/CostTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/CostTests.groovy
new file mode 100644
index 000..5c17a09
--- /dev/null
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/CostTests.groovy
@@ -0,0 +1,73 @@
+/***
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
***/
+package org.apache.ofbiz.product
+
+import org.apache.ofbiz.entity.GenericValue
+import org.apache.ofbiz.service.ServiceUtil
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class CostTests extends OFBizTestCase {
+public CostTests(String name) {
+super(name)
+}
+
+void testCalculateProductStandardCosts() {
+String productId = 'PROD_MANUF'
+Map serviceCtx = [
+productId: productId,
+currencyUomId: 'USD',
+costComponentTypePrefix: 'EST_STD',
+userLogin: userLogin
+]
+Map resultMap = dispatcher.runSync('calculateProductCosts', serviceCtx)
+assert ServiceUtil.isSuccess(resultMap)
+
+List costComponents =
from('CostComponent').where('productId', productId).filterByDate().queryList()
+BigDecimal costTotalAmount = BigDecimal.ZERO;
+
+for (GenericValue costComponent : costComponents) {
+assert costComponent.costUomId == 'USD'
+if (costComponent.costComponentTypeId == 'EST_STD_ROUTE_COST') {
+assert costComponent.cost == 10
+} else if (costComponent.costComponentTypeId ==
'EST_STD_MAT_COST') {
+assert costComponent.cost == 39
+} else if (costComponent.costComponentTypeId ==
'EST_STD_OTHER_COST') {
+assert costComponent.cost == 31
+} else if
[ofbiz-framework] branch trunk updated: Improved: Updated tasks.checkstyleMain.maxErrors to 18050 ~(-2000)
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 b2d7f9e Improved: Updated tasks.checkstyleMain.maxErrors to 18050
~(-2000)
new ca77f88 Merge branch 'trunk' of
https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk
b2d7f9e is described below
commit b2d7f9ea2a2ddeff585549de0c3cf8eb00a86276
Author: Suraj Khurana
AuthorDate: Sat Jul 25 14:03:50 2020 +0530
Improved: Updated tasks.checkstyleMain.maxErrors to 18050 ~(-2000)
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 7b97118..bcf1dc7 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 = 20037
+tasks.checkstyleMain.maxErrors = 18050
// Currently there are a lot of errors so we need to temporarily
// hide them to avoid polluting the terminal output.
showViolations = false
buildbot exception in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a build exception on builder ofbizTrunkFrameworkPlugins while building ofbiz-plugins. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1567 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' triggered this build Build Source Stamp: [branch trunk] 4b88493e1bfd1a0e33bc1a1568ed1e1ba34a254a Blamelist: Suraj Khurana BUILD FAILED: exception javadoc upload test-results part 1 Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Improved: Convert voidPayment service from mini-lang to groovy DSL (OFBIZ-11487)
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 faa59b3 Improved: Convert voidPayment service from mini-lang to
groovy DSL (OFBIZ-11487)
faa59b3 is described below
commit faa59b325fc50fc58b578c2b5d9b6d50d21b2478
Author: Jacques Le Roux
AuthorDate: Sat Jul 25 10:30:47 2020 +0200
Improved: Convert voidPayment service from mini-lang to groovy DSL
(OFBIZ-11487)
Thanks: Sourabh Punyani
---
.../groovyScripts/payment/PaymentServices.groovy | 42 +++
.../minilang/payment/PaymentServices.xml | 47 --
.../accounting/servicedef/services_payment.xml | 4 +-
3 files changed, 44 insertions(+), 49 deletions(-)
diff --git
a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
index b3b6b6a..50e44e1 100644
--- a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
+++ b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
@@ -319,6 +319,48 @@ def massChangePaymentStatus() {
}
return serviceResult
}
+def voidPayment() {
+GenericValue payment = from("Payment").where("paymentId",
parameters.paymentId).queryOne()
+finAccountTransId = payment.finAccountTransId
+transStatusId = 'FINACT_TRNS_CANCELED'
+statusId = transStatusId
+if (!payment) {
+return error(UtilProperties.getResourceBundleMap("AccountingUiLabels",
locale)?.AccountingNoPaymentsfound)
+}
+paymentId = parameters.paymentId
+Map paymentStatusCtx = [:]
+paymentStatusCtx.paymentId = paymentId
+paymentStatusCtx.statusId = 'PMNT_VOID'
+run service: 'setPaymentStatus', with: paymentStatusCtx
+paymentApplications = from("PaymentApplication").where('paymentId',
paymentId).queryList()
+if (paymentApplications) {
+paymentApplications.each{ paymentApplication ->
+updateInvoiceCtx = from("Invoice").where('invoiceId',
paymentApplication.invoiceId).queryOne()
+if (updateInvoiceCtx.statusId == 'INVOICE_PAID') {
+Map invoiceStatusCtx =
dispatcher.getDispatchContext().makeValidContext('setInvoiceStatus',
ModelService.IN_PARAM, updateInvoiceCtx)
+invoiceStatusCtx.paidDate = ''
+invoiceStatusCtx.statusId = 'INVOICE_READY'
+run service: 'setInvoiceStatus', with: invoiceStatusCtx
+}
+Map removePaymentApplicationCtx = [:]
+removePaymentApplicationCtx.paymentApplicationId =
paymentApplication.paymentApplicationId
+run service: 'removePaymentApplication', with:
removePaymentApplicationCtx
+}
+acctgTransPaymentList = from('AcctgTrans').where('invoiceId', '',
'paymentId', paymentId).queryList()
+acctgTransPaymentList.each{ acctgTransPayment ->
+Map copyAcctgTransCtx = [:]
+copyAcctgTransCtx.fromAcctgTransId = acctgTransPayment.acctgTransId
+copyAcctgTransCtx.revert = 'Y'
+acctgTransId = run service: 'copyAcctgTransAndEntries', with:
copyAcctgTransCtx
+if (acctgTransPayment.isPosted == 'Y') {
+Map postAcctgTransMap = [:]
+postAcctgTransMap.acctgTransId = acctgTransId
+run service: 'postAcctgTrans', with: postAcctgTransMap
+}
+}
+}
+return success()
+}
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 eb05f11..157ee84 100644
--- a/applications/accounting/minilang/payment/PaymentServices.xml
+++ b/applications/accounting/minilang/payment/PaymentServices.xml
@@ -267,53 +267,6 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/applications/accounting/servicedef/services_payment.xml
b/applications/accounting/servicedef/services_payment.xml
index 5a4d03a..a34ff87 100644
--- a/applications/accounting/servicedef/services_payment.xml
+++
[ofbiz-plugins] branch trunk updated: Improved: Updated case indentation to 0 for all switch statements in plugins component. Also done formatting changes as per checkstyle best practices. (OFBIZ-1190
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-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 78801df Improved: Updated case indentation to 0 for all switch
statements in plugins component. Also done formatting changes as per checkstyle
best practices. (OFBIZ-11904)
new 4b88493 Merge branch 'trunk' of
https://gitbox.apache.org/repos/asf/ofbiz-plugins into trunk
78801df is described below
commit 78801df4539f3d53d031e40697717315630529f1
Author: Suraj Khurana
AuthorDate: Sat Jul 25 13:48:25 2020 +0530
Improved: Updated case indentation to 0 for all switch statements in
plugins component. Also done formatting changes as per checkstyle best
practices.
(OFBIZ-11904)
---
.../org/apache/ofbiz/ebay/EbayOrderServices.java | 377 -
.../apache/ofbiz/ebay/ImportOrdersFromEbay.java| 153 +
.../org/apache/ofbiz/ebaystore/EbayEvents.java | 4 +-
.../java/org/apache/ofbiz/ebaystore/EbayStore.java | 8 +-
.../apache/ofbiz/ebaystore/EbayStoreHelper.java| 2 +-
.../apache/ofbiz/ebaystore/EbayStoreOptions.java | 2 +-
.../org/apache/ofbiz/ebaystore/EbayStoreOrder.java | 2 +-
.../ofbiz/content/search/ProductDocument.java | 9 +-
.../ofbiz/passport/user/GitHubAuthenticator.java | 40 +--
.../org/apache/ofbiz/htmlreport/HtmlReport.java| 366 ++--
.../ofbiz/htmlreport/util/ReportEncoder.java | 46 +--
.../ofbiz/htmlreport/util/ReportStringUtil.java| 100 +++---
.../apache/ofbiz/pricat/AbstractPricatParser.java | 34 +-
.../ofbiz/pricat/sample/SamplePricatParser.java| 12 +-
.../java/org/apache/ofbiz/solr/ProductUtil.java| 68 ++--
.../org/apache/ofbiz/solr/SolrProductSearch.java | 57 ++--
.../main/java/org/apache/ofbiz/solr/SolrUtil.java | 2 +-
.../java/org/apache/ofbiz/webpos/WebPosEvents.java | 2 +-
18 files changed, 688 insertions(+), 596 deletions(-)
diff --git a/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java
b/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java
index 2b1cfa5..07402e0 100644
--- a/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java
+++ b/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java
@@ -84,14 +84,18 @@ public class EbayOrderServices {
try {
Map eBayConfigResult =
EbayHelper.buildEbayConfig(context, delegator);
if (UtilValidate.isEmpty(eBayConfigResult)) {
-String eBayConfigErrorMsg =
UtilProperties.getMessage(RESOURCE,
"EbayConfigurationSettingsAreMissingForConnectingToEbayServer", locale);
+String eBayConfigErrorMsg =
UtilProperties.getMessage(RESOURCE,
"EbayConfigurationSettingsAreMissingForConnectingToEbayServer",
+locale);
return ServiceUtil.returnError(eBayConfigErrorMsg);
}
StringBuffer sellerTransactionsItemsXml = new StringBuffer();
-if
(!ServiceUtil.isFailure(buildGetSellerTransactionsRequest(context,
sellerTransactionsItemsXml, eBayConfigResult.get("token").toString( {
-result =
EbayHelper.postItem(eBayConfigResult.get("xmlGatewayUri").toString(),
sellerTransactionsItemsXml, eBayConfigResult.get("devID").toString(),
eBayConfigResult.get("appID").toString(),
eBayConfigResult.get("certID").toString(), "GetSellerTransactions",
eBayConfigResult.get("compatibilityLevel").toString(),
eBayConfigResult.get("siteID").toString());
-String getSellerTransactionSuccessMsg = (String)
result.get(ModelService.SUCCESS_MESSAGE);
+if
(!ServiceUtil.isFailure(buildGetSellerTransactionsRequest(context,
sellerTransactionsItemsXml,
+eBayConfigResult.get("token").toString( {
+result =
EbayHelper.postItem(eBayConfigResult.get("xmlGatewayUri").toString(),
sellerTransactionsItemsXml, eBayConfigResult.get(
+"devID").toString(),
eBayConfigResult.get("appID").toString(),
eBayConfigResult.get("certID").toString(),
+"GetSellerTransactions",
eBayConfigResult.get("compatibilityLevel").toString(),
eBayConfigResult.get("siteID").toString());
+String getSellerTransactionSuccessMsg = (String)
result.get(ModelService.SUCCESS_MESSAGE);
if (getSellerTransactionSuccessMsg != null) {
isGetSellerTransactionsCall = true;
result = checkOrders(delegator, dispatcher, locale,
context, getSellerTransactionSuccessMsg);
@@ -100,7 +104,9 @@ public class EbayOrderServices {
StringBuffer getOrdersXml = new StringBuffer();
if (!ServiceUtil.isFailure(buildGetOrdersRequest(context,
getOrdersXml, eBayConfigResult.get("token").toString( {
-result =
[ofbiz-plugins] branch release18.12 updated: Improved: Update markup of Quick Checkout Page according Bootstrap v4.0.0 (OFBIZ-10136) Fixes a typo
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new c05bc3a Improved: Update markup of Quick Checkout Page according
Bootstrap v4.0.0 (OFBIZ-10136) Fixes a typo
c05bc3a is described below
commit c05bc3af1b6cb6d6748c12762b86509a36fe5175
Author: Jacques Le Roux
AuthorDate: Sat Jul 25 09:55:04 2020 +0200
Improved: Update markup of Quick Checkout Page according Bootstrap v4.0.0
(OFBIZ-10136)
Fixes a typo
---
ecommerce/template/order/CheckoutOptions.ftl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ecommerce/template/order/CheckoutOptions.ftl
b/ecommerce/template/order/CheckoutOptions.ftl
index 155578f..85a948a 100644
--- a/ecommerce/template/order/CheckoutOptions.ftl
+++ b/ecommerce/template/order/CheckoutOptions.ftl
@@ -214,7 +214,7 @@ function submitForm(form, mode, value) {
<#-- Payment Method Selection -->
- 3.${uiLabelMap.OrderHowShallYouPay}?
+ 3.${uiLabelMap.OrderHowShallYouPay}?
${uiLabelMap.CommonAdd}:
@@ -369,4 +369,4 @@ function submitForm(form, mode, value) {
${uiLabelMap.OrderContinueToFinalOrderReview}
-
\ No newline at end of file
+
[ofbiz-plugins] branch trunk updated: Improved: Update markup of Quick Checkout Page according Bootstrap v4.0.0 (OFBIZ-10136) Fixes a typo
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 dc55cb4 Improved: Update markup of Quick Checkout Page according
Bootstrap v4.0.0 (OFBIZ-10136) Fixes a typo
dc55cb4 is described below
commit dc55cb4746d21564068b872f81cffe81f17c73ed
Author: Jacques Le Roux
AuthorDate: Sat Jul 25 09:55:04 2020 +0200
Improved: Update markup of Quick Checkout Page according Bootstrap v4.0.0
(OFBIZ-10136)
Fixes a typo
---
ecommerce/template/order/CheckoutOptions.ftl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ecommerce/template/order/CheckoutOptions.ftl
b/ecommerce/template/order/CheckoutOptions.ftl
index 9de1950..8d5643e 100644
--- a/ecommerce/template/order/CheckoutOptions.ftl
+++ b/ecommerce/template/order/CheckoutOptions.ftl
@@ -212,7 +212,7 @@ function submitForm(form, mode, value) {
<#-- Payment Method Selection -->
- 3.${uiLabelMap.OrderHowShallYouPay}?
+ 3.${uiLabelMap.OrderHowShallYouPay}?
${uiLabelMap.CommonAdd}:
@@ -367,4 +367,4 @@ function submitForm(form, mode, value) {
${uiLabelMap.OrderContinueToFinalOrderReview}
-
\ No newline at end of file
+
[ofbiz-framework] branch trunk updated: Fixed: Error in Quick Receive Purchase Order process. (OFBIZ-11911) (#219)
This is an automated email from the ASF dual-hosted git repository.
pawan 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 4739019 Fixed: Error in Quick Receive Purchase Order process.
(OFBIZ-11911) (#219)
4739019 is described below
commit 4739019732851dd3ca48847c1155845fd667ca12
Author: lodhiravi <65070983+lodhir...@users.noreply.github.com>
AuthorDate: Sat Jul 25 12:11:12 2020 +0530
Fixed: Error in Quick Receive Purchase Order process. (OFBIZ-11911) (#219)
Corrected typo
---
applications/product/groovyScripts/shipment/ShipmentServices.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/applications/product/groovyScripts/shipment/ShipmentServices.groovy
b/applications/product/groovyScripts/shipment/ShipmentServices.groovy
index 5501374..93b0db0 100644
--- a/applications/product/groovyScripts/shipment/ShipmentServices.groovy
+++ b/applications/product/groovyScripts/shipment/ShipmentServices.groovy
@@ -1004,7 +1004,7 @@ def createShipmentForFacilityAndShipGroup(GenericValue
orderHeader, List orderIt
shipmentContext.statusId = "SHIPMENT_INPUT"
} else {
shipmentContext.destinationFacilityId = facility.facilityId
-shipmentContext.statusId = "PRUCH_SHIP_CREATED"
+shipmentContext.statusId = "PURCH_SHIP_CREATED"
}
Map serviceResult = run service: "createShipment", with:
shipmentContext
GenericValue shipment = from("Shipment").where(shipmentId:
serviceResult.shipmentId).queryOne()
@@ -1029,7 +1029,7 @@ def createShipmentForFacilityAndShipGroup(GenericValue
orderHeader, List orderIt
run service: "issueOrderItemToShipment", with:
[shipmentId: shipment.shipmentId,
orderId:
item.orderId,
orderItemSeqId: item.orderItemSeqId,
-
shipGroupSeqId: item.shipgroupSeqId,
+
shipGroupSeqId: item.shipGroupSeqId,
quantity:
item.quantity]
}
}
[ofbiz-framework] branch trunk updated: Fixed: Converted GString to String while setting success message in receiveInventoryProduct service to avoid the ClassCastException. Also corrected loop conditi
This is an automated email from the ASF dual-hosted git repository.
pawan 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 356af00 Fixed: Converted GString to String while setting success
message in receiveInventoryProduct service to avoid the ClassCastException.
Also corrected loop condition while creating inventory information during PO
receiving to fix the issue where each product is getting received two times
(doubled the qty) instead of single time.(OFBIZ-11909) (#218)
356af00 is described below
commit 356af00b83e3b697b77f2c3867414e9818a6746a
Author: lodhiravi <65070983+lodhir...@users.noreply.github.com>
AuthorDate: Sat Jul 25 12:04:03 2020 +0530
Fixed: Converted GString to String while setting success message in
receiveInventoryProduct service to avoid the ClassCastException. Also corrected
loop condition while creating inventory information during PO receiving to fix
the issue where each product is getting received two times (doubled the qty)
instead of single time.(OFBIZ-11909) (#218)
---
.../product/groovyScripts/shipment/ShipmentReceiptServices.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/applications/product/groovyScripts/shipment/ShipmentReceiptServices.groovy
b/applications/product/groovyScripts/shipment/ShipmentReceiptServices.groovy
index b69e9cd..287f626 100644
--- a/applications/product/groovyScripts/shipment/ShipmentReceiptServices.groovy
+++ b/applications/product/groovyScripts/shipment/ShipmentReceiptServices.groovy
@@ -108,7 +108,7 @@ def receiveInventoryProduct () {
}
}
-for (Double currentLoop = 0; currentLoop <= loops; currentLoop++) {
+for (Double currentLoop = 0; currentLoop < loops; currentLoop++) {
logInfo("receiveInventoryProduct Looping and creating inventory info -
${currentLoop}")
// if there is an inventoryItemId, update it (this will happen when
receiving serialized inventory already in the system, like for returns); if not
create one
@@ -166,7 +166,7 @@ def receiveInventoryProduct () {
serviceInMap.inventoryItemId = currentInventoryItemId
run service:"balanceInventoryItems", with: serviceInMap
-successMessageList << "Received ${parameters.quantityAccepted} of
${parameters.productId} in inventory item ${currentInventoryItemId}"
+successMessageList << "Received ${parameters.quantityAccepted} of
${parameters.productId} in inventory item ${currentInventoryItemId}".toString()
}
// return the last inventory item received
result.inventoryItemId = currentInventoryItemId
[ofbiz-framework] branch trunk updated: Improved: Convert ProductPriceTests.xml to Groovy(OFBIZ-11856)
This is an automated email from the ASF dual-hosted git repository.
pawan 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 a779bdc Improved: Convert ProductPriceTests.xml to Groovy(OFBIZ-11856)
a779bdc is described below
commit a779bdc5f0ff0819e7c0efdf45a19e2d58b705e1
Author: Pawan Verma
AuthorDate: Sat Jul 25 11:49:28 2020 +0530
Improved: Convert ProductPriceTests.xml to Groovy(OFBIZ-11856)
Thanks, Akash for report and Anushi for patch.
---
.../minilang/product/test/ProductPriceTests.xml| 66 --
.../apache/ofbiz/product/ProductPriceTests.groovy | 63 +
applications/product/testdef/CatalogTests.xml | 2 +-
3 files changed, 64 insertions(+), 67 deletions(-)
diff --git a/applications/product/minilang/product/test/ProductPriceTests.xml
b/applications/product/minilang/product/test/ProductPriceTests.xml
deleted file mode 100644
index 335207a..000
--- a/applications/product/minilang/product/test/ProductPriceTests.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-http://www.w3.org/2001/XMLSchema-instance;
-xmlns="http://ofbiz.apache.org/Simple-Method;
xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method
http://ofbiz.apache.org/dtds/simple-methods.xsd;>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git
a/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPriceTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPriceTests.groovy
new file mode 100644
index 000..8717113
--- /dev/null
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPriceTests.groovy
@@ -0,0 +1,63 @@
+/***
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
***/
+package org.apache.ofbiz.product
+
+import org.apache.ofbiz.entity.GenericValue
+import org.apache.ofbiz.service.ServiceUtil
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class ProductPriceTests extends OFBizTestCase {
+public ProductPriceTests(String name) {
+super(name)
+}
+
+void testCalculateProductPrice() {
+String productId = 'GZ-2002'
+GenericValue product = from('Product').where('productId',
productId).queryOne()
+Map serviceCtx = [:]
+serviceCtx.product = product
+Map resultMap = dispatcher.runSync('calculateProductPrice', serviceCtx)
+assert ServiceUtil.isSuccess(resultMap)
+assert resultMap.defaultPrice == 47.99
+assert resultMap.listPrice == 48
+}
+
+void testCalculateProductPriceOfVariantProduct() {
+// If product is a variant and no price is set, then default price of
virtual product will be set
+String productId = 'GZ-1006-3'
+GenericValue product = from('Product').where('productId',
productId).queryOne()
+Map serviceCtx = [:]
+serviceCtx.product = product
+Map resultMap = dispatcher.runSync('calculateProductPrice', serviceCtx)
+assert ServiceUtil.isSuccess(resultMap)
+assert resultMap.defaultPrice == 1.99
+assert resultMap.listPrice == 5.99
+}
+
+void testCalculateProductPriceOfVirtualProduct() {
+// If product is a virtual and no price is set then then the service
return price of a variant product which have lowest DEFAULT_PRICE. It is also
considered whether the product is discontinued for sale before using the lowest
price against a variant for a virtual product
+String productId = 'DemoProduct'
+GenericValue product = from('Product').where('productId',
productId).queryOne()
+Map
