X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FLetter.pm;h=b16a913656c87b0c5e1c7f709c5141224d56c3b5;hb=29318a627ee21ab0b324d329f78e3c4383af98c8;hp=553fe0a86a2dddb0341293a4e4f5acbba5ba117b;hpb=7afe92aff55c96742fbffb54e382f17f9fe4d907;p=kivitendo-erp.git diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm index 553fe0a86..b16a91365 100644 --- a/SL/Controller/Letter.pm +++ b/SL/Controller/Letter.pm @@ -9,21 +9,24 @@ use POSIX qw(strftime); use SL::Controller::Helper::GetModels; use SL::Controller::Helper::ReportGenerator; use SL::CT; +use SL::DB::Employee; +use SL::DB::Language; use SL::DB::Letter; use SL::DB::LetterDraft; -use SL::DB::Employee; +use SL::DB::Printer; use SL::Helper::Flash qw(flash flash_later); use SL::Helper::CreatePDF; use SL::Helper::PrintOptions; use SL::Locale::String qw(t8); use SL::Mailer; use SL::IS; +use SL::Presenter::Tag qw(select_tag); use SL::ReportGenerator; use SL::Webdav; use SL::Webdav::File; use Rose::Object::MakeMethods::Generic ( - 'scalar --get_set_init' => [ qw(letter all_employees models webdav_objects) ], + 'scalar --get_set_init' => [ qw(letter all_employees models webdav_objects is_sales) ], ); __PACKAGE__->run_before('check_auth_edit'); @@ -37,9 +40,12 @@ my %sort_columns = ( subject => t8('Subject'), letternumber => t8('Letternumber'), customer_id => t8('Customer'), + vendor_id => t8('Vendor'), contact => t8('Contact'), ); +### actions + sub action_add { my ($self, %params) = @_; @@ -60,8 +66,10 @@ sub action_edit { return $self->action_add unless $::form->{letter} || $::form->{draft}; - $self->letter(SL::DB::Letter->new_from_draft($::form->{draft}{id})) - if $::form->{draft}; + if ($::form->{draft}) { + $self->letter(SL::DB::Letter->new_from_draft($::form->{draft}{id})); + $self->is_sales($self->letter->is_sales); + } $self->_display( title => t8('Edit Letter'), @@ -94,7 +102,7 @@ sub action_update_contacts { my $letter = $self->letter; - if (!$self->letter->customer_id || !$self->letter->customer) { + if (!$self->letter->has_customer_vendor) { return $self->js ->replaceWith( '#letter_cp_id', @@ -103,12 +111,12 @@ sub action_update_contacts { ->render; } - my $contacts = $letter->customer->contacts; + my $contacts = $letter->customer_vendor->contacts; my $default; if ( $letter->contact && $letter->contact->cp_cv_id - && $letter->contact->cp_cv_id == $letter->customer_id) { + && $letter->contact->cp_cv_id == $letter->customer_vendor_id) { $default = $letter->contact->cp_id; } else { $default = ''; @@ -117,7 +125,7 @@ sub action_update_contacts { $self->js ->replaceWith( '#letter_cp_id', - SL::Presenter->get->select_tag('letter.cp_id', $contacts, default => $default, value_key => 'cp_id', title_key => 'full_name') + select_tag('letter.cp_id', $contacts, default => $default, value_key => 'cp_id', title_key => 'full_name') ) ->render; } @@ -164,6 +172,7 @@ sub action_delete_letter_drafts { sub action_list { my ($self, %params) = @_; + $self->setup_list_action_bar; $self->make_filter_summary; $self->prepare_report; @@ -233,11 +242,11 @@ sub action_print_letter { my $signature = $::myconfig{signature}; $mail->{$_} = $params{email}->{$_} for qw(to cc subject message bcc); $mail->{from} = qq|"$::myconfig{name}" <$::myconfig{email}>|; - $mail->{attachments} = [{ filename => $result{file_name}, - name => $params{email}->{attachment_filename} }]; + $mail->{attachments} = [{ path => $result{file_name}, + name => $params{email}->{attachment_filename} }]; $mail->{message} .= "\n-- \n$signature"; $mail->{message} =~ s/\r//g; - + $mail->{record_id} = $letter->id; $mail->send; unlink $result{file_name}; @@ -293,67 +302,35 @@ sub action_delete_drafts { $self->action_add(skip_drafts => 1); } -sub action_edit_email { - my ($self) = @_; - - my $letter = $self->_update; - $self->export_letter_to_form($letter); - - $::form->{formname} = "letter"; - $::form->{type} = "letter"; - $::form->{letternumber} = $self->letter->letternumber; - - my @hiddens = map { - my $value = $letter->$_; - $value = $value->to_kivitendo if ref($_) =~ m{Date}; - - { name => "letter.$_", value => $value } - } ($letter->meta->columns); - - my %vars = ( - script => 'controller.pl', - title => t8('Send letter via e-mail'), - email => $letter->contact ? $letter->contact->cp_email : '', - subject => $::form->generate_email_subject, - a_filename => $::form->generate_attachment_filename, - action => 'Letter/send_email', - HIDDEN => \@hiddens, - SHOW_BCC => $::auth->assert('email_bcc', 'may fail'), - ); - - $self->render('generic/edit_email', %vars); -} - sub action_send_email { my ($self) = @_; $::form->{media} = 'email'; - $self->action_print_letter( - email => { - to => $::form->{email}, - map { ($_ => $::form->{$_}) } qw(cc bcc subject attachment_filename message) - } - ); + $self->action_print_letter(email => $::form->{email_form}); } +### internal methods + sub _display { my ($self, %params) = @_; - $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery); + $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery kivi.Letter); my $letter = $self->letter; $params{title} ||= t8('Edit Letter'); $::form->{type} = 'letter'; # needed for print_options - $::form->{vc} = 'customer'; # needs to be for _get_contacts... + $::form->{vc} = $letter->is_sales ? 'customer' : 'vendor'; # needs to be for _get_contacts... $::request->layout->add_javascripts('customer_or_vendor_selection.js'); $::request->layout->add_javascripts('edit_part_window.js'); $::form->{language_id} ||= $params{language_id}; + $::form->{languages} ||= SL::DB::Manager::Language->get_all_sorted; $::form->{printers} = SL::DB::Manager::Printer->get_all_sorted; + $self->setup_display_action_bar; $self->render('letter/edit', %params, TCF => [ map { key => $_, value => t8(ucfirst $_) }, TEXT_CREATED_FOR_VALUES() ], @@ -364,7 +341,9 @@ sub _display { options => { no_postscript => 1, no_opendocument => 1, no_html => 1, - no_queue => 1 }), + no_queue => 1, + show_headers => 1, + }), ); } @@ -386,8 +365,8 @@ sub prepare_report { my $report = SL::ReportGenerator->new(\%::myconfig, $::form); $self->{report} = $report; - my @columns = qw(date subject letternumber customer_id contact date); - my @sortable = qw(date subject letternumber customer_id contact date); + my @columns = qw(date subject letternumber customer_id vendor_id contact date); + my @sortable = qw(date subject letternumber customer_id vendor_id contact date); my %column_defs = ( date => { text => t8('Date'), sub => sub { $_[0]->date_as_date } }, @@ -395,7 +374,8 @@ sub prepare_report { obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, callback => $self->models->get_callback) } }, letternumber => { text => t8('Letternumber'), sub => sub { $_[0]->letternumber }, obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, callback => $self->models->get_callback) } }, - customer_id => { text => t8('Customer'), sub => sub { SL::DB::Manager::Customer->find_by_or_create(id => $_[0]->customer_id)->displayable_name } }, + customer_id => { text => t8('Customer'), sub => sub { SL::DB::Manager::Customer->find_by_or_create(id => $_[0]->customer_id)->displayable_name }, visible => $self->is_sales }, + vendor_id => { text => t8('Vendor'), sub => sub { SL::DB::Manager::Vendor->find_by_or_create(id => $_[0]->vendor_id)->displayable_name }, visible => !$self->is_sales}, contact => { text => t8('Contact'), sub => sub { $_[0]->contact ? $_[0]->contact->full_name : '' } }, ); @@ -405,7 +385,6 @@ sub prepare_report { std_column_visibility => 1, controller_class => 'Letter', output_format => 'HTML', - top_info_text => t8('Letters'), title => t8('Letters'), allow_pdf_export => 1, allow_csv_export => 1, @@ -413,10 +392,11 @@ sub prepare_report { $report->set_columns(%column_defs); $report->set_column_order(@columns); - $report->set_export_options(qw(list filter)); + $report->set_export_options(qw(list filter is_sales)); $report->set_options_from_form; $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i; + $self->models->add_additional_url_params(is_sales => $self->is_sales); $self->models->finalize; $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable); @@ -465,10 +445,15 @@ sub load_letter_draft { return 0 if $params{skip_drafts}; - my $letter_drafts = SL::DB::Manager::LetterDraft->get_all; + my $letter_drafts = SL::DB::Manager::LetterDraft->get_all( + query => [ + SL::DB::Manager::Letter->is_sales_filter($self->is_sales), + ] + ); return unless @$letter_drafts; + $self->setup_load_letter_draft_action_bar; $self->render('letter/load_drafts', title => t8('Letter Draft'), LETTER_DRAFTS => $letter_drafts, @@ -552,7 +537,7 @@ sub init_letter { ->assign_attributes(%{ $::form->{letter} }); if ($letter->cp_id) { -# $letter->customer_id($letter->contact->cp_cv_id); +# $letter->customer_vendor_id($letter->contact->cp_cv_id); # contacts don't have language_id yet # $letter->greeting(GenericTranslations->get( # translation_type => 'greetings::' . ($letter->contact->cp_gender eq 'f' ? 'female' : 'male'), @@ -561,6 +546,8 @@ sub init_letter { # )); } + $self->is_sales($letter->is_sales) if $letter->id; + $letter; } @@ -570,6 +557,9 @@ sub init_models { SL::Controller::Helper::GetModels->new( controller => $self, model => 'Letter', + query => [ + SL::DB::Manager::Letter->is_sales_filter($self->is_sales), + ], sorted => \%sort_columns, with_objects => [ 'contact', 'salesman', 'employee' ], ); @@ -589,17 +579,21 @@ sub init_webdav_objects { number => $self->letter->letternumber, ); - my $webdav_path = $webdav->webdav_path; my @all_objects = $webdav->get_all_objects; return [ map { +{ name => $_->filename, type => t8('File'), - link => File::Spec->catdir($webdav_path, $_->filename), + link => File::Spec->catfile($_->full_filedescriptor), } } @all_objects ]; } +sub init_is_sales { + die 'is_sales must be set' unless defined $::form->{is_sales}; + $::form->{is_sales}; +} + sub check_auth_edit { $::auth->assert('sales_letter_edit'); } @@ -608,6 +602,86 @@ sub check_auth_report { $::auth->assert('sales_letter_report'); } +sub setup_load_letter_draft_action_bar { + my ($self, %params) = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + link => [ + t8('Skip'), + link => $self->url_for(action => 'skip_draft', is_sales => $self->is_sales), + accesskey => 'enter', + ], + action => [ + t8('Delete'), + submit => [ '#form', { action => 'delete_drafts' } ], + checks => [ [ 'kivi.check_if_entries_selected', '[name="ids[+]"]' ] ], + confirm => t8('Do you really want to delete this draft?'), + ], + ); + } +} + +sub setup_display_action_bar { + my ($self, %params) = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Update'), + submit => [ '#form', { action => 'Letter/update' } ], + accesskey => 'enter', + ], + + combobox => [ + action => [ + t8('Save'), + submit => [ '#form', { action => 'Letter/save' } ], + ], + action => [ + t8('Save Draft'), + submit => [ '#form', { action => 'Letter/save_letter_draft' } ], + ], + ], # end of combobox "Save" + + action => [ + t8('Delete'), + submit => [ '#form', { action => 'Letter/delete' } ], + confirm => t8('Are you sure you want to delete this letter?'), + disabled => !$self->letter->id ? t8('The object has not been saved yet.') : undef, + ], + + combobox => [ + action => [ t8('Export') ], + action => [ + t8('Print'), + call => [ 'kivi.SalesPurchase.show_print_dialog', 'Letter/print_letter' ], + disabled => !$self->letter->id ? t8('The object has not been saved yet.') : undef, + ], + action => [ + t8('E-mail'), + call => [ 'kivi.SalesPurchase.show_email_dialog', 'Letter/send_email' ], + disabled => !$self->letter->id ? t8('The object has not been saved yet.') : undef, + ], + ], + ); + } +} + +sub setup_list_action_bar { + my ($self, %params) = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Update'), + submit => [ '#search_form', { action => 'Letter/list' } ], + accesskey => 'enter', + ], + ); + } +} + 1; __END__ @@ -622,14 +696,8 @@ SL::Controller::Letter - Letters CRUD and printing Simple letter CRUD controller with drafting capabilities. -=head1 TODO - - Customer/Vendor switch for dealing with vendor letters - copy to webdav is crap -customer/vendor stuff - =head1 AUTHOR Sven Schöling Es.schoeling@linet-services.deE