From 614293c11478bb2fe950cdbf9c1c637b7dabd6cc Mon Sep 17 00:00:00 2001
From: naomi <naomi@happycatsin.space>
Date: Sun, 3 Apr 2022 17:52:12 +0100
Subject: [PATCH] Added case provider role to opencase config

---
 ...xonomy.vocabulary.oc_case_provider_role.yml |  8 ++++++++
 modules/opencase_cases/opencase_cases.module   |  5 ++++-
 .../opencase_cases/src/Entity/OCCaseFee.php    |  6 ++----
 .../src/Entity/OCCaseProvision.php             | 18 ++++++++++--------
 opencase.links.menu.yml                        |  4 ++--
 5 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 config/install/taxonomy.vocabulary.oc_case_provider_role.yml

diff --git a/config/install/taxonomy.vocabulary.oc_case_provider_role.yml b/config/install/taxonomy.vocabulary.oc_case_provider_role.yml
new file mode 100644
index 0000000..35e4d2b
--- /dev/null
+++ b/config/install/taxonomy.vocabulary.oc_case_provider_role.yml
@@ -0,0 +1,8 @@
+uuid: 85aacc47-8df9-4309-b7f4-f58be70f83d0
+langcode: en
+status: true
+dependencies: {  }
+name: 'Case Provider Roles'
+vid: oc_case_provider_role
+description: ''
+weight: 0
diff --git a/modules/opencase_cases/opencase_cases.module b/modules/opencase_cases/opencase_cases.module
index 2d8df0f..2295e38 100644
--- a/modules/opencase_cases/opencase_cases.module
+++ b/modules/opencase_cases/opencase_cases.module
@@ -8,6 +8,8 @@ declare(strict_types = 1);
 
 use Drupal\Core\Routing\RouteMatchInterface;
 
+use function PHPUnit\Framework\isEmpty;
+
 /**
  * Implements hook_help().
  */
@@ -94,7 +96,8 @@ function opencase_cases_get_activities(Drupal\opencase_cases\entity\OCCase $case
 }
 
 function opencase_cases_get_amount(Drupal\opencase_cases\entity\OCCaseFee $case_fee): string {
-  return $case_fee->amount->first()->value;
+  if (!isEmpty($case_fee->amount)) return $case_fee->amount->first()->value;
+  else return '0';
 }
 
 function opencase_cases_get_case(Drupal\opencase_cases\entity\OCCaseFee $case_fee): Drupal\opencase_cases\entity\OCCase {
diff --git a/modules/opencase_cases/src/Entity/OCCaseFee.php b/modules/opencase_cases/src/Entity/OCCaseFee.php
index 67f1b62..bd000da 100644
--- a/modules/opencase_cases/src/Entity/OCCaseFee.php
+++ b/modules/opencase_cases/src/Entity/OCCaseFee.php
@@ -272,10 +272,8 @@ class OCCaseFee extends EditorialContentEntityBase implements OCCaseFeeInterface
       ->setTranslatable(TRUE)
       ->setCardinality(1)
       ->setDefaultValueCallback('opencase_cases_default_case_id')  // defined in opencase_cases.module
-      ->setDisplayOptions('view', [
-        'type' => 'string',
-        'weight' => 0,
-      ])
+      ->setDisplayConfigurable("view", true)
+      ->setDisplayConfigurable("form", true)
       ->setRequired(TRUE);
 
     $fields['oc_fee_category'] = \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference')
diff --git a/modules/opencase_cases/src/Entity/OCCaseProvision.php b/modules/opencase_cases/src/Entity/OCCaseProvision.php
index ddeafa6..e3084ab 100644
--- a/modules/opencase_cases/src/Entity/OCCaseProvision.php
+++ b/modules/opencase_cases/src/Entity/OCCaseProvision.php
@@ -246,10 +246,14 @@ class OCCaseProvision extends EditorialContentEntityBase implements OCCaseProvis
       ->setDisplayConfigurable('view', TRUE)
       ->setRequired(TRUE);
 
-    $fields['status']->setDescription(t('A boolean indicating whether the Case Provision is published.'))
-    ->setDisplayConfigurable('form', TRUE)
-    ->setDisplayConfigurable('view', TRUE);
-    
+
+      $fields['status'] = BaseFieldDefinition::create('boolean')
+      ->setLabel(t('Visible'))
+      ->setDescription('If this box is not ticked this record will be hidden from view for most users. Users with access to unpublished entities will be able to restore it if needed.')
+      ->setRevisionable(TRUE)
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDefaultValue(TRUE);
+
 
     $fields['created'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Created'))
@@ -273,10 +277,8 @@ class OCCaseProvision extends EditorialContentEntityBase implements OCCaseProvis
       ->setTranslatable(TRUE)
       ->setCardinality(1)
       ->setDefaultValueCallback('opencase_cases_default_case_id')  // defined in opencase_cases.module
-      ->setDisplayOptions('view', [
-        'type' => 'string',
-        'weight' => 0,
-      ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDisplayConfigurable('view', TRUE)
       ->setRequired(TRUE);
 
     $fields['oc_provider'] = \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference')
diff --git a/opencase.links.menu.yml b/opencase.links.menu.yml
index 4a0a3c8..6e89494 100644
--- a/opencase.links.menu.yml
+++ b/opencase.links.menu.yml
@@ -68,14 +68,14 @@ opencase.manage_case_fee_types:
   description: 'Configure types of case fees and their fields'
   menu_name: opencase
   parent: opencase.opencase_admin_menu 
-  url: internal:/admin/opencase/oc_case_fee_type
+  url: internal:/opencase/oc_case_fee_type
   weight: 3
 opencase.manage_case_provision_types:
   title: 'Manage case provision types'
   description: 'Configure types of case provisions and their fields'
   menu_name: opencase
   parent: opencase.opencase_admin_menu 
-  url: internal:/admin/opencase/oc_case_provision_type
+  url: internal:/opencase/oc_case_provision_type
   weight: 3
 opencase.manage_event_types:
   title: 'Manage event types'