Jacques Le Roux

"Applied fix from trunk for revision: 1868395"

------------------------------------------------------------------------

r1868395 | jleroux | 2019-10-13 12:37:08 +0200 (dim. 13 oct. 2019) | 8 lignes

Fixed: Merge UrlRegexpTransform and OfbizUrlTransform classes

(OFBIZ-11229)

OFBIZ-4361 depends on this issue. Here is a first version, the main identified

point was when the request isn't present (email send, service call) the website

isn't pull from context. This solves this aspect

Thanks: Nicolas for the patch

------------------------------------------------------------------------

"Applied fix from trunk for revision: 1868395"

------------------------------------------------------------------------

r1868395 | jleroux | 2019-10-13 12:37:08 +0200 (dim. 13 oct. 2019) | 8 lignes

Fixed: Merge UrlRegexpTransform and OfbizUrlTransform classes

(OFBIZ-11229)

OFBIZ-4361 depends on this issue. Here is a first version, the main identified

point was when the request isn't present (email send, service call) the website

isn't pull from context. This solves this aspect

Thanks: Nicolas for the patch

------------------------------------------------------------------------

Fixed: Merge UrlRegexpTransform and OfbizUrlTransform classes

(OFBIZ-11229)

OFBIZ-4361 depends on this issue. Here is a first version, the main identified

point was when the request isn't present (email send, service call) the website

isn't pull from context. This solves this aspect

Thanks: Nicolas for the patch

Improved: Unit test case for service - ProcessRepairReplacementReturn

(OFBIZ-8869)

OrderTests.groovy has been splitted in other files, this test fits in

OrderReturnTests.groovy

Thanks: Avnindra Sharma for initial test and Suraj for Groovy conversion

Improved: Unit test case for service - ProcessRefundReturnForReplacement

(OFBIZ-8868)

OrderTests.groovy has been splitter in other files, this test fits in

OrderReturnTests.groovy

Thanks: Avnindra Sharma for initial test and Suraj for Groovy conversion

Improved: Unit test case for service - sendOrderConfirmation

(OFBIZ-8507)

Move to Groovy before deciding on moving OrderNotificationTests.groovy

from order to ecommerce or moving EmailOrderScreens from ecommerce to order

"Applied fix from trunk framework for revision: 1868298"

------------------------------------------------------------------------

r1868298 | jleroux | 2019-10-11 18:45:16 +0200 (ven. 11 oct. 2019) | 20 lignes

Fixed: NotSerializableException after uploading images to an order

(OFBIZ-11123)

I found that using in r1866259 the same fix than Si Chen used in OFBIZ-750 was

wrong. The code just above this fix is

{code:java}

if (obj instanceof Serializable) {

reqAttrMap.put(name, obj);

}

{code}

The problem with this code is that if does not handle inner Maps which may

contain a non Serializable Object. So the solution is rather to get one level

deeper and apply the same. We can then remove the harcoded lines with

"uploadedFile" and "_REQUEST_HANDLER_" below. Then all possible cases are handled

as long as we have not inner-inner-Maps

------------------------------------------------------------------------

?\026

"Applied fix from trunk for revision: 1868298"

------------------------------------------------------------------------

r1868298 | jleroux | 2019-10-11 18:45:16 +0200 (ven. 11 oct. 2019) | 20 lignes

Fixed: NotSerializableException after uploading images to an order

(OFBIZ-11123)

I found that using in r1866259 the same fix than Si Chen used in OFBIZ-750 was

wrong. The code just above this fix is

{code:java}

if (obj instanceof Serializable) {

reqAttrMap.put(name, obj);

}

{code}

The problem with this code is that if does not handle inner Maps which may

contain a non Serializable Object. So the solution is rather to get one level

deeper and apply the same. We can then remove the harcoded lines with

"uploadedFile" and "_REQUEST_HANDLER_" below. Then all possible cases are handled

as long as we have not inner-inner-Maps

------------------------------------------------------------------------

"Applied fix from trunk for revision: 1868298"

------------------------------------------------------------------------

r1868298 | jleroux | 2019-10-11 18:45:16 +0200 (ven. 11 oct. 2019) | 20 lignes

Fixed: NotSerializableException after uploading images to an order

(OFBIZ-11123)

I found that using in r1866259 the same fix than Si Chen used in OFBIZ-750 was

wrong. The code just above this fix is

{code:java}

if (obj instanceof Serializable) {

reqAttrMap.put(name, obj);

}

{code}

The problem with this code is that if does not handle inner Maps which may

contain a non Serializable Object. So the solution is rather to get one level

deeper and apply the same. We can then remove the harcoded lines with

"uploadedFile" and "_REQUEST_HANDLER_" below. Then all possible cases are handled

as long as we have not inner-inner-Maps

------------------------------------------------------------------------

Fixed: NotSerializableException after uploading images to an order

(OFBIZ-11123)

I found that using in r1866259 the same fix than Si Chen used in OFBIZ-750 was

