X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FClientAPI%2FMyAccount.pm;h=fa667c0c08ed0e9e10d2cca6329d5ad4447ded21;hb=a6df3bedc91aba52e5010241f1b94a780d478b5c;hp=6fa4c3d9e9411dfac99986eccfc0ac492075d19b;hpb=8e3d674d1fd4b4777d0ee2197e8b0ff771aac9d4;p=freeside.git

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 6fa4c3d9e..fa667c0c0 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -20,6 +20,7 @@ use FS::Msgcat qw(gettext);
 use FS::Misc qw(card_types);
 use FS::Misc::DateTime qw(parse_datetime);
 use FS::ClientAPI_SessionCache;
+use FS::cust_svc;
 use FS::svc_acct;
 use FS::svc_domain;
 use FS::svc_phone;
@@ -339,7 +340,25 @@ sub customer_info {
       $return{balance} = $cust_main->balance;
     }
 
-    $return{tickets} = [ ($cust_main->tickets) ];
+    my @tickets = $cust_main->tickets;
+    # unavoidable false laziness w/ httemplate/view/cust_main/tickets.html
+    if ( FS::TicketSystem->selfservice_priority ) {
+      my $dir = $conf->exists('ticket_system-priority_reverse') ? -1 : 1;
+      $return{tickets} = [ 
+        sort { 
+          (
+            ($a->{'_selfservice_priority'} eq '') <=>
+            ($b->{'_selfservice_priority'} eq '')
+          ) ||
+          ( $dir * 
+            ($b->{'_selfservice_priority'} <=> $a->{'_selfservice_priority'}) 
+          )
+        } @tickets
+      ];
+    }
+    else {
+      $return{tickets} = \@tickets;
+    }
 
     unless ( $session->{'pkgnum'} ) {
       my @open = map {
@@ -400,6 +419,11 @@ sub customer_info {
       $return{discount_terms_hash} = { $cust_main->discount_terms_hash };
     }
 
+    if ( $session->{'svcnum'} ) {
+      my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $session->{'svcnum'} });
+      $return{'svc_label'} = ($cust_svc->label)[1] if $cust_svc;
+    }
+
   } elsif ( $session->{'svcnum'} ) { #no customer record
 
     my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $session->{'svcnum'} } )
@@ -912,6 +936,28 @@ sub invoice {
 
 }
 
+sub invoice_pdf {
+  my $p = shift;
+  my $session = _cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'};
+
+  my $invnum = $p->{'invnum'};
+
+  my $cust_bill = qsearchs('cust_bill', { 'invnum'  => $invnum,
+                                          'custnum' => $custnum } )
+    or return { 'error' => "Can't find invnum" };
+
+  #my %return;
+
+  return { 'error'       => '',
+           'invnum'      => $invnum,
+           'invoice_pdf' => $cust_bill->print_pdf( { unsquelch_cdr => 1 } ),
+         };
+
+}
+
 sub invoice_logo {
   my $p = shift;
 
@@ -957,13 +1003,25 @@ sub list_invoices {
 
   my @cust_bill = $cust_main->cust_bill;
 
+  my $balance = 0;
+
   return  { 'error'       => '',
-            'invoices'    =>  [ map { { 'invnum' => $_->invnum,
-                                        '_date'  => $_->_date,
-					'date'   => time2str("%b %o, %Y", $_->_date),
-                                      }
-                                    } @cust_bill
-                              ]
+            'invoices'    => [
+              map {
+                    my $owed = $_->owed;
+                    $balance += $owed;
+                    +{ 'invnum'     => $_->invnum,
+                       '_date'      => $_->_date,
+                       'date'       => time2str("%b %o, %Y", $_->_date),
+                       'date_short' => time2str("%m-%d-%Y",  $_->_date),
+                       'previous'   => sprintf('%.2f', ($_->previous)[0]),
+                       'charged'    => sprintf('%.2f', $_->charged),
+                       'owed'       => sprintf('%.2f', $owed),
+                       'balance'    => sprintf('%.2f', $balance),
+                     }
+                  }
+                  @cust_bill
+            ]
           };
 }
 
@@ -1038,8 +1096,10 @@ sub list_pkgs {
   { 'svcnum'   => $session->{'svcnum'},
     'custnum'  => $custnum,
     'cust_pkg' => [ map {
-                          { $_->hash,
+                          my $primary_cust_svc = $_->primary_cust_svc;
+                          +{ $_->hash,
                             $_->part_pkg->hash,
+                            status => $_->status,
                             part_svc =>
                               [ map $_->hashref, $_->available_part_svc ],
                             cust_svc => 
@@ -1057,6 +1117,14 @@ sub list_pkgs {
                                       $ref;
                                     } $_->cust_svc
                               ],
+                            primary_cust_svc =>
+                              $primary_cust_svc
+                                ? { $primary_cust_svc->hash,
+                                    label => [ $primary_cust_svc->label ],
+                                    finger => $primary_cust_svc->svc_x->finger, #uuh
+                                    $primary_cust_svc->part_svc->hash,
+                                  }
+                                : {}, #'' ?
                           };
                         } $cust_main->ncancelled_pkgs
                   ],