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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt (-4 / +24 lines)
Lines 141-155 Link Here
141
                                                <th>First name</th>
141
                                                <th>First name</th>
142
                                                <th>Library</th>
142
                                                <th>Library</th>
143
                                                <th>Patron category</th>
143
                                                <th>Patron category</th>
144
                                                <th>Street number</th>
145
                                                <th>Address</th>
146
                                                <th>Address 2</th>
144
                                                <th>City</th>
147
                                                <th>City</th>
145
                                                <th>State</th>
148
                                                <th>State</th>
146
                                                <th>ZIP/Postal code</th>
149
                                                <th>ZIP/Postal code</th>
147
                                                <th>Country</th>
150
                                                <th>Country</th>
151
                                                <th>Primary email</th>
152
                                                <th>Phone</th>
153
                                                <th>Mobile</th>
148
                                                <th class="title-string">Registration date</th>
154
                                                <th class="title-string">Registration date</th>
149
                                                <th class="title-string">Expiry date</th>
155
                                                <th class="title-string">Expiry date</th>
150
                                                <th>Circulation note</th>
156
                                                <th>Circulation note</th>
151
                                                <th>OPAC note</th>
157
                                                <th>OPAC note</th>
152
                                                <th>Primary email</th>
153
                                                <th>Restriction expiration</th>
158
                                                <th>Restriction expiration</th>
154
                                                <th>Restriction comment</th>
159
                                                <th>Restriction comment</th>
155
                                                [% FOREACH attrh IN attributes_header %]
160
                                                [% FOREACH attrh IN attributes_header %]
Lines 168-182 Link Here
168
                                                    <td>[% borrower.firstname | html %]</td>
173
                                                    <td>[% borrower.firstname | html %]</td>
169
                                                    <td>[% Branches.GetName( borrower.branchcode ) | html %]</td>
174
                                                    <td>[% Branches.GetName( borrower.branchcode ) | html %]</td>
170
                                                    <td>[% Categories.GetName(borrower.categorycode) | html %]</td>
175
                                                    <td>[% Categories.GetName(borrower.categorycode) | html %]</td>
176
                                                    <td>[% borrower.streetnumber | html %]</td>
177
                                                    <td>[% borrower.address | html %]</td>
178
                                                    <td>[% borrower.address2 | html %]</td>
171
                                                    <td>[% borrower.city | html %]</td>
179
                                                    <td>[% borrower.city | html %]</td>
172
                                                    <td>[% borrower.state | html %]</td>
180
                                                    <td>[% borrower.state | html %]</td>
173
                                                    <td>[% borrower.zipcode | html %]</td>
181
                                                    <td>[% borrower.zipcode | html %]</td>
174
                                                    <td>[% borrower.country | html %]</td>
182
                                                    <td>[% borrower.country | html %]</td>
183
                                                    <td>[% borrower.email | html %]</td>
184
                                                    <td>[% borrower.phone | html %]</td>
185
                                                    <td>[% borrower.mobile | html %]</td>
175
                                                    <td><span title="[% borrower.dateenrolled | html %]">[% borrower.dateenrolled | $KohaDates %]</span></td>
186
                                                    <td><span title="[% borrower.dateenrolled | html %]">[% borrower.dateenrolled | $KohaDates %]</span></td>
176
                                                    <td><span title="[% borrower.dateexpiry | html %]">[% borrower.dateexpiry | $KohaDates %]</span></td>
187
                                                    <td><span title="[% borrower.dateexpiry | html %]">[% borrower.dateexpiry | $KohaDates %]</span></td>
177
                                                    <td>[% borrower.borrowernotes | html %]</td>
188
                                                    <td>[% borrower.borrowernotes | html %]</td>
178
                                                    <td>[% borrower.opacnote | html %]</td>
189
                                                    <td>[% borrower.opacnote | html %]</td>
179
                                                    <td>[% borrower.email | html %]</td>
180
                                                    <td><span title="[% borrower.debarred | html %]">[% borrower.debarred | $KohaDates %]</span></td>
190
                                                    <td><span title="[% borrower.debarred | html %]">[% borrower.debarred | $KohaDates %]</span></td>
181
                                                    <td>[% borrower.debarredcomment | html %]</td>
191
                                                    <td>[% borrower.debarredcomment | html %]</td>
182
                                                    [% FOREACH pa IN borrower.patron_attributes %]
192
                                                    [% FOREACH pa IN borrower.patron_attributes %]
Lines 215-220 Link Here
215
                                                Library:
225
                                                Library:
216
                                                [% CASE 'categorycode' %]
226
                                                [% CASE 'categorycode' %]
217
                                                Patron category:
227
                                                Patron category:
228
                                                [% CASE 'streetnumber' %]
229
                                                Street number:
230
                                                [% CASE 'address' %]
231
                                                Address:
232
                                                [% CASE 'address2' %]
233
                                                Address 2:
218
                                                [% CASE 'city' %]
234
                                                [% CASE 'city' %]
219
                                                City:
