Attachment #52642 for bug #3669

View | Details | Raw Unified | Return to bug 3669
Collapse All | Expand All

Lines 41-46 my $borrowernumber = $input->param('borrowernumber'); Link Here

(-)a/circ/add_message.pl (-1 / +11 lines)
41	my $branchcode = $input->param('branchcode');	41	my $branchcode = $input->param('branchcode');
42	my $message_type = $input->param('message_type');	42	my $message_type = $input->param('message_type');
43	my $borrower_message = $input->param('borrower_message');	43	my $borrower_message = $input->param('borrower_message');
		44	my $batch = $input->param('batch');
44		45
45	Koha::Patron::Message->new(	46	Koha::Patron::Message->new(
46	{	47	{
Lines 51-55 Koha::Patron::Message->new( Link Here
51	}	52	}
52	)->store;	53	)->store;
53		54
54	my $url = $input->referer() // "/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber";	55	my $url = $input->referer;
		56	if ( $url ) {
		57	if ( $url =~ m\|circulation\.pl$\| ) {
		58	# Trick for POST form from batch checkouts
		59	$url .= "?borrowernumber=$borrowernumber";
		60	$url .= "&batch=1" if $batch;
		61	}
		62	} else {
		63	$url = "/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber";
		64	}
55	print $input->redirect($url);	65	print $input->redirect($url);

Lines 644-649 $template->param( Link Here

(-)a/circ/circulation.pl (+1 lines)
644	is_child => ($borrowernumber && $borrower->{'category_type'} eq 'C'),	644	is_child => ($borrowernumber && $borrower->{'category_type'} eq 'C'),
645	$view => 1,	645	$view => 1,
646	batch_allowed => $batch_allowed,	646	batch_allowed => $batch_allowed,
		647	batch => $batch,
647	AudioAlerts => C4::Context->preference("AudioAlerts"),	648	AudioAlerts => C4::Context->preference("AudioAlerts"),
648	fast_cataloging => $fast_cataloging,	649	fast_cataloging => $fast_cataloging,
649	CircAutoPrintQuickSlip => C4::Context->preference("CircAutoPrintQuickSlip"),	650	CircAutoPrintQuickSlip => C4::Context->preference("CircAutoPrintQuickSlip"),

Lines 248-253 function searchToHold(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (+1 lines)
248	</li>	248	</li>
249	</ol>	249	</ol>
250	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />	250	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
		251	<input type="hidden" name="batch" value="[% batch %]" />
251	<input type="hidden" name="branchcode" value="[% LoginBranchcode %]" />	252	<input type="hidden" name="branchcode" value="[% LoginBranchcode %]" />
252	</fieldset>	253	</fieldset>
253	</div>	254	</div>




    [% END %]
  </div>
[% ELSIF borrower and not checkout_infos %]
  <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl">
    <fieldset id="circ_circulation_issue">
      <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
      <fieldset class="rows">

[% ELSIF borrower %]
  [% IF confirmation_needed && CAN_user_circulate_force_checkout %]
    <h3>Batch checkout confirmation [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3>
    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
  [% ELSE %]
    <h3>Batch checkout information [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] |[% batch %]|[% END %]</h3>
  [% END %]
    <table id="checkout_infos">
      <thead>
- 

Return to bug 3669

Lines 79-85 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-4 / +3 lines)
79	[% END %]	79	[% END %]
80	</div>	80	</div>
81	[% ELSIF borrower and not checkout_infos %]	81	[% ELSIF borrower and not checkout_infos %]
82	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&batch=1">	82	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl">
83	<fieldset id="circ_circulation_issue">	83	<fieldset id="circ_circulation_issue">
84	<label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>	84	<label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
85	<fieldset class="rows">	85	<fieldset class="rows">
Lines 110-118 $(document).ready(function() { Link Here
110	[% ELSIF borrower %]	110	[% ELSIF borrower %]
111	[% IF confirmation_needed && CAN_user_circulate_force_checkout %]	111	[% IF confirmation_needed && CAN_user_circulate_force_checkout %]
112	<h3>Batch checkout confirmation [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3>	112	<h3>Batch checkout confirmation [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3>
113	<form method="post" action="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]" id="mainform" name="mainform" autocomplete="off">	113	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
114	[% ELSE %]	114	[% ELSE %]
115	<h3>Batch checkout information [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3>	115	<h3>Batch checkout information [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] \|[% batch %]\|[% END %]</h3>
116	[% END %]	116	[% END %]
117	<table id="checkout_infos">	117	<table id="checkout_infos">
118	<thead>	118	<thead>
119	-