From: Jan Büren <jan@kivitendo.de>
Date: Tue, 1 Feb 2022 12:44:04 +0000 (+0100)
Subject: OrderController: Wiederkehrende Rechnungen: vorbelegte E-Mail-Texte setzen falls... 
X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~224
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=66869d3f51d7a9711fd7402a9ad89a21c894f6a2;p=kivitendo-erp.git

OrderController: Wiederkehrende Rechnungen: vorbelegte E-Mail-Texte setzen falls leer

    Vorher wurde nur geprüft, ob die Konfiguration schon gesetzt wurde.
    Sollte ein Kunde im Nachhinein auf E-Mail-Versand umstelle ist
    das Verhalten jetzt komfortabler
---

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 5b49c4d15..f24f5cf54 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -566,6 +566,23 @@ sub action_show_periodic_invoices_config_dialog {
                                                                                 language_id      => $::form->{language_id},
                                                                                 translation_type =>"preset_text_periodic_invoices_email_body"),
   );
+  # for older configs, replace email preset text if not yet set.
+  $config->email_subject(GenericTranslations->get(
+                                              language_id      => $::form->{language_id},
+                                              translation_type =>"preset_text_periodic_invoices_email_subject")
+                        ) unless $config->email_subject;
+
+  $config->email_body(GenericTranslations->get(
+                                              language_id      => $::form->{language_id},
+                                              translation_type => "salutation_general")
+                    . GenericTranslations->get(
+                                              language_id      => $::form->{language_id},
+                                              translation_type => "salutation_punctuation_mark") . "\n\n"
+                    . GenericTranslations->get(
+                                              language_id      => $::form->{language_id},
+                                              translation_type =>"preset_text_periodic_invoices_email_body")
+                     ) unless $config->email_body;
+
   $config->periodicity('m')             if none { $_ eq $config->periodicity             }       @SL::DB::PeriodicInvoicesConfig::PERIODICITIES;
   $config->order_value_periodicity('p') if none { $_ eq $config->order_value_periodicity } ('p', @SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIODICITIES);