From cfe38c434ed4b5b1a1663015a65c1016f8d5e396 Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Tue, 15 Oct 2024 11:21:33 +0200 Subject: [PATCH 01/19] =?UTF-8?q?Sorterer=20ut=20slik=20at=20denne=20futur?= =?UTF-8?q?e=20metoden=20ikke=20kj=C3=B8rer=20n=C3=A5r=20det=20er=20bildet?= =?UTF-8?q?olkvaktoppdrag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Det kommer feilmelding pga denne metoden. Dette kommer av at bildetolk-oppdrag blir automatisk Tildelt via Auto Dispatch (som er en batch-jobb). Dette trigger HOT_ServiceAppointmentAccessHandler.recalculateManualSharingFlagOnServiceAppointment (som er en future-metode). Dette er ikke tilllat så det feiler. --- .../classes/HOT_ServiceAppointmentAccessHandler.cls | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/force-app/main/accessControl/classes/HOT_ServiceAppointmentAccessHandler.cls b/force-app/main/accessControl/classes/HOT_ServiceAppointmentAccessHandler.cls index 82baaa15f9..b6825329d1 100644 --- a/force-app/main/accessControl/classes/HOT_ServiceAppointmentAccessHandler.cls +++ b/force-app/main/accessControl/classes/HOT_ServiceAppointmentAccessHandler.cls @@ -4,7 +4,11 @@ public without sharing class HOT_ServiceAppointmentAccessHandler extends MyTrigg for (ServiceAppointment sa : (List) records) { ServiceAppointment oldRecord = (ServiceAppointment) triggerOldMap.get(sa.Id); - if (sa.Status != oldRecord.Status && sa.Status == 'Dispatched') { + if ( + sa.Status != oldRecord.Status && + sa.Status == 'Dispatched' && + sa.HOT_AssignmentType__c != 'Bildetolkvakt' + ) { serviceAppointmentsWithUpdatedStatusDispatched.add(sa.Id); } } From 15ae9f1e0c3d6f812f951592fd060dd2c2175387 Mon Sep 17 00:00:00 2001 From: Mathias Date: Wed, 16 Oct 2024 17:55:08 +0200 Subject: [PATCH 02/19] =?UTF-8?q?legge=20til=201=20=C3=A5r=20sjekk=20for?= =?UTF-8?q?=20filopplastning=20knapp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lwc/mineBestillingerWrapper/mineBestillingerWrapper.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/force-app/main/userCommunity/lwc/mineBestillingerWrapper/mineBestillingerWrapper.js b/force-app/main/userCommunity/lwc/mineBestillingerWrapper/mineBestillingerWrapper.js index a6910d9fe8..b4daabb212 100644 --- a/force-app/main/userCommunity/lwc/mineBestillingerWrapper/mineBestillingerWrapper.js +++ b/force-app/main/userCommunity/lwc/mineBestillingerWrapper/mineBestillingerWrapper.js @@ -182,12 +182,14 @@ export default class MineBestillingerWrapper extends NavigationMixin(LightningEl let tempEndDate = this.isRequestDetails ? new Date(this.request.SeriesEndDate__c) : new Date(this.workOrder.EndDate); + const oneYearAgo = new Date(new Date().setFullYear(new Date().getFullYear() - 1)); this.isRequestEditButtonDisabled = this.request.Status__c === 'Åpen' ? false : true; this.isRequestCancelButtonDisabled = this.request.Status__c === 'Avlyst' || tempEndDate.getTime() < Date.now() || this.isTheOrderer == false ? true : false; - this.isRequestAddFilesButtonDisabled = this.request.Status__c !== 'Avlyst' ? false : true; + this.isRequestAddFilesButtonDisabled = + this.request.Status__c !== 'Avlyst' && tempEndDate > oneYearAgo ? false : true; this.isWOEditButtonDisabled = this.workOrder.HOT_ExternalWorkOrderStatus__c === 'Åpen' ? false : true; this.isWOCancelButtonDisabled = this.workOrder.HOT_ExternalWorkOrderStatus__c === 'Avlyst' ? true : false; this.isWOAddFilesButtonDisabled = this.workOrder.HOT_ExternalWorkOrderStatus__c !== 'Avlyst' ? false : true; From 35bb3cff2661ea9ebf3a59faefd9f99094121e46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Marthinsen?= Date: Thu, 17 Oct 2024 12:29:26 +0200 Subject: [PATCH 03/19] fikse feil hvor AssignedResource ikke fjernes korrekt --- .../classes/HOT_FreelanceAbsenceController.cls | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/force-app/main/freelanceCommunity/classes/HOT_FreelanceAbsenceController.cls b/force-app/main/freelanceCommunity/classes/HOT_FreelanceAbsenceController.cls index 01da0db49a..be4b23bbe0 100644 --- a/force-app/main/freelanceCommunity/classes/HOT_FreelanceAbsenceController.cls +++ b/force-app/main/freelanceCommunity/classes/HOT_FreelanceAbsenceController.cls @@ -156,8 +156,9 @@ public with sharing class HOT_FreelanceAbsenceController { Set appointmentIds = new Set(); for (ServiceAppointment appointment : appointments) { - appointment.Status = null; + appointment.Status = 'None'; appointment.HOT_AssignedResourceId__c = ''; + appointment.HOT_ServiceResource__c = null; appointment.HOT_DoNotCreateHAR__c = true; appointment.HOT_IsNotifyDispatcher__c = true; appointment.HOT_CanceledByInterpreter__c = true; From 2de421e48fc74affef5c3ead9ac3066996257a06 Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Fri, 18 Oct 2024 06:33:54 +0200 Subject: [PATCH 04/19] =?UTF-8?q?Endrer=20sms=20varsel=20listen=20til=20dy?= =?UTF-8?q?namic,=20og=20filtrerer=20bort=20incomming=20sms.=20Legger=20p?= =?UTF-8?q?=C3=A5=20ny=20tab=20og=20liste=20som=20viser=20sms=20dialog=20f?= =?UTF-8?q?iltrert=20p=C3=A5=20innkommende=20sms=20og=20manuelt=20opprette?= =?UTF-8?q?de?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...son_Account_Record_Page.flexipage-meta.xml | 141 +++++++++++++++++- 1 file changed, 134 insertions(+), 7 deletions(-) diff --git a/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml index 70c529b493..f640071229 100644 --- a/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml @@ -1,4 +1,4 @@ - + @@ -297,6 +297,21 @@ + + actionNames + + + adminFilters + + + Type__c|NOT_EQUAL|["Incoming SMS"] + + + + + maxRecordsToDisplay + 10 + parentFieldApiName Account.Id @@ -306,24 +321,122 @@ SMSs__r - relatedListComponentOverride + relatedListDisplayType ADVGRID - rowsToDisplay - 10 + relatedListFieldAliases + + + CREATED_DATE + + + Type__c + + + Status__c + + + Message__c + + + + + relatedListLabel + SMS varsel showActionBar - false + true - force:relatedListSingleContainer - force_relatedListSingleContainer4 + + sortFieldAlias + CREATED_DATE + + + sortFieldOrder + Descending + + lst:dynamicRelatedList + lst_dynamicRelatedList5 Facet-v4djjigqbto Facet + + + + + actionNames + + + adminFilters + + + Type__c|EQUALS|["Incoming SMS"] + + + Domain__c|EQUALS|["HOT"] + + + Type__c|EQUALS|["Manually Created"] + + + + + maxRecordsToDisplay + 30 + + + parentFieldApiName + Account.Id + + + relatedListApiName + SMSs__r + + + relatedListDisplayType + ADVGRID + + + relatedListFieldAliases + + + Sender__c + + + CREATED_DATE + + + Message__c + + + + + relatedListLabel + Toveis sms dialog med bruker + + + showActionBar + true + + + sortFieldAlias + CREATED_DATE + + + sortFieldOrder + Descending + + lst:dynamicRelatedList + lst_dynamicRelatedList3 + + + Facet-ed35f82c-5145-4ea4-9814-09895584c834 + Facet + @@ -371,6 +484,20 @@ customTab3 + + + + body + Facet-ed35f82c-5145-4ea4-9814-09895584c834 + + + title + SMS dialog + + flexipage:tab + flexipage_tab2 + + Facet-8fafb99b-707e-4994-b87e-977523b80930 Facet From 84cc479305176e8d5f19c697d9b9c33664c614db Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Fri, 18 Oct 2024 06:42:40 +0200 Subject: [PATCH 05/19] =?UTF-8?q?Oppdaterer=20flower=20til=20=C3=A5=20bruk?= =?UTF-8?q?e=20det=20alternative=20tlf=20nummeret?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flows/HOT_ReplyOnSMS.flow-meta.xml | 25 ++++++++---- .../flows/HOT_SendSMSToAccount.flow-meta.xml | 40 ++++++++++++------- 2 files changed, 43 insertions(+), 22 deletions(-) diff --git a/force-app/main/default/flows/HOT_ReplyOnSMS.flow-meta.xml b/force-app/main/default/flows/HOT_ReplyOnSMS.flow-meta.xml index d584f79af9..391bc6ed06 100644 --- a/force-app/main/default/flows/HOT_ReplyOnSMS.flow-meta.xml +++ b/force-app/main/default/flows/HOT_ReplyOnSMS.flow-meta.xml @@ -5,7 +5,7 @@ ErrorAssignment 314 - 758 + 674 error Assign @@ -21,7 +21,7 @@ SetSMSValues 50 - 518 + 458 sms.Account__c Assign @@ -57,6 +57,13 @@ Manually Created + + sms.SourceAlternative__c + Assign + + true + + createSMSRecord @@ -65,7 +72,7 @@ Is_it_an_incoming_SMS 314 - 278 + 242 Utg_ende_SMS @@ -86,6 +93,7 @@ + Default HOT_ReplyOnSMS {!$Flow.CurrentDateTime} @@ -111,7 +119,7 @@ createSMSRecord 50 - 638 + 566 ErrorAssignment @@ -121,7 +129,7 @@ GetSMSRecord 314 - 158 + 134 false Is_it_an_incoming_SMS @@ -143,7 +151,7 @@ Error_message_0 314 - 878 + 782 true true true @@ -159,7 +167,7 @@ Type_message 50 - 398 + 350 true true true @@ -172,6 +180,7 @@ LargeTextArea <p>Ikke skriv sensitive opplysninger! Meldingen vil bli sendt til nummeret brukeren har registrert i kontakt og reservasjonsregisteret.</p> + UseStoredValues true true @@ -181,7 +190,7 @@ Utg_ende_SMS 578 - 398 + 350 true true true diff --git a/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml b/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml index 4befa9ec12..ec3886c94f 100644 --- a/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml +++ b/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml @@ -1,11 +1,11 @@ - + 51.0 ErrorAssignment 314 - 998 + 890 error Assign @@ -21,7 +21,7 @@ Set_choosen_quick_text 50 - 518 + 458 choosenQuickText Assign @@ -37,7 +37,7 @@ SetSMSValues 50 - 758 + 674 sms.Account__c Assign @@ -73,6 +73,13 @@ Manually Created + + sms.SourceAlternative__c + Assign + + true + + createSMSRecord @@ -102,7 +109,7 @@ CheckRecipient 314 - 278 + 242 RecipientIsNull @@ -147,6 +154,7 @@ ActualStartTime Desc + Default today Date @@ -177,7 +185,7 @@ createSMSRecord 50 - 878 + 782 ErrorAssignment @@ -187,7 +195,7 @@ GetPersonRecord 314 - 158 + 134 false CheckRecipient @@ -212,7 +220,7 @@ Error_message_0 314 - 1118 + 998 true true true @@ -228,7 +236,7 @@ quicktextScreen 50 - 398 + 350 false true true @@ -244,6 +252,7 @@ IngenHurtigtekst Velg en hurtigtekst eller bare gå videre RadioButtons + UseStoredValues false true @@ -253,13 +262,14 @@ RecipientIsNull 578 - 398 + 350 true true true errorMsg - <p>Brukeren har ikke registrert et telefonnummer i kontakt- og reservasjonsregisteret, og du kan derfor ikke sende en sms til bruker på denne måten.</p> + <p>Brukeren har ikke registrert et telefonnummer i kontakt- og reservasjonsregisteret, og du kan derfor ikke sende en sms til bruker på denne måten.</p> DisplayText true @@ -269,7 +279,7 @@ Type_message 50 - 638 + 566 false true true @@ -283,7 +293,9 @@ Melding LargeTextArea - <p>Ikke skriv sensitive opplysninger! Meldingen vil bli sendt til nummeret brukeren har registrert i kontakt og reservasjonsregisteret.</p> + <p>Ikke skriv sensitive opplysninger! Meldingen vil bli sendt til nummeret brukeren har registrert i kontakt og reservasjonsregisteret.</p> + UseStoredValues true true @@ -340,4 +352,4 @@ Mvh tolketjenesten i NAV false SMS__c - \ No newline at end of file + From 256672398dc7581e652bbca2e5993a7f0584a8d5 Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Fri, 18 Oct 2024 06:43:02 +0200 Subject: [PATCH 06/19] Permissionset --- .../default/permissionsets/HOT_Admin.permissionset-meta.xml | 5 +++++ .../permissionsets/HOT_Tolk_Formidler.permissionset-meta.xml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/force-app/main/default/permissionsets/HOT_Admin.permissionset-meta.xml b/force-app/main/default/permissionsets/HOT_Admin.permissionset-meta.xml index 5ff3d56d22..77532c4a01 100644 --- a/force-app/main/default/permissionsets/HOT_Admin.permissionset-meta.xml +++ b/force-app/main/default/permissionsets/HOT_Admin.permissionset-meta.xml @@ -1244,6 +1244,11 @@ SMS__c.ServiceAppointment__c true + + true + SMS__c.SourceAlternative__c + true + true SMS__c.Status__c diff --git a/force-app/main/default/permissionsets/HOT_Tolk_Formidler.permissionset-meta.xml b/force-app/main/default/permissionsets/HOT_Tolk_Formidler.permissionset-meta.xml index 67843aadd9..976a620f44 100644 --- a/force-app/main/default/permissionsets/HOT_Tolk_Formidler.permissionset-meta.xml +++ b/force-app/main/default/permissionsets/HOT_Tolk_Formidler.permissionset-meta.xml @@ -1055,6 +1055,11 @@ SMS__c.ServiceAppointment__c true + + true + SMS__c.SourceAlternative__c + true + false SMS__c.Status__c From 83a43cbc77949a8ef47c526ff4367658b3065f9c Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:27:24 +0200 Subject: [PATCH 07/19] =?UTF-8?q?Kj=C3=B8rer=20ikke=20n=C3=A5r=20det=20er?= =?UTF-8?q?=20batch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classes/HOT_ServiceAppointmentAccessHandler.cls | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/force-app/main/accessControl/classes/HOT_ServiceAppointmentAccessHandler.cls b/force-app/main/accessControl/classes/HOT_ServiceAppointmentAccessHandler.cls index b6825329d1..5219bf10f0 100644 --- a/force-app/main/accessControl/classes/HOT_ServiceAppointmentAccessHandler.cls +++ b/force-app/main/accessControl/classes/HOT_ServiceAppointmentAccessHandler.cls @@ -4,11 +4,7 @@ public without sharing class HOT_ServiceAppointmentAccessHandler extends MyTrigg for (ServiceAppointment sa : (List) records) { ServiceAppointment oldRecord = (ServiceAppointment) triggerOldMap.get(sa.Id); - if ( - sa.Status != oldRecord.Status && - sa.Status == 'Dispatched' && - sa.HOT_AssignmentType__c != 'Bildetolkvakt' - ) { + if (sa.Status != oldRecord.Status && sa.Status == 'Dispatched' && !system.isBatch()) { serviceAppointmentsWithUpdatedStatusDispatched.add(sa.Id); } } From fbaa2e6a10e998061f1e76d7a16e766647e3a78d Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Mon, 21 Oct 2024 07:23:31 +0200 Subject: [PATCH 08/19] Oppdaterer pakke versjoner --- sfdx-project.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sfdx-project.json b/sfdx-project.json index b6c5dc7ef3..96cfe8d034 100644 --- a/sfdx-project.json +++ b/sfdx-project.json @@ -11,7 +11,7 @@ "dependencies": [ { "package": "crm-platform-base", - "versionNumber": "0.218.0.LATEST" + "versionNumber": "0.224.0.LATEST" }, { "package": "crm-shared-flowComponents", @@ -23,7 +23,7 @@ }, { "package": "crm-platform-integration", - "versionNumber": "0.101.0.LATEST" + "versionNumber": "0.130.0.LATEST" }, { "package": "crm-platform-access-control", @@ -31,7 +31,7 @@ }, { "package": "crm-community-base", - "versionNumber": "0.113.0.LATEST" + "versionNumber": "0.119.0.LATEST" }, { "package": "crm-platform-reporting", From da5dc46c7617cf3aac13bb26c08ecf67f6d2b1fe Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:16:01 +0200 Subject: [PATCH 09/19] Endrer pakkeversjoner i script --- scripts/bat/newScratchOrg.bat | 12 ++++++------ scripts/bat/newScratchOrgMac | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/bat/newScratchOrg.bat b/scripts/bat/newScratchOrg.bat index e4c85cf7b1..8536fe4473 100644 --- a/scripts/bat/newScratchOrg.bat +++ b/scripts/bat/newScratchOrg.bat @@ -1,8 +1,8 @@ echo "Oppretter scratch org" call sf org create scratch --definition-file config\project-scratch-def.json --alias %1 --duration-days %2 --set-default --json --wait 30 -echo "Installerer crm-platform-base ver. 0.218" -call sf package install --package 04t7U000000Y3esQAC --no-prompt --installation-key %3 --wait 30 --publish-wait 30 +echo "Installerer crm-platform-base ver. 0.224" +call sf package install --package 04tKB000000XzDhYAK --no-prompt --installation-key %3 --wait 30 --publish-wait 30 echo "Installerer crm-shared-flowComponents ver. 0.4" call sf package install --package 04t7U0000008qz4QAA --no-prompt --installation-key %3 --wait 30 --publish-wait 30 @@ -10,14 +10,14 @@ call sf package install --package 04t7U0000008qz4QAA --no-prompt --installation- echo "Installer crm-henvendelse-base ver. 0.20" call sf package install --package 04t7U000000Y4EgQAK --no-prompt --installation-key %3 --wait 30 --publish-wait 30 -echo "Installerer crm-platform-integration ver. 0.101" -call sf package install --package 04t7U000000om5FQAQ --no-prompt --installation-key %3 --wait 30 --publish-wait 30 +echo "Installerer crm-platform-integration ver. 0.130" +call sf package install --package 04tKB000000Y0coYAC --no-prompt --installation-key %3 --wait 30 --publish-wait 30 echo "Installerer crm-platform-access-control ver. 0.113" call sf package install --package 04t7U0000004e8tQAA --no-prompt --installation-key %3 --wait 30 --publish-wait 30 -echo "Installerer crm-community-base ver. 0.113" -call sf package install --package 04t7U000000Y4ZAQA0 --no-prompt --installation-key %3 --wait 30 --publish-wait 30 +echo "Installerer crm-community-base ver. 0.119" +call sf package install --package 04tKB000000Y0CZYA0 --no-prompt --installation-key %3 --wait 30 --publish-wait 30 echo "Installerer crm-platform-reporting ver. 0.31" call sf package install --package 04t7U0000008rBAQAY --no-prompt --installation-key %3 --wait 30 --publish-wait 30 diff --git a/scripts/bat/newScratchOrgMac b/scripts/bat/newScratchOrgMac index d7ec209451..e8f808ed9d 100755 --- a/scripts/bat/newScratchOrgMac +++ b/scripts/bat/newScratchOrgMac @@ -3,8 +3,8 @@ # Oppretter scratch org sf org create scratch --definition-file config/project-scratch-def.json --alias $1 --duration-days $2 --set-default --json --wait 30 -# Installer crm-platform-base ver. 0.218 -sf package install --package 04t7U000000Y3esQAC --no-prompt --installation-key $3 --wait 30 --publish-wait 30 +# Installer crm-platform-base ver. 0.224 +sf package install --package 04tKB000000XzDhYAK --no-prompt --installation-key $3 --wait 30 --publish-wait 30 # Installer crm-shared-flowComponents ver. 0.4 sf package install --package 04t7U0000008qz4QAA --no-prompt --installation-key $3 --wait 30 --publish-wait 30 @@ -12,14 +12,14 @@ sf package install --package 04t7U0000008qz4QAA --no-prompt --installation-key $ # Installer crm-henvendelse-base ver. 0.20 sf package install --package 04t7U000000Y4EgQAK --no-prompt --installation-key $3 --wait 30 --publish-wait 30 -# Installer crm-platform-integration ver. 0.101 -sf package install --package 04t7U000000om5FQAQ --no-prompt --installation-key $3 --wait 30 --publish-wait 30 +# Installer crm-platform-integration ver. 0.130 +sf package install --package 04tKB000000Y0coYAC --no-prompt --installation-key $3 --wait 30 --publish-wait 30 # Installer crm-platform-access-control ver. 0.113 sf package install --package 04t7U0000004e8tQAA --no-prompt --installation-key $3 --wait 30 --publish-wait 30 -# Installer crm-community-base ver. 0.113 -sf package install --package 04t7U000000Y4ZAQA0 --no-prompt --installation-key $3 --wait 30 --publish-wait 30 +# Installer crm-community-base ver. 0.119 +sf package install --package 04tKB000000Y0CZYA0 --no-prompt --installation-key $3 --wait 30 --publish-wait 30 # Installer crm-platform-reporting ver. 0.31 sf package install --package 04t7U0000008rBAQAY --no-prompt --installation-key $3 --wait 30 --publish-wait 30 From 362b66bdfba19b8187ee883517b734b7adc7d112 Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:16:27 +0200 Subject: [PATCH 10/19] =?UTF-8?q?Endrer=20meldingtekst.=20Fordi=20de=20bli?= =?UTF-8?q?r=20sendt=20fra=20et=20nummer=20man=20n=C3=A5=20kan=20svare=20p?= =?UTF-8?q?=C3=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml b/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml index ec3886c94f..4ec5159f57 100644 --- a/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml +++ b/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml @@ -313,14 +313,14 @@ quicktext1 true Hei! -Det har dessverre ikke latt seg gjøre å skaffe tolk til din bestilling i dag. Du kan ikke svare på denne meldingen. +Det har dessverre ikke latt seg gjøre å skaffe tolk til din bestilling i dag. Mvh tolketjenesten i NAV quicktext2 true Hei! -Du har fått tolk til din bestilling for [dato,klokkeslett]. For mer informasjon, logg inn på tolkebestilling.nav.no. Du kan ikke svare på denne meldingen. +Du har fått tolk til din bestilling for [dato,klokkeslett]. For mer informasjon, logg inn på tolkebestilling.nav.no. Mvh tolketjenesten i NAV From aaddacd59bcf3babaa7096333725f602dc400a65 Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:17:41 +0200 Subject: [PATCH 11/19] =?UTF-8?q?HOT=20Domene=20p=C3=A5=20sms=20p=C3=A5=20?= =?UTF-8?q?account=20sms=20listene?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HOT_Person_Account_Record_Page.flexipage-meta.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml index f640071229..c5a69a0456 100644 --- a/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml @@ -306,6 +306,9 @@ Type__c|NOT_EQUAL|["Incoming SMS"] + + Domain__c|EQUALS|["HOT"] + From 43c2afd73202af6efd5b16799bcf704c622cdb62 Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Tue, 22 Oct 2024 08:17:31 +0200 Subject: [PATCH 12/19] Fikser html feil --- .../lwc/mineBestillingerWrapper/mineBestillingerWrapper.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/force-app/main/userCommunity/lwc/mineBestillingerWrapper/mineBestillingerWrapper.html b/force-app/main/userCommunity/lwc/mineBestillingerWrapper/mineBestillingerWrapper.html index 688e0bc35b..6a69996fcd 100644 --- a/force-app/main/userCommunity/lwc/mineBestillingerWrapper/mineBestillingerWrapper.html +++ b/force-app/main/userCommunity/lwc/mineBestillingerWrapper/mineBestillingerWrapper.html @@ -132,9 +132,7 @@

{headerToShow}

{interpreter}: {workOrder.HOT_Interpreters__c}

- Foretrukket tolkemetode: Foretrukket>/strong>{request.UserInterpretationMethod__c} + Foretrukket tolkemetode: {request.UserInterpretationMethod__c}

Tolkemetode: {request.InterpretationMethodName__c} From 860fd3a99a394ad98091c05130d179c18accaa89 Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Tue, 22 Oct 2024 08:30:54 +0200 Subject: [PATCH 13/19] Innkommende sms liste --- .../HOT_Person_Account_Record_Page.flexipage-meta.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml index c5a69a0456..021001b928 100644 --- a/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml @@ -377,14 +377,11 @@ adminFilters - Type__c|EQUALS|["Incoming SMS"] + Type__c|EQUALS|["Incoming SMS","Manually Created"] Domain__c|EQUALS|["HOT"] - - Type__c|EQUALS|["Manually Created"] - @@ -407,7 +404,7 @@ relatedListFieldAliases - Sender__c + Type__c CREATED_DATE From 6d732605469d9bc6f1ac5e22f762bc43c7e06881 Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:23:47 +0200 Subject: [PATCH 14/19] Oppdatert pakkeversjoner til platform integration --- scripts/bat/newScratchOrg.bat | 4 ++-- scripts/bat/newScratchOrgMac | 4 ++-- sfdx-project.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/bat/newScratchOrg.bat b/scripts/bat/newScratchOrg.bat index 8536fe4473..1fd7a33ebc 100644 --- a/scripts/bat/newScratchOrg.bat +++ b/scripts/bat/newScratchOrg.bat @@ -10,8 +10,8 @@ call sf package install --package 04t7U0000008qz4QAA --no-prompt --installation- echo "Installer crm-henvendelse-base ver. 0.20" call sf package install --package 04t7U000000Y4EgQAK --no-prompt --installation-key %3 --wait 30 --publish-wait 30 -echo "Installerer crm-platform-integration ver. 0.130" -call sf package install --package 04tKB000000Y0coYAC --no-prompt --installation-key %3 --wait 30 --publish-wait 30 +echo "Installerer crm-platform-integration ver. 0.133" +call sf package install --package 04tKB000000Y1GEYA0 --no-prompt --installation-key %3 --wait 30 --publish-wait 30 echo "Installerer crm-platform-access-control ver. 0.113" call sf package install --package 04t7U0000004e8tQAA --no-prompt --installation-key %3 --wait 30 --publish-wait 30 diff --git a/scripts/bat/newScratchOrgMac b/scripts/bat/newScratchOrgMac index e8f808ed9d..0581155f6e 100755 --- a/scripts/bat/newScratchOrgMac +++ b/scripts/bat/newScratchOrgMac @@ -12,8 +12,8 @@ sf package install --package 04t7U0000008qz4QAA --no-prompt --installation-key $ # Installer crm-henvendelse-base ver. 0.20 sf package install --package 04t7U000000Y4EgQAK --no-prompt --installation-key $3 --wait 30 --publish-wait 30 -# Installer crm-platform-integration ver. 0.130 -sf package install --package 04tKB000000Y0coYAC --no-prompt --installation-key $3 --wait 30 --publish-wait 30 +# Installer crm-platform-integration ver. 0.133 +sf package install --package 04tKB000000Y1GEYA0 --no-prompt --installation-key $3 --wait 30 --publish-wait 30 # Installer crm-platform-access-control ver. 0.113 sf package install --package 04t7U0000004e8tQAA --no-prompt --installation-key $3 --wait 30 --publish-wait 30 diff --git a/sfdx-project.json b/sfdx-project.json index 96cfe8d034..27eae38bba 100644 --- a/sfdx-project.json +++ b/sfdx-project.json @@ -23,7 +23,7 @@ }, { "package": "crm-platform-integration", - "versionNumber": "0.130.0.LATEST" + "versionNumber": "0.133.0.LATEST" }, { "package": "crm-platform-access-control", From 15d06dfdb681f934c5b876d04f82afadf0c6397b Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:33:09 +0200 Subject: [PATCH 15/19] =?UTF-8?q?Filterer=20bort=20opprettede=20sms=20p?= =?UTF-8?q?=C3=A5=20varsellister,=20og=20setter=20p=C3=A5=20status=20p?= =?UTF-8?q?=C3=A5=20sms=20p=C3=A5=20sms=20dialog=20listene?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HOT_Person_Account_Record_Page.flexipage-meta.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml index 021001b928..074d41a04d 100644 --- a/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/HOT_Person_Account_Record_Page.flexipage-meta.xml @@ -304,7 +304,7 @@ adminFilters - Type__c|NOT_EQUAL|["Incoming SMS"] + Type__c|NOT_EQUAL|["Incoming SMS","Manually Created"] Domain__c|EQUALS|["HOT"] @@ -406,6 +406,9 @@ Type__c + + Status__c + CREATED_DATE From b027210a74f4cc3b4d5f4b7ff94873ea6e7c2e57 Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Tue, 22 Oct 2024 11:36:53 +0200 Subject: [PATCH 16/19] NAV --> Nav --- .../classes/HOT_MessagesNotification.cls | 6 +-- .../HOT_ServiceAppointmentNotification.cls | 18 ++++----- .../sms/classes/HOT_ReminderSMSService.cls | 38 +++++++++---------- .../flows/HOT_SendSMSToAccount.flow-meta.xml | 20 +++++----- 4 files changed, 42 insertions(+), 40 deletions(-) diff --git a/force-app/main/default/classes/HOT_MessagesNotification.cls b/force-app/main/default/classes/HOT_MessagesNotification.cls index 3e8be7ab14..91d6209682 100644 --- a/force-app/main/default/classes/HOT_MessagesNotification.cls +++ b/force-app/main/default/classes/HOT_MessagesNotification.cls @@ -138,7 +138,7 @@ public without sharing class HOT_MessagesNotification { notification.HOT_NotificationText__c = 'INFO Du har fått en melding fra tolketjenesten.\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; notification.HOT_RelatedObject__c = thread.Id; notification.HOT_RelatedObjectType__c = 'threadInterpreter'; @@ -152,7 +152,7 @@ public without sharing class HOT_MessagesNotification { notification.HOT_NotificationText__c = 'INFO Du har fått en melding fra tolketjenesten.\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; notification.HOT_RelatedObject__c = thread.Id; notification.HOT_RelatedObjectType__c = 'threadUser'; @@ -321,7 +321,7 @@ public without sharing class HOT_MessagesNotification { notification.HOT_NotificationText__c = 'INFO Du har fått en melding fra tolketjenesten. \nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; notification.HOT_RelatedObject__c = thread.Id; notification.HOT_RelatedObjectType__c = 'threadInterpreter'; diff --git a/force-app/main/notification/classes/HOT_ServiceAppointmentNotification.cls b/force-app/main/notification/classes/HOT_ServiceAppointmentNotification.cls index faf8c01686..d1a2380284 100644 --- a/force-app/main/notification/classes/HOT_ServiceAppointmentNotification.cls +++ b/force-app/main/notification/classes/HOT_ServiceAppointmentNotification.cls @@ -266,7 +266,7 @@ public without sharing class HOT_ServiceAppointmentNotification { newNotification.HOT_NotificationText__c = 'For mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; newNotification.HOT_RelatedObject__c = serviceAppointment.Id; newNotification.HOT_RelatedObjectType__c = 'noServiceAppointment'; @@ -381,7 +381,7 @@ public without sharing class HOT_ServiceAppointmentNotification { serviceAppointment.DueDate?.format('HH:mm') + '\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; newNotification.HOT_RelatedObject__c = serviceAppointment.Id; newNotification.HOT_RelatedObjectType__c = 'serviceAppointment'; @@ -487,7 +487,7 @@ public without sharing class HOT_ServiceAppointmentNotification { newNotification.HOT_NotificationText__c = 'For mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; newNotification.HOT_RelatedObject__c = serviceAppointment.Id; newNotification.HOT_RelatedObjectType__c = 'serviceAppointment'; @@ -591,7 +591,7 @@ public without sharing class HOT_ServiceAppointmentNotification { newNotification.HOT_NotificationText__c += '\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; newNotification.HOT_RelatedObject__c = serviceAppointment.Id; newNotification.HOT_RelatedObjectType__c = 'serviceAppointment'; @@ -698,7 +698,7 @@ public without sharing class HOT_ServiceAppointmentNotification { newNotification.HOT_NotificationText__c += 'For mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; newNotification.HOT_RelatedObject__c = serviceAppointment.Id; newNotification.HOT_RelatedObjectType__c = 'noServiceAppointment'; @@ -819,7 +819,7 @@ public without sharing class HOT_ServiceAppointmentNotification { newNotification.HOT_NotificationText__c = 'For mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; newNotification.HOT_RelatedObject__c = serviceAppointment.Id; newNotification.HOT_RelatedObjectType__c = 'serviceAppointment'; @@ -1126,7 +1126,7 @@ public without sharing class HOT_ServiceAppointmentNotification { updatedSAWithInterpreterRemoved.SchedEndTime ); text += '\n\nFor mer informasjon, se tolkebestilling.nav.no. Du kan ikke svare på denne meldingen.'; - text += '\nMvh tolketjenesten i NAV'; + text += '\nMvh tolketjenesten i Nav'; if (text.length() > 250) { newNotification.HOT_NotificationText__c = text.substring(0, 250) + ' ...'; } else { @@ -1278,7 +1278,7 @@ public without sharing class HOT_ServiceAppointmentNotification { updatedSAWithNewInterpreter.SchedEndTime ); text += '\n\nFor mer informasjon, se tolkebestilling.nav.no. Du kan ikke svare på denne meldingen.'; - text += '\nMvh tolketjenesten i NAV'; + text += '\nMvh tolketjenesten i Nav'; if (text.length() > 250) { newNotification.HOT_NotificationText__c = text.substring(0, 250) + ' ...'; } else { @@ -1429,7 +1429,7 @@ public without sharing class HOT_ServiceAppointmentNotification { updatedSAWithNewInterpreter.SchedEndTime ); text += '\n\nFor mer informasjon, se tolkebestilling.nav.no. Du kan ikke svare på denne meldingen.'; - text += '\nMvh tolketjenesten i NAV'; + text += '\nMvh tolketjenesten i Nav'; if (text.length() > 250) { newNotification.HOT_NotificationText__c = text.substring(0, 250) + ' ...'; } else { diff --git a/force-app/main/sms/classes/HOT_ReminderSMSService.cls b/force-app/main/sms/classes/HOT_ReminderSMSService.cls index 0c33b2458a..8aab59b6d9 100644 --- a/force-app/main/sms/classes/HOT_ReminderSMSService.cls +++ b/force-app/main/sms/classes/HOT_ReminderSMSService.cls @@ -39,13 +39,13 @@ public without sharing class HOT_ReminderSMSService { notification.HOT_NotificationText__c += '\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; } else { notification.HOT_NotificationText__c = text; notification.HOT_NotificationText__c += '\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; } notification.HOT_RelatedObject__c = workOrder.Id; notification.HOT_RelatedObjectType__c = 'workOrder'; @@ -94,7 +94,7 @@ public without sharing class HOT_ReminderSMSService { message + '\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; if (request.IsSerieoppdrag__c) { notification.HOT_RelatedObject__c = HOT_WorkOrderHandler.getWorkOrder(request).Id; notification.HOT_RelatedObjectType__c = 'request'; @@ -174,7 +174,7 @@ public without sharing class HOT_ReminderSMSService { message += 'Tolk er: '; message += interpreterNames; message += '\n\nFor mer informasjon, se tolkebestilling.nav.no. Du kan ikke svare på denne meldingen.'; - message += '\nMvh tolketjenesten i NAV'; + message += '\nMvh tolketjenesten i Nav'; return message; } @@ -215,7 +215,7 @@ public without sharing class HOT_ReminderSMSService { notification.HOT_NotificationText__c += notification.HOT_NotificationText__c = '\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; } else { notification.HOT_NotificationText__c = 'Du har fått tolk. Tolk er: ' + @@ -223,7 +223,7 @@ public without sharing class HOT_ReminderSMSService { formatTimePeriod(workOrder.StartDate, workOrder.EndDate) + '\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; } } else if (workOrder.Status == 'Cannot Complete') { notification.HOT_NotificationText__c = @@ -232,7 +232,7 @@ public without sharing class HOT_ReminderSMSService { formatTimePeriod(workOrder.StartDate, workOrder.EndDate) + '\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; } notification.HOT_RelatedObject__c = workOrder.Id; notification.HOT_RelatedObjectType__c = 'workOrder'; @@ -336,7 +336,7 @@ public without sharing class HOT_ReminderSMSService { notification.HOT_NotificationText__c = 'INFO\nDu er ønsket til et oppdrag.\n\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; notification.HOT_RelatedObject__c = ir.Id; notification.HOT_RelatedObjectType__c = 'wanted'; @@ -397,13 +397,13 @@ public without sharing class HOT_ReminderSMSService { notification.HOT_NotificationText__c += '\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; } else { notification.HOT_NotificationText__c = text; notification.HOT_NotificationText__c += '\nFor mer informasjon, se tolkebestilling.nav.no.\n' + 'Du kan ikke svare på denne meldingen.\n' + - 'Mvh tolketjenesten i NAV'; + 'Mvh tolketjenesten i Nav'; } notification.HOT_RelatedObject__c = wo.Id; notification.HOT_RelatedObjectType__c = 'workOrder'; @@ -448,7 +448,7 @@ public without sharing class HOT_ReminderSMSService { message += interpreterName; message += '\nDato: ' + schedStartEndtime; message += '\n\nFor mer informasjon, se tolkebestilling.nav.no. Du kan ikke svare på denne meldingen.'; - message += '\nMvh tolketjenesten i NAV'; + message += '\nMvh tolketjenesten i Nav'; sms.Message__c = message; if (SMS.Recipient__c != null) { @@ -490,7 +490,7 @@ public without sharing class HOT_ReminderSMSService { String message = 'INFO\nEn medtolk har blitt tatt av oppdraget. ' + appointmentNumber + '\n'; message += '\nDato: ' + schedStartEndtime; message += '\n\nFor mer informasjon, se tolkebestilling.nav.no. Du kan ikke svare på denne meldingen.'; - message += '\nMvh tolketjenesten i NAV'; + message += '\nMvh tolketjenesten i Nav'; sms.Message__c = message; if (SMS.Recipient__c != null) { @@ -537,7 +537,7 @@ public without sharing class HOT_ReminderSMSService { message += interpreterName; message += '\nDato: ' + schedStartEndtime; message += '\n\nFor mer informasjon, se tolkebestilling.nav.no. Du kan ikke svare på denne meldingen.'; - message += '\nMvh tolketjenesten i NAV'; + message += '\nMvh tolketjenesten i Nav'; sms.Message__c = message; if (SMS.Recipient__c != null) { @@ -758,7 +758,7 @@ public without sharing class HOT_ReminderSMSService { String message = 'INFO\nDu er ønsket til et oppdrag. ' + appointmentNumber + '\n\n'; message += 'For mer informasjon, se tolkebestilling.nav.no.\n'; message += 'Du kan ikke svare på denne meldingen.\n'; - message += 'Mvh tolketjenesten i NAV'; + message += 'Mvh tolketjenesten i Nav'; return message; } @@ -791,7 +791,7 @@ public without sharing class HOT_ReminderSMSService { } message += '.\n\nFor mer informasjon, se tolkebestilling.nav.no.\n'; message += 'Du kan ikke svare på denne meldingen.\n'; - message += 'Mvh tolketjenesten i NAV'; + message += 'Mvh tolketjenesten i Nav'; return message; } @@ -799,7 +799,7 @@ public without sharing class HOT_ReminderSMSService { String message = 'INFO\nDu har fått en melding fra tolketjenesten.\n\n'; message += 'For mer informasjon, se tolkebestilling.nav.no.\n'; message += 'Du kan ikke svare på denne meldingen.\n'; - message += 'Mvh tolketjenesten i NAV'; + message += 'Mvh tolketjenesten i Nav'; return message; } @@ -811,7 +811,7 @@ public without sharing class HOT_ReminderSMSService { message += ':\nDato: ' + formatTimePeriod(request.StartTime__c, request.EndTime__c); } message += '\n\nFor mer informasjon, se tolkebestilling.nav.no. Du kan ikke svare på denne meldingen.'; - message += '\nMvh tolketjenesten i NAV'; + message += '\nMvh tolketjenesten i Nav'; return message; } @@ -821,7 +821,7 @@ public without sharing class HOT_ReminderSMSService { message += interpreterNames; message += '\nDato: ' + formatTimePeriod(workOrder.StartDate, workOrder.EndDate); message += '\n\nFor mer informasjon, se tolkebestilling.nav.no. Du kan ikke svare på denne meldingen.'; - message += '\nMvh tolketjenesten i NAV'; + message += '\nMvh tolketjenesten i Nav'; return message; } @@ -875,7 +875,7 @@ public without sharing class HOT_ReminderSMSService { } message += '\nDato: ' + formatTimePeriod(workOrder.StartDate, workOrder.EndDate); message += '\n\nFor mer informasjon, se tolkebestilling.nav.no. Du kan ikke svare på denne meldingen.'; - message += '\nMvh tolketjenesten i NAV'; + message += '\nMvh tolketjenesten i Nav'; return message; } diff --git a/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml b/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml index 4ec5159f57..d3541ef3b9 100644 --- a/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml +++ b/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml @@ -268,8 +268,9 @@ true errorMsg - <p>Brukeren har ikke registrert et telefonnummer i kontakt- og reservasjonsregisteret, og du kan derfor ikke sende en sms til bruker på denne måten.</p> + <p>Brukeren har ikke registrert et telefonnummer i kontakt- og + reservasjonsregisteret, og du kan derfor ikke sende en sms til bruker på denne + måten.</p> DisplayText true @@ -293,8 +294,8 @@ Melding LargeTextArea - <p>Ikke skriv sensitive opplysninger! Meldingen vil bli sendt til nummeret brukeren har registrert i kontakt og reservasjonsregisteret.</p> + <p>Ikke skriv sensitive opplysninger! Meldingen vil bli sendt til + nummeret brukeren har registrert i kontakt og reservasjonsregisteret.</p> UseStoredValues true @@ -312,16 +313,17 @@ quicktext1 true - Hei! -Det har dessverre ikke latt seg gjøre å skaffe tolk til din bestilling i dag. -Mvh tolketjenesten i NAV + Hei! + Det har dessverre ikke latt seg gjøre å skaffe tolk til din bestilling i dag. + Mvh tolketjenesten i Nav quicktext2 true Hei! -Du har fått tolk til din bestilling for [dato,klokkeslett]. For mer informasjon, logg inn på tolkebestilling.nav.no. -Mvh tolketjenesten i NAV + Du har fått tolk til din bestilling for [dato,klokkeslett]. For mer informasjon, logg + inn på tolkebestilling.nav.no. + Mvh tolketjenesten i Nav choosenQuickText From 85848788a26ada4fdb1da2ac5c6df1417d9ec46c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:45:11 +0200 Subject: [PATCH 17/19] (CI) Updated to new version number 1.306.0 (#2110) Co-authored-by: olsenrasmus --- sfdx-project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfdx-project.json b/sfdx-project.json index 27eae38bba..77cbfa3a2f 100644 --- a/sfdx-project.json +++ b/sfdx-project.json @@ -7,7 +7,7 @@ "path": "force-app", "default": true, "package": "crm-hot-tolk", - "versionNumber": "1.305.0.NEXT", + "versionNumber": "1.306.0.NEXT", "dependencies": [ { "package": "crm-platform-base", From c105e3104f952055d574a6db8f9dd7c33c6e1a11 Mon Sep 17 00:00:00 2001 From: Rasmus Steine Olsen <111959793+olsenrasmus@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:46:22 +0200 Subject: [PATCH 18/19] Formatering tekst sms flow --- .../main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml b/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml index d3541ef3b9..c373fac3be 100644 --- a/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml +++ b/force-app/main/sms/flows/HOT_SendSMSToAccount.flow-meta.xml @@ -314,16 +314,15 @@ quicktext1 true Hei! - Det har dessverre ikke latt seg gjøre å skaffe tolk til din bestilling i dag. - Mvh tolketjenesten i Nav +Det har dessverre ikke latt seg gjøre å skaffe tolk til din bestilling i dag. +Mvh tolketjenesten i Nav quicktext2 true Hei! - Du har fått tolk til din bestilling for [dato,klokkeslett]. For mer informasjon, logg - inn på tolkebestilling.nav.no. - Mvh tolketjenesten i Nav +Du har fått tolk til din bestilling for [dato,klokkeslett]. For mer informasjon, logg inn på tolkebestilling.nav.no. +Mvh tolketjenesten i Nav choosenQuickText From d01ff1b526ed5fb692466eb9db87593c0101e3e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:56:53 +0200 Subject: [PATCH 19/19] (CI) Updated to new version number 1.307.0 (#2112) Co-authored-by: olsenrasmus --- sfdx-project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfdx-project.json b/sfdx-project.json index 77cbfa3a2f..d4de9c0780 100644 --- a/sfdx-project.json +++ b/sfdx-project.json @@ -7,7 +7,7 @@ "path": "force-app", "default": true, "package": "crm-hot-tolk", - "versionNumber": "1.306.0.NEXT", + "versionNumber": "1.307.0.NEXT", "dependencies": [ { "package": "crm-platform-base",