Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 545acfb6

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

  • ID 545acfb646e9aa199f3125111866d7584b85d66e
  • Vorgänger 9badeafc
  • Nachfolger dabbe57f

Workflow: E-Mail → Lieferschein hinzugefügt

Unterschiede anzeigen:

SL/Controller/DeliveryOrder.pm
use SL::DB::Translation;
use SL::DB::TransferType;
use SL::DB::ValidityToken;
use SL::DB::EmailJournal;
use SL::DB::Warehouse;
use SL::DB::Helper::RecordLink qw(set_record_link_conversions RECORD_ID RECORD_TYPE_REF RECORD_ITEM_ID RECORD_ITEM_TYPE_REF);
use SL::DB::Helper::TypeDataProxy;
......
$self->action_add;
}
sub action_add_from_email_journal {
my ($self) = @_;
die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
$self->action_add();
}
sub action_edit_with_email_journal_workflow {
my ($self) = @_;
die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
$::form->{workflow_email_journal_id} = delete $::form->{email_journal_id};
$::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
$self->action_edit();
}
# edit an existing order
sub action_edit {
my ($self) = @_;
......
type => $to_type,
from_id => $self->order->id,
from_type => $self->order->type,
email_journal_id => $::form->{workflow_email_journal_id},
email_attachment_id => $::form->{workflow_email_attachment_id},
%additional_params,
);
}
......
controller => 'do.pl',
action => 'invoice_from_delivery_order_controller',
from_id => $self->order->id,
email_journal_id => $::form->{workflow_email_journal_id},
email_attachment_id => $::form->{workflow_email_attachment_id},
);
}
......
items_to_delete => $items_to_delete,
);
if ($::form->{email_journal_id}) {
my $email_journal = SL::DB::EmailJournal->new(
id => delete $::form->{email_journal_id}
)->load;
$email_journal->link_to_record_with_attachment(
$self->order,
delete $::form->{email_attachment_id}
);
}
delete $::form->{form_validity_token};
}
templates/design40_webpages/delivery_order/form.html
[%- USE LxERP %]
[%- USE L %]
[%- USE HTML %]
[% IF FORM.workflow_email_journal_id %]
[% SET FORM.title = LxERP.t8("Email Journal Workflow") _ " - " _ FORM.title %]
[% END %]
<h1>[% FORM.title %] <span id='nr_in_title'>[%- SELF.order.number -%]</span></h1>
<div id="print_options" style="display:none">
......
[% L.hidden_tag('id', SELF.order.id) %]
[% L.hidden_tag('converted_from_record_type_ref', SELF.order.converted_from_record_type_ref) %]
[% L.hidden_tag('converted_from_record_id', SELF.order.converted_from_record_id) %]
[% L.hidden_tag('email_journal_id', FORM.email_journal_id) %]
[% L.hidden_tag('email_attachment_id', FORM.email_attachment_id) %]
[% L.hidden_tag('workflow_email_journal_id', FORM.workflow_email_journal_id) %]
[% L.hidden_tag('workflow_email_attachment_id', FORM.workflow_email_attachment_id) %]
[% IF !SELF.order.id %]
[% L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
......
<div class="tabwidget" id="order_tabs">
<ul>
<li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id %]
<li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(FORM.email_attachment_id || FORM.workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
[% END %]
[%- IF INSTANCE_CONF.get_webdav %]
<li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
[%- END %]
templates/design40_webpages/delivery_order/tabs/basic_data.html
<div id="ui-tabs-basic-data">
[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id%]
<div class="wrapper" id="email_attachment_wrapper">
[%
BLOCK panel_1;
P.email_journal.attachment_preview(
FORM.email_attachment_id || FORM.workflow_email_attachment_id,
style="height:600px"
);
END;
INCLUDE 'common/toggle_panel.html'
block_name='panel_1'
button_closed = LxERP.t8('Show Attachment')
button_open = LxERP.t8('Hide Attachment')
;
%]
</div>
[% END %]
<div class="wrapper" id="wrapper-1">
[% INCLUDE 'generic/toggle_wrapper.html' %]
templates/webpages/delivery_order/form.html
[%- USE LxERP %]
[%- USE L %]
[%- USE HTML %]
[% IF FORM.workflow_email_journal_id %]
[% SET FORM.title = LxERP.t8("Email Journal Workflow") _ " - " _ FORM.title %]
[% END %]
<h1>[% FORM.title %] <span id='nr_in_title'>[%- SELF.order.number -%]</span></h1>
<div id="print_options" style="display:none">
......
[% L.hidden_tag('id', SELF.order.id) %]
[% L.hidden_tag('converted_from_record_type_ref', SELF.order.converted_from_record_type_ref) %]
[% L.hidden_tag('converted_from_record_id', SELF.order.converted_from_record_id) %]
[% L.hidden_tag('email_journal_id', FORM.email_journal_id) %]
[% L.hidden_tag('email_attachment_id', FORM.email_attachment_id) %]
[% L.hidden_tag('workflow_email_journal_id', FORM.workflow_email_journal_id) %]
[% L.hidden_tag('workflow_email_attachment_id', FORM.workflow_email_attachment_id) %]
[% IF !SELF.order.id %]
[% L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
......
<div class="tabwidget" id="order_tabs">
<ul>
<li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id %]
<li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(FORM.email_attachment_id || FORM.workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
[% END %]
[%- IF INSTANCE_CONF.get_webdav %]
<li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
[%- END %]

Auch abrufbar als: Unified diff