@@ -, +, @@ --- .../mysql/atomicupdate/bug_17718-add_smartform_syspref.sql | 2 ++ installer/data/mysql/sysprefs.sql | 2 ++ .../prog/en/includes/member-alt-address-style-de.inc | 11 +++++++---- .../prog/en/includes/member-alt-contact-style-de.inc | 9 ++++++--- .../prog/en/includes/member-main-address-style-de.inc | 11 +++++++---- .../prog/en/modules/admin/preferences/patrons.pref | 11 +++++++++++ .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 10 ++++++++++ members/memberentry.pl | 3 +++ 8 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_17718-add_smartform_syspref.sql --- a/installer/data/mysql/atomicupdate/bug_17718-add_smartform_syspref.sql +++ a/installer/data/mysql/atomicupdate/bug_17718-add_smartform_syspref.sql @@ -0,0 +1,2 @@ +INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('SmartformEnable', '0', 'If ON, enable Smartform to simplify address entering during patron registration.', NULL, 'YesNo'); +INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('SmartformClientID', '', 'Smartform service client ID', '', 'Free'); --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -466,6 +466,8 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('ShowReviewer','full','none|full|first|surname|firstandinitial|username','Choose how a commenter\'s identity is presented alongside comments in the OPAC','Choice'), ('ShowReviewerPhoto','1','','If ON, photo of reviewer will be shown beside comments in OPAC','YesNo'), ('SlipCSS','',NULL,'Slips CSS url.','free'), +('SmartformEnable', '0', NULL, 'If ON, enable Smartform service to simplify address entering during patron registration.', 'YesNo'), +('SmartformClientID', '', '', 'Smartform service client ID', 'Free'), ('SMSSendDriver','','','Sets which SMS::Send driver is used to send SMS messages.','free'), ('SMSSendPassword', '', '', 'Password used to send SMS messages', 'free'), ('SMSSendUsername', '', '', 'Username/Login used to send SMS messages', 'free'), --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc @@ -8,7 +8,7 @@ - + [% IF ( mandatoryB_address ) %]Required[% END %] [% END %] @@ -43,7 +43,7 @@ - + [% IF ( mandatoryB_streetnumber ) %]Required[% END %] [% END %] @@ -68,7 +68,7 @@ - + [% IF ( mandatoryB_zipcode ) %]Required[% END %] [% END %] @@ -80,7 +80,7 @@ - + [% IF ( mandatoryB_city ) %]Required[% END %] [% END %] @@ -144,4 +144,7 @@ [% END %] + [% IF SmartformEnable %] + + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc @@ -32,7 +32,7 @@ - + [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %] [% END %] @@ -56,7 +56,7 @@ - + [% IF ( mandatoryaltcontactzipcode ) %]Required[% END %] [% END %] @@ -68,7 +68,7 @@ - + [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %] [% END %] @@ -109,4 +109,7 @@ [% END %] + [% IF SmartformEnable %] + + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc @@ -31,7 +31,7 @@ - + [% IF ( mandatoryaddress ) %]Required[% END %] [% END %] @@ -43,7 +43,7 @@ - + [% IF ( mandatorystreetnumber ) %]Required[% END %] [% END %] @@ -67,7 +67,7 @@ - + [% IF ( mandatoryzipcode ) %]Required[% END %] [% END %] @@ -79,7 +79,7 @@ - + [% IF cities.count %]or choose