In get#InvoicePrintInfo also get PcntInvoiceMessageFrom content for F…

…rom party, and similar for To party
moqui · Dec 2, 2022 · 8b28f43 · 8b28f43
1 parent c07abdf
commit 8b28f43
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/service/mantle/account/InvoiceServices.xml b/service/mantle/account/InvoiceServices.xml
@@ -347,6 +347,8 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="fromParty" type="Map"/>
             <parameter name="fromContactInfo" type="Map"><description>From the mantle.party.ContactServices.get#PartyContactInfo service.</description></parameter>
             <parameter name="logoImageLocation"/>
+            <parameter name="fromPartyMessage"/>
+            <parameter name="toPartyMessage"/>
             <parameter name="toParty" type="Map"/>
             <parameter name="toContactInfo" type="Map"><description>From the mantle.party.ContactServices.get#PartyContactInfo service.</description></parameter>
             <parameter name="toBillingRep" type="Map"/>
@@ -428,10 +430,19 @@ along with this software (see the LICENSE.md file). If not, see
                     in-map="[partyId:invoice.fromPartyId, postalContactMechPurposeId:'PostalPayment',
                         telecomContactMechPurposeId:'PhonePayment', faxContactMechPurposeId:'PhonePaymentFax',
                         emailContactMechPurposeId:'EmailPayment']"/>
+
             <service-call name="mantle.party.PartyServices.get#PartyContentLocation" out-map="logoImageOut"
-                          in-map="[partyId:invoice.fromPartyId, partyContentTypeEnumIdList:['PcntLogoImage', 'PcntPrimaryImage']]"/>
+                    in-map="[partyId:invoice.fromPartyId, partyContentTypeEnumIdList:['PcntLogoImage', 'PcntPrimaryImage']]"/>
             <set field="logoImageLocation" from="logoImageOut.contentLocation"/>
 
+            <service-call name="mantle.party.PartyServices.get#PartyContentLocation" out-map="messageFromOut"
+                    in-map="[partyId:invoice.fromPartyId, partyContentTypeEnumIdList:['PcntInvoiceMessageFrom'], getText:true]"/>
+            <set field="fromPartyMessage" from="messageFromOut.contentText"/>
+            <service-call name="mantle.party.PartyServices.get#PartyContentLocation" out-map="messageToOut"
+                    in-map="[partyId:invoice.toPartyId, partyContentTypeEnumIdList:['PcntInvoiceMessageTo'], getText:true]"/>
+            <set field="toPartyMessage" from="messageToOut.contentText"/>
+            <log level="warn" message="toPartyMessage: ${toPartyMessage}"/>
+
             <entity-find-one entity-name="mantle.party.PartyDetail" value-field="toParty">
                 <field-map field-name="partyId" from="invoice.toPartyId"/></entity-find-one>
             <service-call name="mantle.party.ContactServices.get#PartyContactInfo" out-map="toContactInfo"
@@ -440,7 +451,7 @@ along with this software (see the LICENSE.md file). If not, see
             <entity-find entity-name="mantle.party.PartyRelationship" list="toBillingRelList">
                 <date-filter/>
                 <econdition field-name="toPartyId" from="invoice.toPartyId"/>
-                <econdition field-name="relationshipTypeEnumId" value="PrtRepresentative"/>
+                <!-- don't limit to this, useful for contact and other rel types (like Sales Contact of a Sales Account): <econdition field-name="relationshipTypeEnumId" value="PrtRepresentative"/> -->
                 <econdition field-name="fromRoleTypeId" value="ClientBilling"/>
             </entity-find>
             <entity-find-one entity-name="mantle.party.PartyDetail" value-field="toBillingRep">