ActionBar: Verwendung beim DATEV-Export

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 9b9ac50e6df91b72cf8783a01b50625da7ec5c03..8604da00d42673b337a144deeb0e57f0ea801d59 100644 (file)
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -31,6 +31,7 @@ use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
 
 use SL::Common;
 use SL::DATEV qw(:CONSTANTS);
 
 use SL::Common;
 use SL::DATEV qw(:CONSTANTS);

+use SL::Locale::String qw(t8);

 
 use strict;
 
 
 use strict;
 


@@ -48,6 +49,8 @@ sub export {
 
   my $stamm = SL::DATEV->new->get_datev_stamm;
 
 
   my $stamm = SL::DATEV->new->get_datev_stamm;
 

+  setup_datev_export_action_bar();
+

   $::form->header;
   print $::form->parse_html_template('datev/export', $stamm);
 
   $::form->header;
   print $::form->parse_html_template('datev/export', $stamm);
 


@@ -70,6 +73,8 @@ sub export_bewegungsdaten {
   $::lxdebug->enter_sub;
   $::auth->assert('datev_export');
 
   $::lxdebug->enter_sub;
   $::auth->assert('datev_export');
 

+  setup_datev_export2_action_bar();
+

   $::form->header;
   print $::form->parse_html_template('datev/export_bewegungsdaten');
 
   $::form->header;
   print $::form->parse_html_template('datev/export_bewegungsdaten');
 


@@ -80,6 +85,8 @@ sub export_stammdaten {
   $::lxdebug->enter_sub;
   $::auth->assert('datev_export');
 
   $::lxdebug->enter_sub;
   $::auth->assert('datev_export');
 

+  setup_datev_export2_action_bar();
+

   $::form->header;
   print $::form->parse_html_template('datev/export_stammdaten');
 
   $::form->header;
   print $::form->parse_html_template('datev/export_stammdaten');
 


@@ -115,8 +122,10 @@ sub export3 {
   $datev->export;
 
   if (!$datev->errors) {
   $datev->export;
 
   if (!$datev->errors) {

+    setup_datev_export3_action_bar(download_token => $datev->download_token);
+

     $::form->header;
     $::form->header;

-    print $::form->parse_html_template('datev/export3', { datev => $datev });
+    print $::form->parse_html_template('datev/export3');

   } else {
     $::form->error("Export schlug fehl.\n" . join "\n", $datev->errors);
   }
   } else {
     $::form->error("Export schlug fehl.\n" . join "\n", $datev->errors);
   }


@@ -199,3 +208,52 @@ sub _get_dates {
 
   return ($fromdate, $todate);
 }
 
   return ($fromdate, $todate);
 }

+
+sub setup_datev_export_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Continue'),
+        submit    => [ '#form', { action => 'export2' } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+
+sub setup_datev_export2_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Export'),
+        submit    => [ '#form', { action => 'export3' } ],
+        accesskey => 'enter',
+      ],
+      action => [
+        t8('Back'),
+        call => [ 'kivi.history_back' ],
+      ],
+    );
+  }
+}
+
+sub setup_datev_export3_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      link => [
+        t8('Download'),
+        link => [ 'datev.pl?action=download&download_token=' . $::form->escape($params{download_token}) ],
+      ],
+      action => [
+        t8('Back'),
+        call => [ 'kivi.history_back' ],
+      ],
+    );
+  }
+}

