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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-12 / +12 lines)
Lines 13-30 Link Here
13
            </tr>
13
            </tr>
14
        </thead>
14
        </thead>
15
15
16
        <tfoot>
17
        <tr>
18
            [%- IF ENABLE_OPAC_PAYMENTS -%]
19
                [%- SET COLSPAN = 4 -%]
20
            [%- ELSE -%]
21
                [%- SET COLSPAN = 3 -%]
22
            [%- END -%]
23
            <th class="sum" colspan="[% COLSPAN | html %]">Total due</th>
24
            <td class="sum">[% total | $Price %]</td>
25
        </tr>
26
        </tfoot>
27
28
        <tbody>
16
        <tbody>
29
            [% FOREACH ACCOUNT_LINE IN ACCOUNT_LINES %]
17
            [% FOREACH ACCOUNT_LINE IN ACCOUNT_LINES %]
30
                [% IF ( ACCOUNT_LINE.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
18
                [% IF ( ACCOUNT_LINE.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
Lines 72-77 Link Here
72
            [% END %]
60
            [% END %]
73
        </tbody>
61
        </tbody>
74
62
63
        <tfoot>
64
            <tr>
65
                [%- IF ENABLE_OPAC_PAYMENTS -%]
66
                    [%- SET COLSPAN = 4 -%]
67
                [%- ELSE -%]
68
                    [%- SET COLSPAN = 3 -%]
69
                [%- END -%]
70
                <th class="sum" colspan="[% COLSPAN | html %]">Total due</th>
71
                <td class="sum">[% total | $Price %]</td>
72
            </tr>
73
        </tfoot>
74
75
    </table>
75
    </table>
76
76
77
        [% IF ENABLE_OPAC_PAYMENTS && DISPLAY_PAYMENT_BLOCK %]
77
        [% IF ENABLE_OPAC_PAYMENTS && DISPLAY_PAYMENT_BLOCK %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-144 / +143 lines)
Lines 32-199 Link Here
32
                </tr>
32
                </tr>
33
            </thead>
33
            </thead>
34
            <tbody>
34
            <tbody>
35
            [% FOREACH HOLD IN HOLDS %]
35
                [% FOREACH HOLD IN HOLDS %]
36
                [% IF ( HOLD.is_waiting ) %]
36
                    [% IF ( HOLD.is_waiting ) %]
37
                    [% IF ( HOLD.is_at_destination ) %]
37
                        [% IF ( HOLD.is_at_destination ) %]
38
                        [% IF ( HOLD.is_found ) %]
38
                            [% IF ( HOLD.is_found ) %]
39
                            <tr class="reserved">
39
                                <tr class="reserved">
40
                            [% ELSE %]
41
                                <tr>
42
                            [% END %]
40
                        [% ELSE %]
43
                        [% ELSE %]
41
                            <tr>
44
                            <tr class="transfered">
42
                        [% END %]
45
                        [% END %]
43
                    [% ELSE %]
46
                    [% ELSE %]
44
                        <tr class="transfered">
47
                        <tr>
45
                    [% END %]
48
                    [% END %]
46
                [% ELSE %]
49
                        <td class="title">
47
                    <tr>
50
                            [% IF ! onlyinfo %]
48
                [% END %]
51
                                <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% HOLD.biblionumber | html %]">
49
                    <td class="title">
52
                                    [% HOLD.biblio.title | html %]
50
                        [% IF ! onlyinfo %]
53
                                    [% FOREACH s IN HOLD.biblio.subtitles %]
51
                        <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% HOLD.biblionumber | html %]">
54
                                        [% s | html %]
52
                            [% HOLD.biblio.title | html %]
55
                                    [% END %]
53
                            [% FOREACH s IN HOLD.biblio.subtitles %]
56
                                    [% HOLD.item.enumchron | html %]
54
                                [% s | html %]
57
                                </a>
55
                            [% END %]
56
                            [% HOLD.item.enumchron | html %]
57
                        </a>
58
                        [% ELSE %]
59
                        <strong>
60
                            [% HOLD.biblio.title | html %]
61
                            [% FOREACH s IN HOLD.biblio.subtitles %]
62
                                [% s | html %]
63
                            [% END %]
64
                            [% HOLD.item.enumchron | html %]
65
                        </strong>
66
                        [% END %]
67
                        [% HOLD.biblio.author | html %]
68
                    </td>
69
                    <td class="reservedate">
70
                        <span title="[% HOLD.reservedate | html %]">
71
                            <span class="tdlabel">Hold date:</span>
72
                            [% HOLD.reservedate | $KohaDates %]
73
                        </span>
74
                    </td>
75
                    <td class="expirationdate">
76
                        [% IF ! HOLD.found %]
77
                            [% IF ( HOLD.expirationdate ) %]
78
                                <span title="[% HOLD.expirationdate | html %]">
79
                                    <span class="tdlabel">Expiration:</span>
80
                                        [% HOLD.expirationdate | $KohaDates %]
81
                                </span>
82
                            [% ELSE %]
58
                            [% ELSE %]
83
                                <span title="0000-00-00">
59
                                <strong>
84
                                    <span class="tdlabel">Expiration:</span>
60
                                    [% HOLD.biblio.title | html %]
85
                                    Never expires
61
                                    [% FOREACH s IN HOLD.biblio.subtitles %]
86
                                </span>
62
                                        [% s | html %]
63
                                    [% END %]
64
                                    [% HOLD.item.enumchron | html %]
65
                                </strong>
87
                            [% END %]
66
                            [% END %]
88
                        [% ELSE %]
67
                            [% HOLD.biblio.author | html %]
89
                            <span title="0000-00-00">-</span>
90
                        [% END %]
91
                    </td>
92
                    [% UNLESS( singleBranchMode) %]
93
                        <td class="branch">
94
                            <span class="tdlabel">Pick up location:</span>
95
                            [% HOLD.branch.branchname | html %]
96
                        </td>
68
                        </td>
97
                    [% END %]
69
                        <td class="reservedate">
98
                    [% IF ( showpriority ) %]
70
                            <span title="[% HOLD.reservedate | html %]">
99
                            <td data-order="[% HOLD.priority | html %]" class="priority">
71
                                <span class="tdlabel">Hold date:</span>
100
                            <span class="tdlabel">Priority:</span>
72
                                [% HOLD.reservedate | $KohaDates %]
101
                            [% HOLD.priority | html %]
73
                            </span>
102
                        </td>
74
                        </td>
103
                    [% END %]
75
                        <td class="expirationdate">
104
                    <td class="status">
76
                            [% IF ! HOLD.found %]
105
                        <span class="tdlabel">Status:</span>
77
                                [% IF ( HOLD.expirationdate ) %]
106
                        [% IF ( HOLD.is_waiting ) %]
78
                                    <span title="[% HOLD.expirationdate | html %]">
107
                            [% IF ( HOLD.is_at_destination ) %]
79
                                        <span class="tdlabel">Expiration:</span>
108
                                [% IF ( HOLD.found ) %]
80
                                            [% HOLD.expirationdate | $KohaDates %]
109
                                    Item waiting at <b> [% HOLD.branch.branchname | html %]</b>
81
                                    </span>
110
                                    [% IF ( HOLD.waitingdate ) %]
111
                                        since [% HOLD.waitingdate | $KohaDates %]
112
                                        [% IF HOLD.expirationdate %]
113
                                            until [% HOLD.expirationdate | $KohaDates %]
114
                                        [% END %]
115
                                    [% END %]
116
                                    <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
117
                                [% ELSE %]
82
                                [% ELSE %]
118
                                    Item waiting to be pulled from <b> [% Branches.GetName( HOLD.branchcode ) | html %]</b>
83
                                    <span title="0000-00-00">
84
                                        <span class="tdlabel">Expiration:</span>
85
                                        Never expires
86
                                    </span>
119
                                [% END %]
87
                                [% END %]
120
                            [% ELSE %]
88
                            [% ELSE %]
121
                                Item in transit to <b> [% Branches.GetName( HOLD.branchcode ) | html %]</b> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
89
                                <span title="0000-00-00">-</span>
122
                            [% END %]
90
                            [% END %]
123
                        [% ELSE %]
91
                        </td>
124
                            [% IF ( HOLD.is_in_transit ) %]
92
                        [% UNLESS( singleBranchMode) %]
125
                                [% SET transfer = HOLD.item.get_transfer %]
93
                            <td class="branch">
126
                                Item in transit from <b> [% Branches.GetName( transfer.frombranch ) | html %]</b> since
94
                                <span class="tdlabel">Pick up location:</span>
127
                                [% transfer.datesent | $KohaDates %]
95
                                [% HOLD.branch.branchname | html %]
128
                            [% ELSIF ( HOLD.suspend ) %]
96
                            </td>
129
                                Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | html %] [% END %]
97
                        [% END %]
130
                            [% ELSE %]
98
                        [% IF ( showpriority ) %]
131
                                [% IF HOLD.itemtype %]
99
                                <td data-order="[% HOLD.priority | html %]" class="priority">
132
                                    Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'
100
                                <span class="tdlabel">Priority:</span>
101
                                [% HOLD.priority | html %]
102
                            </td>
103
                        [% END %]
104
                        <td class="status">
105
                            <span class="tdlabel">Status:</span>
106
                            [% IF ( HOLD.is_waiting ) %]
107
                                [% IF ( HOLD.is_at_destination ) %]
108
                                    [% IF ( HOLD.found ) %]
109
                                        Item waiting at <b> [% HOLD.branch.branchname | html %]</b>
110
                                        [% IF ( HOLD.waitingdate ) %]
111
                                            since [% HOLD.waitingdate | $KohaDates %]
112
                                            [% IF HOLD.expirationdate %]
113
                                                until [% HOLD.expirationdate | $KohaDates %]
114
                                            [% END %]
115
                                        [% END %]
116
                                        <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
117
                                    [% ELSE %]
118
                                        Item waiting to be pulled from <b> [% Branches.GetName( HOLD.branchcode ) | html %]</b>
119
                                    [% END %]
133
                                [% ELSE %]
120
                                [% ELSE %]
134
                                    Pending
121
                                    Item in transit to <b> [% Branches.GetName( HOLD.branchcode ) | html %]</b> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
135
                                [% END %]
122
                                [% END %]
136
                            [% END %]
123
                            [% ELSE %]
137
                        [% END %]
124
                                [% IF ( HOLD.is_in_transit ) %]
138
                    </td>
125
                                    [% SET transfer = HOLD.item.get_transfer %]
139
                    [% IF SuspendHoldsOpac and ! onlyinfo %]
126
                                    Item in transit from <b> [% Branches.GetName( transfer.frombranch ) | html %]</b> since
140
                        <td>
127
                                    [% transfer.datesent | $KohaDates %]
141
                            [% IF ( HOLD.is_cancelable_from_opac ) %]
128
                                [% ELSIF ( HOLD.suspend ) %]
142
                                [% IF HOLD.suspend %]
129
                                    Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | html %] [% END %]
