[freeside-commits] branch master updated. b9ca052cf1e7c58e09833371273672b7c854a98a

[Mark Wells]

The branch, master has been updated
       via  b9ca052cf1e7c58e09833371273672b7c854a98a (commit)
       via  8eae613f03657bd343cceb674854035ba501ecb5 (commit)
      from  d3c0497a3ecf0404777fcfa3e84da5e6cbbda96e (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 b9ca052cf1e7c58e09833371273672b7c854a98a
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Jan 11 13:00:35 2016 -0800

    add missing h_svc_ modules on 4.x+

diff --git a/FS/FS/h_svc_conferencing.pm b/FS/FS/h_svc_conferencing.pm
new file mode 100644
index 0000000..032cc3e
--- /dev/null
+++ b/FS/FS/h_svc_conferencing.pm
@@ -0,0 +1,29 @@
+package FS::h_svc_conferencing;
+
+use strict;
+use base qw( FS::h_Common FS::svc_conferencing );
+
+sub table { 'h_svc_conferencing' };
+
+=head1 NAME
+
+FS::h_svc_conferencing - Historical installed conferencing service objects
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+An FS::h_svc_conferencing object represents a historical conferencing service.
+FS::h_svc_conferencing inherits from FS::h_Common and FS::svc_conferencing.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::h_Common>, L<FS::svc_conferencing>, L<FS::Record>, schema.html from the base
+documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/h_svc_video.pm b/FS/FS/h_svc_video.pm
new file mode 100644
index 0000000..2a94d94
--- /dev/null
+++ b/FS/FS/h_svc_video.pm
@@ -0,0 +1,29 @@
+package FS::h_svc_video;
+
+use strict;
+use base qw( FS::h_Common FS::svc_video );
+
+sub table { 'h_svc_video' };
+
+=head1 NAME
+
+FS::h_svc_video - Historical installed video service objects
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+An FS::h_svc_video object represents a historical video service.
+FS::h_svc_video inherits from FS::h_Common and FS::svc_video.
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::h_Common>, L<FS::svc_video>, L<FS::Record>, schema.html from the base
+documentation.
+
+=cut
+
+1;
+

commit 8eae613f03657bd343cceb674854035ba501ecb5
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Jan 11 12:20:08 2016 -0800

    add safety check for existence of h_svc_* modules, #39779, #34107, #22009, #15902, #11454, #7322, #7111

diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 518e847..08003dd 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -12,6 +12,11 @@ use FS::export_svc;
 use FS::cust_svc;
 use FS::part_svc_class;
 
+FS::UID->install_callback(sub {
+    # preload the cache and make sure all modules load
+    my $svc_defs = FS::part_svc->_svc_defs;
+});
+
 $DEBUG = 0;
 
 =head1 NAME
@@ -649,9 +654,17 @@ sub _svc_defs {
         next;
       }
       $info{$mod} = $info;
+
+      # all svc_* modules are required to have h_svc_* modules for invoice
+      # display. check for them as early as possible.
+      eval "use FS::h_$mod;";
+      if ( $@ ) {
+        die "couldn't load history record module h_$mod: $@\n";
+      }
     }
   }
 
+
   tie my %svc_defs, 'Tie::IxHash', 
     map  { $_ => $info{$_}->{'fields'} }
     sort { $info{$a}->{'display_weight'} <=> $info{$b}->{'display_weight'} }

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

Summary of changes:
 FS/FS/h_svc_conferencing.pm |   29 +++++++++++++++++++++++++++++
 FS/FS/h_svc_video.pm        |   29 +++++++++++++++++++++++++++++
 FS/FS/part_svc.pm           |   13 +++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 FS/FS/h_svc_conferencing.pm
 create mode 100644 FS/FS/h_svc_video.pm