Attachment #168162 for bug #35906

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




    return shift->itemtype;
}

=head3 effective_bookable

  my $bookable = $item->effective_bookable;

Returns the effective bookability of the current item, be that item or itemtype level

=cut

sub effective_bookable {
    my ($self) = @_;

    return defined( $self->bookable ) ? $self->bookable : $self->itemtype->bookable;
}

=head3 orders

  my $orders = $item->orders();




sub filter_by_bookable {
    my ($self) = @_;

    my @bookable_itemtypes = Koha::ItemTypes->search( { bookable => 1 } )->get_column('itemtype');
        C4::Context->preference('item-level_booking') == 1
        ? { bookable => 1 }
        : { itype    => { -in => \'SELECT itemtype FROM itemtypes WHERE bookable = 1' } };

    my ( $where, $attr );
    if ( C4::Context->preference("item-level_itypes") ) {
        $where = [ { bookable => 1 }, { bookable => undef, itype => { -in => \@bookable_itemtypes } } ];
    } else {
        $where = [ { bookable => 1 }, { bookable => undef, 'biblioitem.itemtype' => { -in => \@bookable_itemtypes } } ];
        $attr  = { join => 'biblioitem' };
    }

    return $self->search( $where, $attr );
}

=head3 move_to_biblio

Lines 24-29 properties: Link Here

(-)a/api/v1/swagger/definitions/item.yaml (-3 / +11 lines)
24	- "null"	24	- "null"
25	description: Information about the acquisition source (it is not really a vendor id)	25	description: Information about the acquisition source (it is not really a vendor id)
26	bookable:	26	bookable:
		27	type:
		28	- boolean
		29	- "null"
		30	description: Item level bookability override.
		31	effective_bookable:
27	type: boolean	32	type: boolean
28	description: Allow bookings on this item.	33	description: Allow bookings on this item.
29	home_library_id:	34	home_library_id:
Lines 90-96 properties: Link Here
90	- string	95	- string
91	- "null"	96	- "null"
92	format: date-time	97	format: date-time
93	description: The date and time an item was last marked as withdrawn, NULL if not	98	description:
		99	The date and time an item was last marked as withdrawn, NULL if not
94	withdrawn	100	withdrawn
95	callnumber:	101	callnumber:
96	type:	102	type:
Lines 155-168 properties: Link Here
155	type:	161	type:
156	- string	162	- string
157	- "null"	163	- "null"
158	description: Linked to the CART and PROC temporary locations feature, stores the	164	description:
		165	Linked to the CART and PROC temporary locations feature, stores the
159	permanent shelving location	166	permanent shelving location
160	checked_out_date:	167	checked_out_date:
161	type:	168	type:
162	- string	169	- string
163	- "null"	170	- "null"
164	format: date	171	format: date
165	description: Defines if item is checked out (NULL for not checked out, and checkout	172	description:
		173	Defines if item is checked out (NULL for not checked out, and checkout
166	date for checked out)	174	date for checked out)
167	call_number_source:	175	call_number_source:
168	type:	176	type:

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	- effective_bookable
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"




          enum:
            - +strings
            - biblio
            - effective_bookable
        collectionFormat: csv
      - $ref: "../swagger.yaml#/parameters/match"
      - $ref: "../swagger.yaml#/parameters/order_by"

          type: string
          enum:
            - +strings
            - effective_bookable
        collectionFormat: csv
    consumes:
      - application/json

            * linked_analytics: The item has linked analytic records
            * not_same_branch: The item is blocked by independent branches
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "500":
        description: |
          Internal server error. Possible `error_code` attribute values:

Lines 39-45 my $itemnotes_nonpublic=$cgi->param('itemnotes_nonpublic'); Link Here

