From f936f59edf460c72f4e4c4da4d701b99f4456890 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 3 Aug 2010 23:20:24 +0000 Subject: margin and padding css defined properly in px --- httemplate/elements/header.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 90ab0b71c..c83529e2b 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -15,7 +15,6 @@ Example: #old-style include( '/elements/header.html', 'Title', $menubar, $etc, $head); - %# @@ -43,8 +42,8 @@ Example: <% $head |n %> - STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0"> - + STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> +

-- cgit v1.2.1 From b93983d6758cd67b7bcb6c4118344981d8bb6e8d Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 5 Aug 2010 20:10:42 +0000 Subject: Package summary report, RT#8461 --- httemplate/elements/menu.html | 1 + 1 file changed, 1 insertion(+) (limited to 'httemplate/elements') diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index a5bcdeb19..2404ef291 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -207,6 +207,7 @@ if ( $curuser->access_right('Financial reports') ) { $report_packages{'separator2'} = ''; } $report_packages{'All customer packages'} = [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ]; +$report_packages{'Package summary'} = [ $fsurl.'search/cust_pkg_summary.html', 'Show package sales summary', ]; $report_packages{'Suspended customer packages'} = [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ]; $report_packages{'Customer packages with unconfigured services'} = [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ]; $report_packages{'FCC Form 477 packages'} = [ $fsurl.'search/report_477.html', 'Summarize packages by census tract for particular types' ] -- cgit v1.2.1 From 82970ec1511c7bbb892eb296f3c0358480b77ba6 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 7 Aug 2010 07:39:03 +0000 Subject: style password entry 2.1 style too --- httemplate/elements/freeside.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css index dfb56e959..dcb639b41 100644 --- a/httemplate/elements/freeside.css +++ b/httemplate/elements/freeside.css @@ -16,7 +16,7 @@ a[href]:hover { color: #7e0079; } -textarea, input[type="text"] { +textarea, input[type="text"], input[type="password"] { border: 1px solid #666666; padding: 1px; -moz-border-radius: 2px; @@ -24,7 +24,7 @@ textarea, input[type="text"] { border-radius: 2px; } -textarea:hover, input[type="text"]:hover { +textarea:hover, input[type="text"]:hover, input[type="password"]:hover { border: 1px solid #7e0079; padding: 1px; -moz-border-radius: 2px; @@ -32,7 +32,7 @@ textarea:hover, input[type="text"]:hover { border-radius: 2px; } -textarea:focus, input[type="text"]:focus { +textarea:focus, input[type="text"]:focus, input[type="password"]:focus { background-color: #ffffdd; border: 1px solid #7e0079; -moz-border-radius: 2px; -- cgit v1.2.1 From b1d445f94514a29e5d4753839798b0291d89aee3 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 9 Aug 2010 01:03:49 +0000 Subject: package web import from CSV/XLS, RT#9529 --- httemplate/elements/menu.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index 2404ef291..5c48e1c3f 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -318,6 +318,7 @@ $report_menu{'SQL Query'} = [ $fsurl.'search/report_sql.html', 'SQL Query' ] tie my %tools_importing, 'Tie::IxHash', 'Customers' => [ $fsurl.'misc/cust_main-import.cgi', '' ], + 'Customer packages' => [ $fsurl.'misc/cust_pkg-import.html', '' ], 'Customer comments from CSV file' => [ $fsurl.'misc/cust_main_note-import.html', '' ], 'One-time charges from CSV file' => [ $fsurl.'misc/cust_main-import_charges.cgi', '' ], 'Payments from CSV file' => [ $fsurl.'misc/cust_pay-import.cgi', '' ], @@ -399,7 +400,7 @@ if ( $curuser->access_right('Configuration') ) { #package grouping sub-menu? $config_pkg{'Package classes'} = [ $fsurl.'browse/pkg_class.html', 'Package classes define groups of packages, for taxation, ordering convenience and reporting.' ]; - $config_pkg{'Package categories'} = [ $fsurl.'browse/pkg_category.html', 'Package categories define groups of package classes.' ]; + $config_pkg{'Package categories'} = [ $fsurl.'browse/pkg_category.html', 'Package categories define groups of package classes, for invoice sections.' ]; $config_pkg{'Package report classes'} = [ $fsurl.'browse/part_pkg_report_option.html', 'Package classes define optional groups of packages for reporting only.' ]; #eo package grouping sub-menu -- cgit v1.2.1 From 197b6a447eb3a09973c2e2e45c4d4e2be8297b17 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 10 Aug 2010 21:37:05 +0000 Subject: eliminate the '0 status connecting' errors, they're not telling us anything and causing lots of people to waste time asking --- httemplate/elements/xmlhttp.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/xmlhttp.html b/httemplate/elements/xmlhttp.html index 2df3c42c9..ac6f9916e 100644 --- a/httemplate/elements/xmlhttp.html +++ b/httemplate/elements/xmlhttp.html @@ -58,7 +58,11 @@ Example: return; if (xmlhttp.status != 200) { - alert(xmlhttp.status + " status connecting to " + url); + if ( xmlhttp.status != 0 ) { + //not warning on the 0 errors, they pop up when navagating away + // from the page + alert(xmlhttp.status + " status connecting to " + url); + } } else { var data = xmlhttp.responseText; //alert('received response: ' + data); -- cgit v1.2.1 From afc27c6b6ca42943d60ed422209a3c9074e4d8aa Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 11 Aug 2010 03:48:36 +0000 Subject: less visual noise --- httemplate/elements/table-grid.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/table-grid.html b/httemplate/elements/table-grid.html index e1e6c36dc..4d7deeaa4 100644 --- a/httemplate/elements/table-grid.html +++ b/httemplate/elements/table-grid.html @@ -1,8 +1,7 @@ - CELLPADDING=<% $opt{cellpadding} %> BORDER=1 BORDERCOLOR="#000000" <% $opt{bgcolor} %> STYLE="border: solid 1px black; empty-cells: show"> +

