Bug 20912: Rental Fees based on Time Period

[koha.git] / admin / edi_ean_accounts.pl

diff --git a/admin/edi_ean_accounts.pl b/admin/edi_ean_accounts.pl
index 4b32c69..e28457c 100755 (executable)
--- a/admin/edi_ean_accounts.pl
+++ b/admin/edi_ean_accounts.pl
@@ -17,8 +17,7 @@
 # with Koha; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-use strict;
-use warnings;
+use Modern::Perl;
 use CGI;
 use C4::Auth;
 use C4::Output;
@@ -37,12 +36,12 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 my $schema = Koha::Database->new()->schema();
-my $op     = $input->param('op');
-$op ||= 'display';
+
+my $id = scalar $input->param('id');
+my $op = scalar $input->param('op') || 'display';
 
 if ( $op eq 'ean_form' ) {
-    show_ean();
-    $template->param( ean_form => 1 );
+    my $e        = $schema->resultset('EdifactEan')->find($id);
     my @branches = $schema->resultset('Branch')->search(
         undef,
         {
@@ -50,24 +49,47 @@ if ( $op eq 'ean_form' ) {
             order_by => 'branchname',
         }
     );
-    $template->param( branches => \@branches );
+    $template->param(
+        ean_form => 1,
+        branches => \@branches,
+        ean      => $e,
+    );
 }
 elsif ( $op eq 'delete_confirm' ) {
-    show_ean();
-    $template->param( delete_confirm => 1 );
+    my $e = $schema->resultset('EdifactEan')->find($id);
+    $template->param(
+        delete_confirm => 1,
+        ean            => $e,
+    );
 }
 else {
     if ( $op eq 'save' ) {
-        my $change = $input->param('oldean');
+        my $change = $id;
         if ($change) {
-            editsubmit();
+            $schema->resultset('EdifactEan')->find($id)->update(
+                {
+                    branchcode        => scalar $input->param('branchcode') || undef,
+                    description       => scalar $input->param('description'),
+                    ean               => scalar $input->param('ean'),
+                    id_code_qualifier => scalar $input->param('id_code_qualifier'),
+                }
+            );
         }
         else {
-            addsubmit();
+            my $new_ean = $schema->resultset('EdifactEan')->new(
+                {
+                    branchcode        => scalar $input->param('branchcode') || undef,
+                    description       => scalar $input->param('description'),
+                    ean               => scalar $input->param('ean'),
+                    id_code_qualifier => scalar $input->param('id_code_qualifier'),
+                }
+            );
+            $new_ean->insert();
         }
     }
     elsif ( $op eq 'delete_confirmed' ) {
-        delsubmit();
+        my $e = $schema->resultset('EdifactEan')->find($id);
+        $e->delete if $e;
     }
     my @eans = $schema->resultset('EdifactEan')->search(
         {},
@@ -101,61 +123,3 @@ $template->param(
 );
 
 output_html_with_http_headers( $input, $cookie, $template->output );
-
-sub delsubmit {
-    my $ean = $schema->resultset('EdifactEan')->find(
-        {
-            branchcode => $input->param('branchcode'),
-            ean        => $input->param('ean')
-        }
-    );
-    $ean->delete;
-    return;
-}
-
-sub addsubmit {
-
-    my $new_ean = $schema->resultset('EdifactEan')->new(
-        {
-            branchcode        => $input->param('branchcode'),
-            description       => $input->param('description'),
-            ean               => $input->param('ean'),
-            id_code_qualifier => $input->param('id_code_qualifier'),
-        }
-    );
-    $new_ean->insert();
-    return;
-}
-
-sub editsubmit {
-    warn "DESC: " . $input->param('description');
-    $schema->resultset('EdifactEan')->search(
-        {
-            branchcode => $input->param('oldbranchcode'),
-            ean        => $input->param('oldean'),
-        }
-      )->update_all(
-        {
-            branchcode        => $input->param('branchcode'),
-            description       => $input->param('description'),
-            ean               => $input->param('ean'),
-            id_code_qualifier => $input->param('id_code_qualifier'),
-        }
-      );
-    return;
-}
-
-sub show_ean {
-    my $branchcode = $input->param('branchcode');
-    my $ean        = $input->param('ean');
-    if ( $branchcode && $ean ) {
-        my $e = $schema->resultset('EdifactEan')->find(
-            {
-                ean        => $ean,
-                branchcode => $branchcode,
-            }
-        );
-        $template->param( ean => $e );
-    }
-    return;
-}