[Koha-cvs] koha opac/opac-reserve.pl koha-tmpl/opac-tmpl/n... [rel_2_2]

[Ryan Higgins]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Ryan Higgins <rych>	07/04/17 19:35:14

Modified files:
	opac           : opac-reserve.pl 
	koha-tmpl/opac-tmpl/npl/en: opac-reserve.tmpl 

Log message:
	fix auto-charge of $1.00 reserve fee

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-reserve.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.22.2.9&r2=1.22.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-reserve.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.4&r2=1.1.2.5

Patches:
Index: opac/opac-reserve.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.22.2.9
retrieving revision 1.22.2.10
diff -u -b -r1.22.2.9 -r1.22.2.10
--- opac/opac-reserve.pl	18 Apr 2006 19:49:13 -0000	1.22.2.9
+++ opac/opac-reserve.pl	17 Apr 2007 19:35:14 -0000	1.22.2.10
@@ -200,7 +200,7 @@
 		$proceed = 1;
 	} elsif ($query->param('all')) {
 		$template->param(all => 1);
-		$fee = 1;
+		$fee = 0;
 		$proceed = 1;
 	}
 	if ($proceed && $branch) {

Index: koha-tmpl/opac-tmpl/npl/en/opac-reserve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-reserve.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/opac-tmpl/npl/en/opac-reserve.tmpl	18 Apr 2006 20:42:09 -0000	1.1.2.4
+++ koha-tmpl/opac-tmpl/npl/en/opac-reserve.tmpl	17 Apr 2007 19:35:14 -0000	1.1.2.5
@@ -96,7 +96,7 @@
 <!-- /TMPL_IF -->
 		<tr><th>Pick up From: </th><td><!-- TMPL_VAR NAME="branchname" --><input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->"></td></tr>
 </table>
-		<!-- TMPL_IF NAME="fee" -->
+		<!-- TMPL_IF NAME="istherefee" -->
 			<p>Note there will be a reserve charge of <strong>$<!-- TMPL_VAR NAME="fee" --></strong></p>
 		<!-- /TMPL_IF -->
 </div>