CELLPADDING=<% $opt{cellpadding} %> <% $opt{bgcolor} %> STYLE="border: 1px solid #cccccc;"> <%init> -- cgit v1.2.1 From 22773e1b0288fc296c30ba99e2d37a8f4193a462 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 13 Aug 2010 23:53:00 +0000 Subject: fix city blanking on county change, RT#9627 --- httemplate/elements/city.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/city.html b/httemplate/elements/city.html index 61d057889..d774cce59 100644 --- a/httemplate/elements/city.html +++ b/httemplate/elements/city.html @@ -64,11 +64,10 @@ Example: <%$pre%>city_select_changed(what.form.<% $pre %>city_select); what.form.<% $pre %>city.style.display = 'none'; what.form.<% $pre %>city_select.style.display = ''; - } else { - // turn on the text city, turn off the select - what.form.<%$ pre %>city.value = saved_<%$pre%>city; + } else if ( what.form.<% $pre %>city.style.display == 'none' ) { what.form.<% $pre %>city.style.display = ''; what.form.<% $pre %>city_select.style.display = 'none'; + what.form.<%$ pre %>city.value = saved_<%$pre%>city; } //run the callback -- cgit v1.2.1 From 05ff91a2c4b48c43ab3aa30501cda7eb3de2ef03 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 13 Aug 2010 23:54:21 +0000 Subject: fix city blanking on county change, RT#9627 --- httemplate/elements/city.html | 1 + 1 file changed, 1 insertion(+) (limited to 'httemplate/elements') diff --git a/httemplate/elements/city.html b/httemplate/elements/city.html index d774cce59..0e1bf8de0 100644 --- a/httemplate/elements/city.html +++ b/httemplate/elements/city.html @@ -65,6 +65,7 @@ Example: what.form.<% $pre %>city.style.display = 'none'; what.form.<% $pre %>city_select.style.display = ''; } else if ( what.form.<% $pre %>city.style.display == 'none' ) { + // turn on the text city, turn off the select what.form.<% $pre %>city.style.display = ''; what.form.<% $pre %>city_select.style.display = 'none'; what.form.<%$ pre %>city.value = saved_<%$pre%>city; -- cgit v1.2.1 From 7f89738f0f4740efaca00b06034e3a7d86c49ea5 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 13 Aug 2010 23:55:56 +0000 Subject: fix city blanking on county change, RT#9627 --- httemplate/elements/city.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/city.html b/httemplate/elements/city.html index 0e1bf8de0..956d353bd 100644 --- a/httemplate/elements/city.html +++ b/httemplate/elements/city.html @@ -66,9 +66,9 @@ Example: what.form.<% $pre %>city_select.style.display = ''; } else if ( what.form.<% $pre %>city.style.display == 'none' ) { // turn on the text city, turn off the select + what.form.<%$ pre %>city.value = saved_<%$pre%>city; what.form.<% $pre %>city.style.display = ''; what.form.<% $pre %>city_select.style.display = 'none'; - what.form.<%$ pre %>city.value = saved_<%$pre%>city; } //run the callback -- cgit v1.2.1 From 80f722b82cb92fa49ee172230be3c61f72e56f41 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 15 Aug 2010 06:21:06 +0000 Subject: fix payment and refund searches by otaker (now usernum), RT#9555 --- httemplate/elements/select-user.html | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/select-user.html b/httemplate/elements/select-user.html index bdb92e70f..6264398e2 100644 --- a/httemplate/elements/select-user.html +++ b/httemplate/elements/select-user.html @@ -4,8 +4,8 @@ % } -% foreach my $otaker ( @{ $opt{'otakers'} } ) { - +% foreach my $usernum ( keys %{ $opt{'access_user'} } ) { + % } @@ -14,15 +14,18 @@ my %opt = @_; -unless ( $opt{'otakers'} ) { +unless ( $opt{'access_user'} ) { - my $sth = dbh->prepare("SELECT username,usernum FROM access_user". - " WHERE disabled = '' or disabled IS NULL") - or die dbh->errstr; + tie %{ $opt{'access_user'} }, 'Tie::IxHash'; + + my $sth = dbh->prepare(" + SELECT usernum, username FROM access_user + WHERE disabled = '' or disabled IS NULL + ORDER BY username + ") or die dbh->errstr; $sth->execute or die $sth->errstr; - for($sth->fetchall_arrayref) { - $opt{'otakers'} = [ map { $_->[0] } @$_ ]; - $opt{'usernums'} = [ map { $_->[1] } @$_ ]; + while ( my $row = $sth->fetchrow_arrayref ) { + $opt{'access_user'}->{$row->[0]} = $row->[1]; } } -- cgit v1.2.1 From 55476aa0484f5ebada5f36e1407722d84609bd34 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 15 Aug 2010 07:00:21 +0000 Subject: additional by-otaker searches fixed for the brave new world of usernum, RT#9555 --- httemplate/elements/select-user.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/select-user.html b/httemplate/elements/select-user.html index 6264398e2..ec2341be6 100644 --- a/httemplate/elements/select-user.html +++ b/httemplate/elements/select-user.html @@ -4,7 +4,10 @@ % } -% foreach my $usernum ( keys %{ $opt{'access_user'} } ) { +% foreach my $usernum ( +% sort { $opt{'access_user'}->{$a} cmp $opt{'access_user'}->{$b} } +% keys %{ $opt{'access_user'} } +% ) { % } @@ -16,12 +19,9 @@ my %opt = @_; unless ( $opt{'access_user'} ) { - tie %{ $opt{'access_user'} }, 'Tie::IxHash'; - my $sth = dbh->prepare(" SELECT usernum, username FROM access_user WHERE disabled = '' or disabled IS NULL - ORDER BY username ") or die dbh->errstr; $sth->execute or die $sth->errstr; while ( my $row = $sth->fetchrow_arrayref ) { -- cgit v1.2.1 From 9bdca2fe23584918219395b62effbb9ef0fc5f1c Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 17 Aug 2010 17:08:22 +0000 Subject: DNS, RT#8933 --- httemplate/elements/freeside.css | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'httemplate/elements') diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css index dcb639b41..18b14e395 100644 --- a/httemplate/elements/freeside.css +++ b/httemplate/elements/freeside.css @@ -173,6 +173,43 @@ div.fstabcontainer { filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=2); } +.fscontainer { + overflow:hidden; + display:inline-block; +} +.fscontainer { + display:block; +} + +.fsbox { + + float:left; + + background-color:#ffffff; + + padding:8px; + border-top:1px solid #7e0079; + border-left:1px solid #7e0079; + border-right:1px solid #7e0079; + border-bottom:1px solid #7e0079; + -moz-border-radius-bottomleft:8px; + -moz-border-radius-bottomright:8px; + -webkit-border-radius-bottomleft:8px; + -webkit-border-radius-bottomright:8px; + border-radius-bottomleft:8px; + border-radius-bottomright:8px; + -moz-box-shadow: #666666 1px 1px 2px; + -webkit-box-shadow: #666666 1px 1px 2px; + box-shadow: #666666 1px 1px 2px; + filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=2); +} + +.fsbox .fsbox-title { + /*float:left;*/ + font-size:150%; + font-weight:bold; +} + .background { background-color:#f8f8f8; } -- cgit v1.2.1 From 6f395d2ad7d042ded602185efa4ee8a4c2e7279e Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 18 Aug 2010 17:04:53 +0000 Subject: Suspension/unsuspension report, RT#8464 --- httemplate/elements/menu.html | 1 + 1 file changed, 1 insertion(+) (limited to 'httemplate/elements') diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index 5c48e1c3f..7cd6f898c 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -209,6 +209,7 @@ if ( $curuser->access_right('Financial reports') ) { $report_packages{'All customer packages'} = [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ]; $report_packages{'Package summary'} = [ $fsurl.'search/cust_pkg_summary.html', 'Show package sales summary', ]; $report_packages{'Suspended customer packages'} = [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ]; +$report_packages{'Suspension summary'} = [ $fsurl.'search/cust_pkg_susp.html', 'Show suspension activity', ]; $report_packages{'Customer packages with unconfigured services'} = [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ]; $report_packages{'FCC Form 477 packages'} = [ $fsurl.'search/report_477.html', 'Summarize packages by census tract for particular types' ] if $conf->exists('cust_main-require_censustract'); -- cgit v1.2.1 From 48e3f879908a13cb87786e32e158ff8a8bf18fbb Mon Sep 17 00:00:00 2001 From: mark Date: Sat, 4 Sep 2010 02:19:03 +0000 Subject: set expire date for customer packages, RT#9697 --- httemplate/elements/input-date-field.html | 48 +++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 httemplate/elements/input-date-field.html (limited to 'httemplate/elements') diff --git a/httemplate/elements/input-date-field.html b/httemplate/elements/input-date-field.html new file mode 100644 index 000000000..0ea4be70a --- /dev/null +++ b/httemplate/elements/input-date-field.html @@ -0,0 +1,48 @@ + + + + + + + +

