bug 3464 followup - fix glitches

* Fixed 'counry' typo
* added country and B_country to deleteborrowers

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index ac0b80b..0722a52 100644 (file)
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -862,6 +862,7 @@ CREATE TABLE `deletedborrowers` (
   `address2` text,
   `city` mediumtext NOT NULL,
   `zipcode` varchar(25) default NULL,
+  `country` text,
   `email` mediumtext,
   `phone` text,
   `mobile` varchar(50) default NULL,
@@ -873,6 +874,7 @@ CREATE TABLE `deletedborrowers` (
   `B_address` varchar(100) default NULL,
   `B_city` mediumtext,
   `B_zipcode` varchar(25) default NULL,
+  `B_country` text,
   `B_email` text,
   `B_phone` mediumtext,
   `dateofbirth` date default NULL,

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index ef854f4..aee7bec 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2541,6 +2541,8 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     # 
     $dbh->do("ALTER TABLE borrowers ADD `country` text AFTER zipcode");
     $dbh->do("ALTER TABLE borrowers ADD `B_country` text AFTER B_zipcode");
+    $dbh->do("ALTER TABLE deletedborrowers ADD `country` text AFTER zipcode");
+    $dbh->do("ALTER TABLE deletedborrowers ADD `B_country` text AFTER B_zipcode");
     print "Upgrade to $DBversion done (add country and B_country to borrowers)\n";
     SetVersion ($DBversion);
 }

diff --git a/members/memberentry.pl b/members/memberentry.pl
index c7beb7f..ade31e2 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -222,7 +222,7 @@ if (!defined($guarantorid) or $guarantorid eq '' or $guarantorid eq '0') {
     # set only if parameter was passed from the form
     $newdata{'city'}    = $input->param('city')    if defined($input->param('city'));
     $newdata{'zipcode'} = $input->param('zipcode') if defined($input->param('zipcode'));
-    $newdata{'country'} = $input->param('counry') if defined($input->param('country'));
+    $newdata{'country'} = $input->param('country') if defined($input->param('country'));
 }
 
 #builds default userid