Merge branch 'master' into 2222

navikt · Aug 22, 2023 · da830f7 · da830f7
2 parents db5bf1f + 64a5122
commit da830f7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/force-app/main/freelanceCommunity/lwc/hot_myServiceAppointments/columns.js b/force-app/main/freelanceCommunity/lwc/hot_myServiceAppointments/columns.js
@@ -4,6 +4,11 @@ export let columns = [
         name: 'StartAndEndDate',
         type: 'Datetime'
     },
+    {
+        label: 'Oppdragsnummer',
+        name: 'AppointmentNumber',
+        type: 'String'
+    },
     {
         label: 'Poststed',
         name: 'City',

diff --git a/force-app/main/notification/classes/HOT_ServiceAppointmentNotification.cls b/force-app/main/notification/classes/HOT_ServiceAppointmentNotification.cls
@@ -82,6 +82,7 @@ public without sharing class HOT_ServiceAppointmentNotification {
                     oldServiceAppointment.Status == 'Dispatched' ||
                     oldServiceAppointment.Status == 'In Progress') &&
                     (serviceAppointment.Status == null ||
+                    serviceAppointment.Status == 'Scheduled' ||
                     serviceAppointment.Status == 'None') &&
                     serviceAppointment.HOT_CanceledByInterpreter__c == false
                 ) {

diff --git a/force-app/main/triggers/classes/HOT_ServiceAppointmentHandler.cls b/force-app/main/triggers/classes/HOT_ServiceAppointmentHandler.cls
@@ -142,6 +142,7 @@ public without sharing class HOT_ServiceAppointmentHandler extends MyTriggers {
                 (serviceAppointment.Status == null ||
                 serviceAppointment.Status == 'Canceled' ||
                 serviceAppointment.Status == 'Annul' ||
+                serviceAppointment.Status == 'Scheduled' ||
                 serviceAppointment.Status == 'None') &&
                 serviceAppointment.HOT_CanceledByInterpreter__c == false
             ) {

diff --git a/sfdx-project.json b/sfdx-project.json
@@ -8,7 +8,7 @@
             "default": true,
             "package": "crm-hot",
             "versionName": "ver 0.1",
-            "versionNumber": "1.228.0.NEXT",
+            "versionNumber": "1.229.0.NEXT",
             "dependencies": [
                 {
                     "package": "crm-platform-base",