Attachment #51960 for bug #3534

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

(-)a/installer/data/mysql/atomicupdate/bug_3534_add_PatronQuickAdd_sysprefs.sql (+1 lines)

Line 0 Link Here

INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('PatronQuickAddFields', '', 'A list of fields separated by "|" to be displayed along with mandatory fields in the patron quick add form if chosen at patron entry', NULL, 'Free');

Lines 381-386 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
381	('PatronSelfRegistrationVerifyByEmail','0',NULL,'If enabled, any patron attempting to register themselves via the OPAC will be required to verify themselves via email to activate his or her account.','YesNo'),	381	('PatronSelfRegistrationVerifyByEmail','0',NULL,'If enabled, any patron attempting to register themselves via the OPAC will be required to verify themselves via email to activate his or her account.','YesNo'),
382	('PatronsPerPage','20','20','Number of Patrons Per Page displayed by default','Integer'),	382	('PatronsPerPage','20','20','Number of Patrons Per Page displayed by default','Integer'),
383	('EnablePayPalOpacPayments', '0', NULL , 'Enables the ability to pay fees and fines from the OPAC via PayPal', 'YesNo' ),	383	('EnablePayPalOpacPayments', '0', NULL , 'Enables the ability to pay fees and fines from the OPAC via PayPal', 'YesNo' ),
		384	('PatronQuickAddFields', '', NULL , 'A list of fields separated by "\|" to be displayed along with mandatory fields in the patron quick add form if chosen at patron entry', 'Free' ),
384	('PayPalChargeDescription', 'Koha fee payment', NULL , 'This preference defines what the user will see the charge listed as in PayPal', 'Free'),	385	('PayPalChargeDescription', 'Koha fee payment', NULL , 'This preference defines what the user will see the charge listed as in PayPal', 'Free'),
385	('PayPalPwd', '', NULL , 'Your PayPal API password', 'Free'),	386	('PayPalPwd', '', NULL , 'Your PayPal API password', 'Free'),
386	('PayPalSandboxMode', '1', NULL , 'If enabled, the system will use PayPal''s sandbox server for testing, rather than the production server.', 'YesNo'),	387	('PayPalSandboxMode', '1', NULL , 'If enabled, the system will use PayPal''s sandbox server for testing, rather than the production server.', 'YesNo'),

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc (+10 lines)
1	[% USE Categories %]	1	[% USE Categories %]
		2	[% USE Koha %]
2	[% SET categories = Categories.all %]	3	[% SET categories = Categories.all %]
3		4
4	[% UNLESS ( no_add ) %]	5	[% UNLESS ( no_add ) %]
Lines 9-16 Link Here
9	[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode %]">[% category.description %]</a></li>[% END %]	10	[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode %]">[% category.description %]</a></li>[% END %]
10	</ul>	11	</ul>
11	</div>	12	</div>
		13	[% IF Koha.Preference('PatronQuickAddFields') \|\| Koha.Preference('BorrowerMandatoryField') %]
		14	<div class="btn-group">
		15	<button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
		16	<ul class="dropdown-menu">
		17	[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode %]&quickadd=true">[% category.description %]</a></li>[% END %]
		18	</ul>
		19	</div>
		20	[% END %]
12	[% IF CAN_user_tools_manage_patron_lists %]	21	[% IF CAN_user_tools_manage_patron_lists %]
13	<a class="btn btn-small" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="fa fa-edit"></i>Patron lists</a>	22	<a class="btn btn-small" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="fa fa-edit"></i>Patron lists</a>
14	[% END %]	23	[% END %]
		24
15	</div>	25	</div>
16	[% END %]	26	[% END %]

Lines 100-105 Patrons: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (+5 lines)
100	class: integer	100	class: integer
101	- results per page in the staff client.	101	- results per page in the staff client.
102	-	102	-
		103	- pref: PatronQuickAddFields
		104	class: multi
		105	- (separate columns with \|)
		106	- "add these fields to the patron quick add form when entering a new patron. Displays only mandatory fields and fields specified here"
		107	-