(-)a/catalogue/updateitem.pl (-1 / +2 lines)
39	my $withdrawn=$cgi->param('withdrawn');	39	my $withdrawn=$cgi->param('withdrawn');
40	my $damaged=$cgi->param('damaged');	40	my $damaged=$cgi->param('damaged');
41	my $exclude_from_local_holds_priority = $cgi->param('exclude_from_local_holds_priority');	41	my $exclude_from_local_holds_priority = $cgi->param('exclude_from_local_holds_priority');
42	my $bookable = $cgi->param('bookable');	42	my $bookable = $cgi->param('bookable') // q{};
43		43
44	my $confirm=$cgi->param('confirm');	44	my $confirm=$cgi->param('confirm');
45	my $dbh = C4::Context->dbh;	45	my $dbh = C4::Context->dbh;
Lines 77-82 elsif ( $op eq "cud-set_public_note" ) { # i.e., itemnotes parameter passed from Link Here
77	$item->exclude_from_local_holds_priority($exclude_from_local_holds_priority);	77	$item->exclude_from_local_holds_priority($exclude_from_local_holds_priority);
78	$messages = "updated_exclude_from_local_holds_priority=$exclude_from_local_holds_priority&";	78	$messages = "updated_exclude_from_local_holds_priority=$exclude_from_local_holds_priority&";
79	} elsif ( $op eq "cud-set_bookable" && $bookable ne $item_data_hashref->{'bookable'} ) {	79	} elsif ( $op eq "cud-set_bookable" && $bookable ne $item_data_hashref->{'bookable'} ) {
		80	undef($bookable) if $bookable eq "";
80	$item->bookable($bookable);	81	$item->bookable($bookable);
81	} elsif ( $op eq "cud-set_damaged" && $damaged ne $item_data_hashref->{'damaged'}) {	82	} elsif ( $op eq "cud-set_damaged" && $damaged ne $item_data_hashref->{'damaged'}) {
82	$item->damaged($damaged);	83	$item->damaged($damaged);




        my ($args) = @_;
        my ( $dbh, $out ) = @$args{qw(dbh out)};

        $dbh->do(
            q{
        });

        $dbh->do(q{
            ALTER TABLE itemtypes ADD IF NOT EXISTS bookable INT(1) DEFAULT 0
        }
        );

        say $out "Added new system preference 'item-level_booking'";
        say $out "Added column 'itemtypes.bookable'";

        $dbh->do(
            q{
            ALTER TABLE items MODIFY COLUMN bookable tinyint(1) DEFAULT NULL COMMENT 'nullable boolean value defining whether this this item is available for bookings or not'
        }
        );

        say $out "Updated column 'items.bookable' allow nullable";

        $dbh->do(
            q{
            ALTER TABLE deleteditems MODIFY COLUMN bookable tinyint(1) DEFAULT NULL COMMENT 'nullable boolean value defining whether this this item is available for bookings or not'
        }
        );

        say $out "Updated column 'deleteditems.bookable' allow nullable";

    },
};

