From eef42f43c02b386ed7a0b1ce9911964bb94d3e96 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Jan 2004 23:45:03 +0000
Subject: fix newline problem in dump

---
 httemplate/misc/dump.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate')

diff --git a/httemplate/misc/dump.cgi b/httemplate/misc/dump.cgi
index 2c7dfc455..dc1323bb3 100644
--- a/httemplate/misc/dump.cgi
+++ b/httemplate/misc/dump.cgi
@@ -13,7 +13,7 @@
   http_header('Content-Type' => 'text/plain' );
 
   while (<DUMP>) {
-    chomp;
-%><%= $_ %><% }
-   close DUMP;
+    print $_;
+  }
+  close DUMP;
 %>
-- 
cgit v1.2.1


From 9163d831264988af6065139c7531d59a1bb29c10 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 22 Jan 2004 00:11:01 +0000
Subject: report cancellation errors properly

---
 httemplate/misc/cust_main-cancel.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate')

diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi
index 526e128a4..257c3384f 100755
--- a/httemplate/misc/cust_main-cancel.cgi
+++ b/httemplate/misc/cust_main-cancel.cgi
@@ -7,8 +7,8 @@ my $custnum = $1;
 
 my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
 
-my $error = $cust_main->cancel;
-eidiot($error) if $error;
+my @errors = $cust_main->cancel;
+eidiot(join(' / ', @errors)) if scalar(@errors);
 
 #print $cgi->redirect($p. "view/cust_main.cgi?". $cust_main->custnum);
 print $cgi->redirect($p);
-- 
cgit v1.2.1


From 85be0d954dbe4a2c86841a37dc6a4df690dd5142 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 02:53:12 +0000
Subject: fix state default and set min year to this year, patch from
 <matthewd>, thanks!

---
 httemplate/edit/cust_main.cgi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'httemplate')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 1909b5438..bfe4a2d4f 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -191,8 +191,10 @@ END
 my $countrydefault = $conf->config('countrydefault') || 'US';
 $cust_main->country( $countrydefault ) unless $cust_main->country;
 
-$cust_main->state( $conf->config('statedefault') || 'CA' )
-  unless $cust_main->state || $cust_main->country ne 'US';
+my $statedefault = $conf->config('statedefault')
+                   || ($countrydefault eq 'US' ? 'CA' : '');
+$cust_main->state( $statedefault )
+  unless $cust_main->state || $cust_main->country ne $countrydefault;
 
 my($county_html, $state_html, $country_html) =
   FS::cust_main_county::regionselector( $cust_main->county,
@@ -343,7 +345,9 @@ sub expselect {
     $return .= ">$_";
   }
   $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
-  for ( 2001 .. 2037 ) {
+  my @t = localtime;
+  my $thisYear = $t[5] + 1900;
+  for ( ($thisYear > $y && $y > 0 ? $y : $thisYear) .. 2037 ) {
     $return .= "<OPTION";
     $return .= " SELECTED" if $_ == $y;
     $return .= ">$_";
-- 
cgit v1.2.1


From 24eb823f02d7681b052261dd321b3505ac970e61 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 03:01:22 +0000
Subject: and the same for ship_

---
 httemplate/edit/cust_main.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'httemplate')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index bfe4a2d4f..857e769a3 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -291,8 +291,9 @@ END
   #false laziness with regular state
   $cust_main->ship_country( $countrydefault ) unless $cust_main->ship_country;
 
-  $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
-    unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
+  $cust_main->ship_state( $statedefault )
+    unless $cust_main->ship_state
+           || $cust_main->ship_country ne $countrydefault;
 
   my($ship_county_html, $ship_state_html, $ship_country_html) =
     FS::cust_main_county::regionselector( $cust_main->ship_county,
-- 
cgit v1.2.1


From 0cb82fbbb68d51ea51cdc321c6322ab22508373c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 08:55:10 +0000
Subject: first try at prepaid income report

---
 httemplate/search/report_prepaid_income.cgi | 67 +++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 httemplate/search/report_prepaid_income.cgi

(limited to 'httemplate')

diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
new file mode 100644
index 000000000..f1d284b1a
--- /dev/null
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -0,0 +1,67 @@
+<!-- mason kludge -->
+<%
+
+  #doesn't yet deal with daily/weekly packages
+
+  #needs to be re-written in sql for efficiency
+
+  my $now = time;
+
+  my %prepaid;
+
+  my @cust_bill_pkg =
+    grep { $_->cust_pkg && $_->cust_pkg->part_pkg->freq !~ /^([01]|\d+[dw])$/ }
+      qsearch( 'cust_bill_pkg', {
+                                  'recur' => { op=>'!=', value=>0 },
+                                  'edate' => { op=>'>', value=>$now },
+                                }, );
+
+  foreach my $cust_bill_pkg ( @cust_bill_pkg ) {
+
+    #conceptual false laziness w/texas tax exempt_amount stuff in
+    #FS::cust_main::bill
+
+    my $freq = $cust_bill_pkg->cust_pkg->part_pkg->freq;
+    my $per_month = sprintf("%.2f", $cust_bill_pkg->recur / $freq);
+
+    my($mon, $year) = (localtime($cust_bill_pkg->sdate) )[4,5];
+    $mon+=2; $year+=1900;
+
+    foreach my $which_month ( 2 .. $freq ) {
+      until ( $mon < 13 ) { $mon -= 12; $year++; }
+      $prepaid{"$year-$mon"} += $per_month;
+    }
+
+  }
+
+%>
+
+<%= header('Prepaid Income Report', menubar( 'Main Menu'=>$p, ) ) %>
+<%= table() %>
+<%
+
+  my $total = 0;
+
+  my ($now_mon, $now_year) = (localtime($now))[4,5];
+  $now_mon+=2; $now_year+=1900;
+  until ( $now_mon < 13 ) { $now_mon -= 12; $now_year++; }
+
+  my $subseq = 0;
+  for my $year ( $now_year .. 2037 ) {
+    for my $mon ( ( $subseq++ ? 1 : $now_mon ) .. 12 ) {
+      if ( $prepaid{"$year-$mon"} ) {
+        $total += $prepaid{"$year-$mon"};
+        %> <TR><TD><%= "$year-$mon" %></TD>
+               <TD><%= sprintf("%.2f", $prepaid{"$year-$mon"} ) %></TD>
+           </TR>
+        <%
+      }
+    }
+
+  }
+
+%>
+<TR><TH>Total</TH><TD><%= sprintf("%.2f", $total) %></TD></TR>
+</TABLE>
+</BODY>
+</HTML>
-- 
cgit v1.2.1