103	- "Use the SMS::Send::"	108	- "Use the SMS::Send::"
104	- pref: SMSSendDriver	109	- pref: SMSSendDriver
105	- driver to send SMS messages.	110	- driver to send SMS messages.




	[% END %]
});

$(document).ready(function() {

    var toggle_quick_add = $(".toggle_quick_add");
    $(toggle_quick_add).click(function(e){
        toggle_quick_add.toggle();
        e.preventDefault();
        var toggle_to = '';
        var toggle_from = '';
        if( $("#entryform:visible").length ) {
            toggle_to = "#quick_add_form label";
            toggle_from = "#entryform label";
        } else {
            toggle_to="#entryform label";
            toggle_from = "#quick_add_form label";
        }
        $(toggle_from).each(function() {
            var input_label = $(this).attr('for');
            if ( input_label == 'sex-male' || input_label == 'sex-none' || input_label == 'sex-female' ) {
            $(toggle_to+"[for='"+input_label+"']").next().prop('checked', $(this).next().prop('checked') );
            return;
            }
            if( $(this).next().val() != '' ) { $(toggle_to+"[for='"+input_label+"']").next().val(  $(this).next().val() );}
        });

        $(".toggler").toggle();
    });

    $(".save_quick_add").click(function(){
        $("#quick_add_form").validate();
        if( $("#quick_add_form").valid()){
            $('.toggle_quick_add').click();
            $('#entryform button[name="save"]').click();
        }
        else {return false;}
    });

});

        var MSG_SEPARATOR = _("Separator must be / in field %s");
        var MSG_INCORRECT_DAY = _("Invalid day entered in field %s");
        var MSG_INCORRECT_MONTH = _("Invalid month entered in field %s");

