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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-55 / +55 lines)
Lines 319-364 Link Here
319
                            [% END %]
319
                            [% END %]
320
320
321
                            <div class="row">
321
                            <div class="row">
322
                                <div id="sco_entry_checkout" class="sco_entry col" >
322
                                <div id="sco_entry_checkout" class="sco_entry col">
323
                                    <h4>Check out</h4>
323
                                    <h4>Check out</h4>
324
                                    <form id="mainform" action="/cgi-bin/koha/sco/sco-main.pl" name="mainform" method="post">
324
                                    <form id="mainform" action="/cgi-bin/koha/sco/sco-main.pl" name="mainform" method="post">
325
                                        [% INCLUDE 'csrf-token.inc' %]
325
                                        [% INCLUDE 'csrf-token.inc' %]
326
                                        <fieldset>
326
                                        <fieldset>
327
                                            <legend>Log in to your account</legend>
327
                                            <legend>Log in to your account</legend>
328
                                                <div class="col-md-6">
328
                                            <div class="col-md-6">
329
                                                    [% IF ( Koha.Preference('SelfCheckoutByLogin') ) %]
329
                                                [% IF ( Koha.Preference('SelfCheckoutByLogin') ) %]
330
                                                        <div class="row">
330
                                                    <div class="row">
331
                                                            <div class="col-md-12"> [% PROCESS login_label for="patronlogin" %] </div>
331
                                                        <div class="col-md-12"> [% PROCESS login_label for="patronlogin" %] </div>
332
                                                            <div class="col-md-12">
332
                                                        <div class="col-md-12">
333
                                                                <input type="text" id="patronlogin" class="form-control focus noEnterSubmit" size="20" name="patronlogin" autocomplete="off" />
333
                                                            <input type="text" id="patronlogin" class="form-control focus noEnterSubmit" size="20" name="patronlogin" autocomplete="off" />
334
                                                            </div>
335
                                                            <div class="col-md-12">
336
                                                                <label for="patronpw">Password:</label>
337
                                                            </div>
338
                                                            <div class="col-md-12">
339
                                                                <input type="password" id="patronpw" class="form-control" size="20" name="patronpw" autocomplete="off" />
340
                                                            </div>
341
                                                            <div class="col-md-12">
342
                                                                <button type="submit" class="btn btn-primary">Log in</button>
343
                                                            </div>
344
                                                        </div>
334
                                                        </div>
345
                                                        <!-- /.row -->
335
                                                        <div class="col-md-12">
346
                                                    [% ELSE %]
336
                                                            <label for="patronpw">Password:</label>
347
                                                        <div class="row">
348
                                                            <div class="col-md-12">
349
                                                                <label for="patronid">Please enter your card number:</label>
350
                                                            </div>
351
                                                            <div class="col-md-12">
352
                                                                <input type="text" id="patronid" class="form-control focus" size="20" name="patronid" autocomplete="off" />
353
                                                            </div>
354
                                                            <div class="col-md-12">
355
                                                                <button type="submit" class="btn btn-primary">Submit</button>
356
                                                            </div>
357
                                                        </div>
337
                                                        </div>
358
                                                        <!-- /.row -->
338
                                                        <div class="col-md-12">
359
                                                    [% END %]
339
                                                            <input type="password" id="patronpw" class="form-control" size="20" name="patronpw" autocomplete="off" />
360
                                                </div>
340
                                                        </div>
361
                                                <!-- /.col-md-6 -->
341
                                                        <div class="col-md-12">
342
                                                            <button type="submit" class="btn btn-primary">Log in</button>
343
                                                        </div>
344
                                                    </div>
345
                                                    <!-- /.row -->
346
                                                [% ELSE %]
347
                                                    <div class="row">
348
                                                        <div class="col-md-12">
349
                                                            <label for="patronid">Please enter your card number:</label>
350
                                                        </div>
351
                                                        <div class="col-md-12">
352
                                                            <input type="text" id="patronid" class="form-control focus" size="20" name="patronid" autocomplete="off" />
353
                                                        </div>
354
                                                        <div class="col-md-12">
355
                                                            <button type="submit" class="btn btn-primary">Submit</button>
356
                                                        </div>
357
                                                    </div>
358
                                                    <!-- /.row -->
359
                                                [% END %]
360
                                            </div>
361
                                            <!-- /.col-md-6 -->
362
                                            [% FOREACH INPUT IN INPUTS %]
362
                                            [% FOREACH INPUT IN INPUTS %]
363
                                                <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
363
                                                <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
364
                                            [% END %]
364
                                            [% END %]
Lines 368-401 Link Here
368
                                    <!-- /#mainform -->
368
                                    <!-- /#mainform -->
369
                                </div>
369
                                </div>
370
                                <!-- / #sco_entry_checkout -->
370
                                <!-- / #sco_entry_checkout -->
371
                                <div id="sco_entry_checkin" class="sco_entry col" >
371
                                <div id="sco_entry_checkin" class="sco_entry col">
372
                                    <h4>Check in</h4>
372
                                    <h4>Check in</h4>
373
                                    <form id="barcodeform" action="/cgi-bin/koha/sco/sco-main.pl" name="barcodeform" method="post">