Lines 352-358 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 lines)
352	('IssueLostItem','alert','Defines what should be done when an attempt is made to issue an item that has been marked as lost.','alert\|confirm\|nothing','Choice'),	352	('IssueLostItem','alert','Defines what should be done when an attempt is made to issue an item that has been marked as lost.','alert\|confirm\|nothing','Choice'),
353	('IssuingInProcess','0',NULL,'If ON, disables fines if the patron is issuing item that accumulate debt','YesNo'),	353	('IssuingInProcess','0',NULL,'If ON, disables fines if the patron is issuing item that accumulate debt','YesNo'),
354	('item-level_itypes','1','','If ON, enables Item-level Itemtype / Issuing Rules','YesNo'),	354	('item-level_itypes','1','','If ON, enables Item-level Itemtype / Issuing Rules','YesNo'),
355	('item-level_booking','1','','If ON, enables Item-level for future booking feature','YesNo'),
356	('itemBarcodeFallbackSearch','0',NULL,'If set, uses scanned item barcodes as a catalogue search if not found as barcodes','YesNo'),	355	('itemBarcodeFallbackSearch','0',NULL,'If set, uses scanned item barcodes as a catalogue search if not found as barcodes','YesNo'),
357	('itemBarcodeInputFilter','','whitespace\|T-prefix\|cuecat\|libsuite8\|EAN13','If set, allows specification of a item barcode input filter','Choice'),	356	('itemBarcodeInputFilter','','whitespace\|T-prefix\|cuecat\|libsuite8\|EAN13','If set, allows specification of a item barcode input filter','Choice'),
358	('itemcallnumber','',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'),	357	('itemcallnumber','',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'),




                        [% END %]
                        <span class="hint">If checked, items will be automatically checked in once they've reached their due date. This feature requires the <code>misc/cronjobs/automatic_checkin.pl</code> cronjob. Ask your system administrator to schedule it.</span>
                </li>
                <li>
                    <label for="bookable">Bookable: </label>
                        [% IF itemtype.bookable %]
                            <input type="checkbox" id="bookable" name="bookable" checked="checked" value="1" />
                        [% ELSE %]
                            <input type="checkbox" id="bookable" name="bookable" value="1" />
                        [% END %]
                        <span class="hint">If checked, all items of this type will be enabled for future bookings unless overridden at the item level.</span>
                </li>
                    </li>
                [% END %]
                <li>
                    <label for="rentalcharge">Rental charge: </label>
                    <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="[% itemtype.rentalcharge | $Price on_editing => 1 %]" min="0" />




                  1: "Do"
                  0: "Don't"
            - place a hold when ordering from a suggestion.
        -
            - Use the type of the
            - pref: item-level_booking
              choices:
                  1: item
                  0: itemtype
            - level to defined witch items can be bookable in future.
    Patron restrictions:
        -
            - pref: PatronRestrictionTypes




                                                    <input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber | html %]" />
                                                    <input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber | html %]" />
                                                    <input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber | html %]" />
                                                    <select name="bookable">
                                                    [% IF ITEM_DAT.bookable == 1 %]
                                                        <option value="">Follow item type</option>
                                                        <option value="1" selected="selected">Yes</option>
                                                        <option value="0">No</option>
                                                    [% ELSIF ITEM_DAT.bookable == 0 %]
                                                        <option value="">Follow item type</option>
                                                        <option value="1">Yes</option>
                                                        <option value="0" selected="selected">No</option>
                                                    [% ELSE %]
                                                        <option value="" selected="selected">Follow item type</option>
                                                        <option value="1">Yes</option>
                                                        <option value="0">No</option>
                                                    [% END %]
                                                    </select>
                                                    <input type="hidden" name="op" value="cud-set_bookable" />
                                                    <input type="submit" name="submit" class="btn btn-primary btn-xs" value="Update" />
                                                </form>
                                            [% ELSE %]
                                                [% IF ITEM_DAT.bookable == 1 %] Yes [% ELSIF ITEM_DAT.bookable == 0 %] No [% ELSE %] Follow item type [% END %]
                                            [% END %]
                                            <span class="hint"> Item type bookable: [% IF ITEM_DAT.effective_itemtype.bookable == 1 %]Yes[% ELSE %]No[% END %]</span>
                                        </li>

                                    </ol> <!-- /.bibliodetails -->




};

