summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2014-07-12 15:51:43 -0700
committerIvan Kohler <ivan@freeside.biz>2014-07-12 15:51:43 -0700
commit48e85cba67e48bb37b79d9e4fa72cf0df7cd3759 (patch)
tree1853c69154d08545edaf173df5c02faeae7b95d8
parent44f17d3e7639e05931089d01d5b6eccaffe41fbf (diff)
parent0a9c5d7a2e387f3c30df51fc952725e77ad27c1e (diff)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
-rw-r--r--FS/FS/cdr/cisco.pm6
-rw-r--r--httemplate/edit/payment_gateway.html1
2 files changed, 4 insertions, 3 deletions
diff --git a/FS/FS/cdr/cisco.pm b/FS/FS/cdr/cisco.pm
index f9b9befbc..335d4832a 100644
--- a/FS/FS/cdr/cisco.pm
+++ b/FS/FS/cdr/cisco.pm
@@ -73,11 +73,11 @@ use Date::Parse;
#destRSVPVideoStat
'answerdate', #dateTimeConnect
'enddate', #dateTimeDisconnect
- skip(6), #lastRedirectDn
+ skip(3), #lastRedirectDn
#pkid
#originalCalledPartyNumberPartition
- #callingPartyNumberPartition
- #finalCalledPartyNumberPartition
+ 'accountcode', #callingPartyNumberPartition
+ skip(2), #finalCalledPartyNumberPartition
#lastRedirectDnPartition
'billsec', #duration
skip(22), #origDeviceName
diff --git a/httemplate/edit/payment_gateway.html b/httemplate/edit/payment_gateway.html
index 0cd93e4a5..97976dfef 100644
--- a/httemplate/edit/payment_gateway.html
+++ b/httemplate/edit/payment_gateway.html
@@ -55,6 +55,7 @@ my %modules = (
'eSelectPlus',
'ElavonVirtualMerchant',
'Exact',
+ 'FirstDataGlobalGateway',
'iAuthorizer',
'Ingotz',
'InternetSecure',