From 69df93bdea1c7692de8c7d11a9bee04dbd9e1ff9 Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Wed, 21 Nov 2018 07:43:33 -0500
Subject: Revert "RT# 79902 - fixed display issue with updating accounts"

This reverts commit d9b37134d7e5dc98012b3111698e160d8f06bb98.
---
 fs_selfservice/FS-SelfService/cgi/image.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'fs_selfservice/FS-SelfService/cgi')

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};
 
-- 
cgit v1.2.1


From afb1c3d32628a6778c56fd3ff356dfaaa6ac0c58 Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Wed, 21 Nov 2018 07:46:31 -0500
Subject: Revert "RT# 79902 - fixed so change payment information link will
 still work when upgraded from V3 to V4 and restores functionality in V3"

This reverts commit 3fc05ed5adb6cbfcd6aee27b2ae199cf95cd4224.
---
 fs_selfservice/FS-SelfService/cgi/change_pay.html |  4 +++-
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi | 11 +++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'fs_selfservice/FS-SelfService/cgi')

diff --git a/fs_selfservice/FS-SelfService/cgi/change_pay.html b/fs_selfservice/FS-SelfService/cgi/change_pay.html
index 75ceee8f7..f90f6d92b 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"> ).
@@ -61,6 +60,9 @@
   delete $options{'DCRD'} unless $payby eq 'DCRD' || ! exists $options{'CARD'};
   delete $options{'DCHK'} unless $payby eq 'DCHK' || ! exists $options{'CHEK'};
 
+  ## set default layer to first payby.
+  @p = keys %options; $payby = $p[0];
+
   HTML::Widgets::SelectLayers->new(
     options => \%options,
     selected_layer => $payby,
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 {
-- 
cgit v1.2.1


From 0df9455e5c155bc7aea4f515876111825f1931b9 Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Wed, 21 Nov 2018 11:20:28 -0500
Subject: RT# 79902 - restored functionality to selfservice change_pay so it
 does not break on v3 to v4 upgrade.

---
 fs_selfservice/FS-SelfService/cgi/change_pay.html | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'fs_selfservice/FS-SelfService/cgi')

diff --git a/fs_selfservice/FS-SelfService/cgi/change_pay.html b/fs_selfservice/FS-SelfService/cgi/change_pay.html
index f90f6d92b..e272669dc 100644
--- a/fs_selfservice/FS-SelfService/cgi/change_pay.html
+++ b/fs_selfservice/FS-SelfService/cgi/change_pay.html
@@ -60,9 +60,6 @@
   delete $options{'DCRD'} unless $payby eq 'DCRD' || ! exists $options{'CARD'};
   delete $options{'DCHK'} unless $payby eq 'DCHK' || ! exists $options{'CHEK'};
 
-  ## set default layer to first payby.
-  @p = keys %options; $payby = $p[0];
-
   HTML::Widgets::SelectLayers->new(
     options => \%options,
     selected_layer => $payby,
-- 
cgit v1.2.1