From 8c8f6da30e72f6e80f6a0c8914d5bb46b7487d64 Mon Sep 17 00:00:00 2001 From: Thomas Heck Date: Tue, 14 Aug 2012 12:52:12 +0200 Subject: [PATCH] ap::form_footer auf template umgestellt. --- bin/mozilla/ap.pl | 117 +++++-------------------- templates/webpages/ap/form_footer.html | 70 +++++++++++++++ 2 files changed, 93 insertions(+), 94 deletions(-) create mode 100644 templates/webpages/ap/form_footer.html diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 7c6d1bf4b..f961ead5d 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -832,108 +832,37 @@ $jsscript } sub form_footer { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - my $cgi = $::request->{cgi}; - - $main::auth->assert('general_ledger'); + $::lxdebug->enter_sub; + $::auth->assert('general_ledger'); - my $follow_ups_block; - if ($form->{id}) { - my $follow_ups = FU->follow_ups('trans_id' => $form->{id}); + my $num_due; + my $num_follow_ups; + if ($::form->{id}) { + my $follow_ups = FU->follow_ups('trans_id' => $::form->{id}); - if (@{ $follow_ups} ) { - my $num_due = sum map { $_->{due} * 1 } @{ $follow_ups }; - $follow_ups_block = qq|

| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|

|; + if (@{ $follow_ups }) { + $num_due = sum map { $_->{due} * 1 } @{ $follow_ups }; + $num_follow_ups = scalar @{ $follow_ups } } } - print qq| - -$follow_ups_block - - - - - -| -. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}]) -. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]) -. qq| - -
-|; - - if (!$form->{id} && $form->{draft_id}) { - print(NTI($cgi->checkbox('-name' => 'remove_draft', '-id' => 'remove_draft', - '-value' => 1, '-checked' => $form->{remove_draft}, - '-label' => '')) . - qq| 
|); - } + my $transdate = $::form->datetonum($::form->{transdate}, \%::myconfig); + my $closedto = $::form->datetonum($::form->{closedto}, \%::myconfig); - my $transdate = $form->datetonum($form->{transdate}, \%myconfig); - my $closedto = $form->datetonum($form->{closedto}, \%myconfig); + my $storno = $::form->{id} + && !IS->has_storno(\%::myconfig, $::form, 'ap') + && !IS->is_storno( \%::myconfig, $::form, 'ap', $::form->{id}) + && ($::form->{totalpaid} == 0 || $::form->{totalpaid} eq ''); - print qq||; + $::form->header; + print $::form->parse_html_template('ap/form_footer', { + num_due => $num_due, + num_follow_ups => $num_follow_ups, + show_post_draft => ($transdate > $closedto) && !$::form->{id}, + show_storno => $storno, + }); - if ($form->{id}) { - if ($form->{radier}) { - print qq| - -|; - } - # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it - print qq| | - if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}) && (($form->{totalpaid} == 0) || ($form->{totalpaid} eq ""))); - - print qq| - - -|; - } elsif (($transdate > $closedto) && !$form->{id}) { - print qq| - | . - NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit')); - } - # button for saving history - if($form->{id} ne "") { - print qq| |; - } - # /button for saving history - # mark_as_paid button - if($form->{id} ne "") { - print qq| |; - } - # /mark_as_paid button - print " - - - - -"; - - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } sub mark_as_paid { diff --git a/templates/webpages/ap/form_footer.html b/templates/webpages/ap/form_footer.html new file mode 100644 index 000000000..466ab3456 --- /dev/null +++ b/templates/webpages/ap/form_footer.html @@ -0,0 +1,70 @@ +[%- USE T8 %] +[%- USE HTML %] +[%- USE L %] +[%- USE LxERP %] + +[%- IF (num_follow_ups && num_due) %] +

[% 'There are #1 unfinished follow-ups of which #2 are due.' | $T8(num_follow_ups, num_due) %]

+[%- END %] + + + + + + +[%- IF ( !id && draft_id ) %] + [% L.checkbox_tag('remove_draft', checked=remove_draft, label=LxERP.t8('Remove draft when posting')) %] +
+[%- END %] + +
+ + + +[%- IF id %] + [%- IF radier %] + + + [%- END %] + + [%- IF show_storno %] + + [%- END %] + + + + + +[%- ELSIF show_post_draft %] + + +[%- END %] + +[%- IF id %] + + +[%- END %] + + + + + + + + -- 2.20.1