X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FClientAPI%2FMyAccount.pm;h=fa0bbb8a76cb0f636d9d0fd6d50674f618590431;hb=158103c8701d8cd87148c579dc101979c808b8c2;hp=fb445e555d471c52b1e19dcf2b7d83bede44c332;hpb=fda372ea3d82601724eb4fd064ba95fbfdd68bdb;p=freeside.git
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index fb445e555..fa0bbb8a7 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -18,6 +18,7 @@ use FS::Conf;
use FS::Record qw(qsearch qsearchs dbh);
use FS::Msgcat qw(gettext);
use FS::Misc qw(card_types);
+use FS::Misc::DateTime qw(parse_datetime);
use FS::ClientAPI_SessionCache;
use FS::svc_acct;
use FS::svc_domain;
@@ -532,6 +533,8 @@ sub payment_info {
'show_paystate' => $conf->exists('show_bankstate'),
'save_unchecked' => $conf->exists('selfservice-save_unchecked'),
+
+ 'credit_card_surcharge_percentage' => $conf->config('credit-card-surcharge-percentage'),
};
}
@@ -637,6 +640,7 @@ sub process_payment {
#false laziness w/process/payment.cgi
my $payinfo;
my $paycvv = '';
+ my $paynum = '';
if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
$p->{'payinfo1'} =~ /^([\dx]+)$/
@@ -698,6 +702,7 @@ sub process_payment {
'payname' => $payname,
'paybatch' => $paybatch, #this doesn't actually do anything
'paycvv' => $paycvv,
+ 'paynum_ref' => \$paynum,
'pkgnum' => $session->{'pkgnum'},
'discount_term' => $discount_term,
'selfservice' => 1,
@@ -740,7 +745,46 @@ sub process_payment {
}
}
- return { 'error' => '' };
+ my $receipt_html = '';
+ if($paynum) {
+ # currently supported for realtime CC only; send receipt data to SS
+ my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
+ if($cust_pay) {
+ $receipt_html = qq!
+
+
+
+ Payment# |
+ ! . $cust_pay->paynum . qq! |
+
+
+
+ Date |
+
+ ! .
+ time2str("%a %b %o, %Y %r", $cust_pay->_date)
+ . qq! |
+
+
+
+
+ Amount |
+ ! . $cust_pay->paid . qq! |
+
+
+
+
+ Payment method |
+ ! . $cust_pay->payby_name .' #'. $cust_pay->paymask
+ . qq! |
+
+
+
+!;
+ }
+ }
+
+ return { 'error' => '', 'receipt_html' => $receipt_html, };
}
@@ -978,6 +1022,7 @@ sub list_pkgs {
'wholesale_view' => 1,
'login_svcpart' => [ $conf->config('selfservice_server-login_svcpart') ],
'date_format' => $conf->config('date_format') || '%m/%d/%Y',
+ 'lnp' => $conf->exists('svc_phone-lnp'),
};
}
@@ -1039,9 +1084,13 @@ sub list_svcs {
#@svc_x = sort { $a->domain cmp $b->domain || $a->username cmp $b->username }
# @svc_x;
+ my $conf = new FS::Conf;
+
{
'svcnum' => $session->{'svcnum'},
'custnum' => $custnum,
+ 'date_format' => $conf->config('date_format') || '%m/%d/%Y',
+ 'view_usage_nodomain' => $conf->exists('selfservice-view_usage_nodomain'),
'svcs' => [
map {
my $svc_x = $_->svc_x;
@@ -1077,7 +1126,7 @@ sub list_svcs {
# more...
);
- } elsif ( $svcdb eq 'svc_phone' ) {
+ } elsif ( $svcdb eq 'svc_phone' || $svcdb eq 'svc_port' ) {
%hash = (
%hash,
);
@@ -1091,6 +1140,21 @@ sub list_svcs {
}
+sub port_graph {
+ my $p = shift;
+ _usage_details( \&_port_graph, $p,
+ 'svcdb' => 'svc_port',
+ );
+}
+
+sub _port_graph {
+ my($svc_port, $begin, $end) = @_;
+ my @usage = ();
+ my $pngOrError = $svc_port->graph_png( start=>$begin, end=> $end );
+ push @usage, { 'png' => $pngOrError };
+ (@usage);
+}
+
sub _list_svc_usage {
my($svc_acct, $begin, $end) = @_;
my @usage = ();
@@ -1132,8 +1196,8 @@ sub list_support_usage {
sub _list_cdr_usage {
my($svc_phone, $begin, $end) = @_;
- map [ $_->downstream_csv('format' => 'default') ], #XXX config for format
- $svc_phone->get_cdrs( 'begin'=>$begin, 'end'=>$end, );
+ map [ $_->downstream_csv('format' => 'default', 'keeparray' => 1) ], #XXX config for format
+ $svc_phone->get_cdrs( 'begin'=>$begin, 'end'=>$end, );
}
sub list_cdr_usage {
@@ -1270,7 +1334,7 @@ sub order_pkg {
map { $_ => $p->{$_} } @{$fields{$svcdb}}
} );
- if ( $svcdb eq 'svc_acct' ) {
+ if ( $svcdb eq 'svc_acct' && exists($p->{"snarf_machine1"}) ) {
my @acct_snarf;
my $snarfnum = 1;
while ( length($p->{"snarf_machine$snarfnum"}) ) {
@@ -1300,7 +1364,7 @@ sub order_pkg {
tie my %hash, 'Tie::RefHash';
%hash = ( $cust_pkg => \@svc );
#msgcat
- $error = $cust_main->order_pkgs( \%hash, '', 'noexport' => 1 );
+ $error = $cust_main->order_pkgs( \%hash, 'noexport' => 1 );
return { 'error' => $error } if $error;
my $conf = new FS::Conf;
@@ -1568,7 +1632,23 @@ sub cancel_pkg {
sub provision_phone {
my $p = shift;
- my @bulkdid = @{$p->{'bulkdid'}};
+ my @bulkdid;
+ @bulkdid = @{$p->{'bulkdid'}} if $p->{'bulkdid'};
+
+# single DID LNP
+ unless($p->{'lnp'}) {
+ $p->{'lnp_desired_due_date'} = parse_datetime($p->{'lnp_desired_due_date'});
+ $p->{'lnp_status'} = "portingin";
+ return _provision( 'FS::svc_phone',
+ [qw(lnp_desired_due_date lnp_other_provider
+ lnp_other_provider_account phonenum countrycode lnp_status)],
+ [qw(phonenum countrycode)],
+ $p,
+ @_
+ );
+ }
+
+# single DID order
unless (scalar(@bulkdid)) {
return _provision( 'FS::svc_phone',
[qw(phonenum countrycode)],
@@ -1578,7 +1658,7 @@ sub provision_phone {
);
}
-# bulk case
+# bulk DID order case
my $error;
foreach my $did ( @bulkdid ) {
$did =~ s/[^0-9]//g;
@@ -1957,16 +2037,24 @@ sub get_ticket {
# the requested ticket was actually linked to this customer
my @custs = @{$err_or_ticket->{'custs'}};
my @txns = @{$err_or_ticket->{'txns'}};
+ my @filtered_txns;
return { 'error' => 'no customer' } unless ( $custnum && scalar(@custs) );
return { 'error' => 'invalid ticket requested' }
unless grep($_ eq $custnum, @custs);
+ foreach my $txn ( @txns ) {
+ push @filtered_txns, $txn
+ if ($txn->{'type'} eq 'EmailRecord'
+ || $txn->{'type'} eq 'Correspond'
+ || $txn->{'type'} eq 'Create');
+ }
+
warn "$me get_ticket: sucessful: \n"
if $DEBUG;
return { 'error' => '',
- 'transactions' => \@txns,
+ 'transactions' => \@filtered_txns,
'ticket_id' => $p->{'ticket_id'},
};
} else {