# 'Asterisk (or other?) CDR table',
#;
+tie my %temporalities, 'Tie::IxHash',
+ 'upcoming' => "Upcoming (future)",
+ 'preceding' => "Preceding (past)",
+;
+
%info = (
'name' => 'VoIP rating by plan of CDR records in an internal (or external) SQL table',
'shortname' => 'VoIP/telco CDR rating (standard)',
'recur_fee' => { 'name' => 'Base recurring fee for this package',
'default' => 0,
},
+
+ #false laziness w/flat.pm
+ 'recur_temporality' => { 'name' => 'Charge recurring fee for period',
+ 'type' => 'select',
+ 'select_options' => \%temporalities,
+ },
+
'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
' of service at cancellation',
'type' => 'checkbox',
# 'type' => 'checkbox',
# },
- 'international_prefix' => { 'name' => 'Destination prefix for international CDR records',
+ 'international_prefix' => { 'name' => 'Destination prefix(es) for international CDR records. Separate multiple options with commas.',
'default' => '011',
},
},
'fieldorder' => [qw(
- setup_fee recur_fee unused_credit
+ setup_fee recur_fee recur_temporality unused_credit
rating_method ratenum
default_prefix
disable_src
domestic_prefix international_prefix
- use_amaflags use_disposition output_format
- summarize_usage usage_section
+ use_amaflags use_disposition
+ use_disposition_taqua use_carrierid use_cdrtypenum
+ 411_rewrite
+ output_format summarize_usage usage_section
)
],
'weight' => 40,
sub calc_recur {
my($self, $cust_pkg, $sdate, $details, $param ) = @_;
- my $last_bill = $cust_pkg->last_bill;
+ #my $last_bill = $cust_pkg->last_bill;
+ my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
+
+ return 0
+ if $self->option('recur_temporality', 1) eq 'preceding' && $last_bill == 0;
my $ratenum = $cust_pkg->part_pkg->option('ratenum');
# $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
my $intl = $self->option('international_prefix') || '011';
+ my @intl = ();
+ if ( $intl =~ /,/ ) {
+ @intl = split(/\s*,\s*/, $intl);
+ } else {
+ @intl = ($intl);
+ }
#determine the country code
+ my $intl_match = 0;
+ foreach my $i (@intl) {
+ if ( $number =~ /^$i(((\d)(\d))(\d))(\d+)$/ ) {
+ $intl_match++;
+ last;
+ }
+ }
my $countrycode;
- if ( $number =~ /^$intl(((\d)(\d))(\d))(\d+)$/
- || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/
- )
- {
+ if ( $intl_match || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/ ) {
my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
#first look for 1 digit country code