Attachment 77047 Details for Bug 14570 – Bug 14570 [QA Followup]: Add Koha::Patron::add_gurarantor

[patch] Bug 14570 [QA Followup]: Add Koha::Patron::add_gurarantor

Bug-14570-QA-Followup-Add-KohaPatronaddgurarantor.patch (text/plain), 4.73 KB, created by Kyle M Hall (khall) on 2018-07-17 14:25:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2018-07-17 14:25:48 UTC

Size: 4.73 KB

patch

obsolete

>From 88a7b8df45e1324675aaf0d080b4c4b3e1218831 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Tue, 17 Jul 2018 08:18:27 -0400
>Subject: [PATCH] Bug 14570 [QA Followup]: Add Koha::Patron::add_gurarantor
>
>---
> Koha/Patron.pm         | 45 +++++++++++++++++++++++++++++++++++++++++++++
> members/memberentry.pl | 35 +++++++++++++----------------------
> 2 files changed, 58 insertions(+), 22 deletions(-)
>
>diff --git a/Koha/Patron.pm b/Koha/Patron.pm
>index 141eb2a6c8..366be8684c 100644
>--- a/Koha/Patron.pm
>+++ b/Koha/Patron.pm
>@@ -1053,6 +1053,51 @@ sub generate_userid {
> 
> }
> 
>+
>+=head3 add_guarantor
>+
>+    my @relationships = $patron->add_guarantor(
>+        {
>+            borrowernumber => $borrowernumber,
>+            surname        => $surname,
>+            firstname      => $firstname,
>+            relationships  => $relationship,
>+        }
>+    );
>+
>+    Adds a new guarantor to a patron, requires either an id ( borrowernumber ) or surname.
>+
>+=cut
>+
>+sub add_guarantor {
>+    my ( $self, $params ) = @_;
>+
>+    my $guarantor_id = $params->{guarantor_id};
>+    my $surname      = $params->{surname};
>+    my $firstname    = $params->{firstname};
>+    my $relationship = $params->{relationship};
>+
>+    if ($guarantor_id) {
>+        return Koha::Patron::Relationship->new(
>+            {
>+                guarantee_id => $self->id,
>+                guarantor_id => $guarantor_id,
>+                relationship => $relationship
>+            }
>+        )->store();
>+    }
>+    elsif ($surname) {
>+        return Koha::Patron::Relationship->new(
>+            {
>+                guarantee_id => $self->id,
>+                surname      => $surname,
>+                firstname    => $firstname,
>+                relationship => $relationship
>+            }
>+        )->store();
>+    }
>+}
>+
> =head2 Internal methods
> 
> =head3 _type
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index 331e7e147f..24dd969719 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -414,7 +414,8 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
> 	if ($op eq 'insert'){
> 		# we know it's not a duplicate borrowernumber or there would already be an error
>         $borrowernumber = &AddMember(%newdata);
>-        add_guarantors( $borrowernumber, $input );
>+        $patron = Koha::Patrons->find( $borrowernumber );
>+        add_guarantors( $patron, $input );
>         $newdata{'borrowernumber'} = $borrowernumber;
> 
>         # If 'AutoEmailOpacUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode.
>@@ -512,7 +513,7 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
>                                                                 # updating any columns in the borrowers table,
>                                                                 # which can happen if we're only editing the
>                                                                 # patron attributes or messaging preferences sections
>-        add_guarantors( $borrowernumber, $input );
>+        add_guarantors( $patron, $input );
>         if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
>             C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
>         }
>@@ -892,7 +893,7 @@ sub patron_attributes_form {
> }
> 
> sub add_guarantors {
>-    my ( $borrowernumber, $input ) = @_;
>+    my ( $patron, $input ) = @_;
> 
>     my @new_guarantor_id           = $input->multi_param('new_guarantor_id');
>     my @new_guarantor_surname      = $input->multi_param('new_guarantor_surname');
>@@ -905,25 +906,15 @@ sub add_guarantors {
>         my $firstname    = $new_guarantor_firstname[$i];
>         my $relationship = $new_guarantor_relationship[$i];
> 
>-        if ($guarantor_id) {
>-            Koha::Patron::Relationship->new(
>-                {
>-                    guarantee_id => $borrowernumber,
>-                    guarantor_id => $guarantor_id,
>-                    relationship => $relationship
>-                }
>-            )->store();
>-        }
>-        elsif ($surname) {
>-            Koha::Patron::Relationship->new(
>-                {
>-                    guarantee_id => $borrowernumber,
>-                    surname      => $surname,
>-                    firstname    => $firstname,
>-                    relationship => $relationship
>-                }
>-            )->store();
>-        }
>+        $patron->add_guarantor(
>+            {
>+                guarantee_id => $patron->id,
>+                guarantor_id => $guarantor_id,
>+                surname      => $surname,
>+                firstname    => $firstname,
>+                relationship => $relationship
>+            }
>+        );
>     }
> }
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 14570: 52400 | 52401 | 52402 | 52403 | 52406 | 52407 | 58146 | 58147 | 58159 | 58202 | 58391 | 58399 | 58412 | 58688 | 58689 | 58739 | 58762 | 58763 | 58764 | 58834 | 58835 | 58836 | 58837 | 58838 | 58839 | 58949 | 58950 | 58951 | 58952 | 58953 | 58954 | 58972 | 58973 | 58974 | 58975 | 58976 | 58977 | 58978 | 58979 | 58980 | 62450 | 62451 | 62452 | 64124 | 64125 | 64126 | 71160 | 71161 | 71162 | 71163 | 73283 | 73284 | 73583 | 73584 | 74950 | 74951 | 74952 | 74953 | 74954 | 74976 | 74977 | 74978 | 74979 | 77029 | 77030 | 77031 | 77032 | 77033 | 77034 | 77040 | 77041 | 77042 | 77043 | 77044 | 77045 | 77046 | 77047 | 77048 | 77049 | 77067 | 77068 | 77069 | 77070 | 77071 | 77072 | 77073 | 77074 | 77075 | 77076 | 77077 | 77078 | 77290 | 77291 | 77346 | 77347 | 77348 | 80842 | 80849 | 81932 | 81933 | 85411 | 85412 | 85431 | 89889 | 89890 | 89891 | 89892 | 89909 | 89910 | 89911 | 89912 | 89921 | 89922 | 89929 | 90048 | 91231 | 91439 | 91440 | 91441 | 91442 | 91443 | 91444 | 91445 | 91694 | 91695 | 91696 | 91697 | 91698 | 91699 | 91700 | 92157 | 92158 | 92161 | 92162 | 92163 | 92180 | 92181 | 92182 | 92183 | 92232 | 92233 | 92234 | 92235 | 92277 | 92278 | 92279 | 92280 | 92281 | 92282 | 92283 | 92284 | 92285 | 92286 | 92287 | 92288 | 92289 | 92290 | 92291 | 92292 | 92298 | 92299 | 92300 | 92301 | 92302 | 92303 | 92304 | 92305 | 92306 | 92307 | 92308 | 92309 | 92310 | 92311 | 92312 | 92313 | 92314 | 92315 | 92316 | 92317 | 92318 | 92319 | 92320 | 92321 | 92322 | 92323 | 92324 | 92325 | 92346 | 92347 | 92348 | 92349 | 92350