wrong. The code just above this fix is

{code:java}

if (obj instanceof Serializable) {

reqAttrMap.put(name, obj);

}

{code}

The problem with this code is that if does not handle inner Maps which may

contain a non Serializable Object. So the solution is rather to get one level

deeper and apply the same. We can then remove the harcoded lines with

"uploadedFile" and "_REQUEST_HANDLER_" below. Then all possible cases are handled

as long as we have not inner-inner-Maps

Improved: Add a discussion feature in order detail view for following

communication about the order (mail, phone etc.)

(OFBIZ-11210)

Adds missing ASL2 header

Improved: Update build.gradle to the latest dependencies

(OFBIZ-11245)

Updates dependency-check-report.html
Update wiki demo help
Improved: Improve the job search view with a better limit and a default sort

(OFBIZ-11241)

Adds a 50 items limit by default instead of 20

Adds a default sort on -runtime to have a look on the lasts jobs executed

Thanks: Carl Demus

Improved: Refactor OrderTests.groovy and separate order and return test services

(OFBIZ-11239)

Forgot to commit OrderNotificationTests.groovy in last commit

Improved: Refactor OrderTests.groovy and separate order and return test services

(OFBIZ-11239)

Based on Suraj's patch

This also moves

testQuickReturnOrder to OrderReturnTests.groovy

the requirement tests in OrderRequirementTests.groovy

renames OrderTest.groovy to OrderNotificationTests.groovy since it contains

only that

renames test-case for OrderTests.xml "order-tests-xml"

Test pass

Thanks: Suraj for initial patch

Improved: no functional change

In r1868022 I added the POS_SALES_CHANNEL was suggested in OFBIZ-10965. Actually

that was wrong. Tt's already in PosTypeData.xml though with a wrong sequenceId

This fixes it

Improved: no functional change

Adds the POS_SALES_CHANNEL was suggested in OFBIZ-10965 and could be useful

Improved: no functional change

As reported by Ethan Vos on user ML, sometimes the alias between wget and

Invoke-WebRequest is not present on Windows 7, better keep it simple!

Also removes the comment:

Anyway I believe this should be only used in dev environment

which is no longer true

"Applied fix from trunk for revision: 1867998"

------------------------------------------------------------------------

r1867998 | jleroux | 2019-10-05 10:05:54 +0200 (sam. 05 oct. 2019) | 8 lignes

Improved: no functional change

As reported by Ethan Vos on user ML, sometimes the alias between wget and

Invoke-WebRequest is not present on Windows 7, better keep it simple!

Also removes the comment:

Anyway I believe this should be only used in dev environment

which is no longer true

------------------------------------------------------------------------

Improved: no functional change

As reported by Ethan Vos on user ML, sometimes the alias between wget and

Invoke-WebRequest is not present on Windows 7, better keep it simple!

Also removes the comment:

Anyway I believe this should be only used in dev environment

which is no longer true

Improved: Unit test case for service - sendOrderCompleteNotification

(OFBIZ-8812)

As Suraj somehow mentioned at https://markmail.org/message/zlf5chufefekb5r2,

we can use the same ticket while converting the test to Groovy

Tests pass

Thanks: Avnindra Sharma for the initial patch (here converted to Groovy)

Improved: Unit test case for service - sendOrderPayRetryNotification

(OFBIZ-8813)

As Suraj somehow mentioned at https://markmail.org/message/zlf5chufefekb5r2,

we can use the same ticket while converting the test to Groov

Tests pass

Thanks: Avnindra Sharma for the initial patch (here converted to Groovy)

Improved: Unit test case for service - SendOrderBackorderNotification

(OFBIZ-8810)

As Suraj somehow mentioned at https://markmail.org/message/zlf5chufefekb5r2,

we can use the same ticket while converting the test to Groov

Tests pass

Thanks: Avnindra Sharma for the initial patch (here converted to Groovy)

Improved: Convert testSendOrderChangeNotification to Groovy

(OFBIZ-11233)

Tests pass

Improved: Unit test case for service - testSendOrderChangeNotification

(OFBIZ-8811)

Removes duplicated order-tests-data-load

Tests pass

Improved: Unit test case for service - testSendOrderChangeNotification

(OFBIZ-8811)

Fixes to right place

There were no reasons to add an OrderTest.xml file,

testSendOrderChangeNotification fits in OrderTests.xml

It was even wrong because of duplicated order-test test-case

Tests pass

Improved: Unit test case for service - SendOrderBackorderNotification

(OFBIZ-8810)(OFBIZ-9647)(OFBIZ-9671)

While working on this I stumbled upon an issue related with

webSiteId="OrderEntry" well related by Ratnesh Upadhyay in OFBIZ-9647.

Unlike him I decided not to remove the webSiteId="OrderEntry" entries but to

replace them by webSiteId="WebStore"

Tests pass!

Improved: no functional change

Formats Javadoc