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 385-390 if ($barcode) { Link Here
385
        $returneditems{0}      = $barcode;
389
        $returneditems{0}      = $barcode;
386
        $riborrowernumber{0}   = $borrower->{'borrowernumber'};
390
        $riborrowernumber{0}   = $borrower->{'borrowernumber'};
387
        $riduedate{0}          = $duedate;
391
        $riduedate{0}          = $duedate;
392
        $rinot_returned{0}     = 0;
388
        $input{borrowernumber} = $borrower->{'borrowernumber'};
393
        $input{borrowernumber} = $borrower->{'borrowernumber'};
389
        $input{duedate}        = $duedate;
394
        $input{duedate}        = $duedate;
390
        unless ( $dropboxmode ) {
395
        unless ( $dropboxmode ) {
Lines 428-433 if ($barcode) { Link Here
428
        }
433
        }
429
        $input{duedate}      = $duedate;
434
        $input{duedate}      = $duedate;
430
        $input{not_returned} = 1;
435
        $input{not_returned} = 1;
436
        $rinot_returned{0}   = 1;
431
        $returneditems{0}    = $barcode;
437
        $returneditems{0}    = $barcode;
432
        $riduedate{0}        = $duedate;
438
        $riduedate{0}        = $duedate;
433
        push( @inputloop, \%input );
439
        push( @inputloop, \%input );
Lines 807-813 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
807
                           # we could handle that better displaying a message in the template
813
                           # we could handle that better displaying a message in the template
808
814
809
815
810
        $ri{not_returned} = 1 unless $returned;
816
        $ri{not_returned} = $rinot_returned{$_};
811
        my $biblio = $item->biblio;
817
        my $biblio = $item->biblio;
812
        # FIXME pass $item to the template and we are done here...
818
        # FIXME pass $item to the template and we are done here...
813
        $ri{itembiblionumber}    = $biblio->biblionumber;
819
        $ri{itembiblionumber}    = $biblio->biblionumber;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +7 lines)
Lines 430-435 Link Here
430
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
430
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
431
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
431
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
432
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
432
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
433
                                                    <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
433
                                                [% END %]
434
                                                [% END %]
434
                                                <button type="submit" class="approve" accesskey="y"><i class="fa fa-check"></i> Yes, checkin (Y)</button>
435
                                                <button type="submit" class="approve" accesskey="y"><i class="fa fa-check"></i> Yes, checkin (Y)</button>
435
                                            </form>
436
                                            </form>
Lines 511-516 Link Here
511
                                            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
512
                                            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
512
                                            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
513
                                            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
513
                                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
514
                                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
515
                                            <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
514
                                            [% END %]
516
                                            [% END %]
515
                                            [% IF item.onloan %]
517
                                            [% IF item.onloan %]
516
                                            <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm checkin and mark missing items as lost</button>
518
                                            <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm checkin and mark missing items as lost</button>
Lines 583-588 Link Here
583
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
585
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
584
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
586
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
585
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
587
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
588
                                                    <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
586
                                                [% END %]
589
                                                [% END %]
587
590
588
                                                <div class="modal-header">
591
                                                <div class="modal-header">
Lines 670-675 Link Here
670
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
673
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
671
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
674
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
672
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
675
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
676
                                                        <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
673
                                                    [% END %]
677
                                                    [% END %]
674
678
675
                                                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
679
                                                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
Lines 777-782 Link Here
777
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
781
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
778
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
782
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
779
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
783
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
784
                                                        <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
780
                                                    [% END %]
785
                                                    [% END %]
781
                                                </div> <!-- /.modal-footer -->
786
                                                </div> <!-- /.modal-footer -->
782
                                            </form> <!-- /#mainform -->
787
                                            </form> <!-- /#mainform -->
Lines 860-865 Link Here
860
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
865
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
861
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
866
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
862
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
867
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
868
                                                        <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
863
                                                    [% END %]
869
                                                    [% END %]
864
870
865
                                                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
871
                                                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
Lines 1122-1127 Link Here
1122
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
1128
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
1123
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
1129
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
1124
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
1130
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
1131
                                                    <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
1125
                                                [% END %]
1132
                                                [% END %]
1126
                                            </div>
1133
                                            </div>
1127
                                    </div>
1134
                                    </div>
1128
- 

Return to bug 37014