X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reserve%2Fmodrequest.pl;h=2f0b8d3f28699131d15f0ac8c07a318bed0b024f;hb=cbd95910104e38545ef4371099f3af0584a5f301;hp=f47e1128ace3c7a0ada2b4fccdbfb69419aaec7a;hpb=8ad2c7d7acc3cb0033426bd78928214a22ad9dd1;p=koha.git diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl index f47e1128ac..2f0b8d3f28 100755 --- a/reserve/modrequest.pl +++ b/reserve/modrequest.pl @@ -18,9 +18,9 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# 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; @@ -41,22 +41,24 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); -my @rank=$query->param('rank-request'); -my @biblionumber=$query->param('biblionumber'); -my @borrower=$query->param('borrowernumber'); -my @branch=$query->param('pickup'); -my @itemnumber=$query->param('itemnumber'); +my @reserve_id = $query->param('reserve_id'); +my @rank = $query->param('rank-request'); +my @biblionumber = $query->param('biblionumber'); +my @borrower = $query->param('borrowernumber'); +my @branch = $query->param('pickup'); +my @itemnumber = $query->param('itemnumber'); +my @suspend_until=$query->param('suspend_until'); my $multi_hold = $query->param('multi_hold'); my $biblionumbers = $query->param('biblionumbers'); my $count=@rank; -my $CancelBiblioNumber=$query->param('CancelBiblioNumber'); -my $CancelBorrowerNumber=$query->param('CancelBorrowerNumber'); -my $CancelItemnumber=$query->param('CancelItemnumber'); +my $CancelBiblioNumber = $query->param('CancelBiblioNumber'); +my $CancelBorrowerNumber = $query->param('CancelBorrowerNumber'); +my $CancelItemnumber = $query->param('CancelItemnumber'); # 2 possibilitys : cancel an item reservation, or modify or cancel the queded list -# 1) cancel an item reservation by fonction ModReserveCancelAll (in reserves.pm) +# 1) cancel an item reservation by function ModReserveCancelAll (in reserves.pm) if ($CancelBorrowerNumber) { ModReserveCancelAll($CancelItemnumber, $CancelBorrowerNumber); $biblionumber[0] = $CancelBiblioNumber, @@ -66,9 +68,16 @@ if ($CancelBorrowerNumber) { else { for (my $i=0;$i<$count;$i++){ undef $itemnumber[$i] unless $itemnumber[$i] ne ''; - ModReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$itemnumber[$i]); #from C4::Reserves + ModReserve({ + rank => $rank[$i], + reserve_id => $reserve_id[$i], + branchcode => $branch[$i], + itemnumber => $itemnumber[$i], + suspend_until => $suspend_until[$i] + }); } } + my $from=$query->param('from'); $from ||= q{}; if ( $from eq 'borrower'){