[freeside-commits] branch FREESIDE_4_BRANCH updated. 6a4cb4fdcbd37ff57a99b58d57a7c017d21d3a7f

[Ivan Kohler]

The branch, FREESIDE_4_BRANCH has been updated
       via  6a4cb4fdcbd37ff57a99b58d57a7c017d21d3a7f (commit)
      from  26de6b1b4f7b4ae81bceb650d8ac3a043f9834c7 (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 6a4cb4fdcbd37ff57a99b58d57a7c017d21d3a7f
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 {

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

Summary of changes:
 httemplate/edit/cust_main-contacts.html | 37 ++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 15 deletions(-)