Attachment #168309 for bug #27919

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

Lines 450-455 Link Here

(-)a/api/v1/swagger/paths/biblios.yaml (+1 lines)
450	- cover_image_ids	450	- cover_image_ids
451	- item_group_item.item_group.description	451	- item_group_item.item_group.description
452	- serial_item.serial	452	- serial_item.serial
		453	- return_claims
453	collectionFormat: csv	454	collectionFormat: csv
454	- $ref: "../swagger.yaml#/parameters/match"	455	- $ref: "../swagger.yaml#/parameters/match"
455	- $ref: "../swagger.yaml#/parameters/order_by"	456	- $ref: "../swagger.yaml#/parameters/order_by"

Lines 229-234 foreach my $item (@items){ Link Here

(-)a/catalogue/moredetail.pl (+3 lines)
229	$item_info->{paidfor} = { patron => $patron, created_on => $payment_offset->created_on };	229	$item_info->{paidfor} = { patron => $patron, created_on => $payment_offset->created_on };
230	}	230	}
231	}	231	}
		232
		233	my $return_claim = $item->return_claim;
		234	$item_info->{has_return_claim} = 1 if $return_claim;
232	}	235	}
233		236
234	if (C4::Context->preference("IndependentBranches")) {	237	if (C4::Context->preference("IndependentBranches")) {

Lines 1854-1859 i { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+6 lines)
1854	font-style: italic;	1854	font-style: italic;
1855	}	1855	}
1856		1856
		1857	// style for return claim detail in catalogsearch
		1858	.claimed_returned {
		1859	display: block;
		1860	font-style: italic;
		1861	}
		1862
1857	#closewindow {	1863	#closewindow {
1858	margin-top: 2em;	1864	margin-top: 2em;
1859	text-align: center;	1865	text-align: center;

Lines 229-234 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc (+7 lines)
229	[% IF Koha.Preference('UseCourseReserves') %]	229	[% IF Koha.Preference('UseCourseReserves') %]
230	embed.push('course_item.course_reserves.course');	230	embed.push('course_item.course_reserves.course');
231	[% END %]	231	[% END %]
		232	[% IF Koha.Preference('ClaimReturnedLostValue') %]
		233	embed.push('return_claims');
		234	[% END %]
232		235
233	[% IF Koha.Preference('EasyAnalyticalRecords') %]	236	[% IF Koha.Preference('EasyAnalyticalRecords') %]
234	// For host records	237	// For host records
Lines 480-486 Link Here
480		483
481	if ( row.lost_status ) {	484	if ( row.lost_status ) {
482	let lost_lib = av_lost.get(row.lost_status.toString()) \|\| _("Unavailable (lost or missing");	485	let lost_lib = av_lost.get(row.lost_status.toString()) \|\| _("Unavailable (lost or missing");
		486	const hasReturnClaims = row.return_claims.filter(rc => !rc.resolution).length > 0 ? true : false
483	nodes += '<span class="lost">%s</span>'.format(escape_str(lost_lib));	487	nodes += '<span class="lost">%s</span>'.format(escape_str(lost_lib));
		488	if(hasReturnClaims) {
		489	nodes += '<span class="claimed_returned">(Claimed returned)</span>';
		490	}
484	}	491	}
485		492
486	if ( row.withdrawn ) {	493	if ( row.withdrawn ) {




                                                        <input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber | html %]" />
                                                        <input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber | html %]" />

                                                        <select name="itemlost">
                                                        <option value="">Choose</option>
                                                        [% FOREACH itemlostloo IN itemlostloop %]
                                                            [% IF itemlostloo.authorised_value == ITEM_DAT.itemlost %]
                                                                <option value="[% itemlostloo.authorised_value | html %]" selected="selected">[% itemlostloo.lib | html %]</option>
                                                            [% ELSIF ClaimReturnedLostValue && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %]
                                                                <option value="[% itemlostloo.authorised_value | html %]" disabled="disabled" title="Return claims must be processed from the patron details page">[% itemlostloo.lib | html %]</option>
                                                            [% ELSE %]
                                                                <option value="[% itemlostloo.authorised_value | html %]">[% itemlostloo.lib | html %]</option>
                                                                [% ELSIF ClaimReturnedLostValue && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %]
                                                                    <option value="[% itemlostloo.authorised_value | html %]" disabled="disabled" title="Return claims must be processed from the patron details page">[% itemlostloo.lib | html %]</option>
                                                                [% ELSE %]
                                                                    <option value="[% itemlostloo.authorised_value | html %]">[% itemlostloo.lib | html %]</option>
                                                                [% END %]
                                                            [% END %]
                                                        [% END %]
                                                        </select>
                                                        <input type="hidden" name="withdrawn" value="[% ITEM_DAT.withdrawn | html %]" />
                                                        <input type="hidden" name="damaged" value="[% ITEM_DAT.damaged | html %]" />

                                                        <input type="hidden" name="op" value="cud-set_lost" />
                                                        <input type="submit" name="submit" class="btn btn-primary btn-xs" value="Set status" />
                                                        [% IF ClaimReturnedLostValue && ITEM_DAT.has_return_claim %]
                                                            <p class="help-block">Item has been claimed as returned.</p>
                                                        [% ELSE %]
                                                            <input type="hidden" name="op" value="cud-set_lost" />
                                                            <input type="submit" name="submit" class="btn btn-primary btn-xs" value="Set status" />
                                                        [% END %]
                                                    </form>
                                                [% ELSE %]
