From 7bc4ecaaa2989870e2200f193815a1815aff7fcd Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Fri, 18 Aug 2017 16:35:24 -0400
Subject: [PATCH] RT# 75817 - Some small updates to be able to backport to V3
 because of no cust_contact table in V3

---
 FS/FS/contact.pm                           |   2 +-
 FS/FS/cust_contact.pm                      | 151 -----------------------------
 httemplate/elements/validate_password.html |   2 +-
 3 files changed, 2 insertions(+), 153 deletions(-)
 delete mode 100644 FS/FS/cust_contact.pm

diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index 76ebe98bb..8a381a509 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -465,7 +465,7 @@ and replace methods.
 sub check {
   my $self = shift;
 
-  if ( $self->selfservice_access eq 'R' || $self->selfservice_access eq 'P' ) {
+  if ( $self->selfservice_access eq 'R' || $self->selfservice_access eq 'E' || $self->selfservice_access eq 'P' ) {
     $self->selfservice_access('Y');
     $self->_resend('Y');
   }
diff --git a/FS/FS/cust_contact.pm b/FS/FS/cust_contact.pm
deleted file mode 100644
index 118a9e000..000000000
--- a/FS/FS/cust_contact.pm
+++ /dev/null
@@ -1,151 +0,0 @@
-package FS::cust_contact;
-use base qw( FS::Record );
-
-use strict;
-use FS::Record qw( qsearch qsearchs );
-
-=head1 NAME
-
-FS::cust_contact - Object methods for cust_contact records
-
-=head1 SYNOPSIS
-
-  use FS::cust_contact;
-
-  $record = new FS::cust_contact \%hash;
-  $record = new FS::cust_contact { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cust_contact object represents a contact's attachment to a specific
-customer.  FS::cust_contact inherits from FS::Record.  The following fields are
-currently supported:
-
-=over 4
-
-=item custcontactnum
-
-primary key
-
-=item custnum
-
-custnum
-
-=item contactnum
-
-contactnum
-
-=item classnum
-
-classnum
-
-=item comment
-
-comment
-
-=item selfservice_access
-
-empty or Y
-
-=item invoice_dest
-
-'Y' if the customer should get invoices sent to this address, null if not
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new record.  To add the record to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'cust_contact'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=item delete
-
-Delete this record from the database.
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  if ( $self->selfservice_access eq 'R' || $self->selfservice_access eq 'E' || $self->selfservice_access eq 'P') {
-    $self->selfservice_access('Y');
-    $self->_resend('Y');
-  }
-
-  my $error = 
-    $self->ut_numbern('custcontactnum')
-    || $self->ut_number('custnum')
-    || $self->ut_number('contactnum')
-    || $self->ut_numbern('classnum')
-    || $self->ut_textn('comment')
-    || $self->ut_enum('selfservice_access', [ '', 'Y' ])
-    || $self->ut_flag('invoice_dest')
-  ;
-  return $error if $error;
-
-  $self->SUPER::check;
-}
-
-=item contact_classname
-
-Returns the name of this contact's class (see L<FS::contact_class>).
-
-=cut
-
-sub contact_classname {
-  my $self = shift;
-  my $contact_class = $self->contact_class or return '';
-  $contact_class->classname;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::contact>, L<FS::cust_main>, L<FS::Record>
-
-=cut
-
-1;
-
diff --git a/httemplate/elements/validate_password.html b/httemplate/elements/validate_password.html
index 3ca311db1..1b0688e3c 100644
--- a/httemplate/elements/validate_password.html
+++ b/httemplate/elements/validate_password.html
@@ -28,7 +28,7 @@ function add_password_validation (fieldid, submitid) {
     var resultfield = document.getElementById(fieldid);
     if (this.value) {
       resultfield.innerHTML = '<SPAN STYLE="color: blue;">Validating password...</SPAN>';
-      validate_password('fieldid',fieldid,'svcnum','<% $opt{'svcnum'} |js_string %>','pkgnum','<% $opt{'pkgnum'} |js_string %>','contactnum','<% $opt{'contactnum'} |js_string %>','password',this.value,
+      validate_password('fieldid',fieldid,'svcnum','<% $opt{'svcnum'} %>','pkgnum','<% $opt{'pkgnum'} %>','contactnum','<% $opt{'contactnum'} %>','password',this.value,
         function (result) {
           result = JSON.parse(result);
           var resultfield = document.getElementById(result.fieldid);
-- 
2.11.0