projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ticket #33046 A2billing changes
[freeside.git]
/
FS
/
FS
/
part_export
/
a2billing.pm
diff --git
a/FS/FS/part_export/a2billing.pm
b/FS/FS/part_export/a2billing.pm
index
f0e979f
..
acf0ed4
100644
(file)
--- 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',
'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' }
;
},
'debug' => { label=>'Enable debugging', type=>'checkbox' }
;
@@
-131,7
+131,7
@@
sub export_insert {
username => $username,
useralias => $username,
uipass => $svc->_password,
username => $username,
useralias => $username,
uipass => $svc->_password,
- credit => $cust_main->credit_limit || $self->option('credit') || 0,
+ credit
limit
=> $cust_main->credit_limit || $self->option('credit') || 0,
tariff => $part_pkg->option('a2billing_tariff'),
status => 1,
lastname => $cust_main->last, # $svc->finger?
tariff => $part_pkg->option('a2billing_tariff'),
status => 1,
lastname => $cust_main->last, # $svc->finger?
@@
-144,6
+144,9
@@
sub export_insert {
zipcode => $location->zip,
simultaccess => $part_pkg->option('a2billing_simultaccess'),
typepaid => $part_pkg->option('a2billing_type'),
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',
sip_buddy => 1,
company_name => $cust_main->company,
activated => 't',
@@
-222,7
+225,7
@@
sub export_insert {
id_cc_country => $cc_country_id,
iduser => $cc_card_id,
did => $svc->phonenum,
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,
);
activated => 1,
);
@@
-233,12
+236,14
@@
sub export_insert {
my $cc_did_id = $self->a2b_find('cc_did', 'svcnum', $svc->svcnum);
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,
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
);
# and if there's already a destination, change it to point to