143
                                    <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
144
                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
145
                                        <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-play"></i> Resume</button>
146
                                    </form>
147
                                [% ELSE %]
130
                                [% ELSE %]
148
                                    [% IF AutoResumeSuspendedHolds %]
131
                                    [% IF HOLD.itemtype %]
149
                                        <a class="btn btn-link js-show" href="#suspendModal[% HOLD.reserve_id | html %]" role="button" data-toggle="modal"><i class="fa fa-pause"></i> Suspend</a>
132
                                        Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'
150
                                        [% # hold suspend modal form %]
151
                                        <div id="suspendModal[% HOLD.reserve_id | html %]" class="modal-nojs" tabindex="-1" role="dialog" aria-labelledby="suspendModal[% HOLD.reserve_id | html %]Label" aria-hidden="true">
152
                                            <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
153
                                                <div class="modal-header">
154
                                                    <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
155
                                                    [% IF HOLD.suspend %]
156
                                                        <h3 id="suspendModal[% HOLD.reserve_id | html %]Label">Resume your hold on <i>[% HOLD.biblio.title | html %]</i></h3>
157
                                                    [% ELSE %]
158
                                                        <h3 id="suspendModal[% HOLD.reserve_id | html %]Label">Suspend your hold on <i>[% HOLD.biblio.title | html %]</i></h3>
159
                                                    [% END %]
160
                                                </div>
161
                                                <div class="modal-body">
162
                                                    <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
163
                                                    <label for="suspend_until_[% HOLD.reserve_id | html %]">Suspend until:</label>
164
                                                    <input type="text" name="suspend_until" id="suspend_until_[% HOLD.reserve_id | html %]" class="suspend-until" size="10" />
165
                                                    [% INCLUDE 'date-format.inc' %]
166
                                                    <p class="js-show"><a href="#" onclick="document.getElementById('suspend_until_[% HOLD.reserve_id | html %]').value='';return false;">Clear date to suspend indefinitely</a></p>
167
                                                    <button class="btn btn-mini js-hide" type="submit" name="submit">Suspend</button>
168
                                                </div>
169
                                                <div class="modal-footer">
170
                                                    <button class="btn btn-primary" type="submit" name="submit">Suspend</button>
171
                                                    <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">Cancel</a>
172
                                                </div>
173
                                            </form>
174
                                        </div>  <!-- /#suspendModal[% HOLD.reserve_id | html %] -->
175
                                    [% ELSE %]
133
                                    [% ELSE %]
134
                                        Pending
135
                                    [% END %]
136
                                [% END %]
137
                            [% END %]
138
                        </td>
139
                        [% IF SuspendHoldsOpac and ! onlyinfo %]
140
                            <td>
141
                                [% IF ( HOLD.is_cancelable_from_opac ) %]
142
                                    [% IF HOLD.suspend %]
176
                                        <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
143
                                        <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
177
                                            <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
144
                                            <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
178
                                            <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-pause"></i> Suspend</button>
145
                                            <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-play"></i> Resume</button>
179
                                        </form>
146
                                        </form>
180
                                    [% END # / IF AutoResumeSuspendedHolds %]
147
                                    [% ELSE %]
181
                                [% END # / IF HOLD.suspend %]
148
                                        [% IF AutoResumeSuspendedHolds %]
182
                            [% END # / IF ( HOLD.is_cancelable_from_opac )%]
149
                                            <a class="btn btn-link js-show" href="#suspendModal[% HOLD.reserve_id | html %]" role="button" data-toggle="modal"><i class="fa fa-pause"></i> Suspend</a>
183
                        </td>
150
                                            [% # hold suspend modal form %]
184
                    [% END # / IF SuspendHoldsOpac %]
151
                                            <div id="suspendModal[% HOLD.reserve_id | html %]" class="modal-nojs" tabindex="-1" role="dialog" aria-labelledby="suspendModal[% HOLD.reserve_id | html %]Label" aria-hidden="true">
185
                    [% IF ! onlyinfo %]
152
                                                <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
186
                        <td class="modify">
153
                                                    <div class="modal-header">
187
                            [% IF ( HOLD.is_cancelable_from_opac ) %]
154
                                                        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
188
                                <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
155
                                                        [% IF HOLD.suspend %]
189
                                <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
156
                                                            <h3 id="suspendModal[% HOLD.reserve_id | html %]Label">Resume your hold on <i>[% HOLD.biblio.title | html %]</i></h3>
190
                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
157
                                                        [% ELSE %]
191
                                <button type="submit" name="submit" class="btn btn-mini btn-danger" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"><i class="fa fa-remove"></i> Cancel</button></form>
158
                                                            <h3 id="suspendModal[% HOLD.reserve_id | html %]Label">Suspend your hold on <i>[% HOLD.biblio.title | html %]</i></h3>
192
                            [% END %]
159
                                                        [% END %]
193
                        </td>
160
                                                    </div>
194
                    [% END # / IF onlyinfo %]
161
                                                    <div class="modal-body">
195
                </tr>
162
                                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
196
            [% END # /FOREACH HOLDS %]
163
                                                        <label for="suspend_until_[% HOLD.reserve_id | html %]">Suspend until:</label>
164
                                                        <input type="text" name="suspend_until" id="suspend_until_[% HOLD.reserve_id | html %]" class="suspend-until" size="10" />
165
                                                        [% INCLUDE 'date-format.inc' %]
166
                                                        <p class="js-show"><a href="#" onclick="document.getElementById('suspend_until_[% HOLD.reserve_id | html %]').value='';return false;">Clear date to suspend indefinitely</a></p>
167
                                                        <button class="btn btn-mini js-hide" type="submit" name="submit">Suspend</button>
168
                                                    </div>
169
                                                    <div class="modal-footer">
170
                                                        <button class="btn btn-primary" type="submit" name="submit">Suspend</button>
171
                                                        <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">Cancel</a>
172
                                                    </div>
173
                                                </form>
174
                                            </div>  <!-- /#suspendModal[% HOLD.reserve_id | html %] -->
175
                                        [% ELSE %]
176
                                            <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
177
                                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
178
                                                <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-pause"></i> Suspend</button>
179
                                            </form>
180
                                        [% END # / IF AutoResumeSuspendedHolds %]
181
                                    [% END # / IF HOLD.suspend %]
182
                                [% END # / IF ( HOLD.is_cancelable_from_opac )%]
183
                            </td>
184
                        [% END # / IF SuspendHoldsOpac %]
185
                        [% IF ! onlyinfo %]
186
                            <td class="modify">
187
                                [% IF ( HOLD.is_cancelable_from_opac ) %]
188
                                    <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
189
                                    <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
190
                                    <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
191
                                    <button type="submit" name="submit" class="btn btn-mini btn-danger" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"><i class="fa fa-remove"></i> Cancel</button></form>
192
                                [% END %]
193
                            </td>
194
                        [% END # / IF onlyinfo %]
195
                    </tr>
196
                [% END # /FOREACH HOLDS %]
197
            </tbody>
197
            </tbody>
198
        </table>
198
        </table>
199
199
200
- 

Return to bug 21772