From 9d8d3c6e4a2d2e757150402b8a89c719b8c1013f Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Tue, 17 Aug 2010 01:05:28 +0000
Subject: fix SelfService county selector, RT#8079

---
 fs_selfservice/FS-SelfService/SelfService.pm  | 12 ++++++++++++
 fs_selfservice/FS-SelfService/cgi/signup.html |  7 ++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'fs_selfservice/FS-SelfService')

diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 7e6821b60..a0e632c1b 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -1393,6 +1393,18 @@ END
   my $county_html = $script_html;
   if ( $countyflag ) {
     $county_html .= qq!<SELECT NAME="${prefix}county" onChange="$param->{'onchange'}">!;
+    foreach my $county ( 
+      sort keys %{ $cust_main_county{$param->{'selected_country'}}{$param->{'selected_state'}} }
+    ) {
+      my $text = $county || '(n/a)';
+      $county_html .= qq!<OPTION VALUE="$county"!.
+                      ($county eq $param->{'selected_county'} ? 
+                        ' SELECTED>' : 
+                        '>'
+                      ).
+                      $text.
+                      '</OPTION>';
+    }
     $county_html .= '</SELECT>';
   } else {
     $county_html .=
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html
index 375137b3c..7a56a31a1 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.html
+++ b/fs_selfservice/FS-SelfService/cgi/signup.html
@@ -74,8 +74,6 @@ Contact Information
 <TR>
   <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
   <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD>
     <%=
         ($county_html, $state_html, $country_html) =
           regionselector( {
@@ -87,8 +85,11 @@ Contact Information
             locales          => \@cust_main_county,
           } );
  
-        "$county_html $state_html";
     %>
+  <TH ALIGN="right"><font color="#ff0000">*</font>
+    <%= ($county_html =~ /SELECT/) ? 'County/State' : 'State' %></TH>
+  <TD>
+    <%= "$county_html $state_html"; %>
   </TD>
   <TH><font color="#ff0000">*</font>Zip</TH>
   <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
-- 
cgit v1.2.1


From 5250c44bd7f282c7d782bf0e8349af12376929df Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 22 Sep 2010 19:16:20 +0000
Subject: prepayment discounts rt#5318

---
 .../FS-SelfService/cgi/discount_term.html          | 17 +++++++++++++++
 .../FS-SelfService/cgi/make_ach_payment.html       |  1 +
 .../FS-SelfService/cgi/make_payment.html           |  4 +++-
 fs_selfservice/FS-SelfService/cgi/myaccount.html   | 10 ++++++++-
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi  | 24 ++++++++++++++++++++--
 5 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 fs_selfservice/FS-SelfService/cgi/discount_term.html

(limited to 'fs_selfservice/FS-SelfService')

diff --git a/fs_selfservice/FS-SelfService/cgi/discount_term.html b/fs_selfservice/FS-SelfService/cgi/discount_term.html
new file mode 100644
index 000000000..7d9ee4d1f
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/discount_term.html
@@ -0,0 +1,17 @@
+<%=
+if ( scalar(keys %discount_terms_hash) ) {
+  $OUT .= '<TR>';
+    $OUT .= '<TD ALIGN="right">Prepayment for</TD>';
+    $OUT .= '<TD>';
+      $OUT .= '<SELECT NAME="discount_term">';
+        $OUT .= qq(<OPTION VALUE="">1 month\n);
+        foreach ( keys %discount_terms_hash ) {
+           $selected = $discount_term eq $_ ? ' SELECTED' : '';
+           $OUT .= qq(<OPTION$selected VALUE="$_">$_ months\n);
+        }
+      $OUT .= '</SELECT>';
+    $OUT .= '</TD>';
+  $OUT .= '</TR>';
+}
+$OUT .= '';
+%>
diff --git a/fs_selfservice/FS-SelfService/cgi/make_ach_payment.html b/fs_selfservice/FS-SelfService/cgi/make_ach_payment.html
index 09391e7ae..5b81b00a4 100644
--- a/fs_selfservice/FS-SelfService/cgi/make_ach_payment.html
+++ b/fs_selfservice/FS-SelfService/cgi/make_ach_payment.html
@@ -21,6 +21,7 @@
     </TD></TR></TABLE>
   </TD>
 </TR>
+<%= include('discount_term') %>
 <%= include('check') %>
 <TR>
   <TD COLSPAN=2>
diff --git a/fs_selfservice/FS-SelfService/cgi/make_payment.html b/fs_selfservice/FS-SelfService/cgi/make_payment.html
index e454647cc..645b68ec7 100644
--- a/fs_selfservice/FS-SelfService/cgi/make_payment.html
+++ b/fs_selfservice/FS-SelfService/cgi/make_payment.html
@@ -20,7 +20,9 @@
       $<INPUT TYPE="text" NAME="amount" SIZE=8 VALUE="<%=sprintf("%.2f",$balance)%>">
     </TD></TR></TABLE>
   </TD>
-</TR><TR>
+</TR>
+<%= include('discount_term') %>
+<TR>
   <TH ALIGN="right">Card&nbsp;type</TH>
   <TD COLSPAN=7>
     <SELECT NAME="card_type"><OPTION></OPTION>
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index 0de738515..6b4187f36 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -14,7 +14,15 @@ Hello <%= $name %>!<BR><BR>
   if (scalar(grep $_, @hide_payment_fields)) {
     $OUT .= qq! <B><A HREF="${url}make_thirdparty_payment&payby_method=CC">Make a payment</A></B><BR><BR>!;
   } else {
-    $OUT .= qq! <B><A HREF="${url}make_payment">Make a payment</A></B><BR><BR>!;
+    $OUT .= qq! <B><A HREF="${url}make_payment">Make a payment</A></B><BR>!;
+    foreach my $term ( sort { $b <=> $a } keys %discount_terms_hash ) {
+      my $saved = $discount_terms_hash{$term}->[1];
+      my $amount = $discount_terms_hash{$term}->[2];
+      my $savings = ( $amount + $saved > 0 )
+                    ? sprintf('%d', $saved / ( $amount + $saved ) * 100 ) : '0';
+      $OUT .= qq! <B><A HREF="${url}make_term_payment;discount_term=$term;amount=$amount">Save $savings\% by paying for $term months: $amount</A></B><BR>!;
+    }
+    $OUT .= qq! <BR>!;
   }
 } %>
 <%=
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 2252852d9..711bd4e12 100644
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -73,7 +73,7 @@ $session_id = $cgi->param('session');
 
 #order|pw_list XXX ???
 $cgi->param('action') =~
