From f97c6cc603b89fc76a425f5a71bf34c437d502bd Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 22 Mar 2023 18:52:05 +0100
Subject: [PATCH] Fixed saving new ContractconfigValuest

---
 application/Contractconfig/ContractconfigController.php  | 1 -
 application/Contractconfig/hooks/Contractconfig_Hook.php | 4 ++--
 application/Contractconfig/hooks/Voicenumberblock.php    | 5 +++--
 application/ContractconfigItem/ContractconfigItem.php    | 2 +-
 application/ContractconfigValue/ContractconfigValue.php  | 3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/Contractconfig/ContractconfigController.php b/application/Contractconfig/ContractconfigController.php
index 55193f955..01998baa1 100644
--- a/application/Contractconfig/ContractconfigController.php
+++ b/application/Contractconfig/ContractconfigController.php
@@ -86,7 +86,6 @@ class ContractconfigController extends mfBaseController {
       }*/
       $old_values[$item->name] = $item->getValue();
       
-      
       if(!$item->value->set($itemvalue)) {
         $error_items[$item->id] = $item->name;
         continue;
diff --git a/application/Contractconfig/hooks/Contractconfig_Hook.php b/application/Contractconfig/hooks/Contractconfig_Hook.php
index 7340a392d..f88afbf94 100644
--- a/application/Contractconfig/hooks/Contractconfig_Hook.php
+++ b/application/Contractconfig/hooks/Contractconfig_Hook.php
@@ -19,8 +19,8 @@ abstract class Contractconfig_Hook {
   abstract public function beforeSave();
   abstract public function afterSave();
   
-  abstract public function beforeDelete();
-  abstract public function afterDelete();
+  abstract public function beforeCancel();
+  abstract public function afterCancel();
   
   
   public function __construct(Contract $contract) {
diff --git a/application/Contractconfig/hooks/Voicenumberblock.php b/application/Contractconfig/hooks/Voicenumberblock.php
index 26f11d532..4f96a6fc1 100644
--- a/application/Contractconfig/hooks/Voicenumberblock.php
+++ b/application/Contractconfig/hooks/Voicenumberblock.php
@@ -85,6 +85,7 @@ class Contractconfig_Hook_Voicenumberblock extends Contractconfig_Hook {
   
   /*
    * TODO: Check if contract was canceled, then set lock and lock_reason to reserved
+   *       => should go into beforeCancel event
    */
   public function checkNewNumbers() {
     $this->log->debug(":: In Contractconfig_Hook_Voicenumberblock->afterSave()");
@@ -158,11 +159,11 @@ class Contractconfig_Hook_Voicenumberblock extends Contractconfig_Hook {
     
   }
   
-  public function beforeDelete() {
+  public function beforeCancel() {
     
   }
   
-  public function afterDelete() {
+  public function afterCancel() {
     
   }
 }
\ No newline at end of file
diff --git a/application/ContractconfigItem/ContractconfigItem.php b/application/ContractconfigItem/ContractconfigItem.php
index 65e8743eb..8edc2611d 100644
--- a/application/ContractconfigItem/ContractconfigItem.php
+++ b/application/ContractconfigItem/ContractconfigItem.php
@@ -59,7 +59,7 @@ class ContractconfigItem extends mfBaseModel {
           $value->contract_id = $this->contract_id;
           $value->create_by = $me->id;
         }
-        
+        //var_dump($value);exit;
         $this->value = $value;
         return $this->value;
       }
diff --git a/application/ContractconfigValue/ContractconfigValue.php b/application/ContractconfigValue/ContractconfigValue.php
index 34665e521..73aa26140 100644
--- a/application/ContractconfigValue/ContractconfigValue.php
+++ b/application/ContractconfigValue/ContractconfigValue.php
@@ -4,7 +4,8 @@ class ContractconfigValue extends mfBaseModel {
   private $item;
   
   public function set($new_value) {
-    $item = $this->getProperty("item");
+    // explicitly load item, because we might not have an id yet
+    $item = new ContractconfigItem($this->item_id);
     
     $me = new User();
     $me->loadMe();