373
                                    <form id="barcodeform" action="/cgi-bin/koha/sco/sco-main.pl" name="barcodeform" method="post">
374
                                        [% INCLUDE 'csrf-token.inc' %]
374
                                        [% INCLUDE 'csrf-token.inc' %]
375
                                        <fieldset>
375
                                        <fieldset>
376
                                                <div class="col-md-6">
376
                                            <div class="col-md-6">
377
                                                    <div class="row">
377
                                                <div class="row">
378
                                                        <div class="col-md-12">
378
                                                    <div class="col-md-12">
379
                                                            <label for="sco_entry_barcode">Please enter barcode:</label>
379
                                                        <label for="sco_entry_barcode">Please enter barcode:</label>
380
                                                        </div>
380
                                                    </div>
381
                                                        <div class="col-md-12">
381
                                                    <div class="col-md-12">
382
                                                            [% IF ( returned == 1 || returned == 0 || empty_return ) %]
382
                                                        [% IF ( returned == 1 || returned == 0 || empty_return ) %]
383
                                                                <input type="text" id="sco_entry_barcode"  class="form-control focus" size="20" name="sco_entry_barcode" autocomplete="off" />
383
                                                            <input type="text" id="sco_entry_barcode" class="form-control focus" size="20" name="sco_entry_barcode" autocomplete="off" />
384
                                                            [% ELSE %]
384
                                                        [% ELSE %]
385
                                                                <input type="text" id="sco_entry_barcode" class="form-control" size="20" name="sco_entry_barcode" autocomplete="off" />
385
                                                            <input type="text" id="sco_entry_barcode" class="form-control" size="20" name="sco_entry_barcode" autocomplete="off" />
386
                                                            [% END %]
386
                                                        [% END %]
387
                                                        </div>
387
                                                    </div>
388
                                                        <div class="col-md-12">
388
                                                    <div class="col-md-12">
389
                                                            <button type="submit" class="btn btn-primary">Submit</button>
389
                                                        <button type="submit" class="btn btn-primary">Submit</button>
390
                                                        </div>
391
                                                    </div>
390
                                                    </div>
392
                                                    <!-- /.row -->
393
                                                    [% FOREACH INPUT IN INPUTS %]
394
                                                    <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]">
395
                                                    [% END %]
396
                                                    <input type="hidden" name="op" value="cud-sco_entry_checkin" />
397
                                                </div>
391
                                                </div>
398
                                                <!-- /.col-md-6 -->
392
                                                <!-- /.row -->
393
                                                [% FOREACH INPUT IN INPUTS %]
394
                                                    <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" />
395
                                                [% END %]
396
                                                <input type="hidden" name="op" value="cud-sco_entry_checkin" />
397
                                            </div>
398
                                            <!-- /.col-md-6 -->
399
                                        </fieldset>
399
                                        </fieldset>
400
                                    </form>
400
                                    </form>
401
                                    <!-- /#barcodeform -->
401
                                    <!-- /#barcodeform -->
(-)a/opac/sco/sco-main.pl (-3 / +3 lines)
Lines 207-213 if ( ( $op eq "cud-sco_entry_checkin" ) || ( $patron && $op eq "cud-returnbook" Link Here
207
207
208
                if ($diff_branch_send) {
208
                if ($diff_branch_send) {
209
                    ModReserveAffect( $itemnumber, $resborrower, $diff_branch_send, $reserve_id );
209
                    ModReserveAffect( $itemnumber, $resborrower, $diff_branch_send, $reserve_id );
210
                    ModItemTransfer( $itemnumber, $branch, $resbranch, 'ResFound' );
210
                    ModItemTransfer( $itemnumber, $branch, $resbranch, 'Reserve' );
211
                } else {
211
                } else {
212
                    my $set_transit = C4::Context->preference('RequireSCCheckInBeforeNotifyingPickups');
212
                    my $set_transit = C4::Context->preference('RequireSCCheckInBeforeNotifyingPickups');
213
                    ModReserveAffect( $itemnumber, $resborrower, $set_transit, $reserve_id );
213
                    ModReserveAffect( $itemnumber, $resborrower, $set_transit, $reserve_id );
Lines 219-226 if ( ( $op eq "cud-sco_entry_checkin" ) || ( $patron && $op eq "cud-returnbook" Link Here
219
            if ( $messages->{'WrongTransfer'} ) {
219
            if ( $messages->{'WrongTransfer'} ) {
220
                my $item         = Koha::Items->find( $messages->{'WrongTransferItem'} );
220
                my $item         = Koha::Items->find( $messages->{'WrongTransferItem'} );
221
                my $old_transfer = $item->get_transfer;
221
                my $old_transfer = $item->get_transfer;
222
                my $to_library   = Koha::Libraries->find( $old_transfer->tobranch );
222
                my $new_transfer = $item->request_transfer(
223
                my $new_transfer = $item->request_transfer(
223
                    { to => $old_transfer->tobranch, reason => $old_transfer->reason, replace => 'WrongTransfer' } );
224
                    { to => $to_library, reason => $old_transfer->reason, replace => 'WrongTransfer' } );
224
            }
225
            }
225
226
226
        }
227
        }
227
- 

Return to bug 22322