[freeside-commits] branch master updated. 1f343115f761ab39020a6aa76d3698fe4c8f2d61
Mark Wells
mark at 420.am
Sat Aug 29 21:28:19 PDT 2015
The branch, master has been updated
via 1f343115f761ab39020a6aa76d3698fe4c8f2d61 (commit)
via 9fd03716b831bd00a725a63edbe19cfe6b88aea0 (commit)
via d622148c3ad8e98aef7ae1ca163e28483e023609 (commit)
from 0f8882fa700977c08688d3bdf6412ad06f0e618e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1f343115f761ab39020a6aa76d3698fe4c8f2d61
Author: Mark Wells <mark at freeside.biz>
Date: Sat Aug 29 21:27:39 2015 -0700
fix improper relative paths, incidental to #21564
diff --git a/httemplate/elements/htmlarea.html b/httemplate/elements/htmlarea.html
index 7c40e61..d8b2512 100644
--- a/httemplate/elements/htmlarea.html
+++ b/httemplate/elements/htmlarea.html
@@ -12,7 +12,7 @@ Example:
</%doc>
% #init
-<SCRIPT TYPE="text/javascript" src="<% $p %>elements/ckeditor/ckeditor.js">
+<SCRIPT TYPE="text/javascript" src="<% $fsurl %>elements/ckeditor/ckeditor.js">
</SCRIPT>
% #editor
@@ -35,7 +35,7 @@ my $config = {
'skin' => 'kama',
'toolbarCanCollapse' => JSON::true,
'removePlugins' => 'elementspath',
- 'basePath' => $p.'elements/ckeditor/',
+ 'basePath' => $fsurl.'elements/ckeditor/',
'enterMode' => 2,
%{ $opt{config} || {} },
};
diff --git a/httemplate/elements/template_image-dialog.html b/httemplate/elements/template_image-dialog.html
index f7fb0c2..b471d28 100644
--- a/httemplate/elements/template_image-dialog.html
+++ b/httemplate/elements/template_image-dialog.html
@@ -14,7 +14,7 @@ url - to redirect to after upload, otherwise just refreshes dialog window
</%doc>
<% include('/elements/xmlhttp.html',
- 'url' => $p.'misc/xmlhttp-template_image.cgi',
+ 'url' => $fsurl.'misc/xmlhttp-template_image.cgi',
'subs' => [ 'get_template_image' ],
) %>
@@ -75,7 +75,7 @@ url - to redirect to after upload, otherwise just refreshes dialog window
<% include('/elements/form-file_upload.html',
'name' => 'TemplateImageUploadForm',
'id' => 'TemplateImageUploadForm',
- 'action' => $p.'misc/process/template_image-upload.cgi',
+ 'action' => $fsurl.'misc/process/template_image-upload.cgi',
'num_files' => 1,
'fields' => [ 'name', 'agentnum' ],
'url' => $opt{'url'} || 'javascript:refreshImageList(1)',
commit 9fd03716b831bd00a725a63edbe19cfe6b88aea0
Author: Mark Wells <mark at freeside.biz>
Date: Sat Aug 29 21:27:20 2015 -0700
#21564: user interface for REST client
diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 827bb98..4c2ac4b 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -5,7 +5,7 @@ use strict;
use vars qw( $DEBUG $conf );
use FS::Conf;
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearch qsearchs dbh );
use FS::cust_msg;
use FS::template_content;
@@ -95,11 +95,16 @@ sub _rebless {
eval "use $class;";
bless($self, $class) unless $@;
- # merge in the extension fields
+ # merge in the extension fields (but let fields in $self override them)
+ # except don't ever override the extension's primary key, it's immutable
if ( $self->msgnum and $self->extension_table ) {
my $extension = $self->_extension;
if ( $extension ) {
- $self->{Hash} = { $self->hash, $extension->hash };
+ my $ext_key = $extension->get($extension->primary_key);
+ $self->{Hash} = { $extension->hash,
+ $self->hash,
+ $extension->primary_key => $ext_key
+ };
}
}
@@ -194,6 +199,8 @@ sub replace {
my $extension = $new->_extension;
if ( $extension ) {
+ # merge changes into the extension record and replace it
+ $extension->{Hash} = { $extension->hash, $new->hash };
$error ||= $extension->replace;
}
@@ -212,7 +219,7 @@ sub replace_check {
if ( $old->msgclass ) {
if ( !$self->msgclass ) {
$self->set('msgclass', $old->msgclass);
- } else {
+ } elsif ( $old->msgclass ne $self->msgclass ) {
return "Can't change message template class from ".$old->msgclass.
" to ".$self->msgclass.".";
}
diff --git a/httemplate/browse/msg_template.html b/httemplate/browse/msg_template/email.html
similarity index 70%
rename from httemplate/browse/msg_template.html
rename to httemplate/browse/msg_template/email.html
index 1646bc1..d0ef4e3 100644
--- a/httemplate/browse/msg_template.html
+++ b/httemplate/browse/msg_template/email.html
@@ -1,9 +1,9 @@
-<% include( 'elements/browse.html',
+<& /browse/elements/browse.html,
'title' => 'Message templates',
'name_singular' => 'template',
'menubar' => \@menubar,
- 'query' => { 'table' => 'msg_template', },
- 'count_query' => 'SELECT COUNT(*) FROM msg_template',
+ 'query' => $query,
+ 'count_query' => $count_query,
'disableable' => 1,
'disabled_statuspos' => (scalar(@locales) + 3),
'agent_virt' => 1,
@@ -14,8 +14,7 @@
'links' => [ $link, @locale_links, '' ],
'link_onclicks' => [ '', map('', @locale_links), $disable_link ],
'cell_style' => [ '', '', map ($locale_style, @locales), $locale_style ],
- )
-%>
+&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
@@ -26,11 +25,21 @@ die "access denied"
my @menubar = ();
if ( $curuser->access_right(['Edit templates', 'Edit global templates']) ) {
- push @menubar, 'Add a new template' => $p.'edit/msg_template.html';
+ push @menubar, 'Add a new template' => $fsurl.'edit/msg_template/email.html';
}
-push @menubar, 'View template images' => $p.'browse/template_image.html';
+push @menubar, 'Template images' => $fsurl.'browse/template_image.html';
-my $link = [ "${p}edit/msg_template.html?msgnum=", 'msgnum' ];
+push @menubar, 'External message interfaces' => $fsurl.'browse/msg_template/http.html';
+
+my $query = {
+ 'table' => 'msg_template',
+ 'select' => '*',
+ 'hashref' => { 'msgclass' => 'email' },
+};
+
+my $count_query = "SELECT COUNT(*) FROM msg_template WHERE msgclass = 'email'";
+
+my $link = [ $fsurl.'edit/msg_template/email.html?msgnum=', 'msgnum' ];
my $locale_style = 'font-size:0.8em; padding:3px';
@@ -43,14 +52,14 @@ foreach my $l ( FS::Locales->locales ) {
};
push @locale_links, sub {
my $content = $_[0]->content_locales->{$l} or return '';
- [ "${p}edit/msg_template.html?locale=$l;msgnum=", 'msgnum' ];
+ [ $fsurl."edit/msg_template/email.html?locale=$l;msgnum=", 'msgnum' ];
};
}
my $disable_link = sub {
my $template = shift;
include('/elements/popup_link_onclick.html',
- action => $p.'misc/disable-msg_template.cgi?msgnum=' .
+ action => $fsurl.'misc/disable-msg_template.cgi?msgnum=' .
$template->msgnum .
($template->disabled ? ';enable=1' : ''),
actionlabel => 'Disable template',
diff --git a/httemplate/browse/msg_template/http.html b/httemplate/browse/msg_template/http.html
new file mode 100644
index 0000000..888fda4
--- /dev/null
+++ b/httemplate/browse/msg_template/http.html
@@ -0,0 +1,68 @@
+<& /browse/elements/browse.html,
+ 'title' => 'External message interfaces',
+ 'name_singular' => 'interface', # what else do we call them?
+ 'menubar' => \@menubar,
+ 'query' => $query,
+ 'count_query' => $count_query,
+ 'disableable' => 1,
+ 'disabled_statuspos' => 4,
+ 'agent_virt' => 1,
+ 'agent_null_right' => ['View global templates','Edit global templates'],
+ 'agent_pos' => 1,
+ 'header' => [ 'Name',
+ # 'Agent',
+ 'Prepare',
+ 'Send',
+ '' ],
+ 'fields' => [ 'msgname',
+ 'prepare_url',
+ 'send_url',
+ $disable_link_label
+ ],
+ 'links' => [ $link, ],
+ 'link_onclicks' => [ '', '', '', $disable_link ],
+ 'cell_style' => [ '', '', $url_style, $url_style ],
+&>
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied"
+ unless $curuser->access_right([ 'View templates', 'View global templates',
+ 'Edit templates', 'Edit global templates', ]);
+
+my @menubar = ();
+if ( $curuser->access_right(['Edit templates', 'Edit global templates']) ) {
+ push @menubar, 'Add a new interface' => $fsurl.'edit/msg_template/http.html';
+}
+push @menubar, 'Email templates' => $fsurl.'browse/msg_template/email.html';
+push @menubar, 'Template images' => $fsurl.'browse/template_image.html';
+
+my $query = {
+ 'table' => 'msg_template',
+ 'select' => '*',
+ 'hashref' => { 'msgclass' => 'http' },
+};
+
+my $count_query = "SELECT COUNT(*) FROM msg_template WHERE msgclass = 'http'";
+
+my $link = [ $fsurl.'edit/msg_template/http.html?msgnum=', 'msgnum' ];
+
+my $url_style = 'font-size:0.8em; padding:3px'; # also for (disable) label
+
+my $disable_link = sub {
+ my $template = shift;
+ include('/elements/popup_link_onclick.html',
+ action => $fsurl.'misc/disable-msg_template.cgi?msgnum=' .
+ $template->msgnum .
+ ($template->disabled ? ';enable=1' : ''),
+ actionlabel => 'Disable template',
+ );
+};
+
+my $disable_link_label = sub {
+ my $template = shift;
+ $template->disabled ? '(enable)' : '(disable)' ;
+};
+
+</%init>
diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html
index df72c5b..889b107 100644
--- a/httemplate/edit/msg_template.html
+++ b/httemplate/edit/msg_template.html
@@ -1,380 +1,9 @@
-<& elements/edit.html,
- 'html_init' => '<TABLE id="outerTable"><TR><TD>',
- 'body_etc' => $body_etc,
- 'name_singular' => 'template',
- 'table' => 'msg_template',
- 'viewall_dir' => 'browse',
- 'agent_virt' => 1,
- 'agent_null' => 1,
- 'agent_null_right' => [ 'View global templates', 'Edit global templates' ],
-
- 'fields' => \@fields,
- 'labels' => {
- 'msgnum' => 'Template',
- 'agentnum' => 'Agent',
- 'msgname' => 'Template name',
- 'from_addr' => 'From: ',
- 'bcc_addr' => 'Bcc: ',
- 'locale' => 'Locale',
- 'subject' => 'Subject: ',
- 'body' => 'Message body',
- },
- 'edit_callback' => \&edit_callback,
- 'error_callback' => \&edit_callback,
- 'html_bottom' => '</DIV>',
- 'html_table_bottom'=> \&html_table_bottom,
- 'html_foot' => ( $no_submit ? '' : "</TD>$sidebar</TR></TABLE>" ),
- 'no_submit' => $no_submit,
-&>
<%init>
-use FS::template_image;
-
-my $curuser = $FS::CurrentUser::CurrentUser;
-
-die "access denied"
- unless $curuser->access_right([ 'View templates', 'View global templates',
- 'Edit templates', 'Edit global templates',
- ]);
-
-my $body_etc = '';
-$body_etc = q!onload="document.getElementById('locale').onchange()"!
- if $cgi->param('locale') eq 'new';
-
-my $msgnum = $cgi->param('msgnum');
-my $msg_template = $msgnum ? qsearchs('msg_template', {msgnum=>$msgnum}) : '';
-
-my $no_submit = 0;
-my @fields = ();
-if ( $curuser->access_right('Edit global templates')
- || ( $curuser->access_right('Edit templates')
- && $msg_template
- && $msg_template->agentnum
- && $curuser->agentnums_href->{$msg_template->agentnum}
- )
- )
-{
- push @fields,
- { field => 'agentnum',
- type => 'select-agent',
- },
- { field => 'msgname', size=>60, },
- { field => 'from_addr', size=>60, },
- { field => 'bcc_addr', size=>60, },
- { type => 'tablebreak-tabs',
- include_opt_callback => \&menubar_opt_callback,
- },
- # template_content fields
- { field => 'locale', type => 'hidden' },
- { field => 'subject', size=>60, },
- { field => 'body',
- type => 'htmlarea',
- width => 763,
- config=> { extraPlugins => 'blockprotect' },
- },
- ;
-} else { #readonly
-
- $no_submit = 1;
-
- push @fields,
- { field => 'agentnum',
- type => 'select-agent',
- fixed => 1,
- },
- { field => 'msgname', type => 'fixed', },
- { field => 'from_addr', type => 'fixed', },
- { field => 'bcc_addr', type => 'fixed', },
- { type => 'tablebreak-tabs',
- include_opt_callback => \&menubar_opt_callback,
- },
- # template_content fields
- { field => 'locale', type => 'hidden' },
- { field => 'subject', type => 'fixed', },
- { field => 'body',
- type => 'fixed',
- noescape => 1,
- },
- ;
-
+my $msgclass = 'email';
+if ( $cgi->param('msgnum') =~ /^(\d+)$/ ) {
+ my $msg_template = FS::msg_template->by_key($1)
+ or die "unknown msgnum $1";
+ $msgclass = $msg_template->msgclass;
}
-
-sub new_callback {
- my ($cgi, $object, $fields_listref, $opt_hashref) = @_;
- my $template_content = new FS::template_content { 'locale' => '' };
- $object->{'Hash'} = { $object->hash, $template_content->hash };
-}
-
-sub edit_callback {
- my ($cgi, $object, $fields_listref, $opt_hashref) = @_;
- $cgi->param('locale') =~ /^(\w*)$/ or die 'bad locale '.$cgi->param('locale');
- my $locale = $1;
-
- # fetch the content object and merge its fields
- my %args = (
- 'msgnum' => $object->msgnum,
- 'locale' => $locale
- );
- my $template_content = qsearchs('template_content', \%args)
- || new FS::template_content( { %args });
- $object->{'Hash'} = { $object->hash, $template_content->hash };
-
- # set up the locale selector if this is a new content
- if ( $locale eq 'new' ) {
-
- # make a list of available locales
- my $content_locales = $object->content_locales;
- my @locales = grep { !exists($content_locales->{$_}) }
- FS::Conf->new->config('available-locales');
- my %labels;
- foreach (@locales) {
- my %info = FS::Locales->locale_info($_);
- $labels{$_} = $info{'label'};
- }
- unshift @locales, 'new';
- $labels{'new'} = 'Select language';
-
- # insert a field def
- my $i = 0;
- $i++ until ( $fields_listref->[$i]->{'field'} eq 'locale' );
- my $locale_field = $fields_listref->[$i];
-
- my $onchange_locale = "document.getElementById('submit').disabled =
- (this.options[this.selectedIndex].value == 'new');";
-
- %$locale_field = (
- field => 'locale',
- type => 'select',
- options => \@locales,
- labels => \%labels,
- curr_value => 'new',
- onchange => $onchange_locale,
- );
- }
-}
-
-sub menubar_opt_callback {
- my $object = shift;
- # generate no tabs for new msg_templates.
- my $msgnum = $object->msgnum or return;
- my (@tabs, @options, %labels);
- push @tabs, mt('Default'), '';
- my $display_new = 0;
- my $selected = '';
- foreach my $l (FS::Locales->locales) {
- if ( exists $object->content_locales->{$l} ) {
- my %info = FS::Locales->locale_info($l);
- push @tabs,
- $info{'label'},
- ';locale='.$l;
- $selected = $info{'label'} if $object->locale eq $l;
- }
- else {
- $display_new = 1; # there is at least one unused locale left
- }
- }
- push @tabs, mt('New'), ';locale=new' if $display_new;
- $selected = mt('New') if $object->locale eq 'new';
- $selected ||= mt('Default');
- (
- 'url_base' => $p.'edit/msg_template.html?msgnum='.$msgnum,
- 'selected' => $selected,
- 'tabs' => \@tabs
- );
-}
-
-my $onchange_locale = '';
-
-# Create hints pane
-
-my %substitutions = (
- 'cust_main' => [
- '$display_custnum'=> 'Customer#',
- '$agentnum' => 'Agent#',
- '$agent_name' => 'Agent name',
- '$payby' => 'Payment method',
- '$paymask' => 'Card/account# (masked)',
- '$payname' => 'Name on card/bank name',
- '$paytype' => 'Account type',
- '$payip' => 'IP address used to submit payment info',
- '$num_ncancelled_pkgs' => '# of active packages',
- '$num_cancelled_pkgs' => '# of cancelled packages',
- '$num_pkgs' => '# of packages',
- '$classname' => 'Customer class',
- '$categoryname' => 'Customer category',
- '$balance' => 'Current balance',
- '$credit_limit' => 'Credit limit',
- '$invoicing_list_emailonly' => 'Billing email address',
- #'$cust_status' => 'Status (raw internal label)',
- '$cust_status_label' => 'Status (display label)',
- '$cust_statuscolor' => 'Status color code',
- '$company_name' => 'Our company name',
- '$company_address'=> 'Our company address',
- '$company_phonenum' => 'Our phone number',
- '$selfservice_server_base_url' => 'Base URL of customer self-service',
- ],
- 'contact' => [ # duplicate this for shipping
- '$name' => 'Company and contact name',
- '$name_short' => 'Company or contact name',
- '$company' => 'Company name',
- '$contact' => 'Contact name (last, first)',
- '$contact_firstlast'=> 'Contact name (first last)',
- '$first' => 'First name',
- '$last' => 'Last name',
- '$address1' => 'Address line 1',
- '$address2' => 'Address line 2',
- '$city' => 'City',
- '$county' => 'County',
- '$state' => 'State',
- '$zip' => 'Zip',
- '$country' => 'Country',
- '$daytime' => 'Day phone',
- '$night' => 'Night phone',
- '$mobile' => 'Mobile phone',
- '$fax' => 'Fax',
- ],
- 'service' => [
- '$ship_address1' => 'Address line 1',
- '$ship_address2' => 'Address line 2',
- '$ship_city' => 'City',
- '$ship_county' => 'County',
- '$ship_state' => 'State',
- '$ship_zip' => 'Zip',
- '$ship_country' => 'Country',
- ],
- 'cust_bill' => [
- '$invnum' => 'Invoice#',
- '$_date_pretty' => 'Invoice date',
- '$due_date' => 'Invoice due date (timestamp)',
- '$due_date2str' => 'Invoice due date (human readable)',
- ],
- 'cust_pkg' => [
- '$pkgnum' => 'Package#',
- '$pkg' => 'Package description',
- '$pkg_label' => 'Description + comment',
- '$status' => 'Status',
- '$statuscolor' => 'Status color code',
- '$start_ymd' => 'Start date',
- '$setup_ymd' => 'Setup date',
- '$last_bill_ymd' => 'Last bill date',
- '$next_bill_ymd' => 'Next bill date',
- '$susp_ymd' => 'Suspended on date',
- '$cancel_ymd' => 'Canceled on date',
- '$adjourn_ymd' => 'Adjournment date',
- '$expire_ymd' => 'Expiration date',
- '$labels_short' => 'Service labels',
- '$location_label' => 'Service location',
- ],
- 'svc_acct' => [
- '$svcnum' => 'Service#',
- '$username' => 'Login name',
- '$password' => 'Password',
- '$domain' => 'Domain name',
- ],
- 'svc_domain' => [
- '$svcnum' => 'Service#',
- '$domain' => 'Domain name',
- '$registrar' => 'Registrar name',
- '$catchall' => 'Catchall email',
- ],
- 'svc_phone' => [
- '$svcnum' => 'Service#',
- '$phonenum' => 'Phone number',
- '$countrycode' => 'Country code',
- '$domain' => 'Domain name'
- ],
- 'svc_broadband' => [
- '$svcnum' => 'Service#',
- '$ip_addr' => 'IP address',
- '$mac_addr' => 'MAC address',
- '$speed_up' => 'Upstream speed',
- '$speed_down' => 'Downstream speed',
- ],
- 'cust_pay' => [
- '$paynum' => 'Payment#',
- '$paid' => 'Amount',
- '$payby' => 'Payment method',
- '$date' => 'Payment date',
- '$payinfo' => 'Card/account# (masked)',
- '$error' => 'Decline reason',
- ],
-);
-
-tie my %sections, 'Tie::IxHash', (
-'contact' => 'Name and contact info (billing)',
-'service' => 'Service address',
-'cust_main' => 'Customer status and payment info',
-'cust_pkg' => 'Package fields',
-'cust_bill' => 'Invoice fields',
-'cust_pay' => 'Payment fields',
-'svc_acct' => 'Login service fields',
-'svc_domain'=> 'Domain service fields',
-'svc_phone' => 'Phone service fields',
-'svc_broadband' => 'Broadband service fields',
-);
-
-my $widget = new HTML::Widgets::SelectLayers(
- 'options' => \%sections,
- 'form_name' => 'dummy',
- 'html_between'=>'</FORM><FONT SIZE=-1>',
- 'selected_layer'=>(keys(%sections))[0],
- 'layer_callback' => sub {
- my $section = shift;
- my $html = include('/elements/table-grid.html');
- my @hints = @{ $substitutions{$section} };
- while(@hints) {
- my $key = shift @hints;
- $html .= qq!\n<TR><TD><A href="javascript:insertHtml('{$key}')">$key</A></TD>!;
- $html .= "\n<TD>".shift(@hints).'</TD></TR>';
- }
- $html .= "\n</TABLE>";
- return $html;
- },
-);
-
-my $sidebar = '
-<SCRIPT TYPE="text/javascript">
-function insertHtml(what) {
- var oEditor = CKEDITOR.instances["body"];
- oEditor.insertHtml(what);
-};
-
-function areyousure(url, message) {
- if (confirm(message))
- window.location.href = url;
-}
-</SCRIPT>
-<TD valign="top"><FORM name="dummy">
-Substitutions: '
-. $widget->html .
-'<P>Click above links to insert substitution code.</P>
-<P>
-Enclose substitutions and other Perl expressions in braces:
-<BR>{ $name } = ExampleCo (Smith, John)
-<BR>{ time2str("%D", time) } = '.time2str("%D", time).'
-</P>';
-$sidebar .= include('/elements/template_image-dialog.html',
- 'callback' => 'insertHtml'
- );
-$sidebar .= '<P><A HREF="javascript:insertImageDialog()">Insert Uploaded Image</A></P>
-</FONT></TD>
-';
-
-sub html_table_bottom {
- my $object = shift;
- $cgi->param('locale') =~ /^(\w+)$/;
- my $locale = $1;
- my $html;
- if ( $locale and $locale ne 'new' ) {
- # set up a delete link
- my $msgnum = $object->msgnum;
- my $url = $p."misc/delete-template_content.html?msgnum=$msgnum;locale=$1";
- my $link = qq!<A HREF="javascript:areyousure('$url','Really delete this template?')">! .
- 'Delete this template' .
- '</A>';
- $html = qq!<TR><TD></TD>
- <TD STYLE="font-style: italic; font-size: small">$link</TD></TR>!;
- }
- $html;
-}
-
+print $cgi->redirect($fsurl."edit/msg_template/$msgclass.html?".$cgi->query_string);
</%init>
diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template/email.html
similarity index 97%
copy from httemplate/edit/msg_template.html
copy to httemplate/edit/msg_template/email.html
index df72c5b..dc70ef6 100644
--- a/httemplate/edit/msg_template.html
+++ b/httemplate/edit/msg_template/email.html
@@ -1,4 +1,5 @@
-<& elements/edit.html,
+<& /edit/elements/edit.html,
+ 'post_url' => $fsurl.'edit/process/msg_template.html',
'html_init' => '<TABLE id="outerTable"><TR><TD>',
'body_etc' => $body_etc,
'name_singular' => 'template',
@@ -54,6 +55,10 @@ if ( $curuser->access_right('Edit global templates')
)
{
push @fields,
+ { field => 'msgclass',
+ type => 'hidden',
+ value => 'email',
+ },
{ field => 'agentnum',
type => 'select-agent',
},
@@ -176,7 +181,7 @@ sub menubar_opt_callback {
$selected = mt('New') if $object->locale eq 'new';
$selected ||= mt('Default');
(
- 'url_base' => $p.'edit/msg_template.html?msgnum='.$msgnum,
+ 'url_base' => $fsurl.'edit/msg_template.html?msgnum='.$msgnum,
'selected' => $selected,
'tabs' => \@tabs
);
@@ -367,7 +372,7 @@ sub html_table_bottom {
if ( $locale and $locale ne 'new' ) {
# set up a delete link
my $msgnum = $object->msgnum;
- my $url = $p."misc/delete-template_content.html?msgnum=$msgnum;locale=$1";
+ my $url = $fsurl."misc/delete-template_content.html?msgnum=$msgnum;locale=$1";
my $link = qq!<A HREF="javascript:areyousure('$url','Really delete this template?')">! .
'Delete this template' .
'</A>';
diff --git a/httemplate/edit/msg_template/http.html b/httemplate/edit/msg_template/http.html
new file mode 100644
index 0000000..e82cc0c
--- /dev/null
+++ b/httemplate/edit/msg_template/http.html
@@ -0,0 +1,82 @@
+<& /edit/elements/edit.html,
+ 'post_url' => $fsurl.'edit/process/msg_template.html',
+ 'name_singular' => 'message interface',
+ 'table' => 'msg_template',
+ 'viewall_dir' => 'browse',
+ 'agent_virt' => 1,
+ 'agent_null' => 1,
+ 'agent_null_right' => [ 'View global templates', 'Edit global templates' ],
+
+ 'fields' => [], # callback takes care of this
+ 'new_callback' => $edit_callback,
+ 'edit_callback' => $edit_callback,
+ 'error_callback' => $edit_callback,
+ 'labels' => \%labels,
+ 'no_submit' => $no_submit,
+&>
+<%init>
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied"
+ unless $curuser->access_right([ 'View templates', 'View global templates',
+ 'Edit templates', 'Edit global templates',
+ ]);
+
+my %labels = (
+ 'msgnum' => 'Template', # it's still a template number
+ 'agentnum' => 'Agent',
+ 'msgname' => 'Interface name',
+ 'prepare_url' => 'Prepare URL',
+ 'send_url' => 'Send URL',
+ 'username' => 'HTTP username',
+ 'password' => 'HTTP password',
+ 'content' => 'Additional POST content',
+);
+
+my $no_submit = 0;
+
+my $edit_callback = sub {
+ my ($cgi, $msg_template, $fields, $opt) = @_;
+ if ( $curuser->access_right('Edit global templates')
+ || ( $curuser->access_right('Edit templates')
+ && $msg_template
+ && $msg_template->agentnum
+ && $curuser->agentnums_href->{$msg_template->agentnum}
+ )
+ ) {
+ @$fields = (
+ { field => 'msgclass',
+ type => 'hidden',
+ value => 'http',
+ },
+ { field => 'agentnum',
+ type => 'select-agent',
+ },
+ { field => 'msgname', size=>60, required => 1 },
+ { field => 'prepare_url', size=>60, required => 1 },
+ { field => 'send_url', size=>60, required => 1 },
+ { field => 'username', size=>20 },
+ { field => 'password', size=>20 },
+ { field => 'content', type => 'textarea' },
+ );
+ } else { #readonly
+
+ $no_submit = 1;
+
+ @$fields = (
+ { field => 'agentnum',
+ type => 'select-agent',
+ fixed => 1,
+ },
+ { field => 'msgname', type => 'fixed', },
+ { field => 'prepare_url', type => 'fixed', },
+ { field => 'send_url', type => 'fixed', },
+ { field => 'username', type => 'fixed', },
+ { field => 'password', type => 'fixed', },
+ { field => 'content', type => 'fixed' },
+ );
+
+ }
+};
+
+</%init>
diff --git a/httemplate/edit/process/msg_template.html b/httemplate/edit/process/msg_template.html
index e146adf..d8b125a 100644
--- a/httemplate/edit/process/msg_template.html
+++ b/httemplate/edit/process/msg_template.html
@@ -1,7 +1,7 @@
<% include( 'elements/process.html',
'table' => 'msg_template',
- 'viewall_dir' => 'browse',
- #'popup_reload'=> 1,
+ 'fields' => $fields,
+ 'viewall_url' => "browse/msg_template/$msgclass.html",
'debug' => 0,
'precheck_callback' => \&precheck_callback,
'args_callback' => \&args_callback,
@@ -11,9 +11,21 @@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right(['Edit templates','Edit global templates']);
+my $msgclass = 'email';
+if ( $cgi->param('msgclass') =~ /^(\w+)$/ ) {
+ $msgclass = $1;
+}
+
+my $fields = [ fields('msg_template') ];
+my $class = "FS::msg_template::$msgclass";
+eval "use $class;";
+if ( $class->extension_table ) {
+ push @$fields, fields($class->extension_table);
+}
+
sub precheck_callback {
my $cgi = shift;
- # validate some fields
+ # validate locale field (for email-type records)
$cgi->param('locale') =~ /^(\w*)$/;
my $locale = $1;
return mt('Language required') if $locale eq 'new'; # the user didn't choose
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index a5fb15b..55645cf 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -767,7 +767,7 @@ tie my %config_nms, 'Tie::IxHash',
;
tie my %config_misc, 'Tie::IxHash';
-$config_misc{'Message templates'} = [ $fsurl.'browse/msg_template.html', 'Templates for customer notices' ]
+$config_misc{'Message templates'} = [ $fsurl.'browse/msg_template/email.html', 'Templates for customer notices' ]
if $curuser->access_right(['View templates', 'View global templates',
'Edit templates', 'Edit global templates', ]);
$config_misc{'Advertising sources'} = [ $fsurl.'browse/part_referral.html', 'Where a customer heard about your service.' ]
commit d622148c3ad8e98aef7ae1ca163e28483e023609
Author: Mark Wells <mark at freeside.biz>
Date: Sat Aug 29 21:26:34 2015 -0700
fix typo
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index beb0173..a279f53 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -348,8 +348,8 @@ if ( $opt{'disableable'} ) {
sub { shift->disabled ? 'FF0000' : '00CC00'; };
splice @{ $opt{'links'} }, $pos, 0, ''
if $opt{'links'};
- splice @{ $opt{'link_onlicks'} }, $pos, 0, ''
- if $opt{'link_onlicks'};
+ splice @{ $opt{'link_onclicks'} }, $pos, 0, ''
+ if $opt{'link_onclicks'};
}
#add show/hide disabled links
-----------------------------------------------------------------------
Summary of changes:
FS/FS/msg_template.pm | 15 +-
.../{msg_template.html => msg_template/email.html} | 29 +-
httemplate/browse/msg_template/http.html | 68 ++++
httemplate/edit/msg_template.html | 383 +-------------------
.../{msg_template.html => msg_template/email.html} | 11 +-
httemplate/edit/msg_template/http.html | 82 +++++
httemplate/edit/process/msg_template.html | 18 +-
httemplate/elements/htmlarea.html | 4 +-
httemplate/elements/menu.html | 2 +-
httemplate/elements/template_image-dialog.html | 4 +-
httemplate/search/elements/search.html | 4 +-
11 files changed, 216 insertions(+), 404 deletions(-)
rename httemplate/browse/{msg_template.html => msg_template/email.html} (70%)
create mode 100644 httemplate/browse/msg_template/http.html
copy httemplate/edit/{msg_template.html => msg_template/email.html} (97%)
create mode 100644 httemplate/edit/msg_template/http.html
More information about the freeside-commits
mailing list