X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fa2billing.pm;h=acf0ed4c27f85385c4e27b804c06660cd65804f6;hb=287cf8c4a261571a77b5db14d9796c7505419f9f;hp=0547a21d0f009427b922b19f52b16251448592f6;hpb=06fd3d9f3ca53b2d2f7595e55be4b129ca69511c;p=freeside.git

diff --git a/FS/FS/part_export/a2billing.pm b/FS/FS/part_export/a2billing.pm
index 0547a21d0..acf0ed4c2 100644
--- a/FS/FS/part_export/a2billing.pm
+++ b/FS/FS/part_export/a2billing.pm
@@ -24,7 +24,7 @@ tie %options, 'Tie::IxHash',
   'credit'      => { label=>'Default credit limit' },
   'billtype'    => {label=>'Billing type',
                     type => 'select',
-                    options => ['monthly', 'weekly']
+                    options => ['Dial Out Rate', 'Free']
                   },
   'debug'       => { label=>'Enable debugging', type=>'checkbox' }
 ;
@@ -131,7 +131,7 @@ sub export_insert {
       username  => $username,
       useralias => $username,
       uipass    => $svc->_password,
-      credit    => $self->option('credit') || 0,
+      creditlimit    => $cust_main->credit_limit || $self->option('credit') || 0,
       tariff    => $part_pkg->option('a2billing_tariff'),
       status    => 1,
       lastname  => $cust_main->last, # $svc->finger?
@@ -142,7 +142,11 @@ sub export_insert {
       state     => $location->state,
       country   => $country3,
       zipcode   => $location->zip,
+      simultaccess  => $part_pkg->option('a2billing_simultaccess'),
       typepaid  => $part_pkg->option('a2billing_type'),
+      email_notification => $cust_main->invoicing_list_emailonly_scalar,
+      notify_email => (if $cust_main->invoicing_list_emailonly_scalar ? 1 : 0),
+      credit_notification => $cust_main->credit_limit || $self->option('credit') || 0,
       sip_buddy => 1,
       company_name => $cust_main->company,
       activated => 't',
@@ -221,7 +225,7 @@ sub export_insert {
       id_cc_country   => $cc_country_id,
       iduser          => $cc_card_id,
       did             => $svc->phonenum,
-      billingtype     => ($self->option('billtype') eq 'weekly' ? 1 : 0),
+      billingtype     => ($self->option('billtype') eq 'Dial Out Rate' ? 2 : 3),
       activated       => 1,
     );
 
@@ -232,12 +236,14 @@ sub export_insert {
 
     my $cc_did_id = $self->a2b_find('cc_did', 'svcnum', $svc->svcnum);
     
-    my $destination = 'SIP/' . $svc->phonenum . '@' . $svc_acct->username;
+    my $destination = 'SIP/user-'. $svc_acct->username. '@'. $svc->sip_server. "!". $svc->phonenum;
     my %cc_did_destination = (
       destination     => $destination,
       priority        => 1,
       id_cc_card      => $cc_card_id,
       id_cc_did       => $cc_did_id,
+      validated       => 1,
+      voip_call       => 1,
     );
 
     # and if there's already a destination, change it to point to