Auftrags-Controller: Sprache f. Überstzung im E-Mail-Dialog verwenden

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index e4644983db8b88dc21bf34e792ef0bc0ff937408..689c597aae288cc24e94a7fb4156cd9406d06b82 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -370,7 +370,8 @@ sub action_show_email_dialog {
   $form->{$self->nr_key()}  = $self->order->number;
   $form->{formname}         = $self->type;
   $form->{type}             = $self->type;
   $form->{$self->nr_key()}  = $self->order->number;
   $form->{formname}         = $self->type;
   $form->{type}             = $self->type;

-  $form->{language}         = 'de';
+  $form->{language}         = '_' . $self->order->language->template_code if $self->order->language;
+  $form->{language_id}      = $self->order->language->id                  if $self->order->language;

   $form->{format}           = 'pdf';
 
   $email_form->{subject}             = $form->generate_email_subject();
   $form->{format}           = 'pdf';
 
   $email_form->{subject}             = $form->generate_email_subject();

diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index f50db046252127f409fe8881961aab301546fa30..e4cebb2f550aeaefa05c6619ae5ddb900cf0cd9c 100644 (file)
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -94,6 +94,7 @@ namespace('kivi.Order', function(ns) {
     if (!ns.check_cv()) return;
 
     var data = $('#order_form').serializeArray();
     if (!ns.check_cv()) return;
 
     var data = $('#order_form').serializeArray();

+    data.push({ name: 'order.language_id', value: $('#language_id').val() }); // language from print options

     data.push({ name: 'action', value: 'Order/show_email_dialog' });
 
     $.post("controller.pl", data, kivi.eval_json_result);
     data.push({ name: 'action', value: 'Order/show_email_dialog' });
 
     $.post("controller.pl", data, kivi.eval_json_result);