projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e5b2660
)
fix RT vs v4-style location-less customers
author
Ivan Kohler
<ivan@freeside.biz>
Wed, 21 Jun 2017 19:37:00 +0000
(12:37 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Wed, 21 Jun 2017 19:37:00 +0000
(12:37 -0700)
rt/lib/RT/URI/freeside/Internal.pm
patch
|
blob
|
history
diff --git
a/rt/lib/RT/URI/freeside/Internal.pm
b/rt/lib/RT/URI/freeside/Internal.pm
index
2b09c87
..
f7b9bab
100644
(file)
--- a/
rt/lib/RT/URI/freeside/Internal.pm
+++ b/
rt/lib/RT/URI/freeside/Internal.pm
@@
-234,10
+234,6
@@
sub CustomerInfo {
my $referral = qsearchs('part_referral', { refnum => $cust_main->refnum });
my @part_tags = $cust_main->part_tag;
my $referral = qsearchs('part_referral', { refnum => $cust_main->refnum });
my @part_tags = $cust_main->part_tag;
- my @lf = $cust_main->location_fields;
- my $bill_location = $cust_main->bill_location;
- my $ship_location = $cust_main->ship_location;
-
my $info = {
%$rec,
my $info = {
%$rec,
@@
-254,12
+250,18
@@
sub CustomerInfo {
BillingType => FS::payby->longname($cust_main->payby),
};
BillingType => FS::payby->longname($cust_main->payby),
};
+ my @lf = $cust_main->location_fields;
+ my $bill_location = $cust_main->bill_location;
+ my $ship_location = $cust_main->ship_location;
+
foreach my $field (@lf) {
foreach my $field (@lf) {
- $info->{"bill_$field"} = $bill_location->get($field);
- $info->{"ship_$field"} = $ship_location->get($field);
+ $info->{"bill_$field"} = $bill_location->get($field)
if $bill_location
;
+ $info->{"ship_$field"} = $ship_location->get($field)
if $ship_location
;
}
}
- $info->{"bill_location"} = $bill_location->location_label(no_prefix => 1);
- $info->{"ship_location"} = $ship_location->location_label(no_prefix => 1);
+ $info->{"bill_location"} = $bill_location->location_label(no_prefix => 1)
+ if $bill_location;
+ $info->{"ship_location"} = $ship_location->location_label(no_prefix => 1)
+ if $ship_location;
return $self->{CustomerInfo} = $info;
}
return $self->{CustomerInfo} = $info;
}