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

(-)a/circ/returns.pl (-1 / +7 lines)
Lines 103-108 my $returned_counter = C4::Context->preference('numReturnedItemsToShow') || 8; Link Here
103
my %returneditems;
103
my %returneditems;
104
my %riduedate;
104
my %riduedate;
105
my %riborrowernumber;
105
my %riborrowernumber;
106
my %rinot_returned;
106
my @inputloop;
107
my @inputloop;
107
foreach ( $query->param ) {
108
foreach ( $query->param ) {
108
    my $counter;
109
    my $counter;
Lines 120-125 foreach ( $query->param ) { Link Here
120
    my $barcode        = $query->param("ri-$counter");
121
    my $barcode        = $query->param("ri-$counter");
121
    my $duedate        = $query->param("dd-$counter");
122
    my $duedate        = $query->param("dd-$counter");
122
    my $borrowernumber = $query->param("bn-$counter");
123
    my $borrowernumber = $query->param("bn-$counter");
124
    my $not_returned   = $query->param("nr-$counter");
123
    $counter++;
125
    $counter++;
124
126
125
    # decode barcode    ## Didn't we already decode them before passing them back last time??
127
    # decode barcode    ## Didn't we already decode them before passing them back last time??
Lines 130-141 foreach ( $query->param ) { Link Here
130
    $returneditems{$counter}    = $barcode;
132
    $returneditems{$counter}    = $barcode;
131
    $riduedate{$counter}        = $duedate;
133
    $riduedate{$counter}        = $duedate;
132
    $riborrowernumber{$counter} = $borrowernumber;
134
    $riborrowernumber{$counter} = $borrowernumber;
135
    $rinot_returned{$counter}   = $not_returned;
133
136
134
    #######################
137
    #######################
135
    $input{counter}        = $counter;
138
    $input{counter}        = $counter;
136
    $input{barcode}        = $barcode;
139
    $input{barcode}        = $barcode;
137
    $input{duedate}        = $duedate;
140
    $input{duedate}        = $duedate;
138
    $input{borrowernumber} = $borrowernumber;
141
    $input{borrowernumber} = $borrowernumber;
142
    $input{not_returned}   = $not_returned;
139
    push( @inputloop, \%input );
143
    push( @inputloop, \%input );
140
}
144
}
141
145
Lines 386-391 if ($barcode && $op eq 'cud-checkin') { Link Here
386
        $returneditems{0}      = $barcode;
390
        $returneditems{0}      = $barcode;
387
        $riborrowernumber{0}   = $borrower->{'borrowernumber'};
391
        $riborrowernumber{0}   = $borrower->{'borrowernumber'};
388
        $riduedate{0}          = $duedate;
392
        $riduedate{0}          = $duedate;
393
        $rinot_returned{0}     = 0;
389
        $input{borrowernumber} = $borrower->{'borrowernumber'};
394
        $input{borrowernumber} = $borrower->{'borrowernumber'};
390
        $input{duedate}        = $duedate;
395
        $input{duedate}        = $duedate;
391
        unless ( $dropboxmode ) {
396
        unless ( $dropboxmode ) {
Lines 429-434 if ($barcode && $op eq 'cud-checkin') { Link Here
429
        }
434
        }
430
        $input{duedate}      = $duedate;
435
        $input{duedate}      = $duedate;
431
        $input{not_returned} = 1;
436
        $input{not_returned} = 1;
437
        $rinot_returned{0}   = 1;
432
        $returneditems{0}    = $barcode;
438
        $returneditems{0}    = $barcode;
433
        $riduedate{0}        = $duedate;
439
        $riduedate{0}        = $duedate;
434
        push( @inputloop, \%input );
440
        push( @inputloop, \%input );
Lines 811-817 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
811
                           # we could handle that better displaying a message in the template
817
                           # we could handle that better displaying a message in the template
812
818
813
819
814
        $ri{not_returned} = 1 unless $returned;
820
        $ri{not_returned} = $rinot_returned{$_};
815
        my $biblio = $item->biblio;
821
        my $biblio = $item->biblio;
816
        # FIXME pass $item to the template and we are done here...
822
        # FIXME pass $item to the template and we are done here...
817
        $ri{itembiblionumber}    = $biblio->biblionumber;
823
        $ri{itembiblionumber}    = $biblio->biblionumber;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +7 lines)
Lines 436-441 Link Here
436
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
436
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
437
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
437
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
438
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
438
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
439
                                                    <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
439
                                                [% END %]
440
                                                [% END %]
440
                                                <button type="submit" class="approve" accesskey="y"><i class="fa fa-check"></i> Yes, checkin (Y)</button>
441
                                                <button type="submit" class="approve" accesskey="y"><i class="fa fa-check"></i> Yes, checkin (Y)</button>
441
                                            </form>
442
                                            </form>
Lines 519-524 Link Here
519
                                            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
520
                                            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
520
                                            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
521
                                            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
521
                                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
522
                                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
523
                                            <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
522
                                            [% END %]
524
                                            [% END %]
523
                                            [% IF item.onloan %]
525
                                            [% IF item.onloan %]
524
                                            <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm checkin and mark missing items as lost</button>
526
                                            <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm checkin and mark missing items as lost</button>
Lines 591-596 Link Here
591
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
593
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
592
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
594
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
593
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
595
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
596
                                                    <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
594
                                                [% END %]
597
                                                [% END %]
595
598
596
                                                <div class="modal-header">
599
                                                <div class="modal-header">
Lines 679-684 Link Here
679
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
682
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
680
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
683
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
681
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
684
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
685
                                                        <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
682
                                                    [% END %]
686
                                                    [% END %]
683
687
684
                                                    <input type="hidden" name="op" value="cud-affect_reserve" />
688
                                                    <input type="hidden" name="op" value="cud-affect_reserve" />
Lines 789-794 Link Here
789
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
793
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
790
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
794
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
791
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
795
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
796
                                                        <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
792
                                                    [% END %]
797
                                                    [% END %]
793
                                                </div> <!-- /.modal-footer -->
798
                                                </div> <!-- /.modal-footer -->
794
                                            </form> <!-- /#mainform -->
799
                                            </form> <!-- /#mainform -->
Lines 873-878 Link Here
873
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
878
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
874
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
879
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
875
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
880
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
881
                                                        <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
876
                                                    [% END %]
882
                                                    [% END %]
877
883
878
                                                    <input type="hidden" name="op" value="cud-affect_reserve" />
884
                                                    <input type="hidden" name="op" value="cud-affect_reserve" />
Lines 1142-1147 Link Here
1142
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
1148
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
1143
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
1149
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
1144
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
1150
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
1151
                                                    <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
1145
                                                [% END %]
1152
                                                [% END %]
1146
                                            </div>
1153
                                            </div>
1147
                                    </div>
1154
                                    </div>
1148
- 

Return to bug 37014