Merge branch 'master' into trav

Added amount field to case fee, total fee to case, and code to calculate the total

css/opencase.css

@@ -3,6 +3,29 @@
   display: none;
 }
 
+/* MOVE THIS INTO GNO! */
+#block-accreditationcount {
+  position: absolute;
+  right: 50%;
+  /*background-color: #fff;*/
+  background-image: linear-gradient(to top, #2a419a 0%, #1d84c3 100%);
+  border-radius: 5px;
+}
+
+#block-accreditationcount table {
+  border: 0px #2a419a;
+  background-color: #1d84c3;
+}
+
+#block-accreditationcount h1 {
+  color: white;
+}
+
+
+#block-accreditationcount td {
+  color: black;
+}
+
 /*  */
 
 body {
@@ -123,3 +146,50 @@ table.views-table.views-view-table caption {
 form.oc-organisation-relation-form tr:first-child {
   display: none;
 }
+
+
+/* trav styling */
+.site-branding {
+	margin-top: -2.20em !important;
+}
+
+.follow-up-due {
+	
+}
+
+tr:nth-child(even) {
+  background-color: #fefefe;
+}
+
+tr:nth-child(odd) {
+  background-color: #eee;
+}
+
+.Off {
+	color:gray;
+}
+
+.Off a {
+	color:gray;
+	background-color:black;
+}
+
+.field--type-entity-reference-revisions {
+	border-radius: 25px;
+	border: 2px solid #2A419A;
+	padding: 10px; 
+	border-width: thin;
+}
+
+.follow-ups-due table{
+	background-color: #FB8A4F;
+}
+
+.views-field-field-client-substatus {
+	font-weight: bold;
+}	
+
+thead {
+	background-color: #1d84c3;
+}	
+

modules/opencase_cases/config/schema/oc_case_fee_type.schema.yml

@@ -0,0 +1,12 @@
+opencase_cases.oc_case_fee_type.*:
+  type: config_entity
+  label: 'Case Fee type config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    uuid:
+      type: string

modules/opencase_cases/config/schema/oc_case_provision_type.schema.yml

@@ -0,0 +1,12 @@
+opencase_cases.oc_case_provision_type.*:
+  type: config_entity
+  label: 'Case Provision type config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    uuid:
+      type: string

modules/opencase_cases/oc_case_fee.page.inc

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Contains oc_case_fee.page.inc.
+ *
+ * Page callback for Case Fee entities.
+ */
+
+use Drupal\Core\Render\Element;
+
+/**
+ * Prepares variables for Case Fee templates.
+ *
+ * Default template: oc_case_fee.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - elements: An associative array containing the user information and any
+ *   - attributes: HTML attributes for the containing element.
+ */
+function template_preprocess_oc_case_fee(array &$variables) {
+  // Fetch OCCaseFee Entity Object.
+  $oc_case_fee = $variables['elements']['#oc_case_fee'];
+
+  // Helpful $content variable for templates.
+  foreach (Element::children($variables['elements']) as $key) {
+    $variables['content'][$key] = $variables['elements'][$key];
+  }
+}

modules/opencase_cases/oc_case_provision.page.inc

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Contains oc_case_provision.page.inc.
+ *
+ * Page callback for Case Provision entities.
+ */
+
+use Drupal\Core\Render\Element;
+
+/**
+ * Prepares variables for Case Provision templates.
+ *
+ * Default template: oc_case_provision.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - elements: An associative array containing the user information and any
+ *   - attributes: HTML attributes for the containing element.
+ */
+function template_preprocess_oc_case_provision(array &$variables) {
+  // Fetch OCCaseProvision Entity Object.
+  $oc_case_provision = $variables['elements']['#oc_case_provision'];
+
+  // Helpful $content variable for templates.
+  foreach (Element::children($variables['elements']) as $key) {
+    $variables['content'][$key] = $variables['elements'][$key];
+  }
+}

modules/opencase_cases/opencase_cases.install

@@ -0,0 +1,86 @@
+<?php
+
+function opencase_cases_update_8025() {
+  //check if the table exists first.  If not, then create the entity.
+  if(!db_table_exists('oc_case_provision')) {
+    \Drupal::entityTypeManager()->clearCachedDefinitions();
+    \Drupal::entityDefinitionUpdateManager()
+      ->installEntityType(\Drupal::entityTypeManager()->getDefinition('oc_case_provision'));
+  }
+}
+
+function opencase_cases_update_8026() {
+    $storage_definition =  \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Role'))
+      ->setSetting('target_type', 'taxonomy_term')
+      ->setSetting('handler_settings', ['target_bundles' => ['oc_case_provider_role' => 'oc_case_provider_role']])
+      ->setSetting('handler', 'default')
+      ->setTranslatable(TRUE)
+      ->setCardinality(1)
+      ->setDisplayConfigurable("view", true)
+      ->setDisplayConfigurable("form", true)
+      ->setRequired(FALSE);
+  \Drupal::entityDefinitionUpdateManager()
+    ->installFieldStorageDefinition('oc_case_provider_role', 'oc_case_provision', 'oc_case_provision', $storage_definition);
+}
+
+function opencase_cases_update_8027() {
+  //check if the table exists first.  If not, then create the entity.
+  if(!db_table_exists('oc_case_fee')) {
+    \Drupal::entityTypeManager()->clearCachedDefinitions();
+    \Drupal::entityDefinitionUpdateManager()
+      ->installEntityType(\Drupal::entityTypeManager()->getDefinition('oc_case_fee'));
+  }
+}
+
+function opencase_cases_update_8028() {
+    $storage_definition =  \Drupal\Core\Field\BaseFieldDefinition::create('decimal')
+      ->setLabel(t('Amount'))
+      ->setRevisionable(TRUE)
+      ->setSettings([
+        'prefix' => '£',
+      ])
+      ->SetDisplayConfigurable("form", true)
+      ->SetDisplayConfigurable("view", true);
+  \Drupal::entityDefinitionUpdateManager()
+    ->installFieldStorageDefinition('amount', 'oc_case_fee', 'oc_case_fee', $storage_definition);
+    $storage_definition =  \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Fee Category'))
+      ->setSetting('target_type', 'taxonomy_term')
+      ->setSetting('handler_settings', ['target_bundles' => ['oc_fee_category' => 'oc_fee_category']])
+      ->setSetting('handler', 'default')
+      ->setTranslatable(TRUE)
+      ->setCardinality(1)
+      ->setDisplayConfigurable("view", true)
+      ->setDisplayConfigurable("form", true)
+      ->setRequired(FALSE);
+  \Drupal::entityDefinitionUpdateManager()
+    ->installFieldStorageDefinition('oc_fee_category', 'oc_case_fee', 'oc_case_fee', $storage_definition);
+}
+
+function opencase_cases_update_8029() {
+    $storage_definition =  \Drupal\Core\Field\BaseFieldDefinition::create('string_long')
+      ->setRevisionable(TRUE)
+      ->setLabel(t('Notes'))
+      ->setSettings(array(
+        'default_value' => '',
+        'max_length' => 255,
+        'text_processing' => 0,
+      ))
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true);
+  \Drupal::entityDefinitionUpdateManager()
+    ->installFieldStorageDefinition('notes', 'oc_case', 'oc_case', $storage_definition);
+}
+
+function opencase_cases_update_8030() {
+    $storage_definition =  \Drupal\Core\Field\BaseFieldDefinition::create('decimal')
+    ->setLabel(t('Total Fee'))
+    ->setRevisionable(TRUE)
+    ->setSettings([
+      'prefix' => '£',
+    ])
+    ->SetDisplayConfigurable("view", true);
+  \Drupal::entityDefinitionUpdateManager()
+    ->installFieldStorageDefinition('total_fee', 'oc_case', 'oc_case', $storage_definition);
+}

modules/opencase_cases/opencase_cases.links.action.yml

@@ -10,3 +10,23 @@ entity.oc_case_type.add_form:
   appears_on:
     - entity.oc_case_type.collection
 
+entity.oc_case_provision.add_form:
+  route_name: entity.oc_case_provision.add_page
+  title: 'Add Case Provision'
+  appears_on:
+    - entity.oc_case_provision.collection
+entity.oc_case_provision_type.add_form:
+  route_name: entity.oc_case_provision_type.add_form
+  title: 'Add Case Provision type'
+  appears_on:
+    - entity.oc_case_provision_type.collection
+entity.oc_case_fee.add_form:
+  route_name: entity.oc_case_fee.add_page
+  title: 'Add Case Fee'
+  appears_on:
+    - entity.oc_case_fee.collection
+entity.oc_case_fee_type.add_form:
+  route_name: entity.oc_case_fee_type.add_form
+  title: 'Add Case Fee type'
+  appears_on:
+    - entity.oc_case_fee_type.collection

modules/opencase_cases/opencase_cases.links.menu.yml

@@ -23,3 +23,37 @@ entity.oc_case_type.collection:
   weight: 99
 
 
+
+# Case Provision menu items definition
+entity.oc_case_provision.collection:
+  title: 'Case Provision list'
+  route_name: entity.oc_case_provision.collection
+  description: 'List Case Provision entities'
+  parent: system.admin_structure
+  weight: 100
+
+
+# Case Provision type menu items definition
+entity.oc_case_provision_type.collection:
+  title: 'Case Provision type'
+  route_name: entity.oc_case_provision_type.collection
+  description: 'List Case Provision type (bundles)'
+  parent: system.admin_structure
+  weight: 99
+
+# Case Fee menu items definition
+entity.oc_case_fee.collection:
+  title: 'Case Fee list'
+  route_name: entity.oc_case_fee.collection
+  description: 'List Case Fee entities'
+  parent: system.admin_structure
+  weight: 100
+
+
+# Case Fee type menu items definition
+entity.oc_case_fee_type.collection:
+  title: 'Case Fee type'
+  route_name: entity.oc_case_fee_type.collection
+  description: 'List Case Fee type (bundles)'
+  parent: system.admin_structure
+  weight: 99

modules/opencase_cases/opencase_cases.links.task.yml

@@ -21,3 +21,47 @@ entity.oc_case.delete_form:
   base_route:  entity.oc_case.canonical
   title: Delete
   weight: 10
+# Case Provision routing definition
+
+entity.oc_case_provision.canonical:
+  route_name: entity.oc_case_provision.canonical
+  base_route: entity.oc_case_provision.canonical
+  title: 'View'
+
+entity.oc_case_provision.edit_form:
+  route_name: entity.oc_case_provision.edit_form
+  base_route: entity.oc_case_provision.canonical
+  title: 'Edit'
+
+entity.oc_case_provision.version_history:
+  route_name: entity.oc_case_provision.version_history
+  base_route: entity.oc_case_provision.canonical
+  title: 'Revisions'
+
+entity.oc_case_provision.delete_form:
+  route_name:  entity.oc_case_provision.delete_form
+  base_route:  entity.oc_case_provision.canonical
+  title: Delete
+  weight: 10
+# Case Fee routing definition
+
+entity.oc_case_fee.canonical:
+  route_name: entity.oc_case_fee.canonical
+  base_route: entity.oc_case_fee.canonical
+  title: 'View'
+
+entity.oc_case_fee.edit_form:
+  route_name: entity.oc_case_fee.edit_form
+  base_route: entity.oc_case_fee.canonical
+  title: 'Edit'
+
+entity.oc_case_fee.version_history:
+  route_name: entity.oc_case_fee.version_history
+  base_route: entity.oc_case_fee.canonical
+  title: 'Revisions'
+
+entity.oc_case_fee.delete_form:
+  route_name:  entity.oc_case_fee.delete_form
+  base_route:  entity.oc_case_fee.canonical
+  title: Delete
+  weight: 10

modules/opencase_cases/opencase_cases.module

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 /**
  * @file
@@ -40,10 +41,75 @@ function opencase_cases_theme() {
       'render element' => 'content',
       'variables' => ['content' => NULL],
       'file' => 'oc_case.page.inc',
-    ]
+    ],
+    'oc_case_provision' => [
+      'render element' => 'elements',
+      'file' => 'oc_case_provision.page.inc',
+      'template' => 'oc_case_provision',
+    ],
+    'oc_case_provision_content_add_list' => [
+      'render element' => 'content',
+      'variables' => ['content' => NULL],
+      'file' => 'oc_case_provision.page.inc',
+    ],
+    'oc_case_fee' => [
+      'render element' => 'elements',
+      'file' => 'oc_case_fee.page.inc',
+      'template' => 'oc_case_fee',
+    ],
+    'oc_case_fee_content_add_list' => [
+      'render element' => 'content',
+      'variables' => ['content' => NULL],
+      'file' => 'oc_case_fee.page.inc',
+    ],
   ];
 }
 
+/**
+ * @return Drupal\opencase_cases\entity\OCCaseFee[]
+ */
+function opencase_cases_get_case_fees(Drupal\opencase_cases\entity\OCCase $case): array {
+  $query = \Drupal::entityQuery('oc_case_fee')
+    ->condition('oc_case.target_id', $case->id());
+  $case_fee_ids =  $query->execute();
+  $case_fees = [];
+  foreach($case_fee_ids as $id) {
+    $case_fees[] = Drupal\opencase_cases\entity\OCCaseFee::load($id);
+  }
+  return $case_fees;
+}
+
+function opencase_cases_get_amount(Drupal\opencase_cases\entity\OCCaseFee $case_fee): string {
+  return $case_fee->amount->first()->value;
+}
+
+function opencase_cases_get_case(Drupal\opencase_cases\entity\OCCaseFee $case_fee): Drupal\opencase_cases\entity\OCCase {
+  return $case_fee->oc_case->referencedEntities()[0];
+}
+
+function opencase_cases_update_total_fee_for_case_belonging_to_case_fee(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void {
+  $total = 0;
+  $case = opencase_cases_get_case($case_fee);
+  $case_fees = opencase_cases_get_case_fees($case);
+  foreach($case_fees as $case_fee) {
+    $total += opencase_cases_get_amount($case_fee);
+  }
+  $case->set('total_fee', $total);  
+  $case->save();
+}
+
+function opencase_cases_oc_case_fee_update(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void {
+  opencase_cases_update_total_fee_for_case_belonging_to_case_fee($case_fee);
+}
+
+function opencase_cases_oc_case_fee_insert(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void {
+  opencase_cases_update_total_fee_for_case_belonging_to_case_fee($case_fee);
+}
+
+function opencase_cases_oc_case_fee_delete(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void {
+  opencase_cases_update_total_fee_for_case_belonging_to_case_fee($case_fee);
+}
+
 function opencase_cases_entity_base_field_info($entity_type) {
   $fields = array();
   
@@ -56,7 +122,7 @@ function opencase_cases_entity_base_field_info($entity_type) {
       ->setSetting('handler', 'default')
       ->setTranslatable(TRUE)
       ->setCardinality(1)
-      ->setDefaultValueCallback('opencase_cases_default_activity_case_value')
+      ->setDefaultValueCallback('opencase_cases_default_case_id')
       ->setDisplayOptions('view', [
         'type' => 'string',
         'weight' => -3,
@@ -69,7 +135,7 @@ function opencase_cases_entity_base_field_info($entity_type) {
 /**
  * When creating an activity, it sets the case id from the URL.
  */
-function opencase_cases_default_activity_case_value() {
+function opencase_cases_default_case_id() {
   return array(\Drupal::request()->query->get('case_id'));
 }
 
@@ -138,3 +204,36 @@ function opencase_cases_theme_suggestions_oc_case(array $variables) {
 //  $query->condition('access_filter.actors_involved_target_id', $linked_actor_id);
 //}
 
+
+
+/**
+ * Implements hook_theme_suggestions_HOOK().
+ */
+function opencase_cases_theme_suggestions_oc_case_provision(array $variables) {
+  $suggestions = [];
+  $entity = $variables['elements']['#oc_case_provision'];
+  $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
+
+  $suggestions[] = 'oc_case_provision__' . $sanitized_view_mode;
+  $suggestions[] = 'oc_case_provision__' . $entity->bundle();
+  $suggestions[] = 'oc_case_provision__' . $entity->bundle() . '__' . $sanitized_view_mode;
+  $suggestions[] = 'oc_case_provision__' . $entity->id();
+  $suggestions[] = 'oc_case_provision__' . $entity->id() . '__' . $sanitized_view_mode;
+  return $suggestions;
+}
+
+/**
+ * Implements hook_theme_suggestions_HOOK().
+ */
+function opencase_cases_theme_suggestions_oc_case_fee(array $variables) {
+  $suggestions = [];
+  $entity = $variables['elements']['#oc_case_fee'];
+  $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
+
+  $suggestions[] = 'oc_case_fee__' . $sanitized_view_mode;
+  $suggestions[] = 'oc_case_fee__' . $entity->bundle();
+  $suggestions[] = 'oc_case_fee__' . $entity->bundle() . '__' . $sanitized_view_mode;
+  $suggestions[] = 'oc_case_fee__' . $entity->id();
+  $suggestions[] = 'oc_case_fee__' . $entity->id() . '__' . $sanitized_view_mode;
+  return $suggestions;
+}

modules/opencase_cases/opencase_cases.permissions.yml

@@ -0,0 +1,66 @@
+add case provision entities:
+  title: 'Create new Case Provision entities'
+
+administer case provision entities:
+  title: 'Administer Case Provision entities'
+  description: 'Allow to access the administration form to configure Case Provision entities.'
+  restrict access: true
+
+delete case provision entities:
+  title: 'Delete Case Provision entities'
+
+edit case provision entities:
+  title: 'Edit Case Provision entities'
+
+view published case provision entities:
+  title: 'View published Case Provision entities'
+
+view unpublished case provision entities:
+  title: 'View unpublished Case Provision entities'
+
+view all case provision revisions:
+  title: 'View all Case Provision revisions'
+
+revert all case provision revisions:
+  title: 'Revert all Case Provision revisions'
+  description: 'Role requires permission <em>view Case Provision revisions</em> and <em>edit rights</em> for case provision entities in question or <em>administer case provision entities</em>.'
+
+delete all case provision revisions:
+  title: 'Delete all revisions'
+  description: 'Role requires permission to <em>view Case Provision revisions</em> and <em>delete rights</em> for case provision entities in question or <em>administer case provision entities</em>.'
+
+permission_callbacks:
+  - \Drupal\opencase_cases\OCCaseProvisionPermissions::generatePermissions
+add case fee entities:
+  title: 'Create new Case Fee entities'
+
+administer case fee entities:
+  title: 'Administer Case Fee entities'
+  description: 'Allow to access the administration form to configure Case Fee entities.'
+  restrict access: true
+
+delete case fee entities:
+  title: 'Delete Case Fee entities'
+
+edit case fee entities:
+  title: 'Edit Case Fee entities'
+
+view published case fee entities:
+  title: 'View published Case Fee entities'
+
+view unpublished case fee entities:
+  title: 'View unpublished Case Fee entities'
+
+view all case fee revisions:
+  title: 'View all Case Fee revisions'
+
+revert all case fee revisions:
+  title: 'Revert all Case Fee revisions'
+  description: 'Role requires permission <em>view Case Fee revisions</em> and <em>edit rights</em> for case fee entities in question or <em>administer case fee entities</em>.'
+
+delete all case fee revisions:
+  title: 'Delete all revisions'
+  description: 'Role requires permission to <em>view Case Fee revisions</em> and <em>delete rights</em> for case fee entities in question or <em>administer case fee entities</em>.'
+
+permission_callbacks:
+  - \Drupal\opencase_cases\OCCaseFeePermissions::generatePermissions

modules/opencase_cases/src/Controller/OCCaseFeeController.php

@@ -0,0 +1,209 @@
+<?php
+
+namespace Drupal\opencase_cases\Controller;
+
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Url;
+use Drupal\opencase_cases\Entity\OCCaseFeeInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Class OCCaseFeeController.
+ *
+ *  Returns responses for Case Fee routes.
+ */
+class OCCaseFeeController extends ControllerBase implements ContainerInjectionInterface {
+
+  /**
+   * The date formatter.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatter
+   */
+  protected $dateFormatter;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\Renderer
+   */
+  protected $renderer;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->dateFormatter = $container->get('date.formatter');
+    $instance->renderer = $container->get('renderer');
+    return $instance;
+  }
+
+  /**
+   * Displays a Case Fee revision.
+   *
+   * @param int $oc_case_fee_revision
+   *   The Case Fee revision ID.
+   *
+   * @return array
+   *   An array suitable for drupal_render().
+   */
+  public function revisionShow($oc_case_fee_revision) {
+    $oc_case_fee = $this->entityTypeManager()->getStorage('oc_case_fee')
+      ->loadRevision($oc_case_fee_revision);
+    $view_builder = $this->entityTypeManager()->getViewBuilder('oc_case_fee');
+
+    return $view_builder->view($oc_case_fee);
+  }
+
+  /**
+   * Page title callback for a Case Fee revision.
+   *
+   * @param int $oc_case_fee_revision
+   *   The Case Fee revision ID.
+   *
+   * @return string
+   *   The page title.
+   */
+  public function revisionPageTitle($oc_case_fee_revision) {
+    $oc_case_fee = $this->entityTypeManager()->getStorage('oc_case_fee')
+      ->loadRevision($oc_case_fee_revision);
+    return $this->t('Revision of %title from %date', [
+      '%title' => $oc_case_fee->label(),
+      '%date' => $this->dateFormatter->format($oc_case_fee->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * Generates an overview table of older revisions of a Case Fee.
+   *
+   * @param \Drupal\opencase_cases\Entity\OCCaseFeeInterface $oc_case_fee
+   *   A Case Fee object.
+   *
+   * @return array
+   *   An array as expected by drupal_render().
+   */
+  public function revisionOverview(OCCaseFeeInterface $oc_case_fee) {
+    $account = $this->currentUser();
+    $oc_case_fee_storage = $this->entityTypeManager()->getStorage('oc_case_fee');
+
+    $langcode = $oc_case_fee->language()->getId();
+    $langname = $oc_case_fee->language()->getName();
+    $languages = $oc_case_fee->getTranslationLanguages();
+    $has_translations = (count($languages) > 1);
+    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', ['@langname' => $langname, '%title' => $oc_case_fee->label()]) : $this->t('Revisions for %title', ['%title' => $oc_case_fee->label()]);
+
+    $header = [$this->t('Revision'), $this->t('Operations')];
+    $revert_permission = (($account->hasPermission("revert all case fee revisions") || $account->hasPermission('administer case fee entities')));
+    $delete_permission = (($account->hasPermission("delete all case fee revisions") || $account->hasPermission('administer case fee entities')));
+
+    $rows = [];
+
+    $vids = $oc_case_fee_storage->revisionIds($oc_case_fee);
+
+    $latest_revision = TRUE;
+
+    foreach (array_reverse($vids) as $vid) {
+      /** @var \Drupal\opencase_cases\OCCaseFeeInterface $revision */
+      $revision = $oc_case_fee_storage->loadRevision($vid);
+      // Only show revisions that are affected by the language that is being
+      // displayed.
+      if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
+        $username = [
+          '#theme' => 'username',
+          '#account' => $revision->getRevisionUser(),
+        ];
+
+        // Use revision link to link to revisions that are not active.
+        $date = $this->dateFormatter->format($revision->getRevisionCreationTime(), 'short');
+        if ($vid != $oc_case_fee->getRevisionId()) {
+          $link = $this->l($date, new Url('entity.oc_case_fee.revision', [
+            'oc_case_fee' => $oc_case_fee->id(),
+            'oc_case_fee_revision' => $vid,
+          ]));
+        }
+        else {
+          $link = $oc_case_fee->link($date);
+        }
+
+        $row = [];
+        $column = [
+          'data' => [
+            '#type' => 'inline_template',
+            '#template' => '{% trans %}{{ date }} by {{ username }}{% endtrans %}{% if message %}<p class="revision-log">{{ message }}</p>{% endif %}',
+            '#context' => [
+              'date' => $link,
+              'username' => $this->renderer->renderPlain($username),
+              'message' => [
+                '#markup' => $revision->getRevisionLogMessage(),
+                '#allowed_tags' => Xss::getHtmlTagList(),
+              ],
+            ],
+          ],
+        ];
+        $row[] = $column;
+
+        if ($latest_revision) {
+          $row[] = [
+            'data' => [
+              '#prefix' => '<em>',
+              '#markup' => $this->t('Current revision'),
+              '#suffix' => '</em>',
+            ],
+          ];
+          foreach ($row as &$current) {
+            $current['class'] = ['revision-current'];
+          }
+          $latest_revision = FALSE;
+        }
+        else {
+          $links = [];
+          if ($revert_permission) {
+            $links['revert'] = [
+              'title' => $this->t('Revert'),
+              'url' => $has_translations ?
+              Url::fromRoute('entity.oc_case_fee.translation_revert', [
+                'oc_case_fee' => $oc_case_fee->id(),
+                'oc_case_fee_revision' => $vid,
+                'langcode' => $langcode,
+              ]) :
+              Url::fromRoute('entity.oc_case_fee.revision_revert', [
+                'oc_case_fee' => $oc_case_fee->id(),
+                'oc_case_fee_revision' => $vid,
+              ]),
+            ];
+          }
+
+          if ($delete_permission) {
+            $links['delete'] = [
+              'title' => $this->t('Delete'),
+              'url' => Url::fromRoute('entity.oc_case_fee.revision_delete', [
+                'oc_case_fee' => $oc_case_fee->id(),
+                'oc_case_fee_revision' => $vid,
+              ]),
+            ];
+          }
+
+          $row[] = [
+            'data' => [
+              '#type' => 'operations',
+              '#links' => $links,
+            ],
+          ];
+        }
+
+        $rows[] = $row;
+      }
+    }
+
+    $build['oc_case_fee_revisions_table'] = [
+      '#theme' => 'table',
+      '#rows' => $rows,
+      '#header' => $header,
+    ];
+
+    return $build;
+  }
+
+}

modules/opencase_cases/src/Controller/OCCaseProvisionController.php

@@ -0,0 +1,209 @@
+<?php
+
+namespace Drupal\opencase_cases\Controller;
+
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Url;
+use Drupal\opencase_cases\Entity\OCCaseProvisionInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Class OCCaseProvisionController.
+ *
+ *  Returns responses for Case Provision routes.
+ */
+class OCCaseProvisionController extends ControllerBase implements ContainerInjectionInterface {
+
+  /**
+   * The date formatter.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatter
+   */
+  protected $dateFormatter;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\Renderer
+   */
+  protected $renderer;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->dateFormatter = $container->get('date.formatter');
+    $instance->renderer = $container->get('renderer');
+    return $instance;
+  }
+
+  /**
+   * Displays a Case Provision revision.
+   *
+   * @param int $oc_case_provision_revision
+   *   The Case Provision revision ID.
+   *
+   * @return array
+   *   An array suitable for drupal_render().
+   */
+  public function revisionShow($oc_case_provision_revision) {
+    $oc_case_provision = $this->entityTypeManager()->getStorage('oc_case_provision')
+      ->loadRevision($oc_case_provision_revision);
+    $view_builder = $this->entityTypeManager()->getViewBuilder('oc_case_provision');
+
+    return $view_builder->view($oc_case_provision);
+  }
+
+  /**
+   * Page title callback for a Case Provision revision.
+   *
+   * @param int $oc_case_provision_revision
+   *   The Case Provision revision ID.
+   *
+   * @return string
+   *   The page title.
+   */
+  public function revisionPageTitle($oc_case_provision_revision) {
+    $oc_case_provision = $this->entityTypeManager()->getStorage('oc_case_provision')
+      ->loadRevision($oc_case_provision_revision);
+    return $this->t('Revision of %title from %date', [
+      '%title' => $oc_case_provision->label(),
+      '%date' => $this->dateFormatter->format($oc_case_provision->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * Generates an overview table of older revisions of a Case Provision.
+   *
+   * @param \Drupal\opencase_cases\Entity\OCCaseProvisionInterface $oc_case_provision
+   *   A Case Provision object.
+   *
+   * @return array
+   *   An array as expected by drupal_render().
+   */
+  public function revisionOverview(OCCaseProvisionInterface $oc_case_provision) {
+    $account = $this->currentUser();
+    $oc_case_provision_storage = $this->entityTypeManager()->getStorage('oc_case_provision');
+
+    $langcode = $oc_case_provision->language()->getId();
+    $langname = $oc_case_provision->language()->getName();
+    $languages = $oc_case_provision->getTranslationLanguages();
+    $has_translations = (count($languages) > 1);
+    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', ['@langname' => $langname, '%title' => $oc_case_provision->label()]) : $this->t('Revisions for %title', ['%title' => $oc_case_provision->label()]);
+
+    $header = [$this->t('Revision'), $this->t('Operations')];
+    $revert_permission = (($account->hasPermission("revert all case provision revisions") || $account->hasPermission('administer case provision entities')));
+    $delete_permission = (($account->hasPermission("delete all case provision revisions") || $account->hasPermission('administer case provision entities')));
+
+    $rows = [];
+
+    $vids = $oc_case_provision_storage->revisionIds($oc_case_provision);
+
+    $latest_revision = TRUE;
+
+    foreach (array_reverse($vids) as $vid) {
+      /** @var \Drupal\opencase_cases\OCCaseProvisionInterface $revision */
+      $revision = $oc_case_provision_storage->loadRevision($vid);
+      // Only show revisions that are affected by the language that is being
+      // displayed.
+      if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
+        $username = [
+          '#theme' => 'username',
+          '#account' => $revision->getRevisionUser(),
+        ];
+
+        // Use revision link to link to revisions that are not active.
+        $date = $this->dateFormatter->format($revision->getRevisionCreationTime(), 'short');
+        if ($vid != $oc_case_provision->getRevisionId()) {
+          $link = $this->l($date, new Url('entity.oc_case_provision.revision', [
+            'oc_case_provision' => $oc_case_provision->id(),
+            'oc_case_provision_revision' => $vid,
+          ]));
+        }
+        else {
+          $link = $oc_case_provision->link($date);
+        }
+
+        $row = [];
+        $column = [
+          'data' => [
+            '#type' => 'inline_template',
+            '#template' => '{% trans %}{{ date }} by {{ username }}{% endtrans %}{% if message %}<p class="revision-log">{{ message }}</p>{% endif %}',
+            '#context' => [
+              'date' => $link,
+              'username' => $this->renderer->renderPlain($username),
+              'message' => [
+                '#markup' => $revision->getRevisionLogMessage(),
+                '#allowed_tags' => Xss::getHtmlTagList(),
+              ],
+            ],
+          ],
+        ];
+        $row[] = $column;
+
+        if ($latest_revision) {
+          $row[] = [
+            'data' => [
+              '#prefix' => '<em>',
+              '#markup' => $this->t('Current revision'),
+              '#suffix' => '</em>',
+            ],
+          ];
+          foreach ($row as &$current) {
+            $current['class'] = ['revision-current'];
+          }
+          $latest_revision = FALSE;
+        }
+        else {
+          $links = [];
+          if ($revert_permission) {
+            $links['revert'] = [
+              'title' => $this->t('Revert'),
+              'url' => $has_translations ?
+              Url::fromRoute('entity.oc_case_provision.translation_revert', [
+                'oc_case_provision' => $oc_case_provision->id(),
+                'oc_case_provision_revision' => $vid,
+                'langcode' => $langcode,
+              ]) :
+              Url::fromRoute('entity.oc_case_provision.revision_revert', [
+                'oc_case_provision' => $oc_case_provision->id(),
+                'oc_case_provision_revision' => $vid,
+              ]),
+            ];
+          }
+
+          if ($delete_permission) {
+            $links['delete'] = [
+              'title' => $this->t('Delete'),
+              'url' => Url::fromRoute('entity.oc_case_provision.revision_delete', [
+                'oc_case_provision' => $oc_case_provision->id(),
+                'oc_case_provision_revision' => $vid,
+              ]),
+            ];
+          }
+
+          $row[] = [
+            'data' => [
+              '#type' => 'operations',
+              '#links' => $links,
+            ],
+          ];
+        }
+
+        $rows[] = $row;
+      }
+    }
+
+    $build['oc_case_provision_revisions_table'] = [
+      '#theme' => 'table',
+      '#rows' => $rows,
+      '#header' => $header,
+    ];
+
+    return $build;
+  }
+
+}

modules/opencase_cases/src/Entity/OCCase.php

@@ -41,6 +41,11 @@ use Drupal\user\UserInterface;
  *   data_table = "oc_case_field_data",
  *   revision_table = "oc_case_revision",
  *   revision_data_table = "oc_case_field_revision",
+ *   revision_metadata_keys = {
+ *     "revision_user" = "revision_user",
+ *     "revision_created" = "revision_created",
+ *     "revision_log_message" = "revision_log"
+ *   },
  *   translatable = TRUE,
  *   admin_permission = "administer case entities",
  *   entity_keys = {
@@ -206,8 +211,9 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
     // not currently used. Will add form and view settings when ready
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Publishing status'))
-      ->setDescription(t('A boolean indicating whether the Case is published.'))
+      ->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['user_id'] = BaseFieldDefinition::create('entity_reference')
@@ -228,7 +234,7 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ->setLabel(t('Title'))
       ->setRevisionable(TRUE)
       ->setSettings([
-        'max_length' => 50,
+        'max_length' => 120,
         'text_processing' => 0,
       ])
       ->setDefaultValue('')
@@ -289,6 +295,26 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ->setRevisionable(TRUE)
       ->setTranslatable(TRUE);
 
+    $fields['notes'] = BaseFieldDefinition::create('string_long')
+      ->setRevisionable(TRUE)
+      ->setLabel(t('Notes'))
+      ->setSettings(array(
+        'default_value' => '',
+        'max_length' => 255,
+        'text_processing' => 0,
+      ))
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true);
+
+
+    $fields['total_fee'] = BaseFieldDefinition::create('decimal')
+    ->setLabel(t('Total Fee'))
+    ->setRevisionable(TRUE)
+    ->setSettings([
+      'prefix' => '£',
+    ])
+    ->SetDisplayConfigurable("view", true);
+
     return $fields;
   }
 }

modules/opencase_cases/src/Entity/OCCaseFee.php

@@ -0,0 +1,300 @@
+<?php
+
+namespace Drupal\opencase_cases\Entity;
+
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Entity\EditorialContentEntityBase;
+use Drupal\Core\Entity\RevisionableInterface;
+use Drupal\Core\Entity\EntityChangedTrait;
+use Drupal\Core\Entity\EntityPublishedTrait;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\user\UserInterface;
+
+/**
+ * Defines the Case Fee entity.
+ *
+ * @ingroup opencase_cases
+ *
+ * @ContentEntityType(
+ *   id = "oc_case_fee",
+ *   label = @Translation("Case Fee"),
+ *   bundle_label = @Translation("Case Fee type"),
+ *   handlers = {
+ *     "storage" = "Drupal\opencase_cases\OCCaseFeeStorage",
+ *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
+ *     "list_builder" = "Drupal\opencase_cases\OCCaseFeeListBuilder",
+ *     "views_data" = "Drupal\opencase_cases\Entity\OCCaseFeeViewsData",
+ *     "translation" = "Drupal\opencase_cases\OCCaseFeeTranslationHandler",
+ *
+ *     "form" = {
+ *       "default" = "Drupal\opencase_cases\Form\OCCaseFeeForm",
+ *       "add" = "Drupal\opencase_cases\Form\OCCaseFeeForm",
+ *       "edit" = "Drupal\opencase_cases\Form\OCCaseFeeForm",
+ *       "delete" = "Drupal\opencase_cases\Form\OCCaseFeeDeleteForm",
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\opencase_cases\OCCaseFeeHtmlRouteProvider",
+ *     },
+ *     "access" = "Drupal\opencase_cases\OCCaseFeeAccessControlHandler",
+ *   },
+ *   base_table = "oc_case_fee",
+ *   data_table = "oc_case_fee_field_data",
+ *   revision_table = "oc_case_fee_revision",
+ *   revision_data_table = "oc_case_fee_field_revision",
+ *   translatable = TRUE,
+ *   permission_granularity = "bundle",
+ *   admin_permission = "administer case fee entities",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "revision" = "vid",
+ *     "bundle" = "type",
+ *     "label" = "name",
+ *     "uuid" = "uuid",
+ *     "uid" = "user_id",
+ *     "langcode" = "langcode",
+ *     "published" = "status",
+ *   },
+ *   links = {
+ *     "canonical" = "/opencase/oc_case_fee/{oc_case_fee}",
+ *     "add-page" = "/opencase/oc_case_fee/add",
+ *     "add-form" = "/opencase/oc_case_fee/add/{oc_case_fee_type}",
+ *     "edit-form" = "/opencase/oc_case_fee/{oc_case_fee}/edit",
+ *     "delete-form" = "/opencase/oc_case_fee/{oc_case_fee}/delete",
+ *     "version-history" = "/opencase/oc_case_fee/{oc_case_fee}/revisions",
+ *     "revision" = "/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/view",
+ *     "revision_revert" = "/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/revert",
+ *     "revision_delete" = "/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/delete",
+ *     "translation_revert" = "/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/revert/{langcode}",
+ *     "collection" = "/opencase/oc_case_fee",
+ *   },
+ *   bundle_entity_type = "oc_case_fee_type",
+ *   field_ui_base_route = "entity.oc_case_fee_type.edit_form"
+ * )
+ */
+class OCCaseFee extends EditorialContentEntityBase implements OCCaseFeeInterface {
+
+  use EntityChangedTrait;
+  use EntityPublishedTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function preCreate(EntityStorageInterface $storage_controller, array &$values) {
+    parent::preCreate($storage_controller, $values);
+    $values += [
+      'user_id' => \Drupal::currentUser()->id(),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function urlRouteParameters($rel) {
+    $uri_route_parameters = parent::urlRouteParameters($rel);
+
+    if ($rel === 'revision_revert' && $this instanceof RevisionableInterface) {
+      $uri_route_parameters[$this->getEntityTypeId() . '_revision'] = $this->getRevisionId();
+    }
+    elseif ($rel === 'revision_delete' && $this instanceof RevisionableInterface) {
+      $uri_route_parameters[$this->getEntityTypeId() . '_revision'] = $this->getRevisionId();
+    }
+
+    return $uri_route_parameters;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    parent::preSave($storage);
+
+    foreach (array_keys($this->getTranslationLanguages()) as $langcode) {
+      $translation = $this->getTranslation($langcode);
+
+      // If no owner has been set explicitly, make the anonymous user the owner.
+      if (!$translation->getOwner()) {
+        $translation->setOwnerId(0);
+      }
+    }
+
+    // If no revision author has been set explicitly,
+    // make the oc_case_fee owner the revision author.
+    if (!$this->getRevisionUser()) {
+      $this->setRevisionUserId($this->getOwnerId());
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getName() {
+    return $this->get('name')->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setName($name) {
+    $this->set('name', $name);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCreatedTime() {
+    return $this->get('created')->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setCreatedTime($timestamp) {
+    $this->set('created', $timestamp);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getOwner() {
+    return $this->get('user_id')->entity;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getOwnerId() {
+    return $this->get('user_id')->target_id;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setOwnerId($uid) {
+    $this->set('user_id', $uid);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setOwner(UserInterface $account) {
+    $this->set('user_id', $account->id());
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields = parent::baseFieldDefinitions($entity_type);
+
+    // Add the published field.
+    $fields += static::publishedBaseFieldDefinitions($entity_type);
+
+    $fields['user_id'] = BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Authored by'))
+      ->setDescription(t('The user ID of author of the Case Fee entity.'))
+      ->setRevisionable(TRUE)
+      ->setSetting('target_type', 'user')
+      ->setSetting('handler', 'default')
+      ->setTranslatable(TRUE)
+      ->setDisplayOptions('view', [
+        'label' => 'hidden',
+        'type' => 'author',
+        'weight' => 0,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'entity_reference_autocomplete',
+        'weight' => 5,
+        'settings' => [
+          'match_operator' => 'CONTAINS',
+          'size' => '60',
+          'autocomplete_type' => 'tags',
+          'placeholder' => '',
+        ],
+      ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDisplayConfigurable('view', TRUE);
+
+    $fields['name'] = BaseFieldDefinition::create('string')
+      ->setLabel(t('Name'))
+      ->setDescription(t('The name of the Case Fee entity.'))
+      ->setRevisionable(TRUE)
+      ->setSettings([
+        'max_length' => 50,
+        'text_processing' => 0,
+      ])
+      ->setDefaultValue('')
+      ->setDisplayOptions('view', [
+        'label' => 'above',
+        'type' => 'string',
+        'weight' => -4,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'string_textfield',
+        'weight' => -4,
+      ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDisplayConfigurable('view', TRUE)
+      ->setRequired(TRUE);
+
+    $fields['status']->setDescription(t('A boolean indicating whether the Case Fee is published.'))
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDisplayConfigurable('view', TRUE);
+
+    $fields['created'] = BaseFieldDefinition::create('created')
+      ->setLabel(t('Created'))
+      ->setDescription(t('The time that the entity was created.'));
+
+    $fields['changed'] = BaseFieldDefinition::create('changed')
+      ->setLabel(t('Changed'))
+      ->setDescription(t('The time that the entity was last edited.'));
+
+    $fields['revision_translation_affected'] = BaseFieldDefinition::create('boolean')
+      ->setLabel(t('Revision translation affected'))
+      ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.'))
+      ->setReadOnly(TRUE)
+      ->setRevisionable(TRUE)
+      ->setTranslatable(TRUE);
+
+    $fields['oc_case'] = \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Case'))
+      ->setSetting('target_type', 'oc_case')
+      ->setSetting('handler', 'default')
+      ->setTranslatable(TRUE)
+      ->setCardinality(1)
+      ->setDefaultValueCallback('opencase_cases_default_case_id')  // defined in opencase_cases.module
+      ->setDisplayOptions('view', [
+        'type' => 'string',
+        'weight' => 0,
+      ])
+      ->setRequired(TRUE);
+
+    $fields['oc_fee_category'] = \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Fee Category'))
+      ->setSetting('target_type', 'taxonomy_term')
+      ->setSetting('handler_settings', ['target_bundles' => ['oc_fee_category' => 'oc_fee_category']])
+      ->setSetting('handler', 'default')
+      ->setTranslatable(TRUE)
+      ->setCardinality(1)
+      ->setDisplayConfigurable("view", true)
+      ->setDisplayConfigurable("form", true)
+      ->setRequired(FALSE);
+
+    $fields['amount'] = BaseFieldDefinition::create('decimal')
+      ->setLabel(t('Amount'))
+      ->setRevisionable(TRUE)
+      ->setSettings([
+        'prefix' => '£',
+      ])
+      ->setRequired(TRUE)
+      ->SetDisplayConfigurable("form", true)
+      ->SetDisplayConfigurable("view", true);
+
+    return $fields;
+  }
+
+}

modules/opencase_cases/src/Entity/OCCaseFeeInterface.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace Drupal\opencase_cases\Entity;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\RevisionLogInterface;
+use Drupal\Core\Entity\EntityChangedInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
+use Drupal\user\EntityOwnerInterface;
+
+/**
+ * Provides an interface for defining Case Fee entities.
+ *
+ * @ingroup opencase_cases
+ */
+interface OCCaseFeeInterface extends ContentEntityInterface, RevisionLogInterface, EntityChangedInterface, EntityPublishedInterface, EntityOwnerInterface {
+
+  /**
+   * Add get/set methods for your configuration properties here.
+   */
+
+  /**
+   * Gets the Case Fee name.
+   *
+   * @return string
+   *   Name of the Case Fee.
+   */
+  public function getName();
+
+  /**
+   * Sets the Case Fee name.
+   *
+   * @param string $name
+   *   The Case Fee name.
+   *
+   * @return \Drupal\opencase_cases\Entity\OCCaseFeeInterface
+   *   The called Case Fee entity.
+   */
+  public function setName($name);
+
+  /**
+   * Gets the Case Fee creation timestamp.
+   *
+   * @return int
+   *   Creation timestamp of the Case Fee.
+   */
+  public function getCreatedTime();
+
+  /**
+   * Sets the Case Fee creation timestamp.
+   *
+   * @param int $timestamp
+   *   The Case Fee creation timestamp.
+   *
+   * @return \Drupal\opencase_cases\Entity\OCCaseFeeInterface
+   *   The called Case Fee entity.
+   */
+  public function setCreatedTime($timestamp);
+
+  /**
+   * Gets the Case Fee revision creation timestamp.
+   *
+   * @return int
+   *   The UNIX timestamp of when this revision was created.
+   */
+  public function getRevisionCreationTime();
+
+  /**
+   * Sets the Case Fee revision creation timestamp.
+   *
+   * @param int $timestamp
+   *   The UNIX timestamp of when this revision was created.
+   *
+   * @return \Drupal\opencase_cases\Entity\OCCaseFeeInterface
+   *   The called Case Fee entity.
+   */
+  public function setRevisionCreationTime($timestamp);
+
+  /**
+   * Gets the Case Fee revision author.
+   *
+   * @return \Drupal\user\UserInterface
+   *   The user entity for the revision author.
+   */
+  public function getRevisionUser();
+
+  /**
+   * Sets the Case Fee revision author.
+   *
+   * @param int $uid
+   *   The user ID of the revision author.
+   *
+   * @return \Drupal\opencase_cases\Entity\OCCaseFeeInterface
+   *   The called Case Fee entity.
+   */
+  public function setRevisionUserId($uid);
+
+}

modules/opencase_cases/src/Entity/OCCaseFeeType.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\opencase_cases\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
+
+/**
+ * Defines the Case Fee type entity.
+ *
+ * @ConfigEntityType(
+ *   id = "oc_case_fee_type",
+ *   label = @Translation("Case Fee type"),
+ *   handlers = {
+ *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
+ *     "list_builder" = "Drupal\opencase_cases\OCCaseFeeTypeListBuilder",
+ *     "form" = {
+ *       "add" = "Drupal\opencase_cases\Form\OCCaseFeeTypeForm",
+ *       "edit" = "Drupal\opencase_cases\Form\OCCaseFeeTypeForm",
+ *       "delete" = "Drupal\opencase_cases\Form\OCCaseFeeTypeDeleteForm"
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\opencase_cases\OCCaseFeeTypeHtmlRouteProvider",
+ *     },
+ *   },
+ *   config_prefix = "oc_case_fee_type",
+ *   admin_permission = "administer site configuration",
+ *   bundle_of = "oc_case_fee",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "label",
+ *     "uuid" = "uuid"
+ *   },
+ *   links = {
+ *     "canonical" = "/opencase/oc_case_fee_type/{oc_case_fee_type}",
+ *     "add-form" = "/opencase/oc_case_fee_type/add",
+ *     "edit-form" = "/opencase/oc_case_fee_type/{oc_case_fee_type}/edit",
+ *     "delete-form" = "/opencase/oc_case_fee_type/{oc_case_fee_type}/delete",
+ *     "collection" = "/opencase/oc_case_fee_type"
+ *   }
+ * )
+ */
+class OCCaseFeeType extends ConfigEntityBundleBase implements OCCaseFeeTypeInterface {
+
+  /**
+   * The Case Fee type ID.
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * The Case Fee type label.
+   *
+   * @var string
+   */
+  protected $label;
+
+}

modules/opencase_cases/src/Entity/OCCaseFeeTypeInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Drupal\opencase_cases\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+/**
+ * Provides an interface for defining Case Fee type entities.
+ */
+interface OCCaseFeeTypeInterface extends ConfigEntityInterface {
+
+  // Add get/set methods for your configuration properties here.
+}

modules/opencase_cases/src/Entity/OCCaseFeeViewsData.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Drupal\opencase_cases\Entity;
+
+use Drupal\views\EntityViewsData;
+
+/**
+ * Provides Views data for Case Fee entities.
+ */
+class OCCaseFeeViewsData extends EntityViewsData {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getViewsData() {
+    $data = parent::getViewsData();
+
+    // Additional information for Views integration, such as table joins, can be
+    // put here.
+    return $data;
+  }
+
+}

modules/opencase_cases/src/Entity/OCCaseProvision.php

@@ -0,0 +1,307 @@
+<?php
+
+namespace Drupal\opencase_cases\Entity;
+
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Entity\EditorialContentEntityBase;
+use Drupal\Core\Entity\RevisionableInterface;
+use Drupal\Core\Entity\EntityChangedTrait;
+use Drupal\Core\Entity\EntityPublishedTrait;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\user\UserInterface;
+
+/**
+ * Defines the Case Provision entity.
+ *
+ * @ingroup opencase_cases
+ *
+ * @ContentEntityType(
+ *   id = "oc_case_provision",
+ *   label = @Translation("Case Provision"),
+ *   bundle_label = @Translation("Case Provision type"),
+ *   handlers = {
+ *     "storage" = "Drupal\opencase_cases\OCCaseProvisionStorage",
+ *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
+ *     "list_builder" = "Drupal\opencase_cases\OCCaseProvisionListBuilder",
+ *     "views_data" = "Drupal\opencase_cases\Entity\OCCaseProvisionViewsData",
+ *     "translation" = "Drupal\opencase_cases\OCCaseProvisionTranslationHandler",
+ *
+ *     "form" = {
+ *       "default" = "Drupal\opencase_cases\Form\OCCaseProvisionForm",
+ *       "add" = "Drupal\opencase_cases\Form\OCCaseProvisionForm",
+ *       "edit" = "Drupal\opencase_cases\Form\OCCaseProvisionForm",
+ *       "delete" = "Drupal\opencase_cases\Form\OCCaseProvisionDeleteForm",
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\opencase_cases\OCCaseProvisionHtmlRouteProvider",
+ *     },
+ *     "access" = "Drupal\opencase_cases\OCCaseProvisionAccessControlHandler",
+ *   },
+ *   base_table = "oc_case_provision",
+ *   data_table = "oc_case_provision_field_data",
+ *   revision_table = "oc_case_provision_revision",
+ *   revision_data_table = "oc_case_provision_field_revision",
+ *   translatable = TRUE,
+ *   permission_granularity = "bundle",
+ *   admin_permission = "administer case provision entities",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "revision" = "vid",
+ *     "bundle" = "type",
+ *     "label" = "name",
+ *     "uuid" = "uuid",
+ *     "uid" = "user_id",
+ *     "langcode" = "langcode",
+ *     "published" = "status",
+ *   },
+ *   links = {
+ *     "canonical" = "/opencase/oc_case_provision/{oc_case_provision}",
+ *     "add-page" = "/opencase/oc_case_provision/add",
+ *     "add-form" = "/opencase/oc_case_provision/add/{oc_case_provision_type}",
+ *     "edit-form" = "/opencase/oc_case_provision/{oc_case_provision}/edit",
+ *     "delete-form" = "/opencase/oc_case_provision/{oc_case_provision}/delete",
+ *     "version-history" = "/opencase/oc_case_provision/{oc_case_provision}/revisions",
+ *     "revision" = "/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/view",
+ *     "revision_revert" = "/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/revert",
+ *     "revision_delete" = "/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/delete",
+ *     "translation_revert" = "/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/revert/{langcode}",
+ *     "collection" = "/opencase/oc_case_provision",
+ *   },
+ *   bundle_entity_type = "oc_case_provision_type",
+ *   field_ui_base_route = "entity.oc_case_provision_type.edit_form"
+ * )
+ */
+class OCCaseProvision extends EditorialContentEntityBase implements OCCaseProvisionInterface {
+
+  use EntityChangedTrait;
+  use EntityPublishedTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function preCreate(EntityStorageInterface $storage_controller, array &$values) {
+    parent::preCreate($storage_controller, $values);
+    $values += [
+      'user_id' => \Drupal::currentUser()->id(),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function urlRouteParameters($rel) {
+    $uri_route_parameters = parent::urlRouteParameters($rel);
+
+    if ($rel === 'revision_revert' && $this instanceof RevisionableInterface) {
+      $uri_route_parameters[$this->getEntityTypeId() . '_revision'] = $this->getRevisionId();
+    }
+    elseif ($rel === 'revision_delete' && $this instanceof RevisionableInterface) {
+      $uri_route_parameters[$this->getEntityTypeId() . '_revision'] = $this->getRevisionId();
+    }
+
+    return $uri_route_parameters;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    parent::preSave($storage);
+
+    foreach (array_keys($this->getTranslationLanguages()) as $langcode) {
+      $translation = $this->getTranslation($langcode);
+
+      // If no owner has been set explicitly, make the anonymous user the owner.
+      if (!$translation->getOwner()) {
+        $translation->setOwnerId(0);
+      }
+    }
+
+    // If no revision author has been set explicitly,
+    // make the oc_case_provision owner the revision author.
+    if (!$this->getRevisionUser()) {
+      $this->setRevisionUserId($this->getOwnerId());
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getName() {
+    return $this->get('name')->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setName($name) {
+    $this->set('name', $name);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCreatedTime() {
+    return $this->get('created')->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setCreatedTime($timestamp) {
+    $this->set('created', $timestamp);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getOwner() {
+    return $this->get('user_id')->entity;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getOwnerId() {
+    return $this->get('user_id')->target_id;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setOwnerId($uid) {
+    $this->set('user_id', $uid);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setOwner(UserInterface $account) {
+    $this->set('user_id', $account->id());
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields = parent::baseFieldDefinitions($entity_type);
+
+    // Add the published field.
+    $fields += static::publishedBaseFieldDefinitions($entity_type);
+
+    $fields['user_id'] = BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Authored by'))
+      ->setDescription(t('The user ID of author of the Case Provision entity.'))
+      ->setRevisionable(TRUE)
+      ->setSetting('target_type', 'user')
+      ->setSetting('handler', 'default')
+      ->setTranslatable(TRUE)
+      ->setDisplayOptions('view', [
+        'label' => 'hidden',
+        'type' => 'author',
+        'weight' => 0,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'entity_reference_autocomplete',
+        'weight' => 5,
+        'settings' => [
+          'match_operator' => 'CONTAINS',
+          'size' => '60',
+          'autocomplete_type' => 'tags',
+          'placeholder' => '',
+        ],
+      ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDisplayConfigurable('view', TRUE);
+
+    $fields['name'] = BaseFieldDefinition::create('string')
+      ->setLabel(t('Name'))
+      ->setDescription(t('The name of the Case Provision entity.'))
+      ->setRevisionable(TRUE)
+      ->setSettings([
+        'max_length' => 50,
+        'text_processing' => 0,
+      ])
+      ->setDefaultValue('')
+      ->setDisplayOptions('view', [
+        'label' => 'above',
+        'type' => 'string',
+        'weight' => -4,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'string_textfield',
+        'weight' => -4,
+      ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->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['created'] = BaseFieldDefinition::create('created')
+      ->setLabel(t('Created'))
+      ->setDescription(t('The time that the entity was created.'));
+
+    $fields['changed'] = BaseFieldDefinition::create('changed')
+      ->setLabel(t('Changed'))
+      ->setDescription(t('The time that the entity was last edited.'));
+
+    $fields['revision_translation_affected'] = BaseFieldDefinition::create('boolean')
+      ->setLabel(t('Revision translation affected'))
+      ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.'))
+      ->setReadOnly(TRUE)
+      ->setRevisionable(TRUE)
+      ->setTranslatable(TRUE);
+
+    $fields['oc_case'] = \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Case'))
+      ->setSetting('target_type', 'oc_case')
+      ->setSetting('handler', 'default')
+      ->setTranslatable(TRUE)
+      ->setCardinality(1)
+      ->setDefaultValueCallback('opencase_cases_default_case_id')  // defined in opencase_cases.module
+      ->setDisplayOptions('view', [
+        'type' => 'string',
+        'weight' => 0,
+      ])
+      ->setRequired(TRUE);
+
+    $fields['oc_provider'] = \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Provider'))
+      ->setSetting('target_type', 'oc_actor') // TODO: this should eventually point to a Provider rather than an Actor
+      ->setSetting('handler', 'views')
+      ->setTranslatable(TRUE)
+      ->setCardinality(1)
+      ->setSetting('handler_settings', [
+        'view' => [
+          'view_name' => 'case_providers',
+          'display_name' => 'entity_reference_1',
+          'arguments' => [],
+        ]
+      ])
+      ->setDisplayConfigurable("view", true)
+      ->setDisplayConfigurable("form", true)
+      ->setRequired(TRUE);
+
+    $fields['oc_case_provider_role'] = \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference') 
+      ->setLabel(t('Role'))
+      ->setSetting('target_type', 'taxonomy_term')
+      ->setSetting('handler_settings', ['target_bundles' => ['oc_case_provider_role' => 'oc_case_provider_role']])
+      ->setSetting('handler', 'default')
+      ->setTranslatable(TRUE)
+      ->setCardinality(1)
+      ->setDisplayConfigurable("view", true)
+      ->setDisplayConfigurable("form", true)
+      ->setRequired(FALSE);
+    return $fields;
+  }
+
+}

modules/opencase_cases/src/Entity/OCCaseProvisionInterface.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace Drupal\opencase_cases\Entity;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\RevisionLogInterface;
+use Drupal\Core\Entity\EntityChangedInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
+use Drupal\user\EntityOwnerInterface;
+
+/**
+ * Provides an interface for defining Case Provision entities.
+ *
+ * @ingroup opencase_cases
+ */
+interface OCCaseProvisionInterface extends ContentEntityInterface, RevisionLogInterface, EntityChangedInterface, EntityPublishedInterface, EntityOwnerInterface {
+
+  /**
+   * Add get/set methods for your configuration properties here.
+   */
+
+  /**
+   * Gets the Case Provision name.
+   *
+   * @return string
+   *   Name of the Case Provision.
+   */
+  public function getName();
+
+  /**
+   * Sets the Case Provision name.
+   *
+   * @param string $name
+   *   The Case Provision name.
+   *
+   * @return \Drupal\opencase_cases\Entity\OCCaseProvisionInterface
+   *   The called Case Provision entity.
+   */
+  public function setName($name);
+
+  /**
+   * Gets the Case Provision creation timestamp.
+   *
+   * @return int
+   *   Creation timestamp of the Case Provision.
+   */
+  public function getCreatedTime();
+
+  /**
+   * Sets the Case Provision creation timestamp.
+   *
+   * @param int $timestamp
+   *   The Case Provision creation timestamp.
+   *
+   * @return \Drupal\opencase_cases\Entity\OCCaseProvisionInterface
+   *   The called Case Provision entity.
+   */
+  public function setCreatedTime($timestamp);
+
+  /**
+   * Gets the Case Provision revision creation timestamp.
+   *
+   * @return int
+   *   The UNIX timestamp of when this revision was created.
+   */
+  public function getRevisionCreationTime();
+
+  /**
+   * Sets the Case Provision revision creation timestamp.
+   *
+   * @param int $timestamp
+   *   The UNIX timestamp of when this revision was created.
+   *
+   * @return \Drupal\opencase_cases\Entity\OCCaseProvisionInterface
+   *   The called Case Provision entity.
+   */
+  public function setRevisionCreationTime($timestamp);
+
+  /**
+   * Gets the Case Provision revision author.
+   *
+   * @return \Drupal\user\UserInterface
+   *   The user entity for the revision author.
+   */
+  public function getRevisionUser();
+
+  /**
+   * Sets the Case Provision revision author.
+   *
+   * @param int $uid
+   *   The user ID of the revision author.
+   *
+   * @return \Drupal\opencase_cases\Entity\OCCaseProvisionInterface
+   *   The called Case Provision entity.
+   */
+  public function setRevisionUserId($uid);
+
+}

modules/opencase_cases/src/Entity/OCCaseProvisionType.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\opencase_cases\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
+
+/**
+ * Defines the Case Provision type entity.
+ *
+ * @ConfigEntityType(
+ *   id = "oc_case_provision_type",
+ *   label = @Translation("Case Provision type"),
+ *   handlers = {
+ *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
+ *     "list_builder" = "Drupal\opencase_cases\OCCaseProvisionTypeListBuilder",
+ *     "form" = {
+ *       "add" = "Drupal\opencase_cases\Form\OCCaseProvisionTypeForm",
+ *       "edit" = "Drupal\opencase_cases\Form\OCCaseProvisionTypeForm",
+ *       "delete" = "Drupal\opencase_cases\Form\OCCaseProvisionTypeDeleteForm"
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\opencase_cases\OCCaseProvisionTypeHtmlRouteProvider",
+ *     },
+ *   },
+ *   config_prefix = "oc_case_provision_type",
+ *   admin_permission = "administer site configuration",
+ *   bundle_of = "oc_case_provision",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "label",
+ *     "uuid" = "uuid"
+ *   },
+ *   links = {
+ *     "canonical" = "/opencase/oc_case_provision_type/{oc_case_provision_type}",
+ *     "add-form" = "/opencase/oc_case_provision_type/add",
+ *     "edit-form" = "/opencase/oc_case_provision_type/{oc_case_provision_type}/edit",
+ *     "delete-form" = "/opencase/oc_case_provision_type/{oc_case_provision_type}/delete",
+ *     "collection" = "/opencase/oc_case_provision_type"
+ *   }
+ * )
+ */
+class OCCaseProvisionType extends ConfigEntityBundleBase implements OCCaseProvisionTypeInterface {
+
+  /**
+   * The Case Provision type ID.
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * The Case Provision type label.
+   *
+   * @var string
+   */
+  protected $label;
+
+}

modules/opencase_cases/src/Entity/OCCaseProvisionTypeInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Drupal\opencase_cases\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+/**
+ * Provides an interface for defining Case Provision type entities.
+ */
+interface OCCaseProvisionTypeInterface extends ConfigEntityInterface {
+
+  // Add get/set methods for your configuration properties here.
+}

modules/opencase_cases/src/Entity/OCCaseProvisionViewsData.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Drupal\opencase_cases\Entity;
+
+use Drupal\views\EntityViewsData;
+
+/**
+ * Provides Views data for Case Provision entities.
+ */
+class OCCaseProvisionViewsData extends EntityViewsData {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getViewsData() {
+    $data = parent::getViewsData();
+
+    // Additional information for Views integration, such as table joins, can be
+    // put here.
+    return $data;
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseFeeDeleteForm.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Entity\ContentEntityDeleteForm;
+
+/**
+ * Provides a form for deleting Case Fee entities.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseFeeDeleteForm extends ContentEntityDeleteForm {
+
+
+}

modules/opencase_cases/src/Form/OCCaseFeeForm.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Form controller for Case Fee edit forms.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseFeeForm extends ContentEntityForm {
+
+  /**
+   * The current user account.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $account;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    // Instantiates this form class.
+    $instance = parent::create($container);
+    $instance->account = $container->get('current_user');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    /* @var \Drupal\opencase_cases\Entity\OCCaseFee $entity */
+    $form = parent::buildForm($form, $form_state);
+
+    if (!$this->entity->isNew()) {
+      $form['new_revision'] = [
+        '#type' => 'checkbox',
+        '#title' => $this->t('Create new revision'),
+        '#default_value' => FALSE,
+        '#weight' => 10,
+      ];
+    }
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $entity = $this->entity;
+
+    // Save as a new revision if requested to do so.
+    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
+      $entity->setNewRevision();
+
+      // If a new revision is created, save the current user as revision author.
+      $entity->setRevisionCreationTime($this->time->getRequestTime());
+      $entity->setRevisionUserId($this->account->id());
+    }
+    else {
+      $entity->setNewRevision(FALSE);
+    }
+
+    $status = parent::save($form, $form_state);
+
+    switch ($status) {
+      case SAVED_NEW:
+        $this->messenger()->addMessage($this->t('Created the %label Case Fee.', [
+          '%label' => $entity->label(),
+        ]));
+        break;
+
+      default:
+        $this->messenger()->addMessage($this->t('Saved the %label Case Fee.', [
+          '%label' => $entity->label(),
+        ]));
+    }
+    $form_state->setRedirect('entity.oc_case_fee.canonical', ['oc_case_fee' => $entity->id()]);
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseFeeRevisionDeleteForm.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for deleting a Case Fee revision.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseFeeRevisionDeleteForm extends ConfirmFormBase {
+
+  /**
+   * The Case Fee revision.
+   *
+   * @var \Drupal\opencase_cases\Entity\OCCaseFeeInterface
+   */
+  protected $revision;
+
+  /**
+   * The Case Fee storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $oCCaseFeeStorage;
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $connection;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->oCCaseFeeStorage = $container->get('entity_type.manager')->getStorage('oc_case_fee');
+    $instance->connection = $container->get('database');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'oc_case_fee_revision_delete_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to delete the revision from %revision-date?', [
+      '%revision-date' => format_date($this->revision->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.oc_case_fee.version_history', ['oc_case_fee' => $this->revision->id()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $oc_case_fee_revision = NULL) {
+    $this->revision = $this->OCCaseFeeStorage->loadRevision($oc_case_fee_revision);
+    $form = parent::buildForm($form, $form_state);
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->OCCaseFeeStorage->deleteRevision($this->revision->getRevisionId());
+
+    $this->logger('content')->notice('Case Fee: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
+    $this->messenger()->addMessage(t('Revision from %revision-date of Case Fee %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
+    $form_state->setRedirect(
+      'entity.oc_case_fee.canonical',
+       ['oc_case_fee' => $this->revision->id()]
+    );
+    if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {oc_case_fee_field_revision} WHERE id = :id', [':id' => $this->revision->id()])->fetchField() > 1) {
+      $form_state->setRedirect(
+        'entity.oc_case_fee.version_history',
+         ['oc_case_fee' => $this->revision->id()]
+      );
+    }
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseFeeRevisionRevertForm.php

@@ -0,0 +1,137 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Drupal\opencase_cases\Entity\OCCaseFeeInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for reverting a Case Fee revision.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseFeeRevisionRevertForm extends ConfirmFormBase {
+
+  /**
+   * The Case Fee revision.
+   *
+   * @var \Drupal\opencase_cases\Entity\OCCaseFeeInterface
+   */
+  protected $revision;
+
+  /**
+   * The Case Fee storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $oCCaseFeeStorage;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->oCCaseFeeStorage = $container->get('entity_type.manager')->getStorage('oc_case_fee');
+    $instance->dateFormatter = $container->get('date.formatter');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'oc_case_fee_revision_revert_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to revert to the revision from %revision-date?', [
+      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.oc_case_fee.version_history', ['oc_case_fee' => $this->revision->id()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Revert');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDescription() {
+    return '';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $oc_case_fee_revision = NULL) {
+    $this->revision = $this->OCCaseFeeStorage->loadRevision($oc_case_fee_revision);
+    $form = parent::buildForm($form, $form_state);
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // The revision timestamp will be updated when the revision is saved. Keep
+    // the original one for the confirmation message.
+    $original_revision_timestamp = $this->revision->getRevisionCreationTime();
+
+    $this->revision = $this->prepareRevertedRevision($this->revision, $form_state);
+    $this->revision->revision_log = $this->t('Copy of the revision from %date.', [
+      '%date' => $this->dateFormatter->format($original_revision_timestamp),
+    ]);
+    $this->revision->save();
+
+    $this->logger('content')->notice('Case Fee: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
+    $this->messenger()->addMessage(t('Case Fee %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
+    $form_state->setRedirect(
+      'entity.oc_case_fee.version_history',
+      ['oc_case_fee' => $this->revision->id()]
+    );
+  }
+
+  /**
+   * Prepares a revision to be reverted.
+   *
+   * @param \Drupal\opencase_cases\Entity\OCCaseFeeInterface $revision
+   *   The revision to be reverted.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return \Drupal\opencase_cases\Entity\OCCaseFeeInterface
+   *   The prepared revision ready to be stored.
+   */
+  protected function prepareRevertedRevision(OCCaseFeeInterface $revision, FormStateInterface $form_state) {
+    $revision->setNewRevision();
+    $revision->isDefaultRevision(TRUE);
+    $revision->setRevisionCreationTime(REQUEST_TIME);
+
+    return $revision;
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseFeeRevisionRevertTranslationForm.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\opencase_cases\Entity\OCCaseFeeInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for reverting a Case Fee revision for a single trans.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseFeeRevisionRevertTranslationForm extends OCCaseFeeRevisionRevertForm {
+
+  /**
+   * The language to be reverted.
+   *
+   * @var string
+   */
+  protected $langcode;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->languageManager = $container->get('language_manager');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'oc_case_fee_revision_revert_translation_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to revert @language translation to the revision from %revision-date?', [
+      '@language' => $this->languageManager->getLanguageName($this->langcode),
+      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $oc_case_fee_revision = NULL, $langcode = NULL) {
+    $this->langcode = $langcode;
+    $form = parent::buildForm($form, $form_state, $oc_case_fee_revision);
+
+    $form['revert_untranslated_fields'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Revert content shared among translations'),
+      '#default_value' => FALSE,
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function prepareRevertedRevision(OCCaseFeeInterface $revision, FormStateInterface $form_state) {
+    $revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
+
+    /** @var \Drupal\opencase_cases\Entity\OCCaseFeeInterface $default_revision */
+    $latest_revision = $this->OCCaseFeeStorage->load($revision->id());
+    $latest_revision_translation = $latest_revision->getTranslation($this->langcode);
+
+    $revision_translation = $revision->getTranslation($this->langcode);
+
+    foreach ($latest_revision_translation->getFieldDefinitions() as $field_name => $definition) {
+      if ($definition->isTranslatable() || $revert_untranslated_fields) {
+        $latest_revision_translation->set($field_name, $revision_translation->get($field_name)->getValue());
+      }
+    }
+
+    $latest_revision_translation->setNewRevision();
+    $latest_revision_translation->isDefaultRevision(TRUE);
+    $revision->setRevisionCreationTime(REQUEST_TIME);
+
+    return $latest_revision_translation;
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseFeeSettingsForm.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Class OCCaseFeeSettingsForm.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseFeeSettingsForm extends FormBase {
+
+  /**
+   * Returns a unique string identifying the form.
+   *
+   * @return string
+   *   The unique string identifying the form.
+   */
+  public function getFormId() {
+    return 'occasefee_settings';
+  }
+
+  /**
+   * Form submission handler.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // Empty implementation of the abstract submit class.
+  }
+
+  /**
+   * Defines the settings form for Case Fee entities.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return array
+   *   Form definition array.
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['occasefee_settings']['#markup'] = 'Settings form for Case Fee entities. Manage field settings here.';
+    return $form;
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseFeeTypeDeleteForm.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Entity\EntityConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+
+/**
+ * Builds the form to delete Case Fee type entities.
+ */
+class OCCaseFeeTypeDeleteForm extends EntityConfirmFormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to delete %name?', ['%name' => $this->entity->label()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.oc_case_fee_type.collection');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->entity->delete();
+
+    $this->messenger()->addMessage(
+      $this->t('content @type: deleted @label.', [
+        '@type' => $this->entity->bundle(),
+        '@label' => $this->entity->label(),
+      ])
+    );
+
+    $form_state->setRedirectUrl($this->getCancelUrl());
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseFeeTypeForm.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Class OCCaseFeeTypeForm.
+ */
+class OCCaseFeeTypeForm extends EntityForm {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    $oc_case_fee_type = $this->entity;
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => $oc_case_fee_type->label(),
+      '#description' => $this->t("Label for the Case Fee type."),
+      '#required' => TRUE,
+    ];
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#default_value' => $oc_case_fee_type->id(),
+      '#machine_name' => [
+        'exists' => '\Drupal\opencase_cases\Entity\OCCaseFeeType::load',
+      ],
+      '#disabled' => !$oc_case_fee_type->isNew(),
+    ];
+
+    /* You will need additional form elements for your custom properties. */
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $oc_case_fee_type = $this->entity;
+    $status = $oc_case_fee_type->save();
+
+    switch ($status) {
+      case SAVED_NEW:
+        $this->messenger()->addMessage($this->t('Created the %label Case Fee type.', [
+          '%label' => $oc_case_fee_type->label(),
+        ]));
+        break;
+
+      default:
+        $this->messenger()->addMessage($this->t('Saved the %label Case Fee type.', [
+          '%label' => $oc_case_fee_type->label(),
+        ]));
+    }
+    $form_state->setRedirectUrl($oc_case_fee_type->toUrl('collection'));
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseForm.php

@@ -44,7 +44,7 @@ class OCCaseForm extends ContentEntityForm {
       $entity->setNewRevision();
 
       // If a new revision is created, save the current user as revision author.
-      $entity->setRevisionCreationTime(REQUEST_TIME);
+      $entity->setRevisionCreationTime( \Drupal::time()->getRequestTime());
       $entity->setRevisionUserId(\Drupal::currentUser()->id());
     }
     else {
@@ -55,17 +55,25 @@ class OCCaseForm extends ContentEntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Case.', [
+        \Drupal::messenger()->addMessage($this->t('Created the %label Case.', [
           '%label' => $entity->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Case.', [
+        \Drupal::messenger()->addMessage($this->t('Saved the %label Case.', [
           '%label' => $entity->label(),
         ]));
     }
-    $form_state->setRedirect('entity.oc_case.canonical', ['oc_case' => $entity->id()]);
+    // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
+    if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished case entities')) {
+      \Drupal::messenger()->addMessage($this->t('The record for "%label" is now unpublished & hidden from you.', [
+        '%label' => $entity->label(),
+      ]));
+      $form_state->setRedirect('<front>');
+    } else {
+      $form_state->setRedirect('entity.oc_case.canonical', ['oc_case' => $entity->id()]);
+    }
   }
 
 }

modules/opencase_cases/src/Form/OCCaseProvisionDeleteForm.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Entity\ContentEntityDeleteForm;
+
+/**
+ * Provides a form for deleting Case Provision entities.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseProvisionDeleteForm extends ContentEntityDeleteForm {
+
+
+}

modules/opencase_cases/src/Form/OCCaseProvisionForm.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Form controller for Case Provision edit forms.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseProvisionForm extends ContentEntityForm {
+
+  /**
+   * The current user account.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $account;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    // Instantiates this form class.
+    $instance = parent::create($container);
+    $instance->account = $container->get('current_user');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    /* @var \Drupal\opencase_cases\Entity\OCCaseProvision $entity */
+    $form = parent::buildForm($form, $form_state);
+
+    if (!$this->entity->isNew()) {
+      $form['new_revision'] = [
+        '#type' => 'checkbox',
+        '#title' => $this->t('Create new revision'),
+        '#default_value' => FALSE,
+        '#weight' => 10,
+      ];
+    }
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $entity = $this->entity;
+
+    // Save as a new revision if requested to do so.
+    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
+      $entity->setNewRevision();
+
+      // If a new revision is created, save the current user as revision author.
+      $entity->setRevisionCreationTime($this->time->getRequestTime());
+      $entity->setRevisionUserId($this->account->id());
+    }
+    else {
+      $entity->setNewRevision(FALSE);
+    }
+
+    $status = parent::save($form, $form_state);
+
+    switch ($status) {
+      case SAVED_NEW:
+        $this->messenger()->addMessage($this->t('Created the %label Case Provision.', [
+          '%label' => $entity->label(),
+        ]));
+        break;
+
+      default:
+        $this->messenger()->addMessage($this->t('Saved the %label Case Provision.', [
+          '%label' => $entity->label(),
+        ]));
+    }
+    $form_state->setRedirect('entity.oc_case_provision.canonical', ['oc_case_provision' => $entity->id()]);
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseProvisionRevisionDeleteForm.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for deleting a Case Provision revision.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseProvisionRevisionDeleteForm extends ConfirmFormBase {
+
+  /**
+   * The Case Provision revision.
+   *
+   * @var \Drupal\opencase_cases\Entity\OCCaseProvisionInterface
+   */
+  protected $revision;
+
+  /**
+   * The Case Provision storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $oCCaseProvisionStorage;
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $connection;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->oCCaseProvisionStorage = $container->get('entity_type.manager')->getStorage('oc_case_provision');
+    $instance->connection = $container->get('database');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'oc_case_provision_revision_delete_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to delete the revision from %revision-date?', [
+      '%revision-date' => format_date($this->revision->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.oc_case_provision.version_history', ['oc_case_provision' => $this->revision->id()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $oc_case_provision_revision = NULL) {
+    $this->revision = $this->OCCaseProvisionStorage->loadRevision($oc_case_provision_revision);
+    $form = parent::buildForm($form, $form_state);
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->OCCaseProvisionStorage->deleteRevision($this->revision->getRevisionId());
+
+    $this->logger('content')->notice('Case Provision: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
+    $this->messenger()->addMessage(t('Revision from %revision-date of Case Provision %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
+    $form_state->setRedirect(
+      'entity.oc_case_provision.canonical',
+       ['oc_case_provision' => $this->revision->id()]
+    );
+    if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {oc_case_provision_field_revision} WHERE id = :id', [':id' => $this->revision->id()])->fetchField() > 1) {
+      $form_state->setRedirect(
+        'entity.oc_case_provision.version_history',
+         ['oc_case_provision' => $this->revision->id()]
+      );
+    }
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseProvisionRevisionRevertForm.php

@@ -0,0 +1,137 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Drupal\opencase_cases\Entity\OCCaseProvisionInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for reverting a Case Provision revision.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseProvisionRevisionRevertForm extends ConfirmFormBase {
+
+  /**
+   * The Case Provision revision.
+   *
+   * @var \Drupal\opencase_cases\Entity\OCCaseProvisionInterface
+   */
+  protected $revision;
+
+  /**
+   * The Case Provision storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $oCCaseProvisionStorage;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->oCCaseProvisionStorage = $container->get('entity_type.manager')->getStorage('oc_case_provision');
+    $instance->dateFormatter = $container->get('date.formatter');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'oc_case_provision_revision_revert_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to revert to the revision from %revision-date?', [
+      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.oc_case_provision.version_history', ['oc_case_provision' => $this->revision->id()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Revert');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDescription() {
+    return '';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $oc_case_provision_revision = NULL) {
+    $this->revision = $this->OCCaseProvisionStorage->loadRevision($oc_case_provision_revision);
+    $form = parent::buildForm($form, $form_state);
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // The revision timestamp will be updated when the revision is saved. Keep
+    // the original one for the confirmation message.
+    $original_revision_timestamp = $this->revision->getRevisionCreationTime();
+
+    $this->revision = $this->prepareRevertedRevision($this->revision, $form_state);
+    $this->revision->revision_log = $this->t('Copy of the revision from %date.', [
+      '%date' => $this->dateFormatter->format($original_revision_timestamp),
+    ]);
+    $this->revision->save();
+
+    $this->logger('content')->notice('Case Provision: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
+    $this->messenger()->addMessage(t('Case Provision %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
+    $form_state->setRedirect(
+      'entity.oc_case_provision.version_history',
+      ['oc_case_provision' => $this->revision->id()]
+    );
+  }
+
+  /**
+   * Prepares a revision to be reverted.
+   *
+   * @param \Drupal\opencase_cases\Entity\OCCaseProvisionInterface $revision
+   *   The revision to be reverted.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return \Drupal\opencase_cases\Entity\OCCaseProvisionInterface
+   *   The prepared revision ready to be stored.
+   */
+  protected function prepareRevertedRevision(OCCaseProvisionInterface $revision, FormStateInterface $form_state) {
+    $revision->setNewRevision();
+    $revision->isDefaultRevision(TRUE);
+    $revision->setRevisionCreationTime(REQUEST_TIME);
+
+    return $revision;
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseProvisionRevisionRevertTranslationForm.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\opencase_cases\Entity\OCCaseProvisionInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for reverting a Case Provision revision for a single trans.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseProvisionRevisionRevertTranslationForm extends OCCaseProvisionRevisionRevertForm {
+
+  /**
+   * The language to be reverted.
+   *
+   * @var string
+   */
+  protected $langcode;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->languageManager = $container->get('language_manager');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'oc_case_provision_revision_revert_translation_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to revert @language translation to the revision from %revision-date?', [
+      '@language' => $this->languageManager->getLanguageName($this->langcode),
+      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $oc_case_provision_revision = NULL, $langcode = NULL) {
+    $this->langcode = $langcode;
+    $form = parent::buildForm($form, $form_state, $oc_case_provision_revision);
+
+    $form['revert_untranslated_fields'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Revert content shared among translations'),
+      '#default_value' => FALSE,
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function prepareRevertedRevision(OCCaseProvisionInterface $revision, FormStateInterface $form_state) {
+    $revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
+
+    /** @var \Drupal\opencase_cases\Entity\OCCaseProvisionInterface $default_revision */
+    $latest_revision = $this->OCCaseProvisionStorage->load($revision->id());
+    $latest_revision_translation = $latest_revision->getTranslation($this->langcode);
+
+    $revision_translation = $revision->getTranslation($this->langcode);
+
+    foreach ($latest_revision_translation->getFieldDefinitions() as $field_name => $definition) {
+      if ($definition->isTranslatable() || $revert_untranslated_fields) {
+        $latest_revision_translation->set($field_name, $revision_translation->get($field_name)->getValue());
+      }
+    }
+
+    $latest_revision_translation->setNewRevision();
+    $latest_revision_translation->isDefaultRevision(TRUE);
+    $revision->setRevisionCreationTime(REQUEST_TIME);
+
+    return $latest_revision_translation;
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseProvisionSettingsForm.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Class OCCaseProvisionSettingsForm.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseProvisionSettingsForm extends FormBase {
+
+  /**
+   * Returns a unique string identifying the form.
+   *
+   * @return string
+   *   The unique string identifying the form.
+   */
+  public function getFormId() {
+    return 'occaseprovision_settings';
+  }
+
+  /**
+   * Form submission handler.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // Empty implementation of the abstract submit class.
+  }
+
+  /**
+   * Defines the settings form for Case Provision entities.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return array
+   *   Form definition array.
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['occaseprovision_settings']['#markup'] = 'Settings form for Case Provision entities. Manage field settings here.';
+    return $form;
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseProvisionTypeDeleteForm.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Entity\EntityConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+
+/**
+ * Builds the form to delete Case Provision type entities.
+ */
+class OCCaseProvisionTypeDeleteForm extends EntityConfirmFormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to delete %name?', ['%name' => $this->entity->label()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.oc_case_provision_type.collection');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->entity->delete();
+
+    $this->messenger()->addMessage(
+      $this->t('content @type: deleted @label.', [
+        '@type' => $this->entity->bundle(),
+        '@label' => $this->entity->label(),
+      ])
+    );
+
+    $form_state->setRedirectUrl($this->getCancelUrl());
+  }
+
+}

modules/opencase_cases/src/Form/OCCaseProvisionTypeForm.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\opencase_cases\Form;
+
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Class OCCaseProvisionTypeForm.
+ */
+class OCCaseProvisionTypeForm extends EntityForm {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    $oc_case_provision_type = $this->entity;
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => $oc_case_provision_type->label(),
+      '#description' => $this->t("Label for the Case Provision type."),
+      '#required' => TRUE,
+    ];
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#default_value' => $oc_case_provision_type->id(),
+      '#machine_name' => [
+        'exists' => '\Drupal\opencase_cases\Entity\OCCaseProvisionType::load',
+      ],
+      '#disabled' => !$oc_case_provision_type->isNew(),
+    ];
+
+    /* You will need additional form elements for your custom properties. */
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $oc_case_provision_type = $this->entity;
+    $status = $oc_case_provision_type->save();
+
+    switch ($status) {
+      case SAVED_NEW:
+        $this->messenger()->addMessage($this->t('Created the %label Case Provision type.', [
+          '%label' => $oc_case_provision_type->label(),
+        ]));
+        break;
+
+      default:
+        $this->messenger()->addMessage($this->t('Saved the %label Case Provision type.', [
+          '%label' => $oc_case_provision_type->label(),
+        ]));
+    }
+    $form_state->setRedirectUrl($oc_case_provision_type->toUrl('collection'));
+  }
+
+}

modules/opencase_cases/src/OCCaseFeeAccessControlHandler.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\EntityAccessControlHandler;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Access\AccessResult;
+
+/**
+ * Access controller for the Case Fee entity.
+ *
+ * @see \Drupal\opencase_cases\Entity\OCCaseFee.
+ */
+class OCCaseFeeAccessControlHandler extends EntityAccessControlHandler {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
+    /** @var \Drupal\opencase_cases\Entity\OCCaseFeeInterface $entity */
+
+    switch ($operation) {
+
+      case 'view':
+
+        if (!$entity->isPublished()) {
+          $permission = $this->checkOwn($entity, 'view unpublished', $account);
+          if (!empty($permission)) {
+            return AccessResult::allowed();
+          }
+
+          return AccessResult::allowedIfHasPermission($account, 'view unpublished case fee entities');
+        }
+
+        $permission = $this->checkOwn($entity, $operation, $account);
+        if (!empty($permission)) {
+          return AccessResult::allowed();
+        }
+
+        return AccessResult::allowedIfHasPermission($account, 'view published case fee entities');
+
+      case 'update':
+
+        $permission = $this->checkOwn($entity, $operation, $account);
+        if (!empty($permission)) {
+          return AccessResult::allowed();
+        }
+        return AccessResult::allowedIfHasPermission($account, 'edit case fee entities');
+
+      case 'delete':
+
+        $permission = $this->checkOwn($entity, $operation, $account);
+        if (!empty($permission)) {
+          return AccessResult::allowed();
+        }
+        return AccessResult::allowedIfHasPermission($account, 'delete case fee entities');
+    }
+
+    // Unknown operation, no opinion.
+    return AccessResult::neutral();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
+    return AccessResult::allowedIfHasPermission($account, 'add case fee entities');
+  }
+
+  /**
+   * Test for given 'own' permission.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   * @param $operation
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *
+   * @return string|null
+   *   The permission string indicating it's allowed.
+   */
+  protected function checkOwn(EntityInterface $entity, $operation, AccountInterface $account) {
+    $status = $entity->isPublished();
+    $uid = $entity->getOwnerId();
+
+    $is_own = $account->isAuthenticated() && $account->id() == $uid;
+    if (!$is_own) {
+      return;
+    }
+
+    $bundle = $entity->bundle();
+
+    $ops = [
+      'create' => '%bundle add own %bundle entities',
+      'view unpublished' => '%bundle view own unpublished %bundle entities',
+      'view' => '%bundle view own entities',
+      'update' => '%bundle edit own entities',
+      'delete' => '%bundle delete own entities',
+    ];
+    $permission = strtr($ops[$operation], ['%bundle' => $bundle]);
+
+    if ($operation === 'view unpublished') {
+      if (!$status && $account->hasPermission($permission)) {
+        return $permission;
+      }
+      else {
+        return NULL;
+      }
+    }
+    if ($account->hasPermission($permission)) {
+      return $permission;
+    }
+
+    return NULL;
+  }
+
+}

modules/opencase_cases/src/OCCaseFeeHtmlRouteProvider.php

@@ -0,0 +1,196 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Provides routes for Case Fee entities.
+ *
+ * @see \Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
+ * @see \Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
+ */
+class OCCaseFeeHtmlRouteProvider extends AdminHtmlRouteProvider {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRoutes(EntityTypeInterface $entity_type) {
+    $collection = parent::getRoutes($entity_type);
+
+    $entity_type_id = $entity_type->id();
+
+    if ($history_route = $this->getHistoryRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.version_history", $history_route);
+    }
+
+    if ($revision_route = $this->getRevisionRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision", $revision_route);
+    }
+
+    if ($revert_route = $this->getRevisionRevertRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision_revert", $revert_route);
+    }
+
+    if ($delete_route = $this->getRevisionDeleteRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision_delete", $delete_route);
+    }
+
+    if ($translation_route = $this->getRevisionTranslationRevertRoute($entity_type)) {
+      $collection->add("{$entity_type_id}.revision_revert_translation_confirm", $translation_route);
+    }
+
+    if ($settings_form_route = $this->getSettingsFormRoute($entity_type)) {
+      $collection->add("$entity_type_id.settings", $settings_form_route);
+    }
+
+    return $collection;
+  }
+
+  /**
+   * Gets the version history route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getHistoryRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('version-history')) {
+      $route = new Route($entity_type->getLinkTemplate('version-history'));
+      $route
+        ->setDefaults([
+          '_title' => "{$entity_type->getLabel()} revisions",
+          '_controller' => '\Drupal\opencase_cases\Controller\OCCaseFeeController::revisionOverview',
+        ])
+        ->setRequirement('_permission', 'view all case fee revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision')) {
+      $route = new Route($entity_type->getLinkTemplate('revision'));
+      $route
+        ->setDefaults([
+          '_controller' => '\Drupal\opencase_cases\Controller\OCCaseFeeController::revisionShow',
+          '_title_callback' => '\Drupal\opencase_cases\Controller\OCCaseFeeController::revisionPageTitle',
+        ])
+        ->setRequirement('_permission', 'view all case fee revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision revert route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionRevertRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision_revert')) {
+      $route = new Route($entity_type->getLinkTemplate('revision_revert'));
+      $route
+        ->setDefaults([
+          '_form' => '\Drupal\opencase_cases\Form\OCCaseFeeRevisionRevertForm',
+          '_title' => 'Revert to earlier revision',
+        ])
+        ->setRequirement('_permission', 'revert all case fee revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision delete route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionDeleteRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision_delete')) {
+      $route = new Route($entity_type->getLinkTemplate('revision_delete'));
+      $route
+        ->setDefaults([
+          '_form' => '\Drupal\opencase_cases\Form\OCCaseFeeRevisionDeleteForm',
+          '_title' => 'Delete earlier revision',
+        ])
+        ->setRequirement('_permission', 'delete all case fee revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision translation revert route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionTranslationRevertRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('translation_revert')) {
+      $route = new Route($entity_type->getLinkTemplate('translation_revert'));
+      $route
+        ->setDefaults([
+          '_form' => '\Drupal\opencase_cases\Form\OCCaseFeeRevisionRevertTranslationForm',
+          '_title' => 'Revert to earlier revision of a translation',
+        ])
+        ->setRequirement('_permission', 'revert all case fee revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the settings form route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getSettingsFormRoute(EntityTypeInterface $entity_type) {
+    if (!$entity_type->getBundleEntityType()) {
+      $route = new Route("/admin/structure/{$entity_type->id()}/settings");
+      $route
+        ->setDefaults([
+          '_form' => 'Drupal\opencase_cases\Form\OCCaseFeeSettingsForm',
+          '_title' => "{$entity_type->getLabel()} settings",
+        ])
+        ->setRequirement('_permission', $entity_type->getAdminPermission())
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+}

modules/opencase_cases/src/OCCaseFeeListBuilder.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityListBuilder;
+use Drupal\Core\Link;
+
+/**
+ * Defines a class to build a listing of Case Fee entities.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseFeeListBuilder extends EntityListBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    $header['id'] = $this->t('Case Fee ID');
+    $header['name'] = $this->t('Name');
+    return $header + parent::buildHeader();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    /* @var \Drupal\opencase_cases\Entity\OCCaseFee $entity */
+    $row['id'] = $entity->id();
+    $row['name'] = Link::createFromRoute(
+      $entity->label(),
+      'entity.oc_case_fee.edit_form',
+      ['oc_case_fee' => $entity->id()]
+    );
+    return $row + parent::buildRow($entity);
+  }
+
+}

modules/opencase_cases/src/OCCaseFeePermissions.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\opencase_cases\Entity\OCCaseFee;
+
+
+/**
+ * Provides dynamic permissions for Case Fee of different types.
+ *
+ * @ingroup opencase_cases
+ *
+ */
+class OCCaseFeePermissions{
+
+  use StringTranslationTrait;
+
+  /**
+   * Returns an array of node type permissions.
+   *
+   * @return array
+   *   The OCCaseFee by bundle permissions.
+   *   @see \Drupal\user\PermissionHandlerInterface::getPermissions()
+   */
+  public function generatePermissions() {
+    $perms = [];
+
+    foreach (OCCaseFee::loadMultiple() as $type) {
+      $perms += $this->buildPermissions($type);
+    }
+
+    return $perms;
+  }
+
+  /**
+   * Returns a list of node permissions for a given node type.
+   *
+   * @param \Drupal\opencase_cases\Entity\OCCaseFee $type
+   *   The OCCaseFee type.
+   *
+   * @return array
+   *   An associative array of permission names and descriptions.
+   */
+  protected function buildPermissions(OCCaseFee $type) {
+    $type_id = $type->id();
+    $type_params = ['%type_name' => $type->label()];
+
+    return [
+      "$type_id create entities" => [
+        'title' => $this->t('Create new %type_name entities', $type_params),
+      ],
+      "$type_id edit own entities" => [
+        'title' => $this->t('Edit own %type_name entities', $type_params),
+      ],
+      "$type_id edit any entities" => [
+        'title' => $this->t('Edit any %type_name entities', $type_params),
+      ],
+      "$type_id delete own entities" => [
+        'title' => $this->t('Delete own %type_name entities', $type_params),
+      ],
+      "$type_id delete any entities" => [
+        'title' => $this->t('Delete any %type_name entities', $type_params),
+      ],
+      "$type_id view revisions" => [
+        'title' => $this->t('View %type_name revisions', $type_params),
+        'description' => t('To view a revision, you also need permission to view the entity item.'),
+      ],
+      "$type_id revert revisions" => [
+        'title' => $this->t('Revert %type_name revisions', $type_params),
+        'description' => t('To revert a revision, you also need permission to edit the entity item.'),
+      ],
+      "$type_id delete revisions" => [
+        'title' => $this->t('Delete %type_name revisions', $type_params),
+        'description' => $this->t('To delete a revision, you also need permission to delete the entity item.'),
+      ],
+    ];
+  }
+
+}

modules/opencase_cases/src/OCCaseFeeStorage.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\opencase_cases\Entity\OCCaseFeeInterface;
+
+/**
+ * Defines the storage handler class for Case Fee entities.
+ *
+ * This extends the base storage class, adding required special handling for
+ * Case Fee entities.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseFeeStorage extends SqlContentEntityStorage implements OCCaseFeeStorageInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function revisionIds(OCCaseFeeInterface $entity) {
+    return $this->database->query(
+      'SELECT vid FROM {oc_case_fee_revision} WHERE id=:id ORDER BY vid',
+      [':id' => $entity->id()]
+    )->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function userRevisionIds(AccountInterface $account) {
+    return $this->database->query(
+      'SELECT vid FROM {oc_case_fee_field_revision} WHERE uid = :uid ORDER BY vid',
+      [':uid' => $account->id()]
+    )->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function countDefaultLanguageRevisions(OCCaseFeeInterface $entity) {
+    return $this->database->query('SELECT COUNT(*) FROM {oc_case_fee_field_revision} WHERE id = :id AND default_langcode = 1', [':id' => $entity->id()])
+      ->fetchField();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function clearRevisionsLanguage(LanguageInterface $language) {
+    return $this->database->update('oc_case_fee_revision')
+      ->fields(['langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED])
+      ->condition('langcode', $language->getId())
+      ->execute();
+  }
+
+}

modules/opencase_cases/src/OCCaseFeeStorageInterface.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\ContentEntityStorageInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\opencase_cases\Entity\OCCaseFeeInterface;
+
+/**
+ * Defines the storage handler class for Case Fee entities.
+ *
+ * This extends the base storage class, adding required special handling for
+ * Case Fee entities.
+ *
+ * @ingroup opencase_cases
+ */
+interface OCCaseFeeStorageInterface extends ContentEntityStorageInterface {
+
+  /**
+   * Gets a list of Case Fee revision IDs for a specific Case Fee.
+   *
+   * @param \Drupal\opencase_cases\Entity\OCCaseFeeInterface $entity
+   *   The Case Fee entity.
+   *
+   * @return int[]
+   *   Case Fee revision IDs (in ascending order).
+   */
+  public function revisionIds(OCCaseFeeInterface $entity);
+
+  /**
+   * Gets a list of revision IDs having a given user as Case Fee author.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user entity.
+   *
+   * @return int[]
+   *   Case Fee revision IDs (in ascending order).
+   */
+  public function userRevisionIds(AccountInterface $account);
+
+  /**
+   * Counts the number of revisions in the default language.
+   *
+   * @param \Drupal\opencase_cases\Entity\OCCaseFeeInterface $entity
+   *   The Case Fee entity.
+   *
+   * @return int
+   *   The number of revisions in the default language.
+   */
+  public function countDefaultLanguageRevisions(OCCaseFeeInterface $entity);
+
+  /**
+   * Unsets the language for all Case Fee with the given language.
+   *
+   * @param \Drupal\Core\Language\LanguageInterface $language
+   *   The language object.
+   */
+  public function clearRevisionsLanguage(LanguageInterface $language);
+
+}

modules/opencase_cases/src/OCCaseFeeTranslationHandler.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\content_translation\ContentTranslationHandler;
+
+/**
+ * Defines the translation handler for oc_case_fee.
+ */
+class OCCaseFeeTranslationHandler extends ContentTranslationHandler {
+
+  // Override here the needed methods from ContentTranslationHandler.
+}

modules/opencase_cases/src/OCCaseFeeTypeHtmlRouteProvider.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
+
+/**
+ * Provides routes for Case Fee type entities.
+ *
+ * @see Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
+ * @see Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
+ */
+class OCCaseFeeTypeHtmlRouteProvider extends AdminHtmlRouteProvider {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRoutes(EntityTypeInterface $entity_type) {
+    $collection = parent::getRoutes($entity_type);
+
+    // Provide your custom entity routes here.
+    return $collection;
+  }
+
+}

modules/opencase_cases/src/OCCaseFeeTypeListBuilder.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Provides a listing of Case Fee type entities.
+ */
+class OCCaseFeeTypeListBuilder extends ConfigEntityListBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    $header['label'] = $this->t('Case Fee type');
+    $header['id'] = $this->t('Machine name');
+    return $header + parent::buildHeader();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    $row['label'] = $entity->label();
+    $row['id'] = $entity->id();
+    // You probably want a few more properties here...
+    return $row + parent::buildRow($entity);
+  }
+
+}

modules/opencase_cases/src/OCCaseProvisionAccessControlHandler.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\EntityAccessControlHandler;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Access\AccessResult;
+
+/**
+ * Access controller for the Case Provision entity.
+ *
+ * @see \Drupal\opencase_cases\Entity\OCCaseProvision.
+ */
+class OCCaseProvisionAccessControlHandler extends EntityAccessControlHandler {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
+    /** @var \Drupal\opencase_cases\Entity\OCCaseProvisionInterface $entity */
+
+    switch ($operation) {
+
+      case 'view':
+
+        if (!$entity->isPublished()) {
+          $permission = $this->checkOwn($entity, 'view unpublished', $account);
+          if (!empty($permission)) {
+            return AccessResult::allowed();
+          }
+
+          return AccessResult::allowedIfHasPermission($account, 'view unpublished case provision entities');
+        }
+
+        $permission = $this->checkOwn($entity, $operation, $account);
+        if (!empty($permission)) {
+          return AccessResult::allowed();
+        }
+
+        return AccessResult::allowedIfHasPermission($account, 'view published case provision entities');
+
+      case 'update':
+
+        $permission = $this->checkOwn($entity, $operation, $account);
+        if (!empty($permission)) {
+          return AccessResult::allowed();
+        }
+        return AccessResult::allowedIfHasPermission($account, 'edit case provision entities');
+
+      case 'delete':
+
+        $permission = $this->checkOwn($entity, $operation, $account);
+        if (!empty($permission)) {
+          return AccessResult::allowed();
+        }
+        return AccessResult::allowedIfHasPermission($account, 'delete case provision entities');
+    }
+
+    // Unknown operation, no opinion.
+    return AccessResult::neutral();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
+    return AccessResult::allowedIfHasPermission($account, 'add case provision entities');
+  }
+
+  /**
+   * Test for given 'own' permission.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   * @param $operation
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *
+   * @return string|null
+   *   The permission string indicating it's allowed.
+   */
+  protected function checkOwn(EntityInterface $entity, $operation, AccountInterface $account) {
+    $status = $entity->isPublished();
+    $uid = $entity->getOwnerId();
+
+    $is_own = $account->isAuthenticated() && $account->id() == $uid;
+    if (!$is_own) {
+      return;
+    }
+
+    $bundle = $entity->bundle();
+
+    $ops = [
+      'create' => '%bundle add own %bundle entities',
+      'view unpublished' => '%bundle view own unpublished %bundle entities',
+      'view' => '%bundle view own entities',
+      'update' => '%bundle edit own entities',
+      'delete' => '%bundle delete own entities',
+    ];
+    $permission = strtr($ops[$operation], ['%bundle' => $bundle]);
+
+    if ($operation === 'view unpublished') {
+      if (!$status && $account->hasPermission($permission)) {
+        return $permission;
+      }
+      else {
+        return NULL;
+      }
+    }
+    if ($account->hasPermission($permission)) {
+      return $permission;
+    }
+
+    return NULL;
+  }
+
+}

modules/opencase_cases/src/OCCaseProvisionHtmlRouteProvider.php

@@ -0,0 +1,196 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Provides routes for Case Provision entities.
+ *
+ * @see \Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
+ * @see \Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
+ */
+class OCCaseProvisionHtmlRouteProvider extends AdminHtmlRouteProvider {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRoutes(EntityTypeInterface $entity_type) {
+    $collection = parent::getRoutes($entity_type);
+
+    $entity_type_id = $entity_type->id();
+
+    if ($history_route = $this->getHistoryRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.version_history", $history_route);
+    }
+
+    if ($revision_route = $this->getRevisionRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision", $revision_route);
+    }
+
+    if ($revert_route = $this->getRevisionRevertRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision_revert", $revert_route);
+    }
+
+    if ($delete_route = $this->getRevisionDeleteRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision_delete", $delete_route);
+    }
+
+    if ($translation_route = $this->getRevisionTranslationRevertRoute($entity_type)) {
+      $collection->add("{$entity_type_id}.revision_revert_translation_confirm", $translation_route);
+    }
+
+    if ($settings_form_route = $this->getSettingsFormRoute($entity_type)) {
+      $collection->add("$entity_type_id.settings", $settings_form_route);
+    }
+
+    return $collection;
+  }
+
+  /**
+   * Gets the version history route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getHistoryRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('version-history')) {
+      $route = new Route($entity_type->getLinkTemplate('version-history'));
+      $route
+        ->setDefaults([
+          '_title' => "{$entity_type->getLabel()} revisions",
+          '_controller' => '\Drupal\opencase_cases\Controller\OCCaseProvisionController::revisionOverview',
+        ])
+        ->setRequirement('_permission', 'view all case provision revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision')) {
+      $route = new Route($entity_type->getLinkTemplate('revision'));
+      $route
+        ->setDefaults([
+          '_controller' => '\Drupal\opencase_cases\Controller\OCCaseProvisionController::revisionShow',
+          '_title_callback' => '\Drupal\opencase_cases\Controller\OCCaseProvisionController::revisionPageTitle',
+        ])
+        ->setRequirement('_permission', 'view all case provision revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision revert route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionRevertRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision_revert')) {
+      $route = new Route($entity_type->getLinkTemplate('revision_revert'));
+      $route
+        ->setDefaults([
+          '_form' => '\Drupal\opencase_cases\Form\OCCaseProvisionRevisionRevertForm',
+          '_title' => 'Revert to earlier revision',
+        ])
+        ->setRequirement('_permission', 'revert all case provision revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision delete route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionDeleteRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision_delete')) {
+      $route = new Route($entity_type->getLinkTemplate('revision_delete'));
+      $route
+        ->setDefaults([
+          '_form' => '\Drupal\opencase_cases\Form\OCCaseProvisionRevisionDeleteForm',
+          '_title' => 'Delete earlier revision',
+        ])
+        ->setRequirement('_permission', 'delete all case provision revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision translation revert route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionTranslationRevertRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('translation_revert')) {
+      $route = new Route($entity_type->getLinkTemplate('translation_revert'));
+      $route
+        ->setDefaults([
+          '_form' => '\Drupal\opencase_cases\Form\OCCaseProvisionRevisionRevertTranslationForm',
+          '_title' => 'Revert to earlier revision of a translation',
+        ])
+        ->setRequirement('_permission', 'revert all case provision revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the settings form route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getSettingsFormRoute(EntityTypeInterface $entity_type) {
+    if (!$entity_type->getBundleEntityType()) {
+      $route = new Route("/admin/structure/{$entity_type->id()}/settings");
+      $route
+        ->setDefaults([
+          '_form' => 'Drupal\opencase_cases\Form\OCCaseProvisionSettingsForm',
+          '_title' => "{$entity_type->getLabel()} settings",
+        ])
+        ->setRequirement('_permission', $entity_type->getAdminPermission())
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+}

modules/opencase_cases/src/OCCaseProvisionListBuilder.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityListBuilder;
+use Drupal\Core\Link;
+
+/**
+ * Defines a class to build a listing of Case Provision entities.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseProvisionListBuilder extends EntityListBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    $header['id'] = $this->t('Case Provision ID');
+    $header['name'] = $this->t('Name');
+    return $header + parent::buildHeader();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    /* @var \Drupal\opencase_cases\Entity\OCCaseProvision $entity */
+    $row['id'] = $entity->id();
+    $row['name'] = Link::createFromRoute(
+      $entity->label(),
+      'entity.oc_case_provision.edit_form',
+      ['oc_case_provision' => $entity->id()]
+    );
+    return $row + parent::buildRow($entity);
+  }
+
+}

modules/opencase_cases/src/OCCaseProvisionPermissions.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\opencase_cases\Entity\OCCaseProvision;
+
+
+/**
+ * Provides dynamic permissions for Case Provision of different types.
+ *
+ * @ingroup opencase_cases
+ *
+ */
+class OCCaseProvisionPermissions{
+
+  use StringTranslationTrait;
+
+  /**
+   * Returns an array of node type permissions.
+   *
+   * @return array
+   *   The OCCaseProvision by bundle permissions.
+   *   @see \Drupal\user\PermissionHandlerInterface::getPermissions()
+   */
+  public function generatePermissions() {
+    $perms = [];
+
+    foreach (OCCaseProvision::loadMultiple() as $type) {
+      $perms += $this->buildPermissions($type);
+    }
+
+    return $perms;
+  }
+
+  /**
+   * Returns a list of node permissions for a given node type.
+   *
+   * @param \Drupal\opencase_cases\Entity\OCCaseProvision $type
+   *   The OCCaseProvision type.
+   *
+   * @return array
+   *   An associative array of permission names and descriptions.
+   */
+  protected function buildPermissions(OCCaseProvision $type) {
+    $type_id = $type->id();
+    $type_params = ['%type_name' => $type->label()];
+
+    return [
+      "$type_id create entities" => [
+        'title' => $this->t('Create new %type_name entities', $type_params),
+      ],
+      "$type_id edit own entities" => [
+        'title' => $this->t('Edit own %type_name entities', $type_params),
+      ],
+      "$type_id edit any entities" => [
+        'title' => $this->t('Edit any %type_name entities', $type_params),
+      ],
+      "$type_id delete own entities" => [
+        'title' => $this->t('Delete own %type_name entities', $type_params),
+      ],
+      "$type_id delete any entities" => [
+        'title' => $this->t('Delete any %type_name entities', $type_params),
+      ],
+      "$type_id view revisions" => [
+        'title' => $this->t('View %type_name revisions', $type_params),
+        'description' => t('To view a revision, you also need permission to view the entity item.'),
+      ],
+      "$type_id revert revisions" => [
+        'title' => $this->t('Revert %type_name revisions', $type_params),
+        'description' => t('To revert a revision, you also need permission to edit the entity item.'),
+      ],
+      "$type_id delete revisions" => [
+        'title' => $this->t('Delete %type_name revisions', $type_params),
+        'description' => $this->t('To delete a revision, you also need permission to delete the entity item.'),
+      ],
+    ];
+  }
+
+}

modules/opencase_cases/src/OCCaseProvisionStorage.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\opencase_cases\Entity\OCCaseProvisionInterface;
+
+/**
+ * Defines the storage handler class for Case Provision entities.
+ *
+ * This extends the base storage class, adding required special handling for
+ * Case Provision entities.
+ *
+ * @ingroup opencase_cases
+ */
+class OCCaseProvisionStorage extends SqlContentEntityStorage implements OCCaseProvisionStorageInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function revisionIds(OCCaseProvisionInterface $entity) {
+    return $this->database->query(
+      'SELECT vid FROM {oc_case_provision_revision} WHERE id=:id ORDER BY vid',
+      [':id' => $entity->id()]
+    )->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function userRevisionIds(AccountInterface $account) {
+    return $this->database->query(
+      'SELECT vid FROM {oc_case_provision_field_revision} WHERE uid = :uid ORDER BY vid',
+      [':uid' => $account->id()]
+    )->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function countDefaultLanguageRevisions(OCCaseProvisionInterface $entity) {
+    return $this->database->query('SELECT COUNT(*) FROM {oc_case_provision_field_revision} WHERE id = :id AND default_langcode = 1', [':id' => $entity->id()])
+      ->fetchField();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function clearRevisionsLanguage(LanguageInterface $language) {
+    return $this->database->update('oc_case_provision_revision')
+      ->fields(['langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED])
+      ->condition('langcode', $language->getId())
+      ->execute();
+  }
+
+}

modules/opencase_cases/src/OCCaseProvisionStorageInterface.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\ContentEntityStorageInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\opencase_cases\Entity\OCCaseProvisionInterface;
+
+/**
+ * Defines the storage handler class for Case Provision entities.
+ *
+ * This extends the base storage class, adding required special handling for
+ * Case Provision entities.
+ *
+ * @ingroup opencase_cases
+ */
+interface OCCaseProvisionStorageInterface extends ContentEntityStorageInterface {
+
+  /**
+   * Gets a list of Case Provision revision IDs for a specific Case Provision.
+   *
+   * @param \Drupal\opencase_cases\Entity\OCCaseProvisionInterface $entity
+   *   The Case Provision entity.
+   *
+   * @return int[]
+   *   Case Provision revision IDs (in ascending order).
+   */
+  public function revisionIds(OCCaseProvisionInterface $entity);
+
+  /**
+   * Gets a list of revision IDs having a given user as Case Provision author.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user entity.
+   *
+   * @return int[]
+   *   Case Provision revision IDs (in ascending order).
+   */
+  public function userRevisionIds(AccountInterface $account);
+
+  /**
+   * Counts the number of revisions in the default language.
+   *
+   * @param \Drupal\opencase_cases\Entity\OCCaseProvisionInterface $entity
+   *   The Case Provision entity.
+   *
+   * @return int
+   *   The number of revisions in the default language.
+   */
+  public function countDefaultLanguageRevisions(OCCaseProvisionInterface $entity);
+
+  /**
+   * Unsets the language for all Case Provision with the given language.
+   *
+   * @param \Drupal\Core\Language\LanguageInterface $language
+   *   The language object.
+   */
+  public function clearRevisionsLanguage(LanguageInterface $language);
+
+}

modules/opencase_cases/src/OCCaseProvisionTranslationHandler.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\content_translation\ContentTranslationHandler;
+
+/**
+ * Defines the translation handler for oc_case_provision.
+ */
+class OCCaseProvisionTranslationHandler extends ContentTranslationHandler {
+
+  // Override here the needed methods from ContentTranslationHandler.
+}

modules/opencase_cases/src/OCCaseProvisionTypeHtmlRouteProvider.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
+
+/**
+ * Provides routes for Case Provision type entities.
+ *
+ * @see Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
+ * @see Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
+ */
+class OCCaseProvisionTypeHtmlRouteProvider extends AdminHtmlRouteProvider {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRoutes(EntityTypeInterface $entity_type) {
+    $collection = parent::getRoutes($entity_type);
+
+    // Provide your custom entity routes here.
+    return $collection;
+  }
+
+}

modules/opencase_cases/src/OCCaseProvisionTypeListBuilder.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\opencase_cases;
+
+use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Provides a listing of Case Provision type entities.
+ */
+class OCCaseProvisionTypeListBuilder extends ConfigEntityListBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    $header['label'] = $this->t('Case Provision type');
+    $header['id'] = $this->t('Machine name');
+    return $header + parent::buildHeader();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    $row['label'] = $entity->label();
+    $row['id'] = $entity->id();
+    // You probably want a few more properties here...
+    return $row + parent::buildRow($entity);
+  }
+
+}

modules/opencase_cases/templates/oc-case-fee-content-add-list.html.twig

@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Default theme implementation to present a list of custom content entity types/bundles.
+ *
+ * Available variables:
+ * - types: A collection of all the available custom entity types/bundles.
+ *   Each type/bundle contains the following:
+ *   - link: A link to add a content entity of this type.
+ *   - description: A description of this content entity types/bundle.
+ *
+ * @see template_preprocess_oc_case_fee_content_add_list()
+ *
+ * @ingroup themeable
+ */
+#}
+{% spaceless %}
+  <dl>
+    {% for type in types %}
+      <dt>{{ type.link }}</dt>
+    {% endfor %}
+  </dl>
+{% endspaceless %}

modules/opencase_cases/templates/oc-case-provision-content-add-list.html.twig

@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Default theme implementation to present a list of custom content entity types/bundles.
+ *
+ * Available variables:
+ * - types: A collection of all the available custom entity types/bundles.
+ *   Each type/bundle contains the following:
+ *   - link: A link to add a content entity of this type.
+ *   - description: A description of this content entity types/bundle.
+ *
+ * @see template_preprocess_oc_case_provision_content_add_list()
+ *
+ * @ingroup themeable
+ */
+#}
+{% spaceless %}
+  <dl>
+    {% for type in types %}
+      <dt>{{ type.link }}</dt>
+    {% endfor %}
+  </dl>
+{% endspaceless %}

modules/opencase_cases/templates/oc_case_fee.html.twig

@@ -0,0 +1,22 @@
+{#
+/**
+ * @file oc_case_fee.html.twig
+ * Default theme implementation to present Case Fee data.
+ *
+ * This template is used when viewing Case Fee pages.
+ *
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * - attributes: HTML attributes for the container element.
+ *
+ * @see template_preprocess_oc_case_fee()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes.addClass('oc_case_fee') }}>
+  {% if content %}
+    {{- content -}}
+  {% endif %}
+</div>

modules/opencase_cases/templates/oc_case_provision.html.twig

@@ -0,0 +1,22 @@
+{#
+/**
+ * @file oc_case_provision.html.twig
+ * Default theme implementation to present Case Provision data.
+ *
+ * This template is used when viewing Case Provision pages.
+ *
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * - attributes: HTML attributes for the container element.
+ *
+ * @see template_preprocess_oc_case_provision()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes.addClass('oc_case_provision') }}>
+  {% if content %}
+    {{- content -}}
+  {% endif %}
+</div>

modules/opencase_entities/opencase_entities.permissions.yml

@@ -1,4 +1,7 @@
+
 permission_callbacks:
+  - \Drupal\opencase_entities\OCOrganisationPermissions::generatePermissions
+  - \Drupal\opencase_entities\OCEventPermissions::generatePermissions
   - Drupal\opencase_entities\OpenCaseEntityPermissions::permissions
 
 view edit delete all actor entities:
@@ -40,6 +43,9 @@ view published case entities:
 view unpublished case entities:
   title: 'View unpublished Case entities'
 
+view unpublished actor entities:
+  title: 'View unpublished Actor entities'
+
 view all case revisions:
   title: 'View all Case revisions'
 
@@ -113,8 +119,6 @@ delete all organisation revisions:
   title: 'Delete all revisions'
   description: 'Role requires permission to <em>view Organisation revisions</em> and <em>delete rights</em> for organisation entities in question or <em>administer organisation entities</em>.'
 
-permission_callbacks:
-  - \Drupal\opencase_entities\OCOrganisationPermissions::generatePermissions
 add event entities:
   title: 'Create new Event entities'
 
@@ -135,8 +139,6 @@ view published event entities:
 view unpublished event entities:
   title: 'View unpublished Event entities'
 
-permission_callbacks:
-  - \Drupal\opencase_entities\OCEventPermissions::generatePermissions
 add bank account entities:
   title: 'Create new Bank Account entities'
 

modules/opencase_entities/src/Entity/OCActivity.php

@@ -43,6 +43,11 @@ use Drupal\Core\Datetime\DrupalDateTime;
  *   data_table = "oc_activity_field_data",
  *   revision_table = "oc_activity_revision",
  *   revision_data_table = "oc_activity_field_revision",
+ *   revision_metadata_keys = {
+ *     "revision_user" = "revision_user",
+ *     "revision_created" = "revision_created",
+ *     "revision_log_message" = "revision_log"
+ *   },
  *   translatable = TRUE,
  *   admin_permission = "administer activity entities",
  *   entity_keys = {
@@ -220,31 +225,20 @@ class OCActivity extends RevisionableContentEntityBase implements OCActivityInte
     $fields['activity_date_time'] = BaseFieldDefinition::create('datetime')
       ->setLabel(t('Date and time'))
       ->setRevisionable(TRUE)
-      ->setRequired(TRUE)
       ->setDefaultValueCallback('\Drupal\opencase_entities\Entity\OCActivity::currentDateTime')
       ->setDisplayConfigurable('form', true)
       ->setDisplayConfigurable('view', true)
       ->setSettings([
           'datetime_type' => 'date'
-        ])
-      ->setDisplayOptions('view', [
-        'label' => 'above',
-        'type' => 'datetime_default',
-        'settings' => [
-          'format_type' => 'short',
-        ],
-        'weight' => -3,
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'datetime_default',
-        'weight' => -3,
-      ]);
+       ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDisplayConfigurable('view', TRUE);
 
-    // not currently in use. Will set view and form settings when ready
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Publishing status'))
-      ->setDescription(t('A boolean indicating whether the Activity is published.'))
+      ->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['user_id'] = BaseFieldDefinition::create('entity_reference')

modules/opencase_entities/src/Entity/OCActor.php

@@ -41,6 +41,11 @@ use Drupal\user\UserInterface;
  *   data_table = "oc_actor_field_data",
  *   revision_table = "oc_actor_revision",
  *   revision_data_table = "oc_actor_field_revision",
+ *   revision_metadata_keys = {
+ *     "revision_user" = "revision_user",
+ *     "revision_created" = "revision_created",
+ *     "revision_log_message" = "revision_log"
+ *   },
  *   translatable = TRUE,
  *   admin_permission = "administer actor entities",
  *   entity_keys = {
@@ -213,11 +218,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
 
-    // Currently not using this, but will add form and view settings when ready.
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Publishing status'))
-      ->setDescription(t('Whether this record is published.'))
+      ->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);
 
     // The name gets set on preSave, from the first middle and last
@@ -311,7 +316,7 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setRevisionable(TRUE)
       ->setSettings(array(
         'default_value' => '',
-        'max_length' => 30,
+        'max_length' => 100,
         'text_processing' => 0,
       ))
       ->setDisplayConfigurable("form", true)

modules/opencase_entities/src/Entity/OCEvent.php

@@ -167,7 +167,14 @@ class OCEvent extends ContentEntityBase implements OCEventInterface {
       ->setDisplayConfigurable('view', TRUE)
       ->setRequired(TRUE);
 
-    $fields['status']->setDescription(t('A boolean indicating whether the Event is published.'));
+    $fields['status'] = BaseFieldDefinition::create('boolean')
+      ->setLabel(t('Publishing status'))
+      ->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'))

modules/opencase_entities/src/Entity/OCOrganisation.php

@@ -42,6 +42,11 @@ use Drupal\user\UserInterface;
  *   data_table = "oc_organisation_field_data",
  *   revision_table = "oc_organisation_revision",
  *   revision_data_table = "oc_organisation_field_revision",
+ *   revision_metadata_keys = {
+ *     "revision_user" = "revision_user",
+ *     "revision_created" = "revision_created",
+ *     "revision_log_message" = "revision_log"
+ *   },
  *   translatable = TRUE,
  *   permission_granularity = "bundle",
  *   admin_permission = "administer organisation entities",
@@ -273,7 +278,7 @@ class OCOrganisation extends EditorialContentEntityBase implements OCOrganisatio
       ->setRevisionable(TRUE)
       ->setSettings(array(
         'default_value' => '',
-        'max_length' => 30,
+        'max_length' => 100,
         'text_processing' => 0,
       ))
       ->setDisplayOptions('view', array(
@@ -363,7 +368,7 @@ class OCOrganisation extends EditorialContentEntityBase implements OCOrganisatio
       ->setRevisionable(TRUE)
       ->setSettings(array(
         'default_value' => '',
-        'max_length' => 30,
+        'max_length' => 100,
         'text_processing' => 0,
       ))
       ->setDisplayOptions('view', array(
@@ -456,7 +461,13 @@ class OCOrganisation extends EditorialContentEntityBase implements OCOrganisatio
       ->setDisplayConfigurable('view', TRUE)
       ->setRequired(TRUE);
 
-    $fields['status']->setDescription(t('A boolean indicating whether the Organisation is published.'));
+    $fields['status'] = BaseFieldDefinition::create('boolean')
+      ->setLabel(t('Published'))
+      ->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'))

modules/opencase_entities/src/Entity/OCOrganisationRelation.php

@@ -107,7 +107,7 @@ class OCOrganisationRelation extends ContentEntityBase implements OCOrganisation
         'max_length' => 50,
         'text_processing' => 0,
       ])
-      ->setDefaultValue('Link between organisations')
+      ->setDefaultValue('Link')
       ->setRequired(TRUE);
 
     $fields['created'] = BaseFieldDefinition::create('created')

modules/opencase_entities/src/Form/OCActivityForm.php

@@ -55,17 +55,25 @@ class OCActivityForm extends ContentEntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Activity.', [
-          '%label' => $entity->label(),
+        drupal_set_message($this->t('Created the %bundle.', [
+          '%bundle' => $entity->bundle(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Activity.', [
-          '%label' => $entity->label(),
+        drupal_set_message($this->t('Saved the %bundle.', [
+          '%bundle' => $entity->bundle(),
         ]));
     }
-    $form_state->setRedirect('entity.oc_activity.canonical', ['oc_activity' => $entity->id()]);
+    // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
+    if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished activity entities')) {
+      drupal_set_message($this->t('The %bundle is now unpublished & hidden from you.', [
+        '%bundle' => $entity->bundle(),
+      ]));
+      $form_state->setRedirect('<front>');
+    } else {
+      $form_state->setRedirect('entity.oc_activity.canonical', ['oc_activity' => $entity->id()]);
+    }
   }
 
 }

modules/opencase_entities/src/Form/OCActorForm.php

@@ -58,7 +58,14 @@ class OCActorForm extends ContentEntityForm {
           '%label' => $entity->label(),
         ]));
     }
-    $form_state->setRedirect('entity.oc_actor.canonical', ['oc_actor' => $entity->id()]);
+    // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
+    if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished actor entities')) {
+      drupal_set_message($this->t('The record for "%label" is now unpublished & hidden from you.', [
+        '%label' => $entity->label(),
+      ]));
+      $form_state->setRedirect('<front>');
+    } else {
+      $form_state->setRedirect('entity.oc_actor.canonical', ['oc_actor' => $entity->id()]);
+    }
   }
-
 }

modules/opencase_entities/src/Form/OCEventForm.php

@@ -60,7 +60,15 @@ class OCEventForm extends ContentEntityForm {
           '%label' => $entity->label(),
         ]));
     }
-    $form_state->setRedirect('entity.oc_event.canonical', ['oc_event' => $entity->id()]);
+    // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
+    if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished event entities')) {
+      drupal_set_message($this->t('The record for "%label" is now unpublished & hidden from you.', [
+        '%label' => $entity->label(),
+      ]));
+      $form_state->setRedirect('<front>');
+    } else {
+      $form_state->setRedirect('entity.oc_event.canonical', ['oc_event' => $entity->id()]);
+    }
   }
 
 }

modules/opencase_entities/src/Form/OCOrganisationForm.php

@@ -81,7 +81,15 @@ class OCOrganisationForm extends ContentEntityForm {
           '%label' => $entity->label(),
         ]));
     }
-    $form_state->setRedirect('entity.oc_organisation.canonical', ['oc_organisation' => $entity->id()]);
+    // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
+    if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished organisation entities')) {
+      drupal_set_message($this->t('The record for "%label" is now unpublished & hidden from you.', [
+        '%label' => $entity->label(),
+      ]));
+      $form_state->setRedirect('<front>');
+    } else {
+      $form_state->setRedirect('entity.oc_organisation.canonical', ['oc_organisation' => $entity->id()]);
+    }
   }
 
 }

modules/opencase_entities/src/OCActorAccessControlHandler.php

@@ -32,7 +32,7 @@ class OCActorAccessControlHandler extends EntityAccessControlHandler {
       case 'view':
         if (!$entity->isPublished()) {
           return AccessResult::allowedIf(
-            $account->hasPermission("view unpublished $bundle entities")
+            $account->hasPermission("view unpublished actor entities")
           );
         }
         return AccessResult::allowedIf(

opencase.info.yml

@@ -2,7 +2,7 @@ name: 'OpenCase'
 type: module
 description: 'Simple Case Management'
 core: 8.x
-version: 8.x-2.0.2
+version: 8.x-3.0
 package: 'OpenCase'
 dependencies:
   - opencase_entities

opencase.links.menu.yml

@@ -70,3 +70,8 @@ opencase.manage_event_types:
   parent: opencase.opencase_admin_menu 
   url: internal:/admin/opencase/oc_event_type
   weight: 1
+opencase.reporting:
+  title: 'Reporting'
+  menu_name: opencase 
+  route_name: opencase.opencase_reporting_menu
+  weight: 0

opencase.module

@@ -98,6 +98,20 @@ function opencase_uninstall() {
 } 
 
 function opencase_views_pre_render($view) {
+  if (!empty($view->result)) {
+    foreach ($view->result as $key => $result) {
+      if (empty($result->_entity)) {
+        continue;
+      }
+      $access = \Drupal::entityTypeManager()
+        ->getAccessControlHandler($result->_entity->getEntityTypeId())
+        ->access($result->_entity, 'view', NULL, TRUE);
+
+      if (!$access->isAllowed()) {
+        unset($view->result[$key]);
+      }
+    }
+  }
   if (empty($view->result) && empty($view->exposed_input)) {
     $view->exposed_widgets = NULL;
   }
@@ -121,7 +135,6 @@ function opencase_entity_field_access($operation, \Drupal\Core\Field\FieldDefini
 function opencase_form_alter(&$form, &$form_state, $form_id) {
   if (preg_match('/oc_organisation_relation_.*_delete_form/', $form_id) or (preg_match('/oc_organisation_relation_.*_add_form/', $form_id))) {
     $form['actions']['submit']['#submit'][] = '_opencase_organisation_relation_redirect';
-   // $form['actions']['cancel']['#url'] = $form_state->getFormObject()->getEntity()->toUrl();
   }
 }
 

opencase.routing.yml

@@ -1,7 +1,7 @@
 opencase.opencase_admin_menu:
   path: '/'
   requirements:
-    _permission: 'administer opencase entity bundles'
+    _permission: 'administer opencase entity bundles+administer users'
 opencase.opencase_cases_menu:
   path: '/'
   requirements:
@@ -10,3 +10,7 @@ opencase.opencase_add_new_things_menu:
   path: '/'
   requirements:
     _permission: 'use opencase'
+opencase.opencase_reporting_menu:
+  path: '/'
+  requirements:
+    _permission: 'use opencase'

src/Plugin/Field/FieldFormatter/EntityReferenceCurrentTargetExcluder.php

@@ -23,7 +23,6 @@ class EntityReferenceCurrentTargetExcluder extends EntityReferenceLabelFormatter
     foreach($items as $delta=>$item) {
       $current_org = \Drupal::routeMatch()->getParameter('oc_organisation')->id();
       $item_target_id = $item->get('target_id')->getValue();
-      \Drupal::logger("foo")->error($current_org . " " . $item_target_id);
       if ($current_org == $item_target_id) {
         $items->removeItem($delta);
         break;