+ + + +<%init> + +my($name, $value, $format, $usedatetime); +if ( ref($_[0]) ) { + my $opt = shift; + $name = $opt->{'name'}; + $value = $opt->{'value'}; + $format = $opt->{'format'}; + $usedatetime = $opt->{'usedatetime'}; +} else { + ($name, $value, $format, $usedatetime) = @_; +} + +my $conf = new FS::Conf; + +$format ||= $conf->config('date_format') || '%m/%d/%Y'; + +if ( $value =~ /\S/ ) { + if ( $usedatetime ) { + my $dt = DateTime->from_epoch(epoch => $value, time_zone => 'floating'); + $value = $dt->strftime($format); + } elsif ( $value =~ /^\d+$/ ) { + $value = time2str($format, $value); + } +} else { + $value = ''; +} + + + -- cgit v1.2.1 From 6c9cd1c36adbb9fc950fcf0a0b269fa6f16838a1 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 17 Sep 2010 18:12:08 +0000 Subject: email_search_result for cust_pkg and svc_broadband, RT#8736 --- httemplate/elements/email-link.html | 16 ++++++++++++++++ httemplate/elements/menu.html | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 httemplate/elements/email-link.html (limited to 'httemplate/elements') diff --git a/httemplate/elements/email-link.html b/httemplate/elements/email-link.html new file mode 100644 index 000000000..692e5bc2e --- /dev/null +++ b/httemplate/elements/email-link.html @@ -0,0 +1,16 @@ +% if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') ) { +<%$label%> +% } +<%init> +my %opt = @_; +my $table = $opt{'table'}; +my $search_hash = $opt{'search_hash'}; +die "'table' required" if !$table; +die "'search_hash' required" if !$search_hash; + +my $uri = new URI; +$uri->query_form($search_hash); +my $query = $uri->query; +my $label = ($opt{'label'} || 'Email a notice to these customers'); + + diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index 7cd6f898c..d3e00f3de 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -185,7 +185,7 @@ foreach my $svcdb ( FS::part_svc->svc_tables() ) { ]; } - if ( $svcdb eq 'svc_acct' ) { + if ( $svcdb eq 'svc_acct' || $svcdb eq 'svc_broadband' ) { $report_svc{"Advanced $lcsname reports"} = [ $fsurl."search/report_$svcdb.html", '' ]; } -- cgit v1.2.1 From 0f239ed9a3d20edc4974eed38d2816f20185aefc Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 22 Sep 2010 00:08:30 +0000 Subject: unapplied payment/refund/credit reports, RT#7503 --- httemplate/elements/menu.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'httemplate/elements') diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index d3e00f3de..b852a402e 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -259,6 +259,7 @@ $report_payments{'Pending Payments'} = [ $fsurl.'search/cust_pay_pending.html?ma if $curuser->access_right('View customer pending payments'); $report_payments{'Voided Payments'} = [ $fsurl.'search/report_cust_pay.html?void=1', 'Voided payment report (by type and/or date range)' ] if $curuser->access_right('View customer pending payments'); +$report_payments{'Unapplied Payments'} = [ $fsurl.'search/report_cust_pay.html?unapplied=1', 'Unapplied payment report (by type and/or date range)' ]; $report_payments{'Payment Batches'} = [ $fsurl.'search/pay_batch.html', 'Payment batches (by status and/or date range)' ] if $conf->exists('batch-enable') || $conf->config('batch-enable_payby'); $report_payments{'Unapplied Payment Aging'} = [ $fsurl.'search/report_unapplied_cust_pay.html', 'Unapplied payment aging report' ]; @@ -272,7 +273,9 @@ if($curuser->access_right('Financial reports')) { 'Rated Call Sales Report' => [ $fsurl.'graph/report_cust_bill_pkg_detail.html', 'Sales report and graph (by agent, package class, usage class and/or date range)' ], 'Employee Commission Report' => [ $fsurl.'search/report_employee_commission.html', '' ], 'Credit Report' => [ $fsurl.'search/report_cust_credit.html', 'Credit report (by employee and/or date range)' ], + 'Unapplied Credits' => [ $fsurl.'search/report_cust_credit.html?unapplied=1', 'Unapplied credit report (by type and/or date range)' ], 'Refund Report' => [ $fsurl.'search/report_cust_refund.html', 'Refund report (by type and/or date range)' ], + 'Unapplied Refunds' => [ $fsurl.'search/report_cust_refund.html?unapplied=1', 'Unapplied refund report (by type and/or date range)' ], 'Package Costs Report' => [ $fsurl.'graph/report_cust_pkg_cost.html', 'Package setup and recurring costs graph' ], ); $report_financial{'A/R Aging'} = [ $fsurl.'search/report_receivables.html', 'Accounts Receivable Aging report' ]; -- cgit v1.2.1 From 5250c44bd7f282c7d782bf0e8349af12376929df Mon Sep 17 00:00:00 2001 From: jeff Date: Wed, 22 Sep 2010 19:16:20 +0000 Subject: prepayment discounts rt#5318 --- httemplate/elements/customer-table.html | 13 +++++++++- httemplate/elements/select-discount_term.html | 32 ++++++++++++++++++++++++ httemplate/elements/tr-select-discount_term.html | 25 ++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 httemplate/elements/select-discount_term.html create mode 100644 httemplate/elements/tr-select-discount_term.html (limited to 'httemplate/elements') diff --git a/httemplate/elements/customer-table.html b/httemplate/elements/customer-table.html index f00419f9c..3c3f8b2ee 100644 --- a/httemplate/elements/customer-table.html +++ b/httemplate/elements/customer-table.html @@ -22,6 +22,7 @@ Example: ### 'name_singular' => 'customer', #label + 'custnum_update_callback' => 'name_of_js_callback' #passed a rownum #listrefs 'types' => ['immutable', ''], # immutable or ''/text @@ -98,6 +99,9 @@ Example: if ( name.length > 0 ) { customer.value = name; customer.setAttribute('magic', 'nosearch'); +% if ( $opt{custnum_update_callback} ) { + <% $opt{custnum_update_callback} %>(searchrow, '<% $opt{prefix} %>') +% } } else { customer.value = 'Not found'; customer.style.color = '#ff0000'; @@ -162,6 +166,9 @@ Example: customer_obj.style.display = ''; customer_select.style.display = 'none'; +% if ( $opt{custnum_update_callback} ) { + <% $opt{custnum_update_callback} %>(searchrow, '<% $opt{prefix} %>') +% } } else { @@ -223,6 +230,10 @@ Example: this.style.display = 'none'; customer_obj.style.display = ''; +% if ( $opt{custnum_update_callback} ) { + <% $opt{custnum_update_callback} %>(searchrow, '<% $opt{prefix} %>') +% } + } } @@ -314,7 +325,7 @@ Example: > % } elsif ($types->[$col] eq 'immutable') { <% $font %><% $value %><% $font ? '' : '' %> - + % } else { Cannot represent unknown type: <% $types->[$col] %> % } diff --git a/httemplate/elements/select-discount_term.html b/httemplate/elements/select-discount_term.html new file mode 100644 index 000000000..26d877a86 --- /dev/null +++ b/httemplate/elements/select-discount_term.html @@ -0,0 +1,32 @@ +% if ( scalar(@discount_term) ) { + +% } +<%init> + +my %opt = @_; + +my $cgi = $opt{'cgi'}; + +my @discount_term; +if ( $opt{discount_term} ) { + + @discount_term = @{ $opt{discount_term} }; + +} else { + + my $custnum = $opt{'custnum'}; + + my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ) + or die "unknown custnum $custnum\n"; + + @discount_term = $cust_main->discount_terms; + +} + + diff --git a/httemplate/elements/tr-select-discount_term.html b/httemplate/elements/tr-select-discount_term.html new file mode 100644 index 000000000..58582675d --- /dev/null +++ b/httemplate/elements/tr-select-discount_term.html @@ -0,0 +1,25 @@ +% if ( scalar(@discount_term) ) { + + + + + +% } + +<%init> +my %opt = @_; + +my $custnum = $opt{'custnum'}; + +my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ) + or die "unknown custnum $custnum\n"; + +my @discount_term = $cust_main->discount_terms; + + -- cgit v1.2.1 From b76d8cd6704292a90d71bfea31859ed22e2fa23f Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 10 Oct 2010 00:26:24 +0000 Subject: add lock_agentnum and lock_pkgpart parameters to new customer page, RT#9782 --- httemplate/elements/freeside.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'httemplate/elements') diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css index 18b14e395..6cb15030b 100644 --- a/httemplate/elements/freeside.css +++ b/httemplate/elements/freeside.css @@ -40,6 +40,16 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus { border-radius: 2px; } +.fsdisabled { + background-color: #dddddd; + color: #666666; + border: 1px solid #999999; + padding: 1px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; +} + input[type="reset"], input[type="submit"], input[type="button"] { background-color: #dddddd; border: 1px solid #666666; -- cgit v1.2.1 From 71a886ac5094f8b9934b20d7bb127ce706a1df5b Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 10 Oct 2010 19:11:15 +0000 Subject: fix documentation link for 2.1 --- httemplate/elements/menu.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index b852a402e..09b8e7405 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -537,8 +537,8 @@ my $wiki = 'http://www.freeside.biz/mediawiki/index.php'; my $doc_link = $conf->config('support-key') ? "$wiki/Supported:Documentation" : $curuser->access_right('Configuration') - ? "$wiki/Freeside:1.9:Documentation" - : "$wiki/Freeside:1.9:Documentation:User"; + ? "$wiki/Freeside:2.1:Documentation" + : "$wiki/Freeside:2.1:Documentation:User"; eval "use RT;" if $conf->config('ticket_system') eq 'RT_Internal'; -- cgit v1.2.1 From eec4949e2c8f09a0b89331437186b77c4db6ff38 Mon Sep 17 00:00:00 2001 From: jeff Date: Mon, 11 Oct 2010 19:00:33 +0000 Subject: external taxes support package locations RT10093 --- httemplate/elements/standardize_locations.html | 18 ++ httemplate/elements/standardize_locations.js | 278 +++++++++++++++++++++++++ 2 files changed, 296 insertions(+) create mode 100644 httemplate/elements/standardize_locations.html create mode 100644 httemplate/elements/standardize_locations.js (limited to 'httemplate/elements') diff --git a/httemplate/elements/standardize_locations.html b/httemplate/elements/standardize_locations.html new file mode 100644 index 000000000..9f8b71c62 --- /dev/null +++ b/httemplate/elements/standardize_locations.html @@ -0,0 +1,18 @@ +<% include('/elements/init_overlib.html') %> + +<% include( '/elements/xmlhttp.html', + 'url' => $p.'misc/xmlhttp-cust_main-address_standardize.html', + 'subs' => [ 'address_standardize' ], + #'method' => 'POST', #could get too long? + ) +%> + + + +<%init> + +my (%options) = @_; + + diff --git a/httemplate/elements/standardize_locations.js b/httemplate/elements/standardize_locations.js new file mode 100644 index 000000000..e6a4aa607 --- /dev/null +++ b/httemplate/elements/standardize_locations.js @@ -0,0 +1,278 @@ +function standardize_locations() { + + var cf = document.<% $formname %>; + + var state_el = cf.elements['<% $main_prefix %>state']; + var ship_state_el = cf.elements['<% $ship_prefix %>state']; + + var address_info = new Array( +% if ( $onlyship ) { + 'onlyship', 1, +% } else { +% if ( $withfirm ) { + 'company', cf.elements['<% $main_prefix %>company'].value, +% } + 'address1', cf.elements['<% $main_prefix %>address1'].value, + 'address2', cf.elements['<% $main_prefix %>address2'].value, + 'city', cf.elements['<% $main_prefix %>city'].value, + 'state', state_el.options[ state_el.selectedIndex ].value, + 'zip', cf.elements['<% $main_prefix %>zip'].value, +% } +% if ( $withfirm ) { + 'ship_company', cf.elements['<% $ship_prefix %>company'].value, +% } + 'ship_address1', cf.elements['<% $ship_prefix %>address1'].value, + 'ship_address2', cf.elements['<% $ship_prefix %>address2'].value, + 'ship_city', cf.elements['<% $ship_prefix %>city'].value, + 'ship_state', ship_state_el.options[ ship_state_el.selectedIndex ].value, + 'ship_zip', cf.elements['<% $ship_prefix %>zip'].value + ); + + address_standardize( address_info, update_address ); + +} + +var standardize_address; + +function update_address(arg) { + + var argsHash = eval('(' + arg + ')'); + + var changed = argsHash['address_standardized']; + var ship_changed = argsHash['ship_address_standardized']; + var error = argsHash['error']; + var ship_error = argsHash['ship_error']; + + + //yay closures + standardize_address = function () { + + var cf = document.<% $formname %>; + var state_el = cf.elements['<% $main_prefix %>state']; + var ship_state_el = cf.elements['<% $ship_prefix %>state']; + +% if ( !$onlyship ) { + if ( changed ) { +% if ( $withfirm ) { + cf.elements['<% $main_prefix %>company'].value = argsHash['new_company']; +% } + cf.elements['<% $main_prefix %>address1'].value = argsHash['new_address1']; + cf.elements['<% $main_prefix %>address2'].value = argsHash['new_address2']; + cf.elements['<% $main_prefix %>city'].value = argsHash['new_city']; + setselect(cf.elements['<% $main_prefix %>state'], argsHash['new_state']); + cf.elements['<% $main_prefix %>zip'].value = argsHash['new_zip']; + } +% } + + if ( ship_changed ) { +% if ( $withfirm ) { + cf.elements['<% $ship_prefix %>company'].value = argsHash['new_ship_company']; +% } + cf.elements['<% $ship_prefix %>address1'].value = argsHash['new_ship_address1']; + cf.elements['<% $ship_prefix %>address2'].value = argsHash['new_ship_address2']; + cf.elements['<% $ship_prefix %>city'].value = argsHash['new_ship_city']; + setselect(cf.elements['<% $ship_prefix %>state'], argsHash['new_ship_state']); + cf.elements['<% $ship_prefix %>zip'].value = argsHash['new_ship_zip']; + } + + post_standardization(); + + } + + + + if ( changed || ship_changed ) { + +% if ( $conf->exists('cust_main-auto_standardize_address') ) { + + standardize_address(); + +% } else { + + // popup a confirmation popup + + var confirm_change = + '
Confirm address standardization

