From: ivan Date: Mon, 5 Apr 2010 06:50:33 +0000 (+0000) Subject: thirdlane deletion fix X-Git-Tag: root_of_svc_elec_features~320 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=467a00f309ef3ab7625cef8499886a1c2fc3353c;hp=e25080d6e892945c0031c964528f5d6458d95dc9 thirdlane deletion fix --- diff --git a/FS/FS/part_export/thirdlane.pm b/FS/FS/part_export/thirdlane.pm index bb18dd4fd..60c099748 100644 --- a/FS/FS/part_export/thirdlane.pm +++ b/FS/FS/part_export/thirdlane.pm @@ -157,7 +157,7 @@ sub _export_replace { if ( $old->pbxsvc ) { my $result = $self->_thirdlane_command( 'asterisk::rpc_did_unassign', - $self->_thirdlane_did($svc_x), + $self->_thirdlane_did($old), ); $result eq '0' or return 'Thirdlane API failure (rpc_did_unassign)'; } @@ -165,7 +165,7 @@ sub _export_replace { if ( $new->pbxsvc ) { my $result = $self->_thirdlane_command( 'asterisk::rpc_did_assign', - $self->_thirdlane_did($svc_x), + $self->_thirdlane_did($new), $new->pbx_title, ); $result eq '0' or return 'Thirdlane API failure (rpc_did_assign)'; @@ -190,7 +190,7 @@ sub _export_replace { ''; #we don't care then } else { - die "guru meditation #11: $svc_x is not FS::svc_pbx, FS::svc_phone or FS::svc_acct"; + die "guru meditation #11: $new is not FS::svc_pbx, FS::svc_phone or FS::svc_acct"; } } @@ -278,11 +278,11 @@ sub _thirdlane_command { } sub _thirdlane_did { - my($self, $svc_x) = @_; + my($self, $svc_phone) = @_; if ( $self->option('omit_countrycode') ) { - $svc_x->phonenum; + $svc_phone->phonenum; } else { - $svc_x->countrycode. $svc_x->phonenum; + $svc_phone->countrycode. $svc_phone->phonenum; } }