X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=bd20669ac509beab42516ef9a35861b33a735c89;hb=55a7b3ba511071b369e6fd4f86bfe769cac8fbca;hp=e3f45a8dffc23e6e3ae852f871a3f9fb278697dc;hpb=bf46061c5ae831038315d77ae8be55bf712b2c87;p=kivitendo-erp.git diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index e3f45a8df..bd20669ac 100644 --- 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 SL::ClientJS; use SL::Presenter; use SL::Locale::String; use SL::SessionFile::Random; +use SL::PriceSource; use SL::Form; use SL::DB::Order; @@ -28,7 +28,7 @@ use English qw(-no_match_vars); 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) ], ); @@ -36,8 +36,10 @@ use Rose::Object::MakeMethods::Generic __PACKAGE__->run_before('_check_auth'); __PACKAGE__->run_before('_recalc', - only => [ qw(edit update save create_pdf) ]); + 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 @@ -91,7 +93,7 @@ sub action_save { 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')); @@ -107,33 +109,8 @@ sub action_save { sub action_create_pdf { my ($self) = @_; - my $print_form = Form->new(''); - $print_form->{type} = 'sales_order'; - $print_form->{formname} = 'sales_order', - $print_form->{format} = 'pdf', - $print_form->{media} = 'file'; - - $self->order->flatten_to_form($print_form, format_amounts => 1); - my $pdf; - my @errors; - $print_form->throw_on_error(sub { - eval { - $print_form->prepare_for_printing; - - $pdf = SL::Helper::CreatePDF->create_pdf( - template => SL::Helper::CreatePDF->find_template(name => $print_form->{formname}), - variables => $print_form, - variable_content_types => { - longdescription => 'html', - partnotes => 'html', - notes => 'html', - }, - ); - 1; - } || push @errors, ref($EVAL_ERROR) eq 'SL::X::FormError' ? $EVAL_ERROR->getMessage : $EVAL_ERROR; - }); - + my @errors = _create_pdf($self->order, \$pdf); if (scalar @errors) { return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self); } @@ -160,6 +137,103 @@ sub action_download_pdf { ); } +sub action_show_email_dialog { + my ($self) = @_; + + my $cv_method = $self->cv; + + if (!$self->order->$cv_method) { + return $self->js->flash('error', t8('Cannot send E-mail without ' . $self->cv)) + ->render($self); + } + + $self->{email}->{to} = $self->order->contact->cp_email if $self->order->contact; + $self->{email}->{to} ||= $self->order->$cv_method->email; + $self->{email}->{cc} = $self->order->$cv_method->cc; + $self->{email}->{bcc} = join ', ', grep $_, $self->order->$cv_method->bcc, SL::DB::Default->get->global_bcc; + # Todo: get addresses from shipto, if any + + my $form = Form->new; + $form->{ordnumber} = $self->order->ordnumber; + $form->{formname} = $self->type; + $form->{type} = $self->type; + $form->{language} = 'de'; + $form->{format} = 'pdf'; + + $self->{email}->{subject} = $form->generate_email_subject(); + $self->{email}->{attachment_filename} = $form->generate_attachment_filename(); + $self->{email}->{message} = $form->create_email_signature(); + + my $dialog_html = $self->render('order/tabs/_email_dialog', { output => 0 }); + $self->js + ->run('show_email_dialog', $dialog_html) + ->reinit_widgets + ->render($self); +} + +# Todo: handling error messages: flash is not displayed in dialog, but in the main form +sub action_send_email { + my ($self) = @_; + + my $mail = Mailer->new; + $mail->{from} = qq|"$::myconfig{name}" <$::myconfig{email}>|; + $mail->{$_} = $::form->{email}->{$_} for qw(to cc bcc subject message); + + my $pdf; + my @errors = _create_pdf($self->order, \$pdf, {media => 'email'}); + if (scalar @errors) { + return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self); + } + + $mail->{attachments} = [{ "content" => $pdf, + "name" => $::form->{email}->{attachment_filename} }]; + + if (my $err = $mail->send) { + return $self->js->flash('error', t8('Sending E-mail: ') . $err) + ->render($self); + } + + # internal notes + my $intnotes = $self->order->intnotes; + $intnotes .= "\n\n" if $self->order->intnotes; + $intnotes .= t8('[email]') . "\n"; + $intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n"; + $intnotes .= t8('To (email)') . ": " . $mail->{to} . "\n"; + $intnotes .= t8('Cc') . ": " . $mail->{cc} . "\n" if $mail->{cc}; + $intnotes .= t8('Bcc') . ": " . $mail->{bcc} . "\n" if $mail->{bcc}; + $intnotes .= t8('Subject') . ": " . $mail->{subject} . "\n\n"; + $intnotes .= t8('Message') . ": " . $mail->{message}; + + $self->js + ->val('#order_intnotes', $intnotes) + ->run('close_email_dialog') + ->render($self); +} + +sub action_save_and_delivery_order { + my ($self) = @_; + + my $errors = $self->_save(); + + if (scalar @{ $errors }) { + $self->js->flash('error', $_) foreach @{ $errors }; + return $self->js->render(); + } + + my $delivery_order = $self->order->convert_to_delivery_order($self->order); + + flash_later('info', $::locale->text('The order has been saved')); + my @redirect_params = ( + controller => 'do.pl', + action => 'edit', + type => $delivery_order->type, + id => $delivery_order->id, + vc => $delivery_order->is_sales ? 'customer' : 'vendor', + ); + + $self->redirect_to(@redirect_params); +} + sub action_customer_vendor_changed { my ($self) = @_; @@ -240,7 +314,7 @@ sub action_add_item { ->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 { @@ -250,7 +324,7 @@ sub action_recalc_amounts_and_taxes { $self->_js_redisplay_linetotals; $self->_js_redisplay_amounts_and_taxes; - $self->js->render($self); + $self->js->render(); } sub _js_redisplay_linetotals { @@ -311,10 +385,6 @@ sub init_cv { return $cv; } -sub init_js { - SL::ClientJS->new; -} - sub init_p { SL::Presenter->get; } @@ -392,10 +462,11 @@ sub _recalc { $self->order->currency_id($::instance_conf->get_currency_id()); my %pat = $self->order->calculate_prices_and_taxes(); + $self->{taxes} = []; foreach my $tax_chart_id (keys %{ $pat{taxes} }) { my $tax = SL::DB::Manager::Tax->find_by(chart_id => $tax_chart_id); - my @amount_keys = grep { $pat{amounts}->{$_}->{tax_id} == $tax->id } keys $pat{amounts}; + my @amount_keys = grep { $pat{amounts}->{$_}->{tax_id} == $tax->id } keys %{ $pat{amounts} }; push(@{ $self->{taxes} }, { amount => $pat{taxes}->{$tax_chart_id}, netamount => $pat{amounts}->{$amount_keys[0]}->{amount}, tax => $tax }); @@ -404,6 +475,25 @@ sub _recalc { pairwise { $a->{linetotal} = $b->{linetotal} } @{$self->order->items}, @{$pat{items}}; } + +sub _get_unalterable_data { + my ($self) = @_; + + 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(''); + } + } +} + + sub _save { my ($self) = @_; @@ -445,6 +535,40 @@ sub _pre_render { $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery); } +sub _create_pdf { + my ($order, $pdf_ref, $params) = @_; + + my $print_form = Form->new(''); + $print_form->{type} = 'sales_order'; + $print_form->{formname} = 'sales_order', + $print_form->{format} = $params->{format} || 'pdf', + $print_form->{media} = $params->{media} || 'file'; + + $order->flatten_to_form($print_form, format_amounts => 1); + # flatten_to_form sets payment_terms from customer/vendor - we do not want that here + delete $print_form->{payment_terms} if !$print_form->{payment_id}; + + my @errors = (); + $print_form->throw_on_error(sub { + eval { + $print_form->prepare_for_printing; + + $$pdf_ref = SL::Helper::CreatePDF->create_pdf( + template => SL::Helper::CreatePDF->find_template(name => $print_form->{formname}), + variables => $print_form, + variable_content_types => { + longdescription => 'html', + partnotes => 'html', + notes => 'html', + }, + ); + 1; + } || push @errors, ref($EVAL_ERROR) eq 'SL::X::FormError' ? $EVAL_ERROR->getMessage : $EVAL_ERROR; + }); + + return @errors; +} + sub _sales_order_type { 'sales_order'; } @@ -454,3 +578,22 @@ sub _purchase_order_type { } 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 Ebernd@kivitendo-premium.deE + +=cut +