- 

Return to bug 27919

Lines 211-241 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-20 / +13 lines)
211	<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber \| html %]" />	211	<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber \| html %]" />
212	<input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber \| html %]" />	212	<input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber \| html %]" />
213		213
214	[% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %]	214	<select name="itemlost">
215	<select name="itemlost" disabled="disabled">	215	<option value="">Choose</option>
216	[% ELSE %]	216	[% FOREACH itemlostloo IN itemlostloop %]
217	<select name="itemlost">	217	[% IF itemlostloo.authorised_value == ITEM_DAT.itemlost %]
218	[% END %]	218	<option value="[% itemlostloo.authorised_value \| html %]" selected="selected">[% itemlostloo.lib \| html %]</option>
219	<option value="">Choose</option>	219	[% ELSIF ClaimReturnedLostValue && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %]
220	[% FOREACH itemlostloo IN itemlostloop %]	220	<option value="[% itemlostloo.authorised_value \| html %]" disabled="disabled" title="Return claims must be processed from the patron details page">[% itemlostloo.lib \| html %]</option>
221	[% IF itemlostloo.authorised_value == ITEM_DAT.itemlost %]	221	[% ELSE %]
222	<option value="[% itemlostloo.authorised_value \| html %]" selected="selected">[% itemlostloo.lib \| html %]</option>	222	<option value="[% itemlostloo.authorised_value \| html %]">[% itemlostloo.lib \| html %]</option>
223	[% ELSIF ClaimReturnedLostValue && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %]
224	<option value="[% itemlostloo.authorised_value \| html %]" disabled="disabled" title="Return claims must be processed from the patron details page">[% itemlostloo.lib \| html %]</option>
225	[% ELSE %]
226	<option value="[% itemlostloo.authorised_value \| html %]">[% itemlostloo.lib \| html %]</option>
227	[% END %]
228	[% END %]	223	[% END %]
		224	[% END %]
229	</select>	225	</select>
230	<input type="hidden" name="withdrawn" value="[% ITEM_DAT.withdrawn \| html %]" />	226	<input type="hidden" name="withdrawn" value="[% ITEM_DAT.withdrawn \| html %]" />
231	<input type="hidden" name="damaged" value="[% ITEM_DAT.damaged \| html %]" />	227	<input type="hidden" name="damaged" value="[% ITEM_DAT.damaged \| html %]" />
232		228
233	[% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %]	229	<input type="hidden" name="op" value="cud-set_lost" />
234	<input type="submit" name="submit" class="submit" value="Set status" disabled="disabled"/>	230	<input type="submit" name="submit" class="btn btn-primary btn-xs" value="Set status" />
		231	[% IF ClaimReturnedLostValue && ITEM_DAT.has_return_claim %]
235	<p class="help-block">Item has been claimed as returned.</p>	232	<p class="help-block">Item has been claimed as returned.</p>
236	[% ELSE %]
237	<input type="hidden" name="op" value="cud-set_lost" />
238	<input type="submit" name="submit" class="btn btn-primary btn-xs" value="Set status" />
239	[% END %]	233	[% END %]
240	</form>	234	</form>
241	[% ELSE %]	235	[% ELSE %]
242	-