[freeside-commits] branch master updated. 9b3e40ffd129991d4567a3439eb2060c64cfa885

[Ivan]

The branch, master has been updated
       via  9b3e40ffd129991d4567a3439eb2060c64cfa885 (commit)
       via  e1e55ec2b39c6db45e4501165f42616eb2454459 (commit)
       via  ad0a365cc548e0f5137b2d1578e2c9f8854e5a86 (commit)
      from  145b39e411aacaf495e0c33ff78a7e87b3f18e72 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9b3e40ffd129991d4567a3439eb2060c64cfa885
Merge: e1e55ec 145b39e
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Feb 5 22:41:22 2014 -0800

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit e1e55ec2b39c6db45e4501165f42616eb2454459
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Feb 5 22:41:18 2014 -0800

    voip innovations v3.0 api, RT#25641

diff --git a/FS/FS/part_export/voip_innovations3.pm b/FS/FS/part_export/voip_innovations3.pm
index 3e4a1fe..40acfcb 100644
--- a/FS/FS/part_export/voip_innovations3.pm
+++ b/FS/FS/part_export/voip_innovations3.pm
@@ -19,8 +19,13 @@ tie my %options, 'Tie::IxHash',
   'no_did_provision' => { label=>'Disable DID provisioning',
                        type=>'checkbox',
                      },
-  'dry_run'       => { label=>"Test mode - don't actually provision",
-                       type=>'checkbox',
+#not particularly useful unless we can_get_dids
+#  'dry_run'       => { label=>"Test mode - don't actually provision",
+#                       type=>'checkbox',
+#                     },
+  'sandbox'       => { label=>'Communicatino with the VoIP Innovations sandbox'.
+                              ' instead of the live server',
+                       type => 'checkbox',
                      },
 ;
 
@@ -52,7 +57,7 @@ sub vi_command {
   my $vi = Net::VoIP_Innovations->new(
     'login'    => $self->option('login'),
     'password' => $self->option('password'),
-    #'debug'    => $debug,
+    'sandbox'  => $self->option('sandbox'),
   );
 
   $vi->$command(@args);

commit ad0a365cc548e0f5137b2d1578e2c9f8854e5a86
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Feb 5 13:51:54 2014 -0800

    add "Basic with upstream destination name" CDR display format, RT#20129

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 80b31bf..0fdcbdf 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -1151,6 +1151,8 @@ sub calltypename {
 
 =cut
 
+# in the future, load this dynamically from detail_format classes
+
 my %export_names = (
   'simple'  => {
     'name'           => 'Simple',
@@ -1169,6 +1171,10 @@ my %export_names = (
     'name'           => 'Basic',
     'invoice_header' => "Date/Time,Called Number,Min/Sec,Price",
   },
+  'basic_upstream_dst_regionname' => {
+    'name'           => 'Basic with upstream destination name',
+    'invoice_header' => "Date/Time,Called Number,Destination,Min/Sec,Price",
+  },
   'default' => {
     'name'           => 'Default',
     'invoice_header' => 'Date,Time,Number,Destination,Duration,Price',
diff --git a/FS/FS/detail_format/basic_upstream_dst_regionname.pm b/FS/FS/detail_format/basic_upstream_dst_regionname.pm
new file mode 100644
index 0000000..258fd90
--- /dev/null
+++ b/FS/FS/detail_format/basic_upstream_dst_regionname.pm
@@ -0,0 +1,22 @@
+package FS::detail_format::basic_upstream_dst_regionname;
+
+use strict;
+use base qw(FS::detail_format);
+
+sub name { 'Basic with upstream destination name' }
+
+sub header_detail { 'Date/Time,Called Number,Destination,Min/Sec,Price' }
+
+sub columns {
+  my $self = shift;
+  my $cdr = shift;
+  (
+    $self->time2str_local('%d %b - %I:%M %p', $cdr->startdate),
+    $cdr->dst,
+    $cdr->upstream_dst_regionname,
+    $self->duration($cdr),
+    $self->price($cdr),
+  )
+}
+
+1;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cdr.pm                                       |    6 ++++++
 .../{basic.pm => basic_upstream_dst_regionname.pm} |    7 ++++---
 FS/FS/part_export/voip_innovations3.pm             |   11 ++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)
 copy FS/FS/detail_format/{basic.pm => basic_upstream_dst_regionname.pm} (52%)