Attachment #83382 for bug #19458

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

Lines 195-200 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (+4 lines)
195	</div>	195	</div>
196	<input type="hidden" name="op" value="checkout" />	196	<input type="hidden" name="op" value="checkout" />
197	<input type="hidden" name="patronid" value="[% patronid \| html %]" />	197	<input type="hidden" name="patronid" value="[% patronid \| html %]" />
		198	<input type="hidden" name="newissues" value="[% newissues \| html %]" />
198	</fieldset>	199	</fieldset>
199	</form>	200	</form>
200		201
Lines 238-243 Link Here
238	<tr>	239	<tr>
239	<td>[% ISSUE.issuedate \| html %]</td>	240	<td>[% ISSUE.issuedate \| html %]</td>
240	<td>	241	<td>
		242	[% IF ( newissues.match(ISSUE.barcode)) %]
		243	<span class="label label-info">NEW</span>
		244	[% END %]
241	[% UNLESS ( noitemlinks ) %]	245	[% UNLESS ( noitemlinks ) %]
242	<a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE. biblionumber \| uri %]">[% ISSUE.title \| html %]</a>	246	<a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE. biblionumber \| uri %]">[% ISSUE.title \| html %]</a>
243	[% ELSE %]	247	[% ELSE %]




}

my $issuerid = $loggedinuser;
my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $newissues) = (
    $query->param("op")         || '',
    $query->param("patronid")   || '',
    $query->param("patronlogin")|| '',
    $query->param("patronpw")   || '',
    $query->param("barcode")    || '',
    $query->param("confirmed")  || '',
    $query->param("newissues")  || '',
);
my @newissueslist = split /,/, $newissues;
my $issuenoconfirm = 1; #don't need to confirm on issue.
my $issuer   = Koha::Patrons->find( $issuerid )->unblessed;
my $item     = GetItem(undef,$barcode);

                )->count;
            }
            AddIssue( $borrower, $barcode );
            push @newissueslist, $barcode;
            print 'Issues \n';
            print join(',', @newissueslist);
            if ( $hold_existed ) {
                my $dtf = Koha::Database->new->schema->storage->datetime_parser;
                $template->param(

} # $op

if ($borrower) {
    print 'borrower \n';
#   warn "issuer's  branchcode: " .   $issuer->{branchcode};
#   warn   "user's  branchcode: " . $borrower->{branchcode};
    my $borrowername = sprintf "%s %s", ($borrower->{firstname} || ''), ($borrower->{surname} || '');

        borrowername => $borrowername,
        issues_count => scalar(@checkouts),
        ISSUES => \@checkouts,
        newissues => join(',',@newissueslist),
        patronid => $patronid,
        patronlogin => $patronlogin,
        patronpw => $patronpw,
- 

Return to bug 19458

Lines 93-107 if (defined C4::Context->preference('AllowSelfCheckReturns')) { Link Here

(-)a/opac/sco/sco-main.pl (-4 / +8 lines)
93	}	93	}
94		94
95	my $issuerid = $loggedinuser;	95	my $issuerid = $loggedinuser;
96	my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed) = (	96	my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $newissues) = (
97	$query->param("op") \|\| '',	97	$query->param("op") \|\| '',
98	$query->param("patronid") \|\| '',	98	$query->param("patronid") \|\| '',
99	$query->param("patronlogin")\|\| '',	99	$query->param("patronlogin")\|\| '',
100	$query->param("patronpw") \|\| '',	100	$query->param("patronpw") \|\| '',
101	$query->param("barcode") \|\| '',	101	$query->param("barcode") \|\| '',
102	$query->param("confirmed") \|\| '',	102	$query->param("confirmed") \|\| '',
		103	$query->param("newissues") \|\| '',
103	);	104	);
104		105	my @newissueslist = split /,/, $newissues;
105	my $issuenoconfirm = 1; #don't need to confirm on issue.	106	my $issuenoconfirm = 1; #don't need to confirm on issue.
106	my $issuer = Koha::Patrons->find( $issuerid )->unblessed;	107	my $issuer = Koha::Patrons->find( $issuerid )->unblessed;
107	my $item = GetItem(undef,$barcode);	108	my $item = GetItem(undef,$barcode);
Lines 215-221 elsif ( $patron and $op eq "checkout" ) { Link Here
215	)->count;	216	)->count;
216	}	217	}
217	AddIssue( $borrower, $barcode );	218	AddIssue( $borrower, $barcode );
218		219	push @newissueslist, $barcode;
		220	print 'Issues \n';
		221	print join(',', @newissueslist);
219	if ( $hold_existed ) {	222	if ( $hold_existed ) {
220	my $dtf = Koha::Database->new->schema->storage->datetime_parser;	223	my $dtf = Koha::Database->new->schema->storage->datetime_parser;
221	$template->param(	224	$template->param(
Lines 245-250 elsif ( $patron and $op eq "checkout" ) { Link Here
245	} # $op	248	} # $op
246		249
247	if ($borrower) {	250	if ($borrower) {
		251	print 'borrower \n';
248	# warn "issuer's branchcode: " . $issuer->{branchcode};	252	# warn "issuer's branchcode: " . $issuer->{branchcode};
249	# warn "user's branchcode: " . $borrower->{branchcode};	253	# warn "user's branchcode: " . $borrower->{branchcode};
250	my $borrowername = sprintf "%s %s", ($borrower->{firstname} \|\| ''), ($borrower->{surname} \|\| '');	254	my $borrowername = sprintf "%s %s", ($borrower->{firstname} \|\| ''), ($borrower->{surname} \|\| '');
Lines 267-272 if ($borrower) { Link Here
267	borrowername => $borrowername,	271	borrowername => $borrowername,
268	issues_count => scalar(@checkouts),	272	issues_count => scalar(@checkouts),
269	ISSUES => \@checkouts,	273	ISSUES => \@checkouts,
		274	newissues => join(',',@newissueslist),
270	patronid => $patronid,	275	patronid => $patronid,
271	patronlogin => $patronlogin,	276	patronlogin => $patronlogin,
272	patronpw => $patronpw,	277	patronpw => $patronpw,
273	-