-    /^(myaccount|view_invoice|make_payment|make_ach_payment|make_thirdparty_payment|payment_results|ach_payment_results|recharge_prepay|recharge_results|logout|change_bill|change_ship|change_pay|process_change_bill|process_change_ship|process_change_pay|customer_order_pkg|process_order_pkg|customer_change_pkg|process_change_pkg|process_order_recharge|provision|provision_svc|process_svc_acct|process_svc_external|delete_svc|view_usage|view_usage_details|view_cdr_details|view_support_details|change_password|process_change_password)$/
+    /^(myaccount|view_invoice|make_payment|make_ach_payment|make_term_payment|make_thirdparty_payment|payment_results|ach_payment_results|recharge_prepay|recharge_results|logout|change_bill|change_ship|change_pay|process_change_bill|process_change_ship|process_change_pay|customer_order_pkg|process_order_pkg|customer_change_pkg|process_change_pkg|process_order_recharge|provision|provision_svc|process_svc_acct|process_svc_external|delete_svc|view_usage|view_usage_details|view_cdr_details|view_support_details|change_password|process_change_password)$/
   or die "unknown action ". $cgi->param('action');
 my $action = $1;
 
@@ -105,7 +105,8 @@ do_template($action, {
 
 #--
 
-sub myaccount { customer_info( 'session_id' => $session_id ); }
+use Data::Dumper;
+sub myaccount { my $result = customer_info( 'session_id' => $session_id ); warn Dumper($result); $result;}
 
 sub change_bill { my $payment_info =
                     payment_info( 'session_id' => $session_id );
@@ -427,6 +428,10 @@ sub payment_results {
   $cgi->param('paybatch') =~ /^([\w\-\.]+)$/ or die "illegal paybatch";
   my $paybatch = $1;
 
+  $cgi->param('discount_term') =~ /^(\d*)$/ or die "illegal discount_term";
+  my $discount_term = $1;
+
+
   process_payment(
     'session_id' => $session_id,
     'payby'      => 'CARD',
@@ -445,6 +450,7 @@ sub payment_results {
     'save'       => $save,
     'auto'       => $auto,
     'paybatch'   => $paybatch,
+    'discount_term' => $discount_term,
   );
 
 }
@@ -529,6 +535,20 @@ sub make_thirdparty_payment {
   realtime_collect( 'session_id' => $session_id, 'method' => $1 );
 }
 
+sub make_term_payment {
+  $cgi->param('amount') =~ /^(\d+\.\d{2})$/
+    or die "illegal payment amount";
+  my $balance = $1;
+  $cgi->param('discount_term') =~ /^(\d+)$/
+    or die "illegal discount term";
+  my $discount_term = $1;
+  $action = 'make_payment';
+  ({ %{payment_info( 'session_id' => $session_id )},
+    'balance' => $balance,
+    'discount_term' => $discount_term,
+  })
+}
+
 sub recharge_prepay {
   customer_info( 'session_id' => $session_id );
 }
-- 
cgit v1.2.1