[freeside-commits] branch master updated. bb6ff4c824ea551497def573a548035238980ed5

[Ivan]

The branch, master has been updated
       via  bb6ff4c824ea551497def573a548035238980ed5 (commit)
       via  45f5f4dd2b7322613697da21c8a11627a44ff4d9 (commit)
       via  c26cfa2b417bc3e553237ba399901741f505bbd2 (commit)
      from  18b6953b62a1b97f3121100e71bbbfc7d29e75a5 (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 bb6ff4c824ea551497def573a548035238980ed5
Author: Fernando Kiernan <fkiernan at id.net.ar>
Date:   Thu Jan 9 18:15:44 2014 -0300

    - Fix delete credit access on payment history.

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 141a079..a005384 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -415,7 +415,7 @@ my %opt = (
         'Apply payment', 'Refund credit card payment', 'Refund Echeck payment',
         'Credit card void', 'Echeck void', 'Void payments', 'Unvoid payments',
         'Delete payment', 'Unapply payment',
-        'Apply credit', 'Delete Credit', 'Unapply credit',
+        'Apply credit', 'Delete credit', 'Unapply credit',
         'Delete refund',
         'Billing event reports', 'View customer billing events',
       )

commit 45f5f4dd2b7322613697da21c8a11627a44ff4d9
Author: Fernando Kiernan <fkiernan at id.net.ar>
Date:   Tue Dec 31 19:56:18 2013 -0300

    - Fix region selector on SelfService

diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 567c710..f54a157 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -1467,7 +1467,7 @@ END
   foreach my $state ( sort keys %{ $cust_main_county{$param->{'selected_country'}} } ) {
     my $text = $state || '(n/a)';
     my $selected = $state eq $param->{'selected_state'} ? 'SELECTED' : '';
-    $state_html .= "\n<OPTION $selected VALUE=$state>$text</OPTION>"
+    $state_html .= "\n<OPTION $selected VALUE=\"$state\">$text</OPTION>"
   }
   $state_html .= '</SELECT>';
 
@@ -1487,7 +1487,7 @@ END
       my $selected = $country eq $param->{'selected_country'}
                        ? ' SELECTED'
                        : '';
-      $country_html .= "\n<OPTION$selected>$country</OPTION>"
+      $country_html .= "\n<OPTION $selected>$country</OPTION>"
     }
     $country_html .= '</SELECT>';
   } else {

commit c26cfa2b417bc3e553237ba399901741f505bbd2
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 18 21:39:35 2014 -0800

    move use statements to beginning instead of in subs

diff --git a/FS/FS/Setup.pm b/FS/FS/Setup.pm
index cac26c1..5e28c13 100644
--- a/FS/FS/Setup.pm
+++ b/FS/FS/Setup.pm
@@ -1,19 +1,32 @@
 package FS::Setup;
+use base qw( Exporter );
 
 use strict;
-use vars qw( @ISA @EXPORT_OK );
-use Exporter;
+use vars qw( ISA @EXPORT_OK );
 #use Tie::DxHash;
 use Tie::IxHash;
 use Crypt::OpenSSL::RSA;
 use FS::UID qw( dbh driver_name );
-use FS::Record;
+#use FS::Record;
 
 use FS::svc_domain;
 $FS::svc_domain::whois_hack = 1;
 $FS::svc_domain::whois_hack = 1;
 
- at ISA = qw( Exporter );
+#populate_locales
+use Locale::Country;
+use Locale::SubCountry 1.42;
+use FS::cust_main_county;
+
+#populate_access
+use FS::AccessRight;
+use FS::access_right;
+use FS::access_groupagent;
+
+#populate_msgcat
+use FS::Record qw(qsearch);
+use FS::msgcat;
+
 @EXPORT_OK = qw( create_initial_data enable_encryption );
 
 =head1 NAME
@@ -93,9 +106,6 @@ sub populate_numbering {
 
 sub populate_locales {
 
-  use Locale::Country;
-  use FS::cust_main_county;
-
   #cust_main_county
   foreach my $country ( sort map uc($_), all_country_codes ) {
     _add_country($country);
@@ -127,8 +137,6 @@ sub populate_addl_locales {
 
 sub _add_country {
 
-  use Locale::SubCountry 1.42;
-
   my( $country ) = shift;
 
   my $subcountry = eval { new Locale::SubCountry($country) };
@@ -411,10 +419,6 @@ sub initial_data {
 
 sub populate_access {
 
-  use FS::AccessRight;
-  use FS::access_right;
-  use FS::access_groupagent;
-
   foreach my $rightname ( FS::AccessRight->default_superuser_rights ) {
     my $access_right = new FS::access_right {
       'righttype'   => 'FS::access_group',
@@ -438,9 +442,6 @@ sub populate_access {
 
 sub populate_msgcat {
 
-  use FS::Record qw(qsearch);
-  use FS::msgcat;
-
   foreach my $del_msgcat ( qsearch('msgcat', {}) ) {
     my $error = $del_msgcat->delete;
     die $error if $error;

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

Summary of changes:
 FS/FS/Setup.pm                                 |   33 ++++++++++++-----------
 fs_selfservice/FS-SelfService/SelfService.pm   |    4 +-
 httemplate/view/cust_main/payment_history.html |    2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)