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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-120 / +92 lines)
Lines 8-13 Link Here
8
[% USE TablesSettings %]
8
[% USE TablesSettings %]
9
[% PROCESS 'i18n.inc' %]
9
[% PROCESS 'i18n.inc' %]
10
[% PROCESS 'member-display-address-style.inc' %]
10
[% PROCESS 'member-display-address-style.inc' %]
11
[% PROCESS 'html_helpers.inc' %]
11
[% SET footerjs = 1 %]
12
[% SET footerjs = 1 %]
12
[% BLOCK display_bormessagepref %]
13
[% BLOCK display_bormessagepref %]
13
    [% IF ( bormessagepref ) %]
14
    [% IF ( bormessagepref ) %]
Lines 841-972 Link Here
841
842
842
        <!-- case of simple return no issue or transfer but with a hold  -->
843
        <!-- case of simple return no issue or transfer but with a hold  -->
843
        [% IF ( reserved and !recalled and !waitingrecall ) %]
844
        [% IF ( reserved and !recalled and !waitingrecall ) %]
844
            <!-- reserved -->
845
            <div id="hold-found2" class="modal modal-lg block audio-alert-action" data-bs-backdrop="static" data-bs-keyboard="false">
846
                <div class="modal-dialog">
847
                    <div class="modal-content">
848
                        <form method="post" action="returns.pl" class="confirm">
849
                            [% INCLUDE 'csrf-token.inc' %]
850
845
851
                            <input type="hidden" name="print_slip" value="0" />
846
            [% SET confirm_button_text = '' %]
852
847
            [% SET print_button = '' %]
853
                            <div class="modal-header">
854
                                <h1 class="modal-title">
855
                                    Hold found:
856
                                    <br />
857
                                    <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a>
858
                                    <div class="hold-found-barcode"> (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | uri %]">[% item.barcode | html %]</a>) </div>
859
                                </h1>
860
                            </div>
861
862
                            <div class="modal-body">
863
                                [% IF ( reservenotes ) %]
864
                                    <h4>Notes:</h4>
865
                                    <p>[% reservenotes | html %]</p>
866
                                    <hr />
867
                                [% END %]
868
                                <h5>Hold for:</h5>
869
                                <ul>
870
                                    <li>