' + + '

Prepayment for

+ <% include('select-discount_term.html', + 'discount_term' => \@discount_term, + 'cgi' => $opt{'cgi'}, + ) + %> +

'; + + if ( changed ) { + + confirm_change = confirm_change + + '' + + ''; + // + ''; + + if ( argsHash['company'] || argsHash['new_company'] ) { + confirm_change = confirm_change + + ''; + } + + confirm_change = confirm_change + + '' + + '' + + '' + + ''; + + } + + if ( ship_changed ) { + + confirm_change = confirm_change + + '' + + ''; + // + ''; + + if ( argsHash['ship_company'] || argsHash['new_ship_company'] ) { + confirm_change = confirm_change + + ''; + } + + confirm_change = confirm_change + + '' + + '' + + '' + + ''; + + } + + var addresses = 'address'; + var height = 268; + if ( changed && ship_changed ) { + addresses = 'addresses'; + height = 396; // #what + } + + confirm_change = confirm_change + + '' + + '' + + + '

Entered billing address	Standardized billing address

' + argsHash['company'] + + '	' + argsHash['new_company'] + '
' + argsHash['address1'] + + '	' + argsHash['new_address1'] + '
' + argsHash['address2'] + + '	' + argsHash['new_address2'] + '
' + argsHash['city'] + ', ' + argsHash['state'] + ' ' + argsHash['zip'] + + '	' + argsHash['new_city'] + ', ' + argsHash['new_state'] + ' ' + argsHash['new_zip'] + '