diff --git a/locale/de/all b/locale/de/all
index 7f22f7b2adda46ffdf4668e13a0555f88359aa1a..c6796fc52558bffd543e744dd4d3258abf9062c8 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1015,6 +1015,7 @@ $self->{texts} = {
   'Done'                        => 'Fertig',
   'Done.'                       => 'Fertig.',
   'Double partnumbers'          => 'Doppelte Artikelnummern',
   'Done'                        => 'Fertig',
   'Done.'                       => 'Fertig.',
   'Double partnumbers'          => 'Doppelte Artikelnummern',

+  'Download'                    => 'Download',

   'Download PDF'                => 'PDF herunterladen',
   'Download PDF, do not print'  => 'Nicht drucken, sondern PDF herunterladen',
   'Download SEPA XML export file' => 'SEPA-XML-Exportdatei herunterladen',
   'Download PDF'                => 'PDF herunterladen',
   'Download PDF, do not print'  => 'Nicht drucken, sondern PDF herunterladen',
   'Download SEPA XML export file' => 'SEPA-XML-Exportdatei herunterladen',

diff --git a/templates/webpages/datev/export.html b/templates/webpages/datev/export.html
index 6381c45bf09c8078e666ff9a40ff76510b024cfa..588309a32b2b026b207fb9e4d72d9293f147d1fd 100644 (file)
--- a/templates/webpages/datev/export.html
+++ b/templates/webpages/datev/export.html
@@ -1,7 +1,7 @@
 [%- USE T8 %]
 <h1>[% 'DATEX - Export Assistent' | $T8 %]</h1>
 
 [%- USE T8 %]
 <h1>[% 'DATEX - Export Assistent' | $T8 %]</h1>
 

-<form method=post action='[% script %]'>
+<form method='post' action='[% script %]' id='form'>

 
 <table width=100%>
   <tr>
 
 <table width=100%>
   <tr>


@@ -54,10 +54,4 @@
     <td><hr size=3 noshade></td>
   </tr>
 </table>
     <td><hr size=3 noshade></td>
   </tr>
 </table>

-
-<input type=hidden name=nextsub value=export2>
-
-<br>
-<input type=submit class=submit name=action value="[% 'Continue' | $T8 %]">

 </form>
 </form>

-

diff --git a/templates/webpages/datev/export3.html b/templates/webpages/datev/export3.html
index 7ea19432826d2edd9839a7026fea50e478a95477..c5fb9d2dfb9db7cc361f4633cefe5459b2877fe0 100644 (file)
--- a/templates/webpages/datev/export3.html
+++ b/templates/webpages/datev/export3.html
@@ -8,8 +8,6 @@
 
   <br><b>[% 'KNE-Export erfolgreich!' | $T8 %]</b>
   <br>
 
   <br><b>[% 'KNE-Export erfolgreich!' | $T8 %]</b>
   <br>

-  <br>
-  <a href="datev.pl?action=download&download_token=[% datev.download_token | html %]">Download</a>

 
 [% IF datev.net_gross_differences.size %]
 [% INCLUDE 'datev/net_gross_difference.html'
 
 [% IF datev.net_gross_differences.size %]
 [% INCLUDE 'datev/net_gross_difference.html'


@@ -17,4 +15,3 @@
   sum_net_gross_differences = datev.sum_net_gross_differences
 %]
 [% END %]
   sum_net_gross_differences = datev.sum_net_gross_differences
 %]
 [% END %]

-

diff --git a/templates/webpages/datev/export_bewegungsdaten.html b/templates/webpages/datev/export_bewegungsdaten.html
index 2593bb447f4ee8071bd0a963f6e3c00dc0f77319..5a3b5627d69d9d8059fddfc23045a6f025c0e171 100644 (file)
--- a/templates/webpages/datev/export_bewegungsdaten.html
+++ b/templates/webpages/datev/export_bewegungsdaten.html
@@ -2,7 +2,7 @@
 [%- USE L %]
 <h1>[% 'DATEX - Export Assistent' | $T8 %]</h1>
 
 [%- USE L %]
 <h1>[% 'DATEX - Export Assistent' | $T8 %]</h1>
 

-<form method=post action="[% script %]">
+<form method="post" action="[% script %]" id="form">

 
 <table width=100%>
   <tr>
 
 <table width=100%>
   <tr>


@@ -69,10 +69,4 @@
 <input type=hidden name=abrechnungsnr value="[% abrechnungsnr %]">
 
 <input type=hidden name=exporttype value="[% exporttype %]">
 <input type=hidden name=abrechnungsnr value="[% abrechnungsnr %]">
 
 <input type=hidden name=exporttype value="[% exporttype %]">

-
-<input type=hidden name=nextsub value=export3>
-
-<br>
-<input type=submit class=submit name=action value="[% 'Continue' | $T8 %]">

 </form>
 </form>

-

diff --git a/templates/webpages/datev/export_stammdaten.html b/templates/webpages/datev/export_stammdaten.html
index 593060b534747248648f3049a5a13db933bdf321..1c7b99821806a962bbab6480f360a2420bfc376f 100644 (file)
--- a/templates/webpages/datev/export_stammdaten.html
+++ b/templates/webpages/datev/export_stammdaten.html
@@ -1,7 +1,7 @@
 [%- USE T8 %]
 <h1>[% 'DATEX - Export Assistent' | $T8 %]</h1>
 
 [%- USE T8 %]
 <h1>[% 'DATEX - Export Assistent' | $T8 %]</h1>
 

-<form method=post action="[% script %]">
+<form method="post" action="[% script %]" id="form">

 <table width=100%>
   <tr>
     <th align=left>[% 'Konten' | $T8 %]</th>
 <table width=100%>
   <tr>
     <th align=left>[% 'Konten' | $T8 %]</th>


@@ -35,10 +35,4 @@
 <input type=hidden name=abrechnungsnr value="[% abrechnungsnr %]">
 
 <input type=hidden name=exporttype value="[% exporttype %]">
 <input type=hidden name=abrechnungsnr value="[% abrechnungsnr %]">
 
 <input type=hidden name=exporttype value="[% exporttype %]">

-
-<input type=hidden name=nextsub value=export3>
-
-<br>
-<input type=submit class=submit name=action value="[% 'Continue' | $T8 %]">

 </form>
 </form>

-