Bug 13021: guarantor search - main patch

[srvgit] / acqui / updatesupplier.pl

diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index 7b3bf9d..d125d89 100755 (executable)
--- a/acqui/updatesupplier.pl
+++ b/acqui/updatesupplier.pl
@@ -37,22 +37,26 @@ All informations regarding this supplier are listed on input parameter.
 Here is the list :
 
 supplier, id, company, company_postal, physical, company_phone,
-physical, company_phone, company_fax, website, company_contact_name,
-company_contact_position, contact_phone, contact_phone_2, contact_fax,
-company_email, contact_notes, notes, status, publishers_imprints,
-list_currency, gst, list_gst, invoice_gst, discount, gstrate.
+physical, company_phone, company_fax, website, company_email, notes,
+status, publishers_imprints, list_currency, gst, list_gst, invoice_gst,
+discount, gstrate, contact_name, contact_position, contact_phone,
+contact_altphone, contact_fax, contact_email, contact_notes,
+contact_claimacquisition, contact_claimissues, contact_acqprimary,
+contact_serialsprimary.
 
 =cut
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
+use List::Util;
 use C4::Context;
 use C4::Auth;
 
 use C4::Bookseller qw( ModBookseller AddBookseller );
+use C4::Bookseller::Contact;
 use C4::Biblio;
 use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
 
 my $input=new CGI;
 my ($template, $loggedinuser, $cookie) = get_template_and_user(
@@ -83,13 +87,6 @@ $data{'phone'}=$input->param('company_phone');
 $data{'accountnumber'}=$input->param('accountnumber');
 $data{'fax'}=$input->param('company_fax');
 $data{'url'}=$input->param('website');
-$data{'contact'}=$input->param('company_contact_name');
-$data{'contpos'}=$input->param('company_contact_position');
-$data{'contphone'}=$input->param('contact_phone');
-$data{'contaltphone'}=$input->param('contact_phone_2');
-$data{'contfax'}=$input->param('contact_fax');
-$data{'contemail'}=$input->param('company_email');
-$data{'contnotes'}=$input->param('contact_notes');
 # warn "".$data{'contnotes'};
 $data{'notes'}=$input->param('notes');
 $data{'active'}=$input->param('status');
@@ -104,14 +101,31 @@ $data{'gstrate'} = $input->param('gstrate');
 $data{'discount'} = $input->param('discount');
 $data{deliverytime} = $input->param('deliverytime');
 $data{'active'}=$input->param('status');
+my @contacts;
+my %contact_info;
+
+foreach (qw(id name position phone altphone fax email notes claimacquisition claimissues acqprimary serialsprimary)) {
+    $contact_info{$_} = [ $input->param('contact_' . $_) ];
+}
+
+for my $cnt (0..scalar(@{$contact_info{'id'}})) {
+    my %contact;
+    my $real_contact;
+    foreach (qw(id name position phone altphone fax email notes claimacquisition claimissues acqprimary serialsprimary)) {
+        $contact{$_} = $contact_info{$_}->[$cnt];
+        $real_contact = 1 if $contact{$_};
+    }
+    push @contacts, C4::Bookseller::Contact->new(\%contact) if $real_contact;
+}
+
 if($data{'name'}) {
        if ($data{'id'}){
-           ModBookseller(\%data);
+        ModBookseller(\%data, \@contacts);
        } else {
-           $data{id}=AddBookseller(\%data);
+        $data{id}=AddBookseller(\%data, \@contacts);
        }
-#redirect to booksellers.pl
-print $input->redirect("booksellers.pl?booksellerid=".$data{id});
+    #redirect to booksellers.pl
+    print $input->redirect("booksellers.pl?booksellerid=".$data{id});
 } else {
-print $input->redirect("supplier.pl?op=enter"); # fail silently.
+    print $input->redirect("supplier.pl?op=enter"); # fail silently.
 }