From 9c9a1838b54292c62e940d7e6cee5141ea8e9b5c Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 16 Mar 2010 08:37:25 +0000 Subject: RT#6226: fckeditor for customer notes --- httemplate/edit/cust_main_note.cgi | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'httemplate/edit') diff --git a/httemplate/edit/cust_main_note.cgi b/httemplate/edit/cust_main_note.cgi index 6c6a1a9a0..1fdf0d9e5 100755 --- a/httemplate/edit/cust_main_note.cgi +++ b/httemplate/edit/cust_main_note.cgi @@ -8,9 +8,11 @@

- +<% include('/elements/htmlarea.html', 'field' => 'comment', + 'curr_value' => $comment) %> +% #

"> @@ -33,6 +35,8 @@ if ( $cgi->param('error') ) { $comment = $note->comments; } +$comment =~ s/\r//g; # remove weird line breaks to protect FCKeditor + $cgi->param('custnum') =~ /^(\d+)$/ or die "illeagl custnum"; my $custnum = $1; -- cgit v1.2.1 From c4991a99f2aa934b24b6c4d635af28ec5450c410 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 18 Mar 2010 08:02:38 +0000 Subject: signup date fix? --- httemplate/edit/cust_main/top_misc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit') diff --git a/httemplate/edit/cust_main/top_misc.html b/httemplate/edit/cust_main/top_misc.html index 3d6c4862d..d1d436851 100644 --- a/httemplate/edit/cust_main/top_misc.html +++ b/httemplate/edit/cust_main/top_misc.html @@ -78,7 +78,7 @@ 'name' => 'signupdate', 'value' => $cust_main->signupdate, 'label' => 'Signup date', - 'format' => $conf->config('date_format') || "%m/%d/%Y", + 'format' => ( $conf->config('date_format') || "%m/%d/%Y" ), }) %> % } -- cgit v1.2.1 From 7c12696f0598ca04c56699e8e6ff4c307000affa Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 21 Mar 2010 23:13:26 +0000 Subject: connection fee for initial N seconds support, RT#7018 --- httemplate/edit/process/rate_region.cgi | 2 +- httemplate/edit/rate_detail.html | 11 ++++++++++- httemplate/edit/rate_region.cgi | 28 +++++++++++++++++++++++++++- 3 files changed, 38 insertions(+), 3 deletions(-) (limited to 'httemplate/edit') diff --git a/httemplate/edit/process/rate_region.cgi b/httemplate/edit/process/rate_region.cgi index 882991e9d..8036f7388 100755 --- a/httemplate/edit/process/rate_region.cgi +++ b/httemplate/edit/process/rate_region.cgi @@ -39,7 +39,7 @@ my @dest_detail = map { new FS::rate_detail { 'ratenum' => $ratenum, map { $_ => $cgi->param("$_$ratenum") } - qw( min_included min_charge sec_granularity classnum ) + qw( min_included conn_charge conn_sec min_charge sec_granularity classnum ) }; } qsearch('rate', {} ); diff --git a/httemplate/edit/rate_detail.html b/httemplate/edit/rate_detail.html index dd8c3f6b3..869ace8d4 100644 --- a/httemplate/edit/rate_detail.html +++ b/httemplate/edit/rate_detail.html @@ -6,6 +6,8 @@ 'dest_regionname' => 'Region', 'dest_prefixes_short' => 'Prefix(es)', 'min_included' => 'Included minutes/calls', + 'conn_charge' => 'Connection charge', + 'conn_sec' => 'For', 'min_charge' => 'Charge per minute/call', 'sec_granularity' => 'Granularity', 'classnum' => 'Usage class', @@ -17,6 +19,13 @@ { field=>'dest_regionname', type=>'fixed', }, { field=>'dest_prefixes_short', type=>'fixed', }, { field=>'min_included', type=>'text', size=>5 }, + { field=>'conn_charge', type=>'money', size=>4 }, + { field =>'conn_sec', + type =>'select', + options => [ keys %conn_secs ], + labels => \%conn_secs, + disable_empty => 1, + }, { field=>'min_charge', type=>'money', size=>4 }, { field =>'sec_granularity', type =>'select', @@ -38,9 +47,9 @@ <%once> tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); +tie my %conn_secs, 'Tie::IxHash', FS::rate_detail::conn_secs(); - <%init> my $conf = new FS::Conf; diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi index 9ca3a3569..f77c0dbe7 100644 --- a/httemplate/edit/rate_region.cgi +++ b/httemplate/edit/rate_region.cgi @@ -51,6 +51,12 @@ Included
minutes/calls + + Connection
charge + + + Connection
charge for + Charge per
minute/call @@ -88,7 +94,20 @@ - $min_charge |h %>"> + <%$money_char%>conn_charge |h %>"> + + + + min_charge |h %>"> @@ -125,12 +144,19 @@ <% include('/elements/footer.html') %> +<%once> + +tie my %conn_secs, 'Tie::IxHash', FS::rate_detail::conn_secs(); + <%init> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); +my $conf = new FS::Conf; +my $money_char = $conf->config('money_char') || '$'; + my $rate_region; if ( $cgi->param('error') ) { $rate_region = new FS::rate_region ( { -- cgit v1.2.1 From f46056f1423db7b7daf4a43f11610e1d961823af Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 23 Mar 2010 03:48:02 +0000 Subject: adding svc_mailinglist for communigate "groups" (mailing lists), RT#7514 --- httemplate/edit/mailinglistmember.html | 25 +++++++++++++++++++++++++ httemplate/edit/part_svc.cgi | 3 ++- httemplate/edit/process/mailinglistmember.html | 6 ++++++ httemplate/edit/process/svc_mailinglist.html | 11 +++++++++++ httemplate/edit/svc_mailinglist.cgi | 25 +++++++++++++++++++++++++ 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 httemplate/edit/mailinglistmember.html create mode 100644 httemplate/edit/process/mailinglistmember.html create mode 100644 httemplate/edit/process/svc_mailinglist.html create mode 100644 httemplate/edit/svc_mailinglist.cgi (limited to 'httemplate/edit') diff --git a/httemplate/edit/mailinglistmember.html b/httemplate/edit/mailinglistmember.html new file mode 100644 index 000000000..2391cb697 --- /dev/null +++ b/httemplate/edit/mailinglistmember.html @@ -0,0 +1,25 @@ +<% include( 'elements/edit.html', + 'name_singular' => 'member', + 'table' => 'mailinglistmember', + 'popup' => 1, + 'fields' => [ + { field=>'listnum', type=>'hidden', }, + { field=>'svcnum', type=>'hidden', }, #not yet + { field=>'contactemailnum', type=>'hidden', }, #not yet + { field=>'email', type=>'text', }, + ], + 'labels' => { 'membernum' => 'Member', + 'email' => 'Email address', + }, + 'new_callback' => $new_callback, + ) +%> +<%init> + +my $new_callback = sub { + #my( $cgi, $object, $fields_listref, $opt_hashref ) = @_; + my( $cgi, $object ) = @_; + $object->listnum( $cgi->param('listnum') ); +}; + + diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi index 51925c0c5..98ed9fec1 100755 --- a/httemplate/edit/part_svc.cgi +++ b/httemplate/edit/part_svc.cgi @@ -15,7 +15,8 @@ Disable new orders Service definitions are the templates for items you offer to your customers.
  • svc_acct - Accounts - anything with a username (Mailboxes, PPP accounts, shell accounts, RADIUS entries for broadband, etc.)
  • svc_domain - Domains -
  • svc_forward - mail forwarding +
  • svc_forward - Mail forwarding +
  • svc_mailinglist - Mailing list
  • svc_www - Virtual domain website
  • svc_broadband - Broadband/High-speed Internet service (always-on)
  • svc_phone - Customer phone numbers diff --git a/httemplate/edit/process/mailinglistmember.html b/httemplate/edit/process/mailinglistmember.html new file mode 100644 index 000000000..f1842b8ef --- /dev/null +++ b/httemplate/edit/process/mailinglistmember.html @@ -0,0 +1,6 @@ +<% include( 'elements/process.html', + 'table' => 'mailinglistmember', + 'popup_reload' => 'Member added', + ) +%> +%#XXX ACL diff --git a/httemplate/edit/process/svc_mailinglist.html b/httemplate/edit/process/svc_mailinglist.html new file mode 100644 index 000000000..580f6ccbd --- /dev/null +++ b/httemplate/edit/process/svc_mailinglist.html @@ -0,0 +1,11 @@ +<% include( 'elements/svc_Common.html', + 'table' => 'svc_mailinglist', + 'fields' => [ fields('svc_mailinglist'), 'listname' ], + ) +%> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Provision customer service'); #something else more specific? + + diff --git a/httemplate/edit/svc_mailinglist.cgi b/httemplate/edit/svc_mailinglist.cgi new file mode 100644 index 000000000..c7c739daa --- /dev/null +++ b/httemplate/edit/svc_mailinglist.cgi @@ -0,0 +1,25 @@ +<% include( 'elements/svc_Common.html', + 'table' => 'svc_mailinglist', + 'fields' => \@fields, + ) +%> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Provision customer service'); #something else more specific? + +my @fields = ( + 'username', + { field=>'domsvc', type=>'select-svc-domain', + #label => 'List address domain', + }, + { field=>'listnum', type=>'hidden', }, + { field=>'listname', type=>'text', }, + { field=>'reply_to', type=>'checkbox', value=>'Y' }, + { field=>'remove_from', type=>'checkbox', value=>'Y' }, + { field=>'reject_auto', type=>'checkbox', value=>'Y' }, + { field=>'remove_to_and_cc', type=>'checkbox', value=>'Y' }, + +); + + -- cgit v1.2.1 From 1d25ae2a3b49fd7a4413ec8f590a696fe13780e8 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 27 Mar 2010 06:11:32 +0000 Subject: resize customer not add popup, eliminate needless
    in popup --- httemplate/edit/cust_main_note.cgi | 2 -- 1 file changed, 2 deletions(-) (limited to 'httemplate/edit') diff --git a/httemplate/edit/cust_main_note.cgi b/httemplate/edit/cust_main_note.cgi index 1fdf0d9e5..e2501cb54 100755 --- a/httemplate/edit/cust_main_note.cgi +++ b/httemplate/edit/cust_main_note.cgi @@ -6,8 +6,6 @@ - -

    <% include('/elements/htmlarea.html', 'field' => 'comment', 'curr_value' => $comment) %> % #