bug fixing :

[koha-ffzg.git] / admin / issuingrules.pl

diff --git a/admin/issuingrules.pl b/admin/issuingrules.pl
index c27dccb..1bae83e 100755 (executable)
--- a/admin/issuingrules.pl
+++ b/admin/issuingrules.pl
@@ -39,7 +39,7 @@ my $op = $input->param('op');
 # my $flagsrequired;
 # $flagsrequired->{circulation}=1;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "parameters/issuingrules.tmpl",
+    = get_template_and_user({template_name => "admin/issuingrules.tmpl",
                              query => $input,
                              type => "intranet",
                              authnotrequired => 0,
@@ -55,8 +55,8 @@ if ($op eq 'save') {
        my $sth_Fupdate=$dbh->prepare("Update issuingrules set fine=?,firstremind=?,chargeperiod=? where branchcode=? and categorycode=? and itemtype=?");
        my $sth_Fdelete=$dbh->prepare("delete from issuingrules where branchcode=? and categorycode=? and itemtype=? and issuelength=0");
 
-       my $sth_Iinsert = $dbh->prepare("insert into issuingrules (branchcode,categorycode,itemtype,maxissueqty,issuelength) values (?,?,?,?,?)");
-       my $sth_Iupdate=$dbh->prepare("Update issuingrules set maxissueqty=?, issuelength=? where branchcode=? and categorycode=? and itemtype=?");
+       my $sth_Iinsert = $dbh->prepare("insert into issuingrules (branchcode,categorycode,itemtype,maxissueqty,issuelength,rentaldiscount) values (?,?,?,?,?,?)");
+       my $sth_Iupdate=$dbh->prepare("Update issuingrules set maxissueqty=?, issuelength=?, rentaldiscount=? where branchcode=? and categorycode=? and itemtype=?");
        my $sth_Idelete=$dbh->prepare("delete from issuingrules where branchcode=? and categorycode=? and itemtype=? and fine=0");
        foreach my $key (@names){
                # ISSUES
@@ -65,14 +65,14 @@ if ($op eq 'save') {
                        my $bor = $2; # borrower category
                        my $cat = $3; # item type
                        my $data=$input->param($key);
-                       my ($issuelength,$maxissueqty)=split(',',$data);
+                       my ($issuelength,$maxissueqty,$rentaldiscount)=split(',',$data);
 #                      if ($maxissueqty >0) {
                                $sth_search->execute($br,$bor,$cat);
                                my $res = $sth_search->fetchrow_hashref();
                                if ($res->{total}) {
-                                       $sth_Iupdate->execute($maxissueqty,$issuelength,$br,$bor,$cat);
+                                       $sth_Iupdate->execute($maxissueqty,$issuelength,$rentaldiscount,$br,$bor,$cat);
                                } else {
-                                       $sth_Iinsert->execute($br,$bor,$cat,$maxissueqty,$issuelength);
+                                       $sth_Iinsert->execute($br,$bor,$cat,$maxissueqty,$issuelength,$rentaldiscount);
                                }
 #                      } else {
 #                              $sth_Idelete->execute($br,$bor,$cat);
@@ -113,7 +113,7 @@ foreach my $thisbranch (keys %$branches) {
 
 my $sth=$dbh->prepare("Select description,categorycode from categories order by description");
 $sth->execute;
- my @trow3;
+my @trow3;
 my @title_loop;
 # my $i=0;
 while (my $data=$sth->fetchrow_hashref){
@@ -158,11 +158,12 @@ foreach my $data (@itemtypes) {
                my $fine=$dat->{'fine'}+0;
                my $maxissueqty = $dat->{'maxissueqty'}+0;
                my $issuelength = $dat->{'issuelength'}+0;
+               my $rentaldiscount = $dat->{'rentaldiscount'}+0;
                my $finesvalue;
                $finesvalue= "$fine,$dat->{'firstremind'},$dat->{'chargeperiod'}" if $fine+$dat->{'firstremind'}+$dat->{'chargeperiod'}>0;
                my $issuingvalue;
 #              if ($maxissueqty>0) {
-                   $issuingvalue = "$issuelength,$maxissueqty" if $issuelength+$maxissueqty>0;
+                   $issuingvalue = "$issuelength,$maxissueqty,$rentaldiscount" if $issuelength+$maxissueqty>0;
 #              }
 #              else {          
 #                  $issuingvalue = "$issuelength, 5";