X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=83f114ef98bbac76f0fe1dd0466916134ee2a33a;hb=c97b6a00f150f5e7a4aa58b71389d5c504817cf2;hp=f1afdb5701a1062924627da32a1135a1283b7f81;hpb=69ecd0e15d3de36b56ad133d5ae57dcddc53c63e;p=freeside.git

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index f1afdb570..83f114ef9 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -412,14 +412,17 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 
   sub freq {
 
+    #false laziness w/edit/part_pkg.cgi
     my %freq = ( #move this
-      1 => 'monthly',
-      2 => 'bi-monthly',
-      3 => 'quarterly',
-      6 => 'semi-annually',
-      12 => 'annually',
-      24 => 'bi-annually',
-      36 => 'tri-annually',
+      '1d' => 'daily',
+      '1w' => 'weekly',
+      '2w' => 'biweekly (every 2 weeks)',
+      '1'  => 'monthly',
+      '2'  => 'bimonthly (every 2 months)',
+      '3'  => 'quarterly (every 3 months)',
+      '6'  => 'semiannually (every 6 months)',
+      '12' => 'annually',
+      '24' => 'biannually (every 2 years)',
     );
 
     my $freq = shift;
@@ -793,8 +796,8 @@ sub get_packages {
     $pkg{expire} = $cust_pkg->getfield('expire');
     $pkg{cancel} = $cust_pkg->getfield('cancel');
   
-    $pkg{svcparts} = []; 
-  
+    my %svcparts = ();
+
     foreach my $pkg_svc (
       qsearch('pkg_svc', { 'pkgpart' => $part_pkg->pkgpart })
     ) {
@@ -811,29 +814,44 @@ sub get_packages {
       $svcpart->{count} = 0;
   
       $svcpart->{services} = [];
-  
-      foreach my $cust_svc (
-        qsearch( 'cust_svc', {
-                               'pkgnum' => $cust_pkg->pkgnum,
-                               'svcpart' => $part_svc->svcpart,
-                             }
-        )
-      ) {
-  
-        my $svc = {};
-        $svc->{svcnum} = $cust_svc->svcnum;
-        $svc->{label} = ($cust_svc->label)[1];
-  
-        push @{$svcpart->{services}}, $svc;
-  
-        $svcpart->{count}++;
-  
-      }
-  
-      push @{$pkg{svcparts}}, $svcpart;
-  
+
+      $svcparts{$svcpart->{svcpart}} = $svcpart;
+
     }
-  
+
+    foreach my $cust_svc (
+      qsearch( 'cust_svc', {
+                             'pkgnum' => $cust_pkg->pkgnum,
+                             #'svcpart' => $part_svc->svcpart,
+                           }
+      )
+    ) {
+
+      warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
+      my $svc = {
+        'svcnum' => $cust_svc->svcnum,
+        'label'  => ($cust_svc->label)[1],
+      };
+
+      #false laziness with above, to catch extraneous services.  whole
+      #damn thing should be OO...
+      my $svcpart = ( $svcparts{$cust_svc->svcpart} ||= {
+        'svcpart'  => $cust_svc->svcpart,
+        'svc'      => $cust_svc->part_svc->svc,
+        'svcdb'    => $cust_svc->part_svc->svcdb,
+        'quantity' => 0,
+        'count'    => 0,
+        'services' => [],
+      } );
+
+      push @{$svcpart->{services}}, $svc;
+
+      $svcpart->{count}++;
+
+    }
+
+    $pkg{svcparts} = [ values %svcparts ];
+
     push @packages, \%pkg;
   
   }