Auftrags-Controller: CVars auch vor Drucken/E-Mail initialisieren

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

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index b6b87a87f7f94ed235a8425355354c9126af76e4..cc0f57e833466b59b6ca94aae615a7b5e31df91c 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -4,10 +4,10 @@ use strict;
 use parent qw(SL::Controller::Base);
 
 use SL::Helper::Flash;
 use parent qw(SL::Controller::Base);
 
 use SL::Helper::Flash;

-use SL::ClientJS;

 use SL::Presenter;
 use SL::Locale::String;
 use SL::SessionFile::Random;
 use SL::Presenter;
 use SL::Locale::String;
 use SL::SessionFile::Random;

+use SL::PriceSource;

 use SL::Form;
 
 use SL::DB::Order;
 use SL::Form;
 
 use SL::DB::Order;


@@ -28,7 +28,7 @@ use English qw(-no_match_vars);
 
 use Rose::Object::MakeMethods::Generic
 (
 
 use Rose::Object::MakeMethods::Generic
 (

- 'scalar --get_set_init' => [ qw(order valid_types type cv js p) ],
+ 'scalar --get_set_init' => [ qw(order valid_types type cv p) ],

 );
 
 
 );
 
 


@@ -38,6 +38,8 @@ __PACKAGE__->run_before('_check_auth');
 __PACKAGE__->run_before('_recalc',
                         only => [ qw(edit update save save_and_delivery_order create_pdf send_email) ]);
 
 __PACKAGE__->run_before('_recalc',
                         only => [ qw(edit update save save_and_delivery_order create_pdf send_email) ]);
 

+__PACKAGE__->run_before('_get_unalterable_data',
+                        only => [ qw(save save_and_delivery_order create_pdf send_email) ]);

 
 #
 # actions
 
 #
 # actions


@@ -91,7 +93,7 @@ sub action_save {
 
   if (scalar @{ $errors }) {
     $self->js->flash('error', $_) foreach @{ $errors };
 
   if (scalar @{ $errors }) {
     $self->js->flash('error', $_) foreach @{ $errors };

-    return $self->js->render($self);
+    return $self->js->render();

   }
 
   flash_later('info', $::locale->text('The order has been saved'));
   }
 
   flash_later('info', $::locale->text('The order has been saved'));


@@ -183,12 +185,8 @@ sub action_send_email {
     return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self);
   }
 
     return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self);
   }
 

-  my $sfile = SL::SessionFile::Random->new(mode => "w");
-  $sfile->fh->print($pdf);
-  $sfile->fh->close;
-
-  $mail->{attachments} = [{ "filename" => $sfile->file_name,
-                            "name"     => $::form->{email}->{attachment_filename} }];
+  $mail->{attachments} = [{ "content" => $pdf,
+                            "name"    => $::form->{email}->{attachment_filename} }];

 
   if (my $err = $mail->send) {
     return $self->js->flash('error', t8('Sending E-mail: ') . $err)
 
   if (my $err = $mail->send) {
     return $self->js->flash('error', t8('Sending E-mail: ') . $err)


@@ -219,7 +217,7 @@ sub action_save_and_delivery_order {
 
   if (scalar @{ $errors }) {
     $self->js->flash('error', $_) foreach @{ $errors };
 
   if (scalar @{ $errors }) {
     $self->js->flash('error', $_) foreach @{ $errors };

-    return $self->js->render($self);
+    return $self->js->render();

   }
 
   my $delivery_order = $self->order->convert_to_delivery_order($self->order);
   }
 
   my $delivery_order = $self->order->convert_to_delivery_order($self->order);


@@ -316,7 +314,7 @@ sub action_add_item {
     ->focus('#add_item_parts_id_name');
 
   $self->_js_redisplay_amounts_and_taxes;
     ->focus('#add_item_parts_id_name');
 
   $self->_js_redisplay_amounts_and_taxes;

-  $self->js->render($self);
+  $self->js->render();

 }
 
 sub action_recalc_amounts_and_taxes {
 }
 
 sub action_recalc_amounts_and_taxes {


@@ -326,7 +324,7 @@ sub action_recalc_amounts_and_taxes {
 
   $self->_js_redisplay_linetotals;
   $self->_js_redisplay_amounts_and_taxes;
 
   $self->_js_redisplay_linetotals;
   $self->_js_redisplay_amounts_and_taxes;

-  $self->js->render($self);
+  $self->js->render();

 }
 
 sub _js_redisplay_linetotals {
 }
 
 sub _js_redisplay_linetotals {


@@ -387,10 +385,6 @@ sub init_cv {
   return $cv;
 }
 
   return $cv;
 }
 

-sub init_js {
-  SL::ClientJS->new;
-}
-

 sub init_p {
   SL::Presenter->get;
 }
 sub init_p {
   SL::Presenter->get;
 }


@@ -481,13 +475,31 @@ sub _recalc {
   pairwise { $a->{linetotal} = $b->{linetotal} } @{$self->order->items}, @{$pat{items}};
 }
 
   pairwise { $a->{linetotal} = $b->{linetotal} } @{$self->order->items}, @{$pat{items}};
 }
 

-sub _save {
+
+sub _get_unalterable_data {

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

-  # autovivify all cvars that are not in the form (cvars_by_config can do it)

   foreach my $item (@{ $self->order->items }) {
   foreach my $item (@{ $self->order->items }) {

+    if ($item->id) {
+      # load data from orderitems (db)
+      my $db_item = SL::DB::OrderItem->new(id => $item->id)->load;
+      $item->$_($db_item->$_) for qw(active_discount_source active_price_source longdescription);
+    } else {
+      # set data from part (or other sources)
+      $item->longdescription($item->part->notes);
+      #$item->active_price_source('');
+      #$item->active_discount_source('');
+    }
+
+    # autovivify all cvars that are not in the form (cvars_by_config can do it).

     $item->cvars_by_config;
     $item->cvars_by_config;

+    $item->parse_custom_variable_values;

   }
   }

+}
+
+
+sub _save {
+  my ($self) = @_;

 
   my $errors = [];
   my $db = $self->order->db;
 
   my $errors = [];
   my $db = $self->order->db;


@@ -565,3 +577,22 @@ sub _purchase_order_type {
 }
 
 1;
 }
 
 1;

+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Controller::Order - controller for orders
+
+=head1 TODO
+
+Testing, PriceSources, pricefactor, units, currency, delivered, delivery order created, ...
+
+=head1 AUTHOR
+
+Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>
+
+=cut
+