From ad0a365cc548e0f5137b2d1578e2c9f8854e5a86 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 5 Feb 2014 13:51:54 -0800
Subject: [PATCH] add "Basic with upstream destination name" CDR display
 format, RT#20129

---
 FS/FS/cdr.pm                                       |  6 ++++++
 .../detail_format/basic_upstream_dst_regionname.pm | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 FS/FS/detail_format/basic_upstream_dst_regionname.pm

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 80b31bfb9..0fdcbdf8d 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 000000000..258fd90a9
--- /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;
-- 
2.11.0