subtest 'filter_by_bookable' => sub {
    plan tests => 4;

    $schema->storage->txn_begin;

    t::lib::Mocks::mock_preference('item-level_itypes', 0);

    my $bookable_item_type = $builder->build_object( { class => 'Koha::ItemTypes', value => { bookable => 1 } } );
    my $non_bookable_item_type = $builder->build_object( { class => 'Koha::ItemTypes', value => { bookable => 0 } } );
    my $biblio = $builder->build_sample_biblio({ itemtype => $bookable_item_type->itemtype });

    # bookable items
    my $bookable_item1 = $builder->build_sample_item( { biblionumber => $biblio->biblionumber, itype => $bookable_item_type->itemtype, bookable => 1 } );

    # not bookable items
    my $non_bookable_item1 = $builder->build_sample_item( { biblionumber => $biblio->biblionumber, itype => $non_bookable_item_type->itemtype, bookable => 0 } );
    my $non_bookable_item2 = $builder->build_sample_item( { biblionumber => $biblio->biblionumber, itype => $non_bookable_item_type->itemtype, bookable => 0 } );

    is( $biblio->items->filter_by_bookable->count, 1, "filter_by_bookable returns the correct number of items set at item level" );
    is(
        $biblio->items->filter_by_bookable->next->itemnumber, $bookable_item1->itemnumber,
        "the correct item is returned from filter_by_bookable at the item level"
    );

    $bookable_item1->bookable(undef)->store();
    $non_bookable_item1->bookable(undef)->store();
    $non_bookable_item2->bookable(undef)->store();
    $biblio->get_from_storage;
    is( $biblio->items->filter_by_bookable->count, 3, "filter_by_bookable returns the correct number of items when not set at item level and using biblio level itemtypes" );
    my $biblio2   = $builder->build_sample_biblio( { itemtype => $item_type->itemtype } );

    t::lib::Mocks::mock_preference('item-level_itypes', 1);
    is( $biblio->items->filter_by_bookable->count, 1, "filter_by_bookable returns the correct number of items when not set at item level and using item level itemtypes" );
        { biblionumber => $biblio2->biblionumber, itype => $item_type->itemtype, bookable => 1 } );
    my $bookable_item4 = $builder->build_sample_item(
        { biblionumber => $biblio2->biblionumber, itype => $item_type->itemtype, bookable => 0 } );

    # items are bookable even if bookable => 0 on item (due to itemtype bookable => 1)
    is( $biblio2->items->filter_by_bookable->count, 2, "filter_by_bookable returns the correct number of items" );

    $schema->storage->txn_rollback;

};
- 

Return to bug 35906

Lines 1832-1837 sub item_type { Link Here

(-)a/Koha/Item.pm (+14 lines)
1832	return shift->itemtype;	1832	return shift->itemtype;
1833	}	1833	}
1834		1834
		1835	=head3 effective_bookable
		1836
		1837	my $bookable = $item->effective_bookable;
		1838
		1839	Returns the effective bookability of the current item, be that item or itemtype level
		1840
		1841	=cut
		1842
		1843	sub effective_bookable {
		1844	my ($self) = @_;
		1845
		1846	return defined( $self->bookable ) ? $self->bookable : $self->itemtype->bookable;
		1847	}
		1848
1835	=head3 orders	1849	=head3 orders
1836		1850
1837	my $orders = $item->orders();	1851	my $orders = $item->orders();

Lines 258-274 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt (-11 / +9 lines)
258	[% END %]	258	[% END %]
259	<span class="hint">If checked, items will be automatically checked in once they've reached their due date. This feature requires the <code>misc/cronjobs/automatic_checkin.pl</code> cronjob. Ask your system administrator to schedule it.</span>	259	<span class="hint">If checked, items will be automatically checked in once they've reached their due date. This feature requires the <code>misc/cronjobs/automatic_checkin.pl</code> cronjob. Ask your system administrator to schedule it.</span>
260	</li>	260	</li>
261	[% IF Koha.Preference('item-level_booking') == 0 %]	261	<li>
262	<li>	262	<label for="bookable">Bookable: </label>
263	<label for="bookable">Bookable: </label>	263	[% IF itemtype.bookable %]
264	[% IF itemtype.bookable %]	264	<input type="checkbox" id="bookable" name="bookable" checked="checked" value="1" />
265	<input type="checkbox" id="bookable" name="bookable" checked="checked" value="1" />	265	[% ELSE %]
266	[% ELSE %]	266	<input type="checkbox" id="bookable" name="bookable" value="1" />
267	<input type="checkbox" id="bookable" name="bookable" value="1" />	267	[% END %]
268	[% END %]	268	<span class="hint">If checked, all items of this type will be enabled for future bookings unless overridden at the item level.</span>
269	<span class="hint">If checked, all items of this type will be enabled for future bookings.</span>	269	</li>
270	</li>
271	[% END %]
272	<li>	270	<li>
273	<label for="rentalcharge">Rental charge: </label>	271	<label for="rentalcharge">Rental charge: </label>
274	<input type="text" id="rentalcharge" name="rentalcharge" size="10" value="[% itemtype.rentalcharge \| $Price on_editing => 1 %]" min="0" />	272	<input type="text" id="rentalcharge" name="rentalcharge" size="10" value="[% itemtype.rentalcharge \| $Price on_editing => 1 %]" min="0" />

