diff options
author | Christopher Burger <burgerc@freeside.biz> | 2019-02-13 11:57:58 -0500 |
---|---|---|
committer | Christopher Burger <burgerc@freeside.biz> | 2019-02-13 11:57:58 -0500 |
commit | 9427fea032c131bc2c000515853d4f1462b7deff (patch) | |
tree | 35d8e376a777c5a44660208aca2b90395d819b62 | |
parent | 5ea21368e57b35d34f20f876e6b93f16975afb78 (diff) | |
parent | 9ad0cdfb307e346add9e3496cf3cbdc1eee4e7d8 (diff) |
Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside
-rw-r--r-- | FS/FS.pm | 30 | ||||
-rw-r--r-- | FS/FS/Schema.pm | 3 | ||||
-rw-r--r-- | FS/FS/cdr.pm | 2 |
3 files changed, 6 insertions, 29 deletions
@@ -664,35 +664,7 @@ and higher SNR than the users list. Send a blank message to Commercial products and services are available; see <http://freeside.biz/freeside/products.html> and <http://freeside.biz/freeside/services.html>. -=head1 AUTHORS - -=head2 CORE TEAM - -Jeremy Davis - -Jason Hall - -Ivan Kohler - -Mark Wells - -=head2 CORE EMERITUS - -Peter Bowen - -Jeff Finucane - -Kristian Hoffman - -Erik Levinson - -Brian McCane - -Richard Siddall - -Matt Simerson - -=head2 CONTRIBUTORS +=head1 AUTHORS AND CONTRIBUTORS See httemplate/docs/credits.html diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 290c89d..fc22d6c 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -5660,6 +5660,9 @@ sub tables_hashref { #NULL, done (or something) 'freesidestatus', 'varchar', 'NULL', 32, '', '', + #additional status info (i.e. reason for "skipped" freesidestatus) + 'freesidestatustext', 'text', 'NULL', '', '', '', + #NULL, done (or something) 'freesiderewritestatus', 'varchar', 'NULL', 32, '', '', diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index 5a398ce..aa1c406 100644 --- a/FS/FS/cdr.pm +++ b/FS/FS/cdr.pm @@ -518,6 +518,7 @@ sub set_status_and_rated_price { } else { $self->freesidestatus($status); + $self->freesidestatustext($opt{'statustext'}) if exists($opt{'statustext'}); $self->rated_price($rated_price); $self->$_($opt{$_}) foreach grep exists($opt{$_}), map "rated_$_", @@ -681,6 +682,7 @@ sub rate_prefix { return $self->set_status_and_rated_price( 'skipped', 0, $opt{'svcnum'}, + 'statustext' => $reason, ); } |