[freeside-commits] branch master updated. 2d7e57036577c272ce0e9ee4c7e3985a4b3adf22

[Ivan]

The branch, master has been updated
       via  2d7e57036577c272ce0e9ee4c7e3985a4b3adf22 (commit)
       via  7c370a4579d1ed8b81dba2fb5fae9978b283b49e (commit)
       via  5583e0b1788d9e307f676f21827e9920f5bf0677 (commit)
      from  1ebcca94aba75c5901c6eefaf373f39e94b03cf0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2d7e57036577c272ce0e9ee4c7e3985a4b3adf22
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 6 15:36:58 2014 -0700

    public demo RT pref disable hack

diff --git a/rt/share/html/Prefs/Other.html b/rt/share/html/Prefs/Other.html
index 15f5dfd..93e85d5 100644
--- a/rt/share/html/Prefs/Other.html
+++ b/rt/share/html/Prefs/Other.html
@@ -89,6 +89,10 @@ if (defined($PreferredKey) and (not $UserObj->FirstAttribute('PreferredKey')
 }
 
 if ( $Update ) {
+  my $fsconf = eval { FS::Conf->new };
+  if ( $fsconf && $fsconf->exists('disable_acl_changes') ) {
+    push @results, loc("Preference changes disabled in public demo.");
+  } else {
     $preferences ||= {};
     $m->comp( '/Widgets/BulkProcess', Meta => {
                 map { $_ => RT->Config->Meta($_) } RT->Config->Options
@@ -101,6 +105,7 @@ if ( $Update ) {
 
     my ($ok, $msg) = $UserObj->SetPreferences( $RT::System, $preferences );
     push @results, $ok ? loc("Preferences saved.") : $msg;
+  }
 }
 </%INIT>
 <%ARGS>

commit 7c370a4579d1ed8b81dba2fb5fae9978b283b49e
Merge: 5583e0b 1ebcca9
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 6 15:36:56 2014 -0700

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


commit 5583e0b1788d9e307f676f21827e9920f5bf0677
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Aug 5 21:38:16 2014 -0700

    referer auth.net hack is finally gone

diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm
index e5e5291..8285cbf 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -300,10 +300,6 @@ sub _bop_content {
                         ? $options->{country}
                         : $self->country;
 
-  #3.0 is a good a time as any to get rid of this... add a config to pass it
-  # if anyone still needs it
-  #$content{referer} = 'http://cleanwhisker.420.am/';
-
   $content{phone} = $self->daytime || $self->night;
 
   my $currency =    $conf->exists('business-onlinepayment-currency')
@@ -1232,11 +1228,6 @@ sub realtime_botpp_capture {
     'amount'         => $cust_pay_pending->paid,
     #'invoice_number' => $options{'invnum'},
     'customer_id'    => $self->custnum,
-
-    #3.0 is a good a time as any to get rid of this... add a config to pass it
-    # if anyone still needs it
-    #'referer'        => 'http://cleanwhisker.420.am/',
-
     'reference'      => $cust_pay_pending->paypendingnum,
     'email'          => $email,
     'phone'          => $self->daytime || $self->night,
@@ -1446,10 +1437,6 @@ sub realtime_refund_bop {
     'password'       => $password,
     'order_number'   => $order_number,
     'amount'         => $amount,
-
-    #3.0 is a good a time as any to get rid of this... add a config to pass it
-    # if anyone still needs it
-    #'referer'        => 'http://cleanwhisker.420.am/',
   );
   $content{authorization} = $auth
     if length($auth); #echeck/ACH transactions have an order # but no auth

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main/Billing_Realtime.pm |   13 -------------
 rt/share/html/Prefs/Other.html      |    5 +++++
 2 files changed, 5 insertions(+), 13 deletions(-)