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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt (-8 / +8 lines)
Lines 321-336 Link Here
321 
                    <input type="radio" id="overwrite_cardnumberyes" name="overwrite_cardnumber" value="1" /><label for="overwrite_cardnumberyes">Overwrite the existing one with this</label>
 321 
                    <input type="radio" id="overwrite_cardnumberyes" name="overwrite_cardnumber" value="1" /><label for="overwrite_cardnumberyes">Overwrite the existing one with this</label>
322 
                    <ul>
 322 
                    <ul>
323 
                        <li>
 323 
                        <li>
324 
                            <input class="overwrite_passwords" type="checkbox" id="overwrite_passwords" name="overwrite_passwords" disabled/>
 324 
                            <label class="update_dateexpiry" for="update_dateexpiry">Renew existing patrons</label>
325 
                            <label class="overwrite_passwords" for="overwrite_passwords">Replace patron passwords with those in the file (blank passwords will be ignored)</label>
 325 
                            <select class="update_dateexpiry" type="select" id="update_dateexpiry" name="update_dateexpiry" disabled/>
326 
                        </li>
 326 
                                <option value="">using the datexpiry value in the file, if present</option>
327 
                        <li>
 327 
                                <option value="dateexpiry">from the current membership expiry date</option>
328 
                            <input class="update_dateexpiry" type="checkbox" id="update_dateexpiry" name="update_dateexpiry" disabled/>
 328 
                                <option value="now">from the current date</option>
329 
                            <label class="update_dateexpiry" for="update_dateexpiry">Update existing patron expiration dates.</label>
 329 
                            </select>
330 
                        </li>
 330 
                        </li>
331 
                        <li>
 331 
                        <li>
332 
                            <input class="update_dateexpiry_from_today" type="checkbox" id="update_dateexpiry_from_today" name="update_dateexpiry_from_today" disabled/>
 332 
                            <input class="overwrite_passwords" type="checkbox" id="overwrite_passwords" name="overwrite_passwords" disabled/>
333 
                            <label class="update_dateexpiry_from_today" for="update_dateexpiry_from_today">Update patron's expiration date based on the current date instead of the patron's enrollment date</label>
 333 
                            <label class="overwrite_passwords" for="overwrite_passwords">Replace patron passwords with those in the file (blank passwords will be ignored)</label>
334 
                        </li>
 334 
                        </li>
335 
                    </ul>
 335 
                    </ul>
336 
                </li>
 336 
                </li>
(-)a/tools/import_borrowers.pl (-5 / +3 lines)
Lines 114-121 if ( $uploadborrowers && length($uploadborrowers) > 0 ) { Link Here
114 
    my $handle   = $input->upload('uploadborrowers');
 114 
    my $handle   = $input->upload('uploadborrowers');
115 
    my %defaults = $input->Vars;
 115 
    my %defaults = $input->Vars;
116 
    my $overwrite_passwords = defined $input->param('overwrite_passwords') ? 1 : 0;
 116 
    my $overwrite_passwords = defined $input->param('overwrite_passwords') ? 1 : 0;
117 
    my $update_dateexpiry = defined $input->param('update_dateexpiry') ? 1 : 0;
 117 
    my $update_dateexpiry = $input->param('update_dateexpiry');
118 
    my $update_dateexpiry_from_today = defined $input->param('update_dateexpiry_from_today') ? 1 : 0;
119 
    my $return = $Import->import_patrons(
 118 
    my $return = $Import->import_patrons(
120 
        {
 119 
        {
121 
            file                         => $handle,
 120 
            file                         => $handle,
Lines 125-132 if ( $uploadborrowers && length($uploadborrowers) > 0 ) { Link Here
125 
            overwrite_passwords          => $overwrite_passwords,
 124 
            overwrite_passwords          => $overwrite_passwords,
126 
            preserve_extended_attributes => scalar $input->param( 'ext_preserve' ) || 0,
 125 
            preserve_extended_attributes => scalar $input->param( 'ext_preserve' ) || 0,
127 
            preserve_fields              => \@preserve_fields,
 126 
            preserve_fields              => \@preserve_fields,
128 
            update_dateexpiry            => $update_dateexpiry,
 127 
            update_dateexpiry            => $update_dateexpiry ? 1 : 0,
129 
            update_dateexpiry_from_today => $update_dateexpiry_from_today,
 128 
            update_dateexpiry_from_today => $update_dateexpiry eq "now" ? 1 : 0,
130 
            send_welcome                 => $welcome_new,
 129 
            send_welcome                 => $welcome_new,
131 
        }
 130 
        }
132 
    );
 131 
    );
133 
-

Return to bug 27920