Merge branch 'master' of git.freeside.biz:/home/git/freeside

3 files changed, 4 insertions, 10 deletions

diff --git a/fs_selfservice/FS-SelfService/cgi/change_pay.html b/fs_selfservice/FS-SelfService/cgi/change_pay.html
index 75ceee8f7..e272669dc 100644
--- a/fs_selfservice/FS-SelfService/cgi/change_pay.html
+++ b/fs_selfservice/FS-SelfService/cgi/change_pay.html
@@ -14,7 +14,6 @@
 
   my $tail = qq(</TABLE>).
              qq(<INPUT TYPE="hidden" NAME="action" VALUE="process_change_pay">).
-             qq(<INPUT TYPE="hidden" NAME="custpaybynum" VALUE="$custpaybynum">).
              qq(<BR>).
              qq(<INPUT TYPE="submit" NAME="process" ).
              qq(VALUE="Save payment information"> ).
diff --git a/fs_selfservice/FS-SelfService/cgi/image.cgi b/fs_selfservice/FS-SelfService/cgi/image.cgi
index 129ac438b..ee17683a6 100755
--- a/fs_selfservice/FS-SelfService/cgi/image.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/image.cgi
@@ -22,7 +22,7 @@ if ( $query =~ /^(\w+)$/ ) {
 my $info = skin_info( agentnum=>$agentnum );
 
 print $cgi->header( '-type'    => 'image/png', #for now
-                    '-expires' => 'now',
+                    #'-expires' => 'now',
                   ).
       $info->{$name};
 
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 698640574..6eab11dae 100755
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -12,7 +12,7 @@ use Date::Format;
 use Date::Parse 'str2time';
 use Number::Format 1.50;
 use FS::SelfService qw(
-  access_info login_info login customer_info edit_info insert_payby update_payby
+  access_info login_info login customer_info edit_info insert_payby update_payby 
   invoice payment_info process_payment realtime_collect process_prepay
   list_pkgs order_pkg signup_info order_recharge
   part_svc_info provision_acct provision_external provision_phone provision_forward
@@ -388,9 +388,8 @@ sub process_change_ship {
 sub process_change_pay {
         my $postal = $cgi->param( 'postal_invoicing' );
         my $payby  = $cgi->param( 'payby' );
-        $cgi->param('paydate', $cgi->param('year') . '-' . $cgi->param('month') . '-01');
         my @list =
-          qw( payby payinfo payinfo1 payinfo2 month year paydate payname custpaybynum
+          qw( payby payinfo payinfo1 payinfo2 month year payname
               address1 address2 city county state zip country auto paytype
               paystate ss stateid stateid_state invoicing_list
             );
@@ -408,11 +407,7 @@ sub process_change_pay {
           };
         }
 
-        if (FS::SelfService->can('update_payby')) {
-          if ($cgi->param( 'custpaybynum' )) { _process_change_payby( 'change_pay', @list ); }
-          else { _process_insert_payby( 'change_pay', @list ); }
-        }
-        else { _process_change_info( 'change_pay', @list ); }
+        _process_change_info( 'change_pay', @list );
 }
 
 sub process_change_creditcard_pay {