From 86c0fb1f651cfbd7fc7061a8fcbb994b7a445df8 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 21 Apr 2022 12:20:22 +0100 Subject: [PATCH] case fee total updates when a fee is updated --- modules/opencase_cases/opencase_cases.module | 25 +++----------------- modules/opencase_cases/src/Entity/OCCase.php | 5 ---- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/modules/opencase_cases/opencase_cases.module b/modules/opencase_cases/opencase_cases.module index baa574e..99cf06d 100644 --- a/modules/opencase_cases/opencase_cases.module +++ b/modules/opencase_cases/opencase_cases.module @@ -96,28 +96,9 @@ function opencase_cases_get_activities(Drupal\opencase_cases\entity\OCCase $case return $activities; } -function opencase_cases_get_amount(Drupal\opencase_cases\entity\OCCaseFee $case_fee): string { - if (!isEmpty($case_fee->amount)) return $case_fee->amount->first()->value; - else return '0'; -} - -function opencase_cases_get_case(Drupal\opencase_cases\entity\OCCaseFee $case_fee): Drupal\opencase_cases\entity\OCCase { - 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); + $case = $case_fee->getCase(); + $case->addToTotalFee($case_fee->amount->value - $case_fee->original->amount->value); } function opencase_cases_oc_case_fee_insert(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void { @@ -127,7 +108,7 @@ function opencase_cases_oc_case_fee_insert(Drupal\opencase_cases\entity\OCCaseFe function opencase_cases_oc_case_fee_delete(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void { $case = $case_fee->getCase(); - $case->subtractFromTotalFee($case_fee->amount->value); + $case->addToTotalFee(0 - $case_fee->amount->value); } function opencase_cases_entity_base_field_info($entity_type) { diff --git a/modules/opencase_cases/src/Entity/OCCase.php b/modules/opencase_cases/src/Entity/OCCase.php index 8e8bc8d..12e679a 100644 --- a/modules/opencase_cases/src/Entity/OCCase.php +++ b/modules/opencase_cases/src/Entity/OCCase.php @@ -227,11 +227,6 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface $this->save(); } - public function subtractFromTotalFee(string $amountToSubtract): void { - $this->set('total_fee', $this->total_fee->value - $amountToSubtract); - $this->save(); - } - /** * {@inheritdoc} */