diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-07-12 15:30:09 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-07-12 15:30:09 -0700 |
| commit | 87324d95c651a0e66ea37604f076f2d338fc85fa (patch) | |
| tree | 4fa68b46d5305c078e57e690da6cbb9b6a1e6aae | |
| parent | 7c50503cd895b53c93d46b0ad53e8b842999ada1 (diff) | |
| parent | 37014964c3436f1df31c52c8078b0b42236b96a4 (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
| -rw-r--r-- | FS/FS/cdr/cisco.pm | 6 | ||||
| -rw-r--r-- | httemplate/edit/payment_gateway.html | 1 |
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', |