summaryrefslogtreecommitdiff
path: root/httemplate/edit
diff options
context:
space:
mode:
authorJonathan Prykop <jonathan@freeside.biz>2015-01-28 19:28:13 -0600
committerJonathan Prykop <jonathan@freeside.biz>2015-01-28 19:28:13 -0600
commit92a327b2bc09344a7e0db93f40e34b71547bf075 (patch)
tree5dd0ea80b997a3a1b003e0dac52463aa20ac96d5 /httemplate/edit
parent730a14abf09f1ed8854cfded6f432fee832ea7d8 (diff)
parent3ed9d0fa90662f037f3fb2f50632ccb34066a979 (diff)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/edit')
-rwxr-xr-xhttemplate/edit/cust_main_note.cgi27
-rwxr-xr-xhttemplate/edit/part_pkg.cgi13
-rw-r--r--httemplate/edit/process/bulk-svc_phone.html2
-rwxr-xr-xhttemplate/edit/process/cust_main_note.cgi1
4 files changed, 31 insertions, 12 deletions
diff --git a/httemplate/edit/cust_main_note.cgi b/httemplate/edit/cust_main_note.cgi
index 61590566c..a089db2d1 100755
--- a/httemplate/edit/cust_main_note.cgi
+++ b/httemplate/edit/cust_main_note.cgi
@@ -18,17 +18,24 @@
<BR>
% }
-% if( $FS::CurrentUser::CurrentUser->option('disable_html_editor') ) {
- <TEXTAREA NAME="comment_plain" ROWS="12" COLS="60"><%
- join '', split /<br \/>|&nbsp;/, $comment
- %></TEXTAREA>
-% }
-% else {
-<% include('/elements/htmlarea.html', 'field' => 'comment_html',
- 'curr_value' => $comment) %>
+% if ( $FS::CurrentUser::CurrentUser->option('disable_html_editor') ) {
+ <TEXTAREA NAME="comment_plain" ROWS="12" COLS="60"><%
+ join '', split /<br \/>|&nbsp;/, $comment
+ %></TEXTAREA>
+% } else {
+ <& /elements/htmlarea.html, 'field' => 'comment_html',
+ 'curr_value' => $comment
+ &>
% }
-<BR><BR>
+<BR>
+
+<& /elements/checkbox.html, 'field' => 'sticky',
+ 'value' => 1,
+ 'curr_value' => $sticky,
+&>
+Sticky note<BR><BR>
+
<INPUT TYPE="submit" VALUE="<% $notenum ? emt("Apply changes") : emt("Add Note") %>">
</FORM>
@@ -42,6 +49,7 @@ my $conf = new FS::Conf;
my $comment;
my $notenum = '';
my $classnum;
+my $sticky = 0;
if ( $cgi->param('error') ) {
$comment = $cgi->param('comment');
$classnum = $cgi->param('classnum');
@@ -52,6 +60,7 @@ if ( $cgi->param('error') ) {
die "no such note: ". $notenum unless $note;
$comment = $note->comments;
$classnum = $note->classnum;
+ $sticky = $note->sticky;
}
$comment =~ s/\r//g; # remove weird line breaks to protect FCKeditor
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 778a0265e..1702a6dc7 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -967,8 +967,17 @@ my $html_bottom = sub {
'msg' => q|You must set the 'suspend_credit_type' option in Configuration->Settings to gain access to this option.|,
'are_met' => sub{
my $conf = new FS::conf;
- my @suspend_credit_type_conf = qsearch('conf', { 'name' => 'suspend_credit_type' } );
- return 1 if (exists($suspend_credit_type_conf[0]) && $suspend_credit_type_conf[0]->{Hash}{value});
+ my @conf_info = qsearch('conf', { 'name' => 'suspend_credit_type' } );
+ return 1 if (exists($conf_info[0]) && $conf_info[0]->{Hash}{value});
+ return 0;
+ }
+ },
+ 'unused_credit_cancel' => {
+ 'msg' => q|You must set the 'cancel_credit_type' option in Configuration->Settings to gain access to this option.|,
+ 'are_met' => sub{
+ my $conf = new FS::conf;
+ my @conf_info = qsearch('conf', { 'name' => 'cancel_credit_type' } );
+ return 1 if (exists($conf_info[0]) && $conf_info[0]->{Hash}{value});
return 0;
}
}
diff --git a/httemplate/edit/process/bulk-svc_phone.html b/httemplate/edit/process/bulk-svc_phone.html
index 5a1fbc647..db486de76 100644
--- a/httemplate/edit/process/bulk-svc_phone.html
+++ b/httemplate/edit/process/bulk-svc_phone.html
@@ -25,7 +25,7 @@ my $num_avail = $1;
errorpage("There are only $num_avail available")
if $end - $start + 1 > $num_avail;
-foreach my $phonenum ( $start .. $end ) {
+foreach my $phonenum ( "$start" .. "$end" ) {
my $svc_phone = new FS::svc_phone {
'phonenum' => $phonenum,
diff --git a/httemplate/edit/process/cust_main_note.cgi b/httemplate/edit/process/cust_main_note.cgi
index 227297eef..53e616a43 100755
--- a/httemplate/edit/process/cust_main_note.cgi
+++ b/httemplate/edit/process/cust_main_note.cgi
@@ -33,6 +33,7 @@ my $new = new FS::cust_main_note ( {
_date => time,
usernum => $FS::CurrentUser::CurrentUser->usernum,
comments => $comment,
+ sticky => scalar( $cgi->param('sticky') ),
} );
my $error;