[freeside-commits] branch master updated. 2a9d2460814b37e07d7cb83392723146a60d34c7
Ivan Kohler
ivan at freeside.biz
Mon Jul 16 18:43:55 PDT 2018
The branch, master has been updated
via 2a9d2460814b37e07d7cb83392723146a60d34c7 (commit)
via 4facec5414f411b97c9b19772c13f125a0b748cb (commit)
via 25b3db5f07ae23cf0c39dbb77b955687eca14cf4 (commit)
via 146c3b35ba82492af12700ea3dcec922a6ba05ae (commit)
via b837d4cc6fb9424cb13b04a0ddabd079f5b4841b (commit)
via 352c40dffca003ef8212333ab22d14faaf8830ce (commit)
from e44835f640559a6eb5bc831e08732d5ab8947dd4 (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 2a9d2460814b37e07d7cb83392723146a60d34c7
Merge: 4facec541 e44835f64
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 16 18:43:48 2018 -0700
Merge branch 'master' of git.freeside.biz:/home/git/freeside
commit 4facec5414f411b97c9b19772c13f125a0b748cb
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 16 18:43:44 2018 -0700
whitespace, RT#79825
diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 38594f0df..078df559a 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -110,12 +110,12 @@ sub table_info {
'speed_down' => 'Download speed (Kbps)',
'speed_up' => 'Upload speed (Kbps)',
'ip_addr' => 'IP address',
- 'blocknum' =>
- { 'label' => 'Address block',
- 'type' => 'select',
- 'select_table' => 'addr_block',
- 'select_key' => 'blocknum',
- 'select_label' => 'cidr',
+ 'blocknum' => {
+ 'label' => 'Address block',
+ 'type' => 'select',
+ 'select_table' => 'addr_block',
+ 'select_key' => 'blocknum',
+ 'select_label' => 'cidr',
'disable_inventory' => 1,
},
'plan_id' => 'Service Plan Id',
commit 25b3db5f07ae23cf0c39dbb77b955687eca14cf4
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 16 18:41:56 2018 -0700
harmless, but don't do a string comparison on numbers anyway, RT#79825
diff --git a/FS/FS/svc_IP_Mixin.pm b/FS/FS/svc_IP_Mixin.pm
index c89245fe2..d28261141 100644
--- a/FS/FS/svc_IP_Mixin.pm
+++ b/FS/FS/svc_IP_Mixin.pm
@@ -80,7 +80,7 @@ sub svc_ip_check {
my $error = $self->ip_check;
return $error if $error;
if ( my $router = $self->router ) {
- if ( grep { $_->routernum eq $router->routernum } $self->allowed_routers ) {
+ if ( grep { $_->routernum == $router->routernum } $self->allowed_routers ) {
return '';
} else {
return 'Router '.$router->routername.' not available for this service';
commit 146c3b35ba82492af12700ea3dcec922a6ba05ae
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 16 18:40:21 2018 -0700
error on batch insert is returned to user, not fatal, RT#75998
diff --git a/FS/FS/cust_main/Billing_Batch.pm b/FS/FS/cust_main/Billing_Batch.pm
index 38d100ef6..74748ec33 100644
--- a/FS/FS/cust_main/Billing_Batch.pm
+++ b/FS/FS/cust_main/Billing_Batch.pm
@@ -138,6 +138,11 @@ sub batch_card {
'country' => $options{country} || $loc->country,
'payby' => $options{payby} || $cust_payby->payby,
'payinfo' => $options{payinfo} || $cust_payby->payinfo,
+ 'paymask' => ( $options{payinfo}
+ ? FS::payinfo_Mixin->mask_payinfo( $options{payby},
+ $options{payinfo} )
+ : $cust_payby->paymask
+ ),
'exp' => $options{paydate} || $cust_payby->paydate,
'payname' => $options{payname} || $cust_payby->payname,
'paytype' => $options{paytype} || $cust_payby->paytype,
commit b837d4cc6fb9424cb13b04a0ddabd079f5b4841b
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 16 18:37:26 2018 -0700
no need for errors decrypting inadvertantly encrypted payinfo to be fatal, RT#76385
diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 0069e207a..92a056c02 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -338,7 +338,10 @@ sub upgrade {
});
foreach my $object ( @objects ) {
my $payinfo = $object->decrypt($object->payinfo);
- die "error decrypting payinfo" if $payinfo eq $object->payinfo;
+ if ( $payinfo eq $object->payinfo ) {
+ warn "error decrypting payinfo for $table: $payinfo\n";
+ next;
+ }
$object->payinfo($payinfo);
my $error = $object->replace;
die $error if $error;
commit 352c40dffca003ef8212333ab22d14faaf8830ce
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 16 18:31:17 2018 -0700
add warning to flat fee description too, RT#79737
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 5c6c411b3..76ba30664 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -783,7 +783,7 @@ my $validate_email = sub { $_[0] =~
{
'key' => 'credit-card-surcharge-flatfee',
'section' => 'credit_cards',
- 'description' => 'Add a credit card surcharge to invoices, as a flat fee.',
+ 'description' => 'Add a credit card surcharge to invoices, as a flat fee. WARNING: Although recently permitted to US merchants in general, specific consumer protection laws may prohibit or restrict this practice in California, Colorado, Connecticut, Florda, Kansas, Maine, Massachusetts, New York, Oklahome, and Texas. Surcharging is also generally prohibited in most countries outside the US, AU and UK. When allowed, typically not permitted to be above 4%.',
'type' => 'text',
'per_agent' => 1,
},
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Conf.pm | 2 +-
FS/FS/Upgrade.pm | 5 ++++-
FS/FS/cust_main/Billing_Batch.pm | 5 +++++
FS/FS/svc_IP_Mixin.pm | 2 +-
FS/FS/svc_broadband.pm | 12 ++++++------
5 files changed, 17 insertions(+), 9 deletions(-)
More information about the freeside-commits
mailing list