X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=0a7a8c031b6c6597acafb8e696697533159d84c4;hb=0dd05e9ff98263d2d42b419b1e278a5a3bc594b2;hp=748cdde5f64f41e93ddc44ccd6c387f789bf47e9;hpb=6837ca2c7a45033a566238bb3e5f3f262d85fc0e;p=freeside.git
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 748cdde5f..0a7a8c031 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -15,8 +15,9 @@
%#get record
%
%my $error = '';
-%my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart);
+%my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart, $saved_domsvc);
%my(@invoicing_list);
+%my ($ss,$stateid,$payinfo);
%my $same = '';
%if ( $cgi->param('error') ) {
% $error = $cgi->param('error');
@@ -24,6 +25,12 @@
% map { $_, scalar($cgi->param($_)) } fields('cust_main')
% } );
% $custnum = $cust_main->custnum;
+% $saved_domsvc = $cgi->param('domsvc') || '';
+% if ( $saved_domsvc =~ /^(\d+)$/ ) {
+% $saved_domsvc = $1;
+% } else {
+% $saved_domsvc = '';
+% }
% $saved_pkgpart = $cgi->param('pkgpart_svcpart') || '';
% if ( $saved_pkgpart =~ /^(\d+)_/ ) {
% $saved_pkgpart = $1;
@@ -36,6 +43,9 @@
% @invoicing_list = split( /\s*,\s*/, $cgi->param('invoicing_list') );
% $same = $cgi->param('same');
% $cust_main->setfield('paid' => $cgi->param('paid')) if $cgi->param('paid');
+% $ss = $cust_main->ss; # don't mask an entered value on errors
+% $stateid = $cust_main->stateid; # don't mask an entered value on errors
+% $payinfo = $cust_main->payinfo; # don't mask an entered value on errors
%} elsif ( $cgi->keywords ) { #editing
% my( $query ) = $cgi->keywords;
% $query =~ /^(\d+)$/;
@@ -48,22 +58,30 @@
% $cust_main->paycvv($paycvv);
% }
% $saved_pkgpart = 0;
+% $saved_domsvc = 0;
% $username = '';
% $password = '';
% $popnum = 0;
% @invoicing_list = $cust_main->invoicing_list;
+% $ss = $cust_main->masked('ss');
+% $stateid = $cust_main->masked('stateid');
+% $payinfo = $cust_main->paymask;
%} else {
% $custnum='';
% $cust_main = new FS::cust_main ( {} );
% $cust_main->otaker( &getotaker );
% $cust_main->referral_custnum( $cgi->param('referral_custnum') );
% $saved_pkgpart = 0;
+% $saved_domsvc = 0;
% $username = '';
% $password = '';
% $popnum = 0;
% @invoicing_list = ();
% push @invoicing_list, 'POST'
% unless $conf->exists('disablepostalinvoicedefault');
+% $ss = '';
+% $stateid = '';
+% $payinfo = '';
%}
%$cgi->delete_all();
%
@@ -186,7 +204,7 @@
Billing address
-<% include('cust_main/contact.html', $cust_main, '', 'bill_changed(this)', '' ) %>
+<% include('cust_main/contact.html', $cust_main, '', 'bill_changed(this)', '', 'ss' => $ss, 'stateid' => $stateid ) %>
% if ( defined $cust_main->dbdef_table->column('ship_last') ) {
@@ -200,17 +218,19 @@ function bill_changed(what) {
what.form.ship_<%$_%>.value = what.form.<%$_%>.value;
% }
-
what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
+
+ function fix_ship_county() {
+ what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
+ }
+
function fix_ship_state() {
what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
+ ship_state_changed(what.form.ship_state, fix_ship_county );
}
+
ship_country_changed(what.form.ship_country, fix_ship_state );
- function fix_ship_county() {
- what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
- }
- ship_state_changed(what.form.ship_state, fix_ship_county );
}
}
function samechanged(what) {
@@ -238,7 +258,7 @@ function samechanged(what) {
% my $disabledselect = '';
% unless ( $cust_main->ship_last && $same ne 'Y' ) {
% $checked = 'CHECKED';
-% $disabled = 'DISABLED style="background-color: #dddddd"';
+% $disabled = 'DISABLED STYLE="background-color: #dddddd"';
% foreach (
% qw( last first company address1 address2 city county state zip country
% daytime night fax )
@@ -259,6 +279,7 @@ Service address
<% include( 'cust_main/billing.html', $cust_main,
+ 'payinfo' => $payinfo,
'invoicing_list' => \@invoicing_list,
)
%>
@@ -275,6 +296,7 @@ function bottomfixup(what) {
'address1', 'address2', 'city',
'county', 'state', 'zip', 'country',
'daytime', 'night', 'fax',
+ 'stateid', 'stateid_state',
'same',
@@ -288,8 +310,8 @@ function bottomfixup(what) {
var layervars = new Array(
'payauto',
- 'payinfo', 'payinfo1', 'payinfo2',
- 'payname', 'exp_month', 'exp_year', 'paycvv',
+ 'payinfo', 'payinfo1', 'payinfo2', 'paytype',
+ 'payname', 'paystate', 'exp_month', 'exp_year', 'paycvv',
'paystart_month', 'paystart_year', 'payissue',
'payip',
'paid'
@@ -298,6 +320,7 @@ function bottomfixup(what) {
var billing_bottomvars = new Array(
'tax',
'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX',
+ 'invoice_terms',
'spool_cdr'
);
@@ -358,6 +381,7 @@ function copyelement(from, to) {
% 'address1', 'address2', 'city',
% 'county', 'state', 'zip', 'country',
% 'daytime', 'night', 'fax',
+% 'stateid', 'stateid_state',
%
% 'same',
%
@@ -369,14 +393,15 @@ function copyelement(from, to) {
% 'select', #XXX key
%
% 'payauto',
-% 'payinfo', 'payinfo1', 'payinfo2',
-% 'payname', 'exp_month', 'exp_year', 'paycvv',
+% 'payinfo', 'payinfo1', 'payinfo2', 'paytype',
+% 'payname', 'paystate', 'exp_month', 'exp_year', 'paycvv',
% 'paystart_month', 'paystart_year', 'payissue',
% 'payip',
% 'paid',
%
% 'tax',
% 'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX',
+% 'invoice_terms',
% 'spool_cdr'
% ) {
%
@@ -420,7 +445,7 @@ function copyelement(from, to) {
% #eslaf
%
% my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
-% qsearch( 'part_pkg', { 'disabled' => '' } );
+% qsearch( 'part_pkg', { 'disabled' => '' }, '', 'ORDER BY pkg' ); # case?
%
% if ( @part_pkg ) {
%
@@ -434,15 +459,12 @@ function copyelement(from, to) {