[freeside-commits] branch master updated. 6edcac3fb4f343273195460f03a5e3c01feecb2a

[Ivan Kohler]

The branch, master has been updated
       via  6edcac3fb4f343273195460f03a5e3c01feecb2a (commit)
       via  ed7babbc6ce214ba0a1f63e7da9529b2e474929c (commit)
       via  9c6c62fe29a5b5e260d331fb0b663a492dc0bf2d (commit)
       via  f95fe844753a411328394dad031279df5bb1a143 (commit)
      from  cee66872f5c67825cae5a0f86da3fb0657c4ebae (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 6edcac3fb4f343273195460f03a5e3c01feecb2a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Aug 26 10:35:00 2018 -0700

    v4 styling

diff --git a/httemplate/edit/cust_main-contacts.html b/httemplate/edit/cust_main-contacts.html
index 3b7eb07d3..76929a7c9 100644
--- a/httemplate/edit/cust_main-contacts.html
+++ b/httemplate/edit/cust_main-contacts.html
@@ -1,13 +1,19 @@
+<%doc>
+
+Hmm, this is now entirely redundant with edit/cust_main/contacts_new.html, and
+this one isn't being maintained well.  :/
+
+</%doc>
 <& elements/edit.html,
-     'name_singular'   => 'customer contacts', #yes, we're editing all of them
-     'table'           => 'cust_main',
-     'post_url'        => popurl(1). 'process/cust_main-contacts.html',
-     'no_pkey_display' => 1,
-     'labels'          => {
-                            'contactnum'  => ' ', #'Contact',
-                            #'locationnum' => ' ',
-                          },
-     'fields'          => [
+     'name_singular'    => 'customer contacts', #yes, we're editing all of them
+     'table'            => 'cust_main',
+     'post_url'         => popurl(1). 'process/cust_main-contacts.html',
+     'no_pkey_display'  => 1,
+     'labels'           => {
+                             'contactnum'  => ' ', #'Contact',
+                             #'locationnum' => ' ',
+                           },
+     'fields'           => [
        { 'field'             => 'contactnum',
          'type'              => 'contact',
          'colspan'           => 6,
@@ -18,11 +24,12 @@
          'm2_error_callback' => $m2_error_callback,
        },
      ],
-     #'new_callback'    => $new_callback,
-     #'edit_callback'   => $edit_callback,
-     #'error_callback'  => $error_callback,
-     'agent_virt'      => 1,
-     'menubar'         => [], #remove "view all" link
+     #'new_callback'     => $new_callback,
+     #'edit_callback'    => $edit_callback,
+     #'error_callback'   => $error_callback,
+     'agent_virt'       => 1,
+     'html_table_class' => 'fsinnerbox',
+     'menubar'          => [], #remove "view all" link
 
      #XXX it would be nice if this could instead be after the error but before
      # the table
@@ -77,7 +84,7 @@ my $m2_error_callback = sub {
   my($cgi, $object) = @_;
 
   #process_o2m fields in process/cust_main-contacts.html
-  my @fields = qw( first last title comment );
+  my @fields = FS::contact->cgi_contact_fields;
   my @gfields = ( '', map "_$_", @fields );
 
   map {

commit ed7babbc6ce214ba0a1f63e7da9529b2e474929c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 16 16:18:05 2017 -0700

    document fields

diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm
index 9e818e142..5e3f180b8 100644
--- a/FS/FS/svc_cable.pm
+++ b/FS/FS/svc_cable.pm
@@ -36,6 +36,26 @@ from FS::Record.  The following fields are currently supported:
 
 primary key
 
+=item providernum
+
+Provider (see L<FS::cable_provider>)
+
+=item ordernum
+
+Provider order number
+
+=item modelnum
+
+Cable device model (see L<FS::cable_model>)
+
+=item serialnum
+
+Cable device serial number
+
+=item mac_addr
+
+Cable device MAC address
+
 =back
 
 =head1 METHODS

commit 9c6c62fe29a5b5e260d331fb0b663a492dc0bf2d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Feb 1 10:20:04 2018 -0800

    quiet warnings

diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm
index e43a525d2..f12b1accd 100644
--- a/FS/FS/part_pkg/flat_introrate.pm
+++ b/FS/FS/part_pkg/flat_introrate.pm
@@ -94,7 +94,7 @@ sub base_recur {
 
 sub item_discount {
   my ($self, $cust_pkg) = @_;
-  return unless $self->option('show_as_discount');
+  return unless $self->option('show_as_discount',1);
   my $intro_end = $self->intro_end($cust_pkg);
   my $amount = sprintf('%.2f',
                 $self->option('intro_fee') - $self->option('recur_fee')

commit f95fe844753a411328394dad031279df5bb1a143
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Jan 9 15:43:42 2018 -0800

    fix employee pw change, RT#79010, RT#32456

diff --git a/FS/FS/Auth/internal.pm b/FS/FS/Auth/internal.pm
index eea4870d7..dfc5f301d 100644
--- a/FS/FS/Auth/internal.pm
+++ b/FS/FS/Auth/internal.pm
@@ -48,7 +48,9 @@ sub change_password {
   my($self, $access_user, $new_password) = @_;
 
   # do nothing if the password is unchanged
-  return if $self->authenticate( $access_user, $new_password );
+  #XXX breaks password changes in employee edit ($access_user object already
+  # has new [plaintext] password)
+  #return if $self->authenticate( $access_user, $new_password );
 
   $self->change_password_fields( $access_user, $new_password );
 

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

Summary of changes:
 FS/FS/Auth/internal.pm                  |  4 +++-
 FS/FS/part_pkg/flat_introrate.pm        |  2 +-
 FS/FS/svc_cable.pm                      | 20 ++++++++++++++++++
 httemplate/edit/cust_main-contacts.html | 37 ++++++++++++++++++++-------------
 4 files changed, 46 insertions(+), 17 deletions(-)