[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(-)

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 <[hidden email]>
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</@ofbizUrl>
   
    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({

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 <[hidden email]>
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">
     <simple-method method-name="testCreateWorkEffortAndPartyAssign" short-description="Test the service createWorkEffortAndPartyAssign" login-required="false">
         <set field="serviceCtx.partyId" value="TestParty-1"/>
-        <set field="serviceCtx.roleTypeId" value="CONTACT"/>
+        <set field="serviceCtx.roleTypeId" value="CAL_OWNER"/>
         <set field="serviceCtx.statusId" value="PRTYASGN_ASSIGNED"/>
         <set field="serviceCtx.workEffortId" value="TestWorkEffort-1"/>
         <set field="serviceCtx.partyTypeId" value="PARTY_GROUP"/>
@@ -39,7 +39,7 @@ under the License.
         <entity-one entity-name="WorkEffort" value-field="workEffort"/>
         <set field="lookupKeyValue.workEffortId" from-field="workEffortId"/>
         <set field="lookupKeyValue.partyId"  value="TestParty-1"/>
-        <set field="lookupKeyValue.roleTypeId"  value="CONTACT"/>
+        <set field="lookupKeyValue.roleTypeId"  value="CAL_OWNER"/>
         <find-by-and entity-name="WorkEffortPartyAssignment" map="lookupKeyValue" list="workEffortPartyAssignmentList"/>
         <first-from-list entry="workEffortPartyAssignment" list="workEffortPartyAssignmentList"/>
         <assert>
@@ -560,21 +560,4 @@ under the License.
         </assert>
         <check-errors/>
     </simple-method>
-    <simple-method method-name="testUnlinkInvoiceFromTimeEntry" short-description="Test the service unlinkInvoiceFromTimeEntry" login-required="false">
-        <set field="serviceCtx.invoiceId" value="TestInvoice"/>
-        <set field="serviceCtx.timeEntryId" value="TestTimeEntry-3"/>
-        <entity-one entity-name="UserLogin" value-field="userLogin">
-            <field-map field-name="userLoginId" value="system"/>
-        </entity-one>
-        <set field="serviceCtx.userLogin" from-field="userLogin"/>
-        <call-service service-name="unlinkInvoiceFromTimeEntry" in-map-name="serviceCtx"/>
-        <entity-one entity-name="TimeEntry" value-field="timeEntry">
-            <field-map field-name="timeEntryId" value="TestTimeEntry-3"/>
-        </entity-one>
-        <assert>
-            <not><if-empty field="timeEntry"/></not>
-            <if-empty field="timeEntry.invoiceId"/>
-        </assert>
-        <check-errors/>
-    </simple-method>
-</simple-methods>
\ No newline at end of file
+</simple-methods>
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.
 
     <Party partyId="TestParty-1" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
     <Person partyId="TestParty-1" firstName="Test" lastName="Party"/>
-    <PartyRole partyId="TestParty-1" roleTypeId="CONTACT"/>
+    <PartyRole partyId="TestParty-1" roleTypeId="CAL_OWNER"/>
     <PartyRole partyId="TestParty-1" roleTypeId="CUSTOMER"/>
     <PartyRole partyId="TestParty-1" roleTypeId="ACCOUNTANT"/>
     <PartyStatus partyId="TestParty-1" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
@@ -79,4 +79,4 @@ under the License.
     <TimeEntry timeEntryId="TestTimeEntry-3" hours="8.0" workEffortId="TestWorkeffort-4" invoiceId="TestInvoice" partyId="TestParty" rateTypeId="STANDARD"/>
 
     <RateAmount rateTypeId="STANDARD" workEffortId="_NA_" partyId="TestParty" periodTypeId="RATE_HOUR" emplPositionTypeId="_NA_" fromDate="2000-01-01 00:00:00.0" rateAmount="95.00" rateCurrencyUomId="USD"/>
-</entity-engine-xml>
\ No newline at end of file
+</entity-engine-xml>