Entered service address	Standardized service address

' + argsHash['ship_company'] + + '	' + argsHash['new_ship_company'] + '
' + argsHash['ship_address1'] + + '	' + argsHash['new_ship_address1'] + '
' + argsHash['ship_address2'] + + '	' + argsHash['new_ship_address2'] + '
' + argsHash['ship_city'] + ', ' + argsHash['ship_state'] + ' ' + argsHash['ship_zip'] + + '	' + argsHash['new_ship_city'] + ', ' + argsHash['new_ship_state'] + ' ' + argsHash['new_ship_zip'] + '

' + + '' + + '	' + + '' + + '
' + + '

'; + + overlib( confirm_change, CAPTION, 'Confirm address standardization', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, height, BGCOLOR, '#333399', CGCOLOR, '#333399', TEXTSIZE, 3 ); + +% } + + } else { + + post_standardization(); + + } + + +} + +function post_standardization() { + + var cf = document.<% $formname %>; + +% if ( $conf->exists('enable_taxproducts') ) { + + if ( new String(cf.elements['<% $taxpre %>zip'].value).length < 10 ) + { + + var country_el = cf.elements['<% $taxpre %>country']; + var country = country_el.options[ country_el.selectedIndex ].value; + var geocode = cf.elements['geocode'].value; + + if ( country == 'CA' || country == 'US' ) { + + var state_el = cf.elements['<% $taxpre %>state']; + var state = state_el.options[ state_el.selectedIndex ].value; + + var url = "<% $p %>/misc/choose_tax_location.html" + + "?data_vendor=cch-zip" + + ";city=" + cf.elements['<% $taxpre %>city'].value + + ";state=" + state + + ";zip=" + cf.elements['<% $taxpre %>zip'].value + + ";country=" + country + + ";geocode=" + geocode + + ";formname=" + '<% $formname %>' + + ";"; + + // popup a chooser + OLgetAJAX( url, update_geocode, 300 ); + + } else { + + cf.elements['geocode'].value = 'DEFAULT'; + <% $post_geocode %>; + + } + + } else { + + cf.elements['geocode'].value = ''; + <% $post_geocode %>; + + } + +% } else { + + <% $post_geocode %>; + +% } + +} + +function update_geocode() { + + //yay closures + set_geocode = function (what) { + + var cf = document.<% $formname %>; + + //alert(what.options[what.selectedIndex].value); + var argsHash = eval('(' + what.options[what.selectedIndex].value + ')'); + cf.elements['<% $taxpre %>city'].value = argsHash['city']; + setselect(cf.elements['<% $taxpre %>state'], argsHash['state']); + cf.elements['<% $taxpre %>zip'].value = argsHash['zip']; + cf.elements['geocode'].value = argsHash['geocode']; + <% $post_geocode %>; + + } + + // popup a chooser + + overlib( OLresponseAJAX, CAPTION, 'Select tax location', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 268, BGCOLOR, '#333399', CGCOLOR, '#333399', TEXTSIZE, 3 ); + +} + +function setselect(el, value) { + + for ( var s = 0; s < el.options.length; s++ ) { + if ( el.options[s].value == value ) { + el.selectedIndex = s; + } + } + +} +<%init> + +my %opt = @_; +my $conf = new FS::Conf; + +my $withfirm = 1; + +my $formname = $opt{form} || 'CustomerForm'; +my $onlyship = $opt{onlyship} || ''; +my $main_prefix = $opt{main_prefix} || ''; +my $ship_prefix = $opt{ship_prefix} || ($onlyship ? '' : 'ship_'); +my $taxpre = $main_prefix; +$taxpre = $ship_prefix if ( $conf->exists('tax-ship_address') || $onlyship ); +my $post_geocode = $opt{callback} || 'post_geocode();'; +$withfirm = 0 if $opt{no_company}; + + -- cgit v1.2.1 From 94d9f31448e3264c36f1590719cd9253d81ea0ae Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 11 Oct 2010 23:36:07 +0000 Subject: expiration month always 2 digits, RT#10161 --- httemplate/elements/select-month_year.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/select-month_year.html b/httemplate/elements/select-month_year.html index 34476bc94..cbf90b6d7 100644 --- a/httemplate/elements/select-month_year.html +++ b/httemplate/elements/select-month_year.html @@ -12,7 +12,7 @@ % if ( $opt{'show_month_abbr'} ) { % @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); % } else { -% @mon = ( 1 .. 12 ); +% @mon = ( ( map "0$_", 1 .. 9 ), 10 .. 12 ), % } % % my $date = $opt{'selected_date'} || ''; -- cgit v1.2.1 From 29472410e3b882a6a6b74fe48d28db411fe8fcff Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 12 Oct 2010 01:15:17 +0000 Subject: package contract end date field, RT#9918 --- httemplate/elements/input-date-field.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/input-date-field.html b/httemplate/elements/input-date-field.html index 0ea4be70a..2a9bc1d53 100644 --- a/httemplate/elements/input-date-field.html +++ b/httemplate/elements/input-date-field.html @@ -1,8 +1,9 @@ - +% if(!$noinit) { +% }