Lines 1069-1081 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-7 lines)
1069	1: "Do"	1069	1: "Do"
1070	0: "Don't"	1070	0: "Don't"
1071	- place a hold when ordering from a suggestion.	1071	- place a hold when ordering from a suggestion.
1072	-
1073	- Use the type of the
1074	- pref: item-level_booking
1075	choices:
1076	1: item
1077	0: itemtype
1078	- level to defined witch items can be bookable in future.
1079	Patron restrictions:	1072	Patron restrictions:
1080	-	1073	-
1081	- pref: PatronRestrictionTypes	1074	- pref: PatronRestrictionTypes

Lines 359-379 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-5 / +12 lines)
359	<input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber \| html %]" />	359	<input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber \| html %]" />
360	<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber \| html %]" />	360	<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber \| html %]" />
361	<input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber \| html %]" />	361	<input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber \| html %]" />
362	<select name="bookable" [% IF ITEM_DAT.effective_itemtype.bookable == 1 && Koha.Preference('item-level_booking') == 0 %]disabled[% END %]>	362	<select name="bookable">
363	[% IF ITEM_DAT.bookable == 1 \|\| ITEM_DAT.effective_itemtype.bookable == 1 %]	363	[% IF ITEM_DAT.bookable == 1 %]
		364	<option value="">Follow item type</option>
364	<option value="1" selected="selected">Yes</option>	365	<option value="1" selected="selected">Yes</option>
365	<option value="0">No</option>	366	<option value="0">No</option>
366	[% ELSE %]	367	[% ELSIF ITEM_DAT.bookable == 0 %]
		368	<option value="">Follow item type</option>
367	<option value="1">Yes</option>	369	<option value="1">Yes</option>
368	<option value="0" selected="selected">No</option>	370	<option value="0" selected="selected">No</option>
369	[% END %]	371	[% ELSE %]
		372	<option value="" selected="selected">Follow item type</option>
		373	<option value="1">Yes</option>
		374	<option value="0">No</option>
		375	[% END %]
370	</select>	376	</select>
371	<input type="hidden" name="op" value="cud-set_bookable" />	377	<input type="hidden" name="op" value="cud-set_bookable" />
372	<input type="submit" name="submit" class="btn btn-primary btn-xs" value="Update" />	378	<input type="submit" name="submit" class="btn btn-primary btn-xs" value="Update" />
373	</form>	379	</form>
374	[% ELSE %]	380	[% ELSE %]
375	[% IF ITEM_DAT.bookable == 1 %] Yes [% ELSE %] No [% END %]	381	[% IF ITEM_DAT.bookable == 1 %] Yes [% ELSIF ITEM_DAT.bookable == 0 %] No [% ELSE %] Follow item type [% END %]
376	[% END %]	382	[% END %]
		383	<span class="hint"> Item type bookable: [% IF ITEM_DAT.effective_itemtype.bookable == 1 %]Yes[% ELSE %]No[% END %]</span>
377	</li>	384	</li>
378		385
379	</ol> <!-- /.bibliodetails -->	386	</ol> <!-- /.bibliodetails -->

