[freeside-commits] branch 13763 updated. 041a755d45f580c1f04cd228022aba3ed5a167fa

Mark Wells mark at 420.am
Sat Apr 14 15:57:49 PDT 2012


The branch, 13763 has been updated
       via  041a755d45f580c1f04cd228022aba3ed5a167fa (commit)
      from  5371ad9dd6bf63e29ffc85c8381f1ea2630b1749 (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 041a755d45f580c1f04cd228022aba3ed5a167fa
Author: Mark Wells <mark at freeside.biz>
Date:   Sat Apr 14 15:57:40 2012 -0700

    remove redundant code for coord lookups

diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm
index 9df8de6..6f7eb99 100644
--- a/FS/FS/cust_location.pm
+++ b/FS/FS/cust_location.pm
@@ -195,9 +195,6 @@ sub check {
   ;
   return $error if $error;
 
-  $self->set_coord
-    unless $self->latitude && $self->longitude;
-
   return "No prospect or customer!" unless $self->prospectnum || $self->custnum;
   return "Prospect and customer!"       if $self->prospectnum && $self->custnum;
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index af65ca7..d45e6ec 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1498,31 +1498,6 @@ sub replace {
       && length($self->get($pre.'zip')) >= 10;
   }
 
-#  for my $pre ( grep $old->get($_.'coord_auto'), ( '', 'ship_' ) ) {
-#
-#    $self->set($pre.'coord_auto', '') && next
-#      if $self->get($pre.'latitude') && $self->get($pre.'longitude')
-#      && (    $self->get($pre.'latitude')  != $old->get($pre.'latitude')
-#           || $self->get($pre.'longitude') != $old->get($pre.'longitude')
-#         );
-#
-#    $self->set_coord($pre)
-#      if $old->get($pre.'address1') ne $self->get($pre.'address1')
-#      || $old->get($pre.'city')     ne $self->get($pre.'city')
-#      || $old->get($pre.'state')    ne $self->get($pre.'state')
-#      || $old->get($pre.'country')  ne $self->get($pre.'country');
-#
-#  }
-#
-#  unless ( $import ) {
-#    $self->set_coord
-#      if ! $self->coord_auto && ! $self->latitude && ! $self->longitude;
-#
-#    $self->set_coord('ship_')
-#      if $self->has_ship_address && ! $self->ship_coord_auto
-#      && ! $self->ship_latitude && ! $self->ship_longitude;
-#  }
-
   local($ignore_expired_card) = 1
     if $old->payby  =~ /^(CARD|DCRD)$/
     && $self->payby =~ /^(CARD|DCRD)$/
@@ -1783,9 +1758,6 @@ sub check {
     || $self->ut_enum('locale', [ '', FS::Locales->locales ])
   ;
 
-  $self->set_coord
-    unless $import || ($self->latitude && $self->longitude);
-
   #barf.  need message catalogs.  i18n.  etc.
   $error .= "Please select an advertising source."
     if $error =~ /^Illegal or empty \(numeric\) refnum: /;
@@ -1889,9 +1861,6 @@ sub check {
     ;
     return $error if $error;
 
-    $self->set_coord('ship_')
-      unless $import || ($self->ship_latitude && $self->ship_longitude);
-
     #false laziness with above
     unless ( qsearchs('cust_main_county', {
       'country' => $self->ship_country,

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

Summary of changes:
 FS/FS/cust_location.pm |    3 ---
 FS/FS/cust_main.pm     |   31 -------------------------------
 2 files changed, 0 insertions(+), 34 deletions(-)




More information about the freeside-commits mailing list