Auftrags-Controller: Beleg neu Laden nach Mail

[mfinanz.git] / SL / Controller / Order.pm

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 3dcf56f69c3629a7f92159c04e09fa32482c9eba..bf0915b7ee2fed09693076e869525ca5a9a6052d 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -350,9 +350,16 @@ sub action_print {
 }
 
 # open the email dialog
 }
 
 # open the email dialog

-sub action_show_email_dialog {
+sub action_save_and_show_email_dialog {

   my ($self) = @_;
 
   my ($self) = @_;
 

+  my $errors = $self->save();
+
+  if (scalar @{ $errors }) {
+    $self->js->flash('error', $_) foreach @{ $errors };
+    return $self->js->render();
+  }
+

   my $cv_method = $self->cv;
 
   if (!$self->order->$cv_method) {
   my $cv_method = $self->cv;
 
   if (!$self->order->$cv_method) {


@@ -373,6 +380,7 @@ sub action_show_email_dialog {
   $form->{type}             = $self->type;
   $form->{language}         = '_' . $self->order->language->template_code if $self->order->language;
   $form->{language_id}      = $self->order->language->id                  if $self->order->language;
   $form->{type}             = $self->type;
   $form->{language}         = '_' . $self->order->language->template_code if $self->order->language;
   $form->{language_id}      = $self->order->language->id                  if $self->order->language;

+  $form->{cusordnumber}     = $self->order->cusordnumber;

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


@@ -444,6 +452,7 @@ sub action_send_email {
     $::form->{tmpdir}  = $sfile->get_path; # for Form::cleanup which may be called in Form::send_email
   }
 
     $::form->{tmpdir}  = $sfile->get_path; # for Form::cleanup which may be called in Form::send_email
   }
 

+  $::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail

   $::form->send_email(\%::myconfig, 'pdf');
 
   # internal notes
   $::form->send_email(\%::myconfig, 'pdf');
 
   # internal notes


@@ -459,11 +468,15 @@ sub action_send_email {
 
   $self->order->update_attributes(intnotes => $intnotes);
 
 
   $self->order->update_attributes(intnotes => $intnotes);
 

-  $self->js
-      ->val('#order_intnotes', $intnotes)
-      ->run('kivi.Order.close_email_dialog')
-      ->flash('info', t8('The email has been sent.'))
-      ->render($self);
+  flash_later('info', t8('The email has been sent.'));
+
+  my @redirect_params = (
+    action => 'edit',
+    type   => $self->type,
+    id     => $self->order->id,
+  );
+
+  $self->redirect_to(@redirect_params);

 }
 
 # open the periodic invoices config dialog
 }
 
 # open the periodic invoices config dialog


@@ -1692,6 +1705,14 @@ sub workflow_sales_or_purchase_order {
                        : $::form->{type} eq sales_order_type()       ? purchase_order_type()
                        : '';
 
                        : $::form->{type} eq sales_order_type()       ? purchase_order_type()
                        : '';
 

+  # check for direct delivery
+  # copy shipto in custom shipto (custom shipto will be copied by new_from() in case)
+  my $custom_shipto;
+  if (   $::form->{type} eq sales_order_type() && $destination_type eq purchase_order_type()
+      && $::form->{use_shipto} && $self->order->shipto) {
+    $custom_shipto = $self->order->shipto->clone('SL::DB::Order');
+  }
+

   $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type));
   $self->{converted_from_oe_id} = delete $::form->{id};
 
   $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type));
   $self->{converted_from_oe_id} = delete $::form->{id};
 


@@ -1700,6 +1721,15 @@ sub workflow_sales_or_purchase_order {
     $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
   }
 
     $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
   }
 

+  if ($::form->{type} eq sales_order_type() && $destination_type eq purchase_order_type()) {
+    if ($::form->{use_shipto}) {
+      $self->order->custom_shipto($custom_shipto) if $custom_shipto;
+    } else {
+      # remove any custom shipto if not wanted
+      $self->order->custom_shipto(SL::DB::Shipto->new(module => 'OE', custom_variables => []));
+    }
+  }
+

   # change form type
   $::form->{type} = $destination_type;
   $self->type($self->init_type);
   # change form type
   $::form->{type} = $destination_type;
   $self->type($self->init_type);


@@ -1822,13 +1852,11 @@ sub setup_edit_action_bar {
           t8('Save and Sales Order'),
           submit   => [ '#order_form', { action => "Order/sales_order" } ],
           only_if  => (any { $self->type eq $_ } (sales_quotation_type(), purchase_order_type())),
           t8('Save and Sales Order'),
           submit   => [ '#order_form', { action => "Order/sales_order" } ],
           only_if  => (any { $self->type eq $_ } (sales_quotation_type(), purchase_order_type())),

-          disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,

         ],
         action => [
           t8('Save and Purchase Order'),
         ],
         action => [
           t8('Save and Purchase Order'),

-          submit   => [ '#order_form', { action => "Order/purchase_order" } ],
-          only_if  => (any { $self->type eq $_ } (sales_order_type(), request_quotation_type())),
-          disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
+          call      => [ 'kivi.Order.purchase_order_check_for_direct_delivery' ],
+          only_if   => (any { $self->type eq $_ } (sales_order_type(), request_quotation_type())),

         ],
         action => [
           t8('Save and Delivery Order'),
         ],
         action => [
           t8('Save and Delivery Order'),


@@ -1861,7 +1889,8 @@ sub setup_edit_action_bar {
         ],
         action => [
           t8('Save and E-mail'),
         ],
         action => [
           t8('Save and E-mail'),

-          call => [ 'kivi.Order.email', $::instance_conf->get_order_warn_duplicate_parts ],
+          call => [ 'kivi.Order.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts ],
+          disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,

         ],
         action => [
           t8('Download attachments of all parts'),
         ],
         action => [
           t8('Download attachments of all parts'),