[% INCLUDE 'header.inc' %]
[% INCLUDE 'patron-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo;
[% IF (firstname || surname ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]</a>  &rsaquo;[% END %]
<strong>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron ([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</strong>
</div>
[% IF ( opadd ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]

   <div id="bd">
	<div id="yui-main">
	<div class="yui-b">


	[% UNLESS ( no_add ) %]
    <h1>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</h1>

    [% IF quickadd && opadd && !check_member %]
        <a href="#" class="toggle_quick_add"><i class="fa fa-plus-square"></i> Show full form</a>
        <a href="#" class="toggle_quick_add" style="display:none"><i class="fa fa-minus-square"></i> Show brief form</a>
    [% END %]

	[% IF ( check_member ) %]
			<div class="dialog alert">
				<h3>Duplicate patron record?</h3>

                <li id="ERROR_cardnumber">Cardnumber length is incorrect.</li>
            [% END %]
			[% IF ( ERROR_age_limitations ) %]
            <li id="ERROR_age_limitations">Patron's age is incorrect for their category.
                    Ages allowed are [% age_low %]-[% age_high %].</li>
			[% END %]
			[% IF ( ERROR_branch ) %]
				<li id="ERROR_branch">Library is invalid.</li>
            [% END %]
			[% IF ( ERROR_dateofbirth ) %]
				<li id="ERROR_dateofbirth">Date of birth is invalid.</li>
			[% END %]

	[% END %]


[% UNLESS ( check_member ) %]<form name="form" id="entryform"  action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off" class="toggler" >
<input type="hidden" name="nodouble"  value="[% nodouble %]" /> [% END %]
<!--    field always hidden in different form (1,2,3) -->
<input type="hidden" name="BorrowerMandatoryField" value="[% BorrowerMandatoryField %]" />

    <legend id="contact_lgd">Contact</legend><ol>
        [% UNLESS nophone %]
      <li>
      [% IF ( mandatoryphone ) %]
      <label for="phone" class="required">
      [% ELSE %]
      <label for="phone">

        [% END %]
        [% UNLESS noemailpro %]
    <li>
      [% IF ( mandatoryemailpro ) %]
      <label for="emailpro" class="required">
      [% ELSE %]
      <label for="emailpro">

				<label for="opacnote" class="required">
			[% ELSE %]
				<label for="opacnote">
            [% END %]
			OPAC note: </label>
            <textarea id="opacnote" name="opacnote" cols="55" rows="5">[% UNLESS opduplicate %][% opacnote %][% END %]</textarea>
			<div class="hint">This message appears on this patron's user page in the OPAC</div>

        [% END %]
        [% UNLESS noborrowernotes %]
		<li>
            [% IF ( mandatoryborrowernotes ) %]
				<label for="borrowernotes" class="required">
			[% ELSE %]
				<label for="borrowernotes">

        <button type="submit" name="save" onclick="return check_form_borrowers();">
            <i class="fa fa-save"></i> Save
        </button>
     [% IF ( opadd ) %]
       <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
	   [% ELSE %]
	  <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a>

    </fieldset>
[% END %]
</fieldset>

</form>

[% IF quickadd && opadd  && !check_member %]
    <form id="quick_add_form" class="toggler">
        <fieldset class="rows quick_add"><legend>Quick add</legend>
            <ol id="quick_add_list">
            </ol>
        </fieldset>

        <fieldset class="action">
            <input type="button" class="save_quick_add"  value="Save" />
           <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
        </fieldset>

    </form>
    <script>
        $(document).ready(function () {
            $("#entryform").hide();
            [% q_add_f = Koha.Preference('PatronQuickAddFields').split('\|') %]
            var qaddfields = "[% FOREACH field IN q_add_f.unique %][% field %] [% END %]";
            $("#entryform label").each(function () {
                var input_label = $(this).attr('for');
                if ( input_label == 'sex-female' ) { input_label='sex'; }
                else if ( input_label == 'btitle' ) { input_label='title'; }
                if( qaddfields.indexOf( input_label ) != -1 || $(this).attr('class') == 'required' ){
                $(this).parent().clone().appendTo("#quick_add_list");
                if( input_label == 'password') $("#entryform label[for='password2']").parent().clone().appendTo("#quick_add_list");
                }
             });
            $("#quick_add_form").show();
        });
    </script>
[% END %]
</div>
</div>


Return to bug 3534

Lines 86-91 my $cardnumber = $input->param('cardnumber'); Link Here

(-)a/members/memberentry.pl (-1 / +2 lines)
86	my $check_member = $input->param('check_member');	86	my $check_member = $input->param('check_member');
87	my $nodouble = $input->param('nodouble');	87	my $nodouble = $input->param('nodouble');
88	my $duplicate = $input->param('duplicate');	88	my $duplicate = $input->param('duplicate');
		89	my $quickadd = $input->param('quickadd');
89	$nodouble = 1 if ($op eq 'modify' or $op eq 'duplicate'); # FIXME hack to represent fact that if we're	90	$nodouble = 1 if ($op eq 'modify' or $op eq 'duplicate'); # FIXME hack to represent fact that if we're
90	# modifying an existing patron, it ipso facto	91	# modifying an existing patron, it ipso facto
91	# isn't a duplicate. Marking FIXME because this	92	# isn't a duplicate. Marking FIXME because this
Lines 144-149 foreach (@field_check) { Link Here
144	$template->param( "no$_" => 1);	145	$template->param( "no$_" => 1);
145	}	146	}
146	$template->param( "add" => 1 ) if ( $op eq 'add' );	147	$template->param( "add" => 1 ) if ( $op eq 'add' );
		148	$template->param( "quickadd" => 1 ) if ( $quickadd );
147	$template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );	149	$template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
148	$template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );	150	$template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
149	( $borrower_data = GetMember( 'borrowernumber' => $borrowernumber ) ) if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' );	151	( $borrower_data = GetMember( 'borrowernumber' => $borrowernumber ) ) if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' );
150	-