235
                                                City:
220
                                                [% CASE 'state' %]
236
                                                [% CASE 'state' %]
Lines 223-228 Link Here
223
                                                ZIP/Postal code:
239
                                                ZIP/Postal code:
224
                                                [% CASE 'country' %]
240
                                                [% CASE 'country' %]
225
                                                Country:
241
                                                Country:
242
                                                [% CASE 'email' %]
243
                                                Primary email:
244
                                                [% CASE 'phone' %]
245
                                                Phone:
246
                                                [% CASE 'mobile' %]
247
                                                Mobile:
226
                                                [% CASE 'sort1' %]
248
                                                [% CASE 'sort1' %]
227
                                                Sort 1:
249
                                                Sort 1:
228
                                                [% CASE 'sort2' %]
250
                                                [% CASE 'sort2' %]
Lines 235-242 Link Here
235
                                                Circulation note:
257
                                                Circulation note:
236
                                                [% CASE 'opacnote' %]
258
                                                [% CASE 'opacnote' %]
237
                                                OPAC note:
259
                                                OPAC note:
238
                                                [% CASE 'email' %]
239
                                                Primary email:
240
                                                [% CASE 'debarred' %]
260
                                                [% CASE 'debarred' %]
241
                                                Restriction expiration:
261
                                                Restriction expiration:
242
                                                [% CASE 'debarredcomment' %]
262
                                                [% CASE 'debarredcomment' %]
(-)a/tools/modborrowers.pl (-8 / +37 lines)
Lines 203-208 if ( $op eq 'show' ) { Link Here
203
        }
203
        }
204
        ,
204
        ,
205
        {
205
        {
206
            name => "streetnumber",
207
            type => "text",
208
            mandatory => ( grep /streetnumber/, @mandatoryFields ) ? 1 : 0,
209
        }
210
        ,
211
        {
212
            name => "address",
213
            type => "text",
214
            mandatory => ( grep /address/, @mandatoryFields ) ? 1 : 0,
215
        }
216
        ,
217
        {
218
            name => "address2",
219
            type => "text",
220
            mandatory => ( grep /address2/, @mandatoryFields ) ? 1 : 0,
221
        }
222
        ,
223
        {
206
            name => "city",
224
            name => "city",
207
            type => "text",
225
            type => "text",
208
            mandatory => ( grep /city/, @mandatoryFields ) ? 1 : 0,
226
            mandatory => ( grep /city/, @mandatoryFields ) ? 1 : 0,
Lines 227-232 if ( $op eq 'show' ) { Link Here
227
        }
245
        }
228
        ,
246
        ,
229
        {
247
        {
248
            name => "email",
249
            type => "text",
250
            mandatory => ( grep /email/, @mandatoryFields ) ? 1 : 0,
251
        }
252
        ,
253
        {
254
            name => "phone",
255
            type => "text",
256
            mandatory => ( grep /phone/, @mandatoryFields ) ? 1 : 0,
257
        }
258
        ,
259
        {
260
            name => "mobile",
261
            type => "text",
262
            mandatory => ( grep /mobile/, @mandatoryFields ) ? 1 : 0,
263
        }
264
        ,
265
        {
230
            name => "sort1",
266
            name => "sort1",
231
            type => @sort1_option ? "select" : "text",
267
            type => @sort1_option ? "select" : "text",
232
            option => \@sort1_option,
268
            option => \@sort1_option,
Lines 265-276 if ( $op eq 'show' ) { Link Here
265
        }
301
        }
266
        ,
302
        ,
267
        {
303
        {
268
            name => "email",
269
            type => "text",
270
            mandatory => ( grep /email/, @mandatoryFields ) ? 1 : 0,
271
        }
272
        ,
273
        {
274
            name => "debarred",
304
            name => "debarred",
275
            type => "date",
305
            type => "date",
276
            mandatory => ( grep /debarred/, @mandatoryFields ) ? 1 : 0,
306
            mandatory => ( grep /debarred/, @mandatoryFields ) ? 1 : 0,
Lines 294-300 if ( $op eq 'do' ) { Link Here
294
324
295
    my @disabled = $input->multi_param('disable_input');
325
    my @disabled = $input->multi_param('disable_input');
296
    my $infos;
326
    my $infos;
297
        for my $field ( qw/surname firstname branchcode categorycode city state zipcode country sort1 sort2 dateenrolled dateexpiry borrowernotes opacnote email/ ) {
327
        for my $field ( qw/surname firstname branchcode categorycode streetnumber address address2 city state zipcode country email phone mobile sort1 sort2 dateenrolled dateexpiry borrowernotes opacnote/ ) {
298
        my $value = $input->param($field);
328
        my $value = $input->param($field);
299
        $infos->{$field} = $value if $value;
329
        $infos->{$field} = $value if $value;
300
        $infos->{$field} = "" if grep { /^$field$/ } @disabled;
330
        $infos->{$field} = "" if grep { /^$field$/ } @disabled;
301
- 

Return to bug 20847