From 3241b8027db4dd52266769fa2a508b3bba9b6379 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Thu, 15 Jan 2026 18:09:39 +0100 Subject: [PATCH] Added new Voicenumber delete_reason --- Layout/default/Voicenumber/Form.php | 1 + .../Voicenumberblock/include/block-detail.php | 2 +- .../Voicenumber/VoicenumberController.php | 10 ++++-- application/Voicenumber/VoicenumberModel.php | 1 + ...oicenumber_add_disable_reason_canceled.php | 33 +++++++++++++++++++ 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php diff --git a/Layout/default/Voicenumber/Form.php b/Layout/default/Voicenumber/Form.php index 1d2e94ac7..ed90b52e4 100644 --- a/Layout/default/Voicenumber/Form.php +++ b/Layout/default/Voicenumber/Form.php @@ -117,6 +117,7 @@ + diff --git a/Layout/default/Voicenumberblock/include/block-detail.php b/Layout/default/Voicenumberblock/include/block-detail.php index 61594e0c9..d9fa9ff16 100644 --- a/Layout/default/Voicenumberblock/include/block-detail.php +++ b/Layout/default/Voicenumberblock/include/block-detail.php @@ -42,7 +42,7 @@ Lokal - disabled_reason?> + disabled_reason?>disabled > 1) ? " (".date("d.m.Y H:i", $num->disabled).")" : ""?> id && $num->enable_on_date) ? date("d.m.Y", $num->enable_on_date) : ""?> $block->id, "number" => $number])?>"> diff --git a/application/Voicenumber/VoicenumberController.php b/application/Voicenumber/VoicenumberController.php index 1e192288c..22ec7d427 100644 --- a/application/Voicenumber/VoicenumberController.php +++ b/application/Voicenumber/VoicenumberController.php @@ -114,8 +114,11 @@ class VoicenumberController extends mfBaseController { $number_data['port_out_date'] = self::dateToTimestamp($r->port_out_date); } - if($r->disabled === "1") { - $number_data['disabled'] = 1; + if($r->disabled == "1") { + if(!$number->disabled) { + $number_data['disabled'] = date('U'); + $number_data['disabled_by'] = $this->me->id; + } switch($r->disabled_reason) { case "ported_out": $number_data['disabled_reason'] = "ported_out"; @@ -123,6 +126,9 @@ class VoicenumberController extends mfBaseController { case "ported_back": $number_data['disabled_reason'] = "ported_back"; break; + case "contract_cancelled": + $number_data['disabled_reason'] = "contract_cancelled"; + break; case "legacy": $number_data['disabled_reason'] = "legacy"; break; diff --git a/application/Voicenumber/VoicenumberModel.php b/application/Voicenumber/VoicenumberModel.php index 28da70fb8..33fc4d1f0 100644 --- a/application/Voicenumber/VoicenumberModel.php +++ b/application/Voicenumber/VoicenumberModel.php @@ -17,6 +17,7 @@ class VoicenumberModel { public $ported_out; public $disabled; public $disabled_reason; + public $disabled_by; public $enable_on_date; public $comment; diff --git a/db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php b/db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php new file mode 100644 index 000000000..f6e7381d7 --- /dev/null +++ b/db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php @@ -0,0 +1,33 @@ +getEnvironment() == "thetool") { + $table = $this->table("Voicenumber"); + $table->changeColumn("disabled", "integer", ["null" => false, "default" => 0]); + $table->changeColumn("disabled_reason", "enum", ["values" => "ported_out,ported_back,reserved,legacy,damaged,contract_cancelled", "null" => true, "default" => null]); + $table->addColumn("disabled_by", "integer", ["null" => true, "default" => null, "after" => "disabled_reason"]); + $table->update(); + } + + if($this->getEnvironment() == "addressdb") { + + } + } + + public function down(): void + { + if($this->getEnvironment() == "thetool") { + + } + + if($this->getEnvironment() == "addressdb") { + + } + } +}