871
                                        [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_reserves" %]
872
                                        <span class="patron-category"> - [% patron.category.description | html %]</span>
873
                                    </li>
874
848
875
                                    [% INCLUDE display_holdpatron_address %]
849
            [% IF transfertodo %]
850
                [% confirm_button_text = 'Confirm hold and transfer' %]
851
                [% print_button = '<button type="button" class="btn btn-default print" accesskey="p"> <i class="fa fa-print"></i> Print slip, transfer, and confirm (P) </button>' %]
852
            [% ELSE %]
853
                [% confirm_button_text = 'Confirm hold' %]
854
                [% print_button = '<button type="button" class="btn btn-default print" accesskey="p"> <i class="fa fa-print"></i> Print slip and confirm (P) </button>' %]
855
            [% END %]
876
856
877
                                    [% IF ( patron.phone ) %]
857
            [% SET modal_print_url = reserve_id | uri %]
878
                                        <li>[% patron.phone | html %]</li>
858
            [% modal_print_url = "/cgi-bin/koha/circ/hold-transfer-slip.pl?reserve_id=" _ modal_print_url %]
879
                                    [% END %]
880
859
881
                                    [% IF ( patron.email ) %]
860
            [% WRAPPER modal_wrapper modal_id="hold-found-modal" modal_header_contents='<h1 class="modal-title">Hold found</h1>' modal_confirm_text=confirm_button_text modal_confirm_accesskey="Y" modal_custom_utility_button=print_button modal_deny_text="Ignore" modal_deny_accesskey="I" modal_deny_action="dismiss" %]
882
                                        <li>
861
                <h1>
883
                                            [% IF ( transfertodo ) %]
862
                    <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a>
884
                                                [% patron.email | html %]
863
                    <div class="hold-found-barcode"> (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | uri %]">[% item.barcode | html %]</a>) </div>
885
                                            [% ELSE %]
864
                </h1>
886
                                                <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
865
                [% IF ( reservenotes ) %]
887
                                            [% END %]
866
                    <h4>Notes:</h4>
888
                                        </li>
867
                    <p>[% reservenotes | html %]</p>
889
                                    [% END %]
868
                    <hr />
869
                [% END %]
870
                <h4>Hold for:</h4>
871
                <ul>
872
                    <li>
873
                        [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_reserves" %]
874
                        <span class="patron-category"> - [% patron.category.description | html %]</span>
875
                    </li>
890
876
891
                                    [% UNLESS ( transfertodo) %]
877
                    [% INCLUDE display_holdpatron_address %]
892
                                        [% INCLUDE display_bormessagepref %]
893
                                        [% IF patron.primary_contact_method %]
894
                                            <li id="main_contact_method"
895
                                                >Main contact method:
896
                                                [% SWITCH patron.primary_contact_method %]
897
                                                [% CASE 'phone' %]
898
                                                    <span>Primary phone</span>
899
                                                [% CASE 'phonepro' %]
900
                                                    <span>Secondary phone</span>
901
                                                [% CASE 'mobile' %]
902
                                                    <span>Other phone</span>
903
                                                [% CASE 'email' %]
904
                                                    <span>Primary email</span>
905
                                                [% CASE 'emailpro' %]
906
                                                    <span>Secondary email</span>
907
                                                [% CASE 'fax' %]
908
                                                    <span>Fax</span>
909
                                                [% END %]
910
                                            </li>
911
                                        [% END %]
912
                                    [% END %]
913
878
914
                                    [% IF ( patron.is_debarred ) %]
879
                    [% IF ( patron.phone ) %]
915
                                        <li class="error">Patron is RESTRICTED</li>
880
                        <li>[% patron.phone | html %]</li>
916
                                    [% END %]
881
                    [% END %]
917
882
918
                                    [% IF ( patron.gonenoaddress ) %]
883
                    [% IF ( patron.email ) %]
919
                                        <li class="error">Patron's address is in doubt</li>
884
                        <li>
920
                                    [% END %]
885
                            [% IF ( transfertodo ) %]
921
                                </ul>
886
                                [% patron.email | html %]
922
                                [% IF ( transfertodo ) %]
887
                            [% ELSE %]
923
                                    <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4>
888
                                <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
924
                                [% ELSE %]
889
                            [% END %]
925
                                    <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4>
890
                        </li>
926
                                [% END %]
891
                    [% END %]
927
892
928
                                [% FOREACH checkin IN checkins %]
893
                    [% UNLESS ( transfertodo) %]
929
                                    <input type="hidden" name="checkin_counter" value="[% loop.count | html %]" />
894
                        [% INCLUDE display_bormessagepref %]
930
                                    <input type="hidden" name="checkin_barcode_[% loop.count | html %]" value="[% checkin.barcode | html %]" />
895
                        [% IF patron.primary_contact_method %]
931
                                    <input type="hidden" name="checkin_duedate_[% loop.count | html %]" value="[% checkin.duedate | html %]" />
896
                            <li id="main_contact_method"
932
                                    <input type="hidden" name="checkin_borrowernumber_[% loop.count | html %]" value="[% checkin.borrowernumber | html %]" />
897
                                >Main contact method:
933
                                    <input type="hidden" name="checkin_not_returned_[% loop.count | html %]" value="[% checkin.not_returned | html %]" />
898
                                [% SWITCH patron.primary_contact_method %]
899
                                [% CASE 'phone' %]
900
                                    <span>Primary phone</span>
901
                                [% CASE 'phonepro' %]
902
                                    <span>Secondary phone</span>
903
                                [% CASE 'mobile' %]
904
                                    <span>Other phone</span>
905
                                [% CASE 'email' %]
906
                                    <span>Primary email</span>
907
                                [% CASE 'emailpro' %]
908
                                    <span>Secondary email</span>
909
                                [% CASE 'fax' %]
910
                                    <span>Fax</span>
934
                                [% END %]
911
                                [% END %]
912
                            </li>
913
                        [% END %]
914
                    [% END %]
935
915
936
                                <input type="hidden" name="op" value="cud-affect_reserve" />
916
                    [% IF ( patron.is_debarred ) %]
937
                                <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
917
                        <li class="error">Patron is RESTRICTED</li>
938
                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
918
                    [% END %]
939
                                <input type="hidden" name="biblionumber" value="[% itembiblionumber | html %]" />
940
                                <input type="hidden" name="reserve_id" value="[% reserve_id | html %]" />
941
                                <input type="hidden" name="diffBranch" value="[% destbranch | html %]" />
942
                                <input type="hidden" name="exemptfine" value="[% exemptfine | html %]" />
943
                                <input type="hidden" name="dropboxmode" value="[% dropboxmode | html %]" />
944
                                <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire | html %]" />
945
                                <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
946
                                <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
947
                                [% INCLUDE all_checkin_messages %]
948
                            </div>
949
919
950
                            <div class="modal-footer">
920
                    [% IF ( patron.gonenoaddress ) %]
951
                                [% IF ( transfertodo ) %]
921
                        <li class="error">Patron's address is in doubt</li>
952
                                    <button type="submit" class="btn btn-default approve" accesskey="y"> <i class="fa fa-check"></i> Confirm hold and transfer (Y) </button>
922
                    [% END %]
953
                                    <button type="button" class="btn btn-default print" accesskey="p"> <i class="fa fa-print"></i> Print slip, transfer, and confirm (P) </button>
923
                </ul>
954
                                [% ELSE %]
924
                [% IF ( transfertodo ) %]
955
                                    <button type="submit" class="btn btn-default approve" accesskey="y"> <i class="fa fa-check"></i> Confirm hold (Y) </button>
925
                    <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4>
956
                                    <button type="button" class="btn btn-default print" accesskey="p"> <i class="fa fa-print"></i> Print slip and confirm (P) </button>
926
                [% ELSE %]
957
                                [% END %]
927
                    <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4>
928
                [% END %]
958
929
959
                                <button type="button" data-bs-dismiss="modal" class="btn btn-default deny" accesskey="i"> <i class="fa fa-times"></i> Ignore (I) </button>
930
                [% PROCESS passthrough_data %]
960
                            </div>
931
961
                            <!-- /.modal-footer -->
932
                <input type="hidden" name="op" value="cud-affect_reserve" />
962
                        </form>
933
                <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
963
                        <!-- /.confirm -->
934
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
964
                    </div>
935
                <input type="hidden" name="biblionumber" value="[% itembiblionumber | html %]" />
965
                    <!-- /.modal-content -->
936
                <input type="hidden" name="reserve_id" value="[% reserve_id | html %]" />
966
                </div>
937
                <input type="hidden" name="diffBranch" value="[% destbranch | html %]" />
967
                <!-- /.modal-dialog -->
938
                <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire | html %]" />