Lines 2078-2118 subtest 'filter_by_for_hold' => sub { Link Here

(-)a/t/db_dependent/Koha/Items.t (-23 / +18 lines)
2078	};	2078	};
2079		2079
2080	subtest 'filter_by_bookable' => sub {	2080	subtest 'filter_by_bookable' => sub {
2081	plan tests => 3;	2081	plan tests => 4;
2082		2082
2083	$schema->storage->txn_begin;	2083	$schema->storage->txn_begin;
2084		2084
2085	my $biblio = $builder->build_sample_biblio;	2085	t::lib::Mocks::mock_preference('item-level_itypes', 0);
		2086
		2087	my $bookable_item_type = $builder->build_object( { class => 'Koha::ItemTypes', value => { bookable => 1 } } );
		2088	my $non_bookable_item_type = $builder->build_object( { class => 'Koha::ItemTypes', value => { bookable => 0 } } );
		2089	my $biblio = $builder->build_sample_biblio({ itemtype => $bookable_item_type->itemtype });
2086		2090
2087	# bookable items	2091	# bookable items
2088	my $bookable_item1 = $builder->build_sample_item( { biblionumber => $biblio->biblionumber, bookable => 1 } );	2092	my $bookable_item1 = $builder->build_sample_item( { biblionumber => $biblio->biblionumber, itype => $bookable_item_type->itemtype, bookable => 1 } );
2089		2093
2090	# not bookable items	2094	# not bookable items
2091	my $non_bookable_item1 = $builder->build_sample_item( { biblionumber => $biblio->biblionumber, bookable => 0 } );	2095	my $non_bookable_item1 = $builder->build_sample_item( { biblionumber => $biblio->biblionumber, itype => $non_bookable_item_type->itemtype, bookable => 0 } );
2092	my $non_bookable_item2 = $builder->build_sample_item( { biblionumber => $biblio->biblionumber, bookable => 0 } );	2096	my $non_bookable_item2 = $builder->build_sample_item( { biblionumber => $biblio->biblionumber, itype => $non_bookable_item_type->itemtype, bookable => 0 } );
2093		2097
2094	is( $biblio->items->filter_by_bookable->count, 1, "filter_by_bookable returns the correct number of items" );	2098	is( $biblio->items->filter_by_bookable->count, 1, "filter_by_bookable returns the correct number of items set at item level" );
2095	is(	2099	is(
2096	$biblio->items->filter_by_bookable->next->itemnumber, $bookable_item1->itemnumber,	2100	$biblio->items->filter_by_bookable->next->itemnumber, $bookable_item1->itemnumber,
2097	"the correct item is returned from filter_by_bookable"	2101	"the correct item is returned from filter_by_bookable at the item level"
2098	);	2102	);
2099		2103
2100	# unset level booking on item (for itemtype)	2104	$bookable_item1->bookable(undef)->store();
2101	t::lib::Mocks::mock_preference( 'item-level_booking', 0 );	2105	$non_bookable_item1->bookable(undef)->store();
2102		2106	$non_bookable_item2->bookable(undef)->store();
2103	# test with itemtype directly bookable	2107	$biblio->get_from_storage;
2104	my $item_type = $builder->build_object( { class => 'Koha::ItemTypes', value => { bookable => 1 } } );	2108	is( $biblio->items->filter_by_bookable->count, 3, "filter_by_bookable returns the correct number of items when not set at item level and using biblio level itemtypes" );
2105	my $biblio2 = $builder->build_sample_biblio( { itemtype => $item_type->itemtype } );
2106		2109
2107	# bookable items	2110	t::lib::Mocks::mock_preference('item-level_itypes', 1);
2108	my $bookable_item3 = $builder->build_sample_item(	2111	is( $biblio->items->filter_by_bookable->count, 1, "filter_by_bookable returns the correct number of items when not set at item level and using item level itemtypes" );
2109	{ biblionumber => $biblio2->biblionumber, itype => $item_type->itemtype, bookable => 1 } );
2110	my $bookable_item4 = $builder->build_sample_item(
2111	{ biblionumber => $biblio2->biblionumber, itype => $item_type->itemtype, bookable => 0 } );
2112
2113	# items are bookable even if bookable => 0 on item (due to itemtype bookable => 1)
2114	is( $biblio2->items->filter_by_bookable->count, 2, "filter_by_bookable returns the correct number of items" );
2115		2112
2116	$schema->storage->txn_rollback;	2113	$schema->storage->txn_rollback;
2117
2118	};	2114	};
2119	-