@@ -18,13 +19,14 @@ <%init> -my($name, $value, $format, $usedatetime); +my($name, $value, $format, $usedatetime, $noinit); if ( ref($_[0]) ) { my $opt = shift; $name = $opt->{'name'}; $value = $opt->{'value'}; $format = $opt->{'format'}; $usedatetime = $opt->{'usedatetime'}; + $noinit = $opt->{'noinit'}; } else { ($name, $value, $format, $usedatetime) = @_; } -- cgit v1.2.1 From 7bbe939d139be7edd77378cfc9a2c3ec6287749d Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 14 Oct 2010 01:14:27 +0000 Subject: more contact work and preliminary business card upload --- httemplate/elements/contact.html | 55 ++++++++++++++++++++++++++++++++++------ httemplate/elements/menu.html | 4 ++- 2 files changed, 50 insertions(+), 9 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/contact.html b/httemplate/elements/contact.html index a7a33b1f0..eea3694e3 100644 --- a/httemplate/elements/contact.html +++ b/httemplate/elements/contact.html @@ -5,12 +5,38 @@ % foreach my $field ( @fields ) { +% +% my $value = ''; +% if ( $field =~ /^phonetypenum(\d+)$/ ) { +% my $contact_phone = qsearchs('contact_phone', { +% 'contactnum' => $curr_value, +% 'phonetypenum' => $1, +% }); +% if ( $contact_phone ) { +% $value = $contact_phone->phonenum; +% $value .= 'x'.$contact_phone->extension +% if $contact_phone->extension; +% $value = '+'. $contact_phone->countrycode. " $value" +% if $contact_phone->countrycode +% && $contact_phone->countrycode ne '1'; +% } +% } elsif ( $field eq 'emailaddress' ) { +% #XXX multiple not yet supported +% my $contact_email = qsearchs('contact_email', { +% 'contactnum' => $curr_value, +% }); +% $value = $contact_email->emailaddress if $contact_email; +% } else { +% $value = $contact->get($field); +% } + @@ -25,6 +25,7 @@ my $curuser = $FS::CurrentUser::CurrentUser; my %opt = @_; my $cgi = $opt{'cgi'}; +my $is_report = $opt{'is_report'}; my @curr_tagnum = (); if ( $cgi->param('error') ) { -- cgit v1.2.1

<% $opt{'label'} || 'Tags' %>