968
            </div>
939
                <input type="hidden" name="print_slip" value="0" />
969
            <!-- /#hold-found2 -->
940
                [% INCLUDE all_checkin_messages %]
941
            [% END #/hold-found-modal %]
970
        [% END #/IF reserved %]
942
        [% END #/IF reserved %]
971
943
972
        [% IF ( recalled ) %]
944
        [% IF ( recalled ) %]
Lines 1486-1496 Link Here
1486
        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
1458
        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
1487
        <input type="hidden" name="dropboxmode" value="[% dropboxmode | html %]" />
1459
        <input type="hidden" name="dropboxmode" value="[% dropboxmode | html %]" />
1488
        <input type="hidden" name="exemptfine" value="[% exemptfine | html %]" />
1460
        <input type="hidden" name="exemptfine" value="[% exemptfine | html %]" />
1489
        [% FOREACH inputloo IN inputloop %]
1461
        [% FOREACH checkin IN checkins %]
1490
            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
1462
            <input type="hidden" name="checkin_counter" value="[% loop.count | html %]" />
1491
            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
1463
            <input type="hidden" name="checkin_barcode_[% loop.count | html %]" value="[% checkin.barcode | html %]" />
1492
            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
1464
            <input type="hidden" name="checkin_duedate_[% loop.count | html %]" value="[% checkin.duedate | html %]" />
1493
            <input type="hidden" name="nr-[% inputloo.counter | html %]" value="[% inputloo.not_returned | html %]" />
1465
            <input type="hidden" name="checkin_borrowernumber_[% loop.count | html %]" value="[% checkin.borrowernumber | html %]" />
1466
            <input type="hidden" name="checkin_not_returned_[% loop.count | html %]" value="[% checkin.not_returned | html %]" />
1494
        [% END %]
1467
        [% END %]
1495
    </fieldset>
1468
    </fieldset>
1496
[% END %]
1469
[% END %]
1497
- 

Return to bug 38842