From b6260b4f39cf34b9e0e5b8560ef88c8881ba0766 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sun, 14 Jun 2015 13:59:11 -0700 Subject: UI spring cleaning: customer edit --- httemplate/edit/cust_main/basics.html | 13 +++++++------ httemplate/edit/cust_main/company.html | 2 +- httemplate/edit/cust_main/fax.html | 2 +- httemplate/edit/cust_main/name.html | 8 ++++---- httemplate/edit/cust_main/phones.html | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) (limited to 'httemplate/edit/cust_main') diff --git a/httemplate/edit/cust_main/basics.html b/httemplate/edit/cust_main/basics.html index 1c5023de9..2ca6f65a5 100644 --- a/httemplate/edit/cust_main/basics.html +++ b/httemplate/edit/cust_main/basics.html @@ -110,7 +110,7 @@ - <% mt('Agent') |h %> + <% mt('Agent') |h %> <% $cust_main->agent->agent |h %> @@ -118,7 +118,7 @@ <& /elements/tr-select-agent.html, 'curr_value' => $cust_main->agentnum, - 'label' => "${r}".emt('Agent')."", + 'label' => $r. emt('Agent'), 'empty_label' => emt('Select agent'), 'disable_empty' => ( $cust_main->agentnum ? 1 : 0 ), 'viewall_right' => emt('None'), @@ -131,7 +131,7 @@ % if ( $conf->exists('cust_main-edit_agent_custid') ) { - <% mt('Customer identifier') |h %> + <% mt('Customer identifier') |h %> @@ -157,6 +157,7 @@ %#sales person <& /elements/tr-select-sales.html, 'curr_value' => $cust_main->salesnum, + 'th' => 1, &> %# referral (advertising source) @@ -169,7 +170,7 @@ <& /elements/tr-select-part_referral.html, 'curr_value' => $refnum, - 'label' => "${r}".emt('Advertising source')."" + 'label' => $r. emt('Advertising source'), &> % } @@ -183,7 +184,7 @@ %) { - <% mt('Referring customer') |h %> + <% mt('Referring customer') |h %> <% $cust_main->referral_custnum %>: <% $referring_cust_main->name |h %> @@ -193,7 +194,7 @@ % } elsif ( ! $conf->exists('disable_customer_referrals') ) { - <% mt('Referring customer') |h %> + <% mt('Referring customer') |h %> <& /elements/search-cust_main.html, 'field_name' => 'referral_custnum', diff --git a/httemplate/edit/cust_main/company.html b/httemplate/edit/cust_main/company.html index 8a6ed0bbf..50c4f709b 100644 --- a/httemplate/edit/cust_main/company.html +++ b/httemplate/edit/cust_main/company.html @@ -1,6 +1,6 @@ % my $cust_main = shift; company ? '' : 'STYLE="display:none"' %>> - <% mt('Company') |h %> + <% mt('Company') |h %> diff --git a/httemplate/edit/cust_main/fax.html b/httemplate/edit/cust_main/fax.html index 237d4be44..c3e9917f4 100644 --- a/httemplate/edit/cust_main/fax.html +++ b/httemplate/edit/cust_main/fax.html @@ -1,5 +1,5 @@ % my $cust_main = shift; - <% mt('Fax') |h %> + <% mt('Fax') |h %> diff --git a/httemplate/edit/cust_main/name.html b/httemplate/edit/cust_main/name.html index 74b2a7b5b..bc55801cf 100644 --- a/httemplate/edit/cust_main/name.html +++ b/httemplate/edit/cust_main/name.html @@ -2,12 +2,12 @@ % my ($field, $value, $label, $extra) = @_;
> -
<% mt($label) %> +
<% mt($label) %>
- <% mt('Contact name') |h %> + <% mt('Contact name') |h %> <& .namepart, 'last', $cust_main->last, 'Last', ',' &> <& .namepart, 'first', $cust_main->first, 'First' &> @@ -21,7 +21,7 @@ % if ( $conf->exists('cust_main-enable_spouse') ) { - <% mt('Spouse\'s name') |h %> + <% mt('Spouse\'s name') |h %> <& .namepart, 'spouse_last', $cust_main->spouse_last, 'Last', ',' &> <& .namepart, 'spouse_first', $cust_main->spouse_first, 'First' &> @@ -31,7 +31,7 @@ % if ( $conf->exists('cust-email-high-visibility') ) { - Email address(es) diff --git a/httemplate/edit/cust_main/phones.html b/httemplate/edit/cust_main/phones.html index 9b23e0716..fa915f540 100644 --- a/httemplate/edit/cust_main/phones.html +++ b/httemplate/edit/cust_main/phones.html @@ -1,5 +1,5 @@ - <% mt('Phones') |h %> + <% mt('Phones') |h %> @@ -10,7 +10,7 @@ VALUE="<% $cust_main->get($phone) %>" SIZE=18 > -
<% mt($phone_label{$phone}) |h %> +
<% mt($phone_label{$phone}) |h %> % } -- cgit v1.2.1 From 5b507bd1cb845ef44a49f84d4f0ae20ec80118d5 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sun, 14 Jun 2015 14:56:51 -0700 Subject: UI spring cleaning: customer edit --- httemplate/edit/cust_main/billing.html | 24 ++++++++++++---------- httemplate/edit/cust_main/contacts_new.html | 16 ++++++++------- httemplate/edit/cust_main/cust_payby.html | 17 +++++++-------- httemplate/edit/cust_main/first_pkg.html | 2 +- httemplate/edit/cust_main/first_pkg/svc_acct.html | 14 ++++++------- httemplate/edit/cust_main/first_pkg/svc_dsl.html | 16 +++++++-------- httemplate/edit/cust_main/first_pkg/svc_phone.html | 12 +++++------ 7 files changed, 53 insertions(+), 48 deletions(-) (limited to 'httemplate/edit/cust_main') diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index d25e88712..c3e89226b 100644 --- a/httemplate/edit/cust_main/billing.html +++ b/httemplate/edit/cust_main/billing.html @@ -15,7 +15,7 @@
<% mt('Billing information') |h %> - <% &ntable("#cccccc") %> +
 
% my $curuser = $FS::CurrentUser::CurrentUser; @@ -63,7 +63,7 @@ % #escape $exempt_group for NAME etc. % my $checked = ($cust_main_exemption || $cgi->param("tax_$exempt_group")); - + % } @@ -108,7 +108,7 @@ % unless ( $conf->exists('cust-email-high-visibility')) { - % } @@ -128,7 +128,7 @@ % if ( $conf->exists('cust_main-select-prorate_day') ) { - + @@ -142,7 +142,7 @@ % ### - + - + - + - + +% sub prorate_day_options { +% my $curr_value = shift; +% my $ret = ''; +% for my $prorate_day ( 1 .. 28 ) { +% my $sel = ''; +% $sel = "SELECTED='SELECTED'" if $curr_value == $prorate_day; +% $ret .= ""; +% } +% $ret; +% } + % } else { % } -- cgit v1.2.1 From d13dae1c37c36c27f1ac9fd134c5d8b3a4fb9754 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Tue, 30 Jun 2015 03:24:08 -0500 Subject: RT#29285: State field not needed for New Zealand --- httemplate/edit/cust_main/basics.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'httemplate/edit/cust_main') diff --git a/httemplate/edit/cust_main/basics.html b/httemplate/edit/cust_main/basics.html index e16aafafc..32a03bbe6 100644 --- a/httemplate/edit/cust_main/basics.html +++ b/httemplate/edit/cust_main/basics.html @@ -46,7 +46,7 @@ var ship_locked_agents = <% encode_json(\%ship_locked_agents) %>; var ship_fields = [ - 'locationname', 'address1', 'city', 'state', 'zip', 'country', + 'locationname', 'address1',<% $conf->exists('cust_main-no_city_in_address') ? '' : q( 'city',) %> 'state', 'zip', 'country', 'latitude', 'longitude', 'district' ]; @@ -307,7 +307,10 @@ foreach (qsearch('agent',{})) { my $agent_ship_location = $cust_main->ship_location; $ship_locked_agents{$agentnum} = +{ map { $_ => $agent_ship_location->$_ } - qw(locationname address1 city state zip country latitude longitude district) + ( + qw(locationname address1 state zip country latitude longitude district), + ($conf->exists('cust_main-no_city_in_address') ? () : 'city') + ) }; } -- cgit v1.2.1
   onChange="tax_changed(this)"> Tax Exempt (<% $exempt_group %> taxes)   onChange="tax_changed(this)"> Tax Exempt (<% $exempt_group %> taxes) - Exemption number exempt_number : '' ) |h %>" <% $checked ? '' : 'DISABLED' %>>
+ <% $conf->exists('cust_main-require_invoicing_list_email', $agentnum) ? $r : '' %>Email address(es) @@ -117,7 +117,7 @@ ( $cust_main->message_noemail eq 'Y' ) ? 'CHECKED' : '' - %>> <% emt('Do not send notices') %> + %>> <% emt('Do not send notices') %>
<% mt('Prorate day (1-28)') |h %> <% mt('Prorate day (1-28)') |h %>
<% mt('Charge card/e-check on this day of the month') |h %> <% mt('Charge card/e-check on this day of the month') |h %>
<% mt('Invoice terms') |h %> <% mt('Invoice terms') |h %> <& /elements/select-terms.html, 'curr_value' => $cust_main->invoice_terms, @@ -180,7 +180,7 @@ % ###
<% mt('Credit limit') |h %> <% mt('Credit limit') |h %> -- cgit v1.2.1 From d928d26f1d623720d2f0c854a9d0b38210d66d2d Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 18 Jun 2015 00:50:23 -0700 Subject: UI spring cleaning: prorate day dropdown --- httemplate/edit/cust_main/billing.html | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'httemplate/edit/cust_main') diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index c3e89226b..6f716c1be 100644 --- a/httemplate/edit/cust_main/billing.html +++ b/httemplate/edit/cust_main/billing.html @@ -128,11 +128,25 @@ % if ( $conf->exists('cust_main-select-prorate_day') ) {
<% mt('Prorate day (1-28)') |h %> + <% mt('Prorate day') |h %> - +