Lines 169-180 Returns a new resultset, containing only those items that are allowed to be book Link Here

(-)a/Koha/Items.pm (-5 / +10 lines)
169	sub filter_by_bookable {	169	sub filter_by_bookable {
170	my ($self) = @_;	170	my ($self) = @_;
171		171
172	my $params =	172	my @bookable_itemtypes = Koha::ItemTypes->search( { bookable => 1 } )->get_column('itemtype');
173	C4::Context->preference('item-level_booking') == 1
174	? { bookable => 1 }
175	: { itype => { -in => \'SELECT itemtype FROM itemtypes WHERE bookable = 1' } };
176		173
177	return $self->search($params);	174	my ( $where, $attr );
		175	if ( C4::Context->preference("item-level_itypes") ) {
		176	$where = [ { bookable => 1 }, { bookable => undef, itype => { -in => \@bookable_itemtypes } } ];
		177	} else {
		178	$where = [ { bookable => 1 }, { bookable => undef, 'biblioitem.itemtype' => { -in => \@bookable_itemtypes } } ];
		179	$attr = { join => 'biblioitem' };
		180	}
		181
		182	return $self->search( $where, $attr );
178	}	183	}
179		184
180	=head3 move_to_biblio	185	=head3 move_to_biblio

Lines 22-27 Link Here

(-)a/api/v1/swagger/paths/items.yaml (-1 / +3 lines)
22	enum:	22	enum:
23	- +strings	23	- +strings
24	- biblio	24	- biblio
		25	- effective_bookable
25	collectionFormat: csv	26	collectionFormat: csv
26	- $ref: "../swagger.yaml#/parameters/match"	27	- $ref: "../swagger.yaml#/parameters/match"
27	- $ref: "../swagger.yaml#/parameters/order_by"	28	- $ref: "../swagger.yaml#/parameters/order_by"
Lines 81-86 Link Here
81	type: string	82	type: string
82	enum:	83	enum:
83	- +strings	84	- +strings
		85	- effective_bookable
84	collectionFormat: csv	86	collectionFormat: csv
85	consumes:	87	consumes:
86	- application/json	88	- application/json
Lines 150-156 Link Here
150	* linked_analytics: The item has linked analytic records	152	* linked_analytics: The item has linked analytic records
151	* not_same_branch: The item is blocked by independent branches	153	* not_same_branch: The item is blocked by independent branches
152	schema:	154	schema:
153	$ref: "../swagger.yaml#/definitions/error"	155	$ref: "../swagger.yaml#/definitions/error"
154	"500":	156	"500":
155	description: \|	157	description: \|
156	Internal server error. Possible `error_code` attribute values:	158	Internal server error. Possible `error_code` attribute values:

Lines 7-21 return { Link Here

(-)a/installer/data/mysql/atomicupdate/Bug_35906_add-column-bookable-itemtype.pl (-7 / +21 lines)
7	my ($args) = @_;	7	my ($args) = @_;
8	my ( $dbh, $out ) = @$args{qw(dbh out)};	8	my ( $dbh, $out ) = @$args{qw(dbh out)};
9		9
10	$dbh->do(q{	10	$dbh->do(
11	INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('item-level_booking', 1, '', 'enables item type level for future booking', 'YesNo');	11	q{
12	});
13
14	$dbh->do(q{
15	ALTER TABLE itemtypes ADD IF NOT EXISTS bookable INT(1) DEFAULT 0	12	ALTER TABLE itemtypes ADD IF NOT EXISTS bookable INT(1) DEFAULT 0
16	});	13	}
		14	);
17		15
18	say $out "Added new system preference 'item-level_booking'";
19	say $out "Added column 'itemtypes.bookable'";	16	say $out "Added column 'itemtypes.bookable'";
		17
		18	$dbh->do(
		19	q{
		20	ALTER TABLE items MODIFY COLUMN bookable tinyint(1) DEFAULT NULL COMMENT 'nullable boolean value defining whether this this item is available for bookings or not'
		21	}
		22	);
		23
		24	say $out "Updated column 'items.bookable' allow nullable";
		25
		26	$dbh->do(
		27	q{
		28	ALTER TABLE deleteditems MODIFY COLUMN bookable tinyint(1) DEFAULT NULL COMMENT 'nullable boolean value defining whether this this item is available for bookings or not'
		29	}
		30	);
		31
		32	say $out "Updated column 'deleteditems.bookable' allow nullable";
		33
20	},	34	},
21	};	35	};

Lines 2750-2756 CREATE TABLE `deleteditems` ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (-2 / +2 lines)
2750	`biblionumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from biblio table used to link this item to the right bib record',	2750	`biblionumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from biblio table used to link this item to the right bib record',
2751	`biblioitemnumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from the biblioitems table to link to item to additional information',	2751	`biblioitemnumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from the biblioitems table to link to item to additional information',
2752	`barcode` varchar(20) DEFAULT NULL COMMENT 'item barcode (MARC21 952$p)',	2752	`barcode` varchar(20) DEFAULT NULL COMMENT 'item barcode (MARC21 952$p)',
2753	`bookable` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'boolean value defining whether this this item is available for bookings or not',	2753	`bookable` tinyint(1) DEFAULT NULL COMMENT 'nullable boolean value defining whether this this item is available for bookings or not',
2754	`dateaccessioned` date DEFAULT NULL COMMENT 'date the item was acquired or added to Koha (MARC21 952$d)',	2754	`dateaccessioned` date DEFAULT NULL COMMENT 'date the item was acquired or added to Koha (MARC21 952$d)',
2755	`booksellerid` longtext DEFAULT NULL COMMENT 'where the item was purchased (MARC21 952$e)',	2755	`booksellerid` longtext DEFAULT NULL COMMENT 'where the item was purchased (MARC21 952$e)',
2756	`homebranch` varchar(10) DEFAULT NULL COMMENT 'foreign key from the branches table for the library that owns this item (MARC21 952$a)',	2756	`homebranch` varchar(10) DEFAULT NULL COMMENT 'foreign key from the branches table for the library that owns this item (MARC21 952$a)',
Lines 4008-4014 CREATE TABLE `items` ( Link Here
4008	`biblionumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from biblio table used to link this item to the right bib record',	4008	`biblionumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from biblio table used to link this item to the right bib record',
4009	`biblioitemnumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from the biblioitems table to link to item to additional information',	4009	`biblioitemnumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from the biblioitems table to link to item to additional information',
4010	`barcode` varchar(20) DEFAULT NULL COMMENT 'item barcode (MARC21 952$p)',	4010	`barcode` varchar(20) DEFAULT NULL COMMENT 'item barcode (MARC21 952$p)',
4011	`bookable` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'boolean value defining whether this this item is available for bookings or not',	4011	`bookable` tinyint(1) DEFAULT NULL COMMENT 'nullable boolean value defining whether this this item is available for bookings or not',
4012	`dateaccessioned` date DEFAULT NULL COMMENT 'date the item was acquired or added to Koha (MARC21 952$d)',	4012	`dateaccessioned` date DEFAULT NULL COMMENT 'date the item was acquired or added to Koha (MARC21 952$d)',
4013	`booksellerid` longtext DEFAULT NULL COMMENT 'where the item was purchased (MARC21 952$e)',	4013	`booksellerid` longtext DEFAULT NULL COMMENT 'where the item was purchased (MARC21 952$e)',
4014	`homebranch` varchar(10) DEFAULT NULL COMMENT 'foreign key from the branches table for the library that owns this item (MARC21 952$a)',	4014	`homebranch` varchar(10) DEFAULT NULL COMMENT 'foreign key from the branches table for the library that owns this item (MARC21 952$a)',