From 824b97e97e4e5ee914a4c936815a4413def71a4f Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 5 Aug 2010 00:24:57 +0000 Subject: error message in decline templates, RT#9507 --- httemplate/edit/msg_template.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'httemplate/edit/msg_template.html') diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html index 67eae185d..c38c40e4a 100644 --- a/httemplate/edit/msg_template.html +++ b/httemplate/edit/msg_template.html @@ -51,6 +51,7 @@ my %substitutions = ( '$ucfirst_cust_status' => 'Status, capitalized', '$cust_statuscolor' => 'Status color code', '$company_name' => 'Our company name', + '$company_address'=> 'Our company address', ], 'contact' => [ # duplicate this for shipping '$name' => 'Company and contact name', @@ -101,6 +102,7 @@ my %substitutions = ( '$payby' => 'Payment method', '$date' => 'Payment date', '$payinfo' => 'Card/account# (masked)', + '$error' => 'Decline reason', ], ); my @c = @{ $substitutions{'contact'} }; -- cgit v1.2.1 From 4774ede40353662ddcb4181d824ab2167c68ff8c Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 16 Aug 2010 17:49:03 +0000 Subject: Bcc address for impending recur notices, RT#8953 --- httemplate/edit/msg_template.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'httemplate/edit/msg_template.html') diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html index c38c40e4a..460f4dcc2 100644 --- a/httemplate/edit/msg_template.html +++ b/httemplate/edit/msg_template.html @@ -10,11 +10,13 @@ 'fields' => [ 'msgname', 'subject', 'from_addr', + 'bcc_addr', { field=>'body', type=>'htmlarea', width=>763 }, ], 'labels' => { 'msgnum' => 'Template', 'msgname' => 'Template name', 'from_addr' => 'Return address', + 'bcc_addr' => 'Bcc address (optional)', 'subject' => 'Message subject', 'body' => 'Message template', }, -- cgit v1.2.1 From 76fc32468d0353e606c99ca9a26bcb0137fc9de1 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 17 Aug 2010 07:00:48 +0000 Subject: allow Configuration right to see global message templates, avoid weird surprises on upgrade --- httemplate/edit/msg_template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit/msg_template.html') diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html index 460f4dcc2..a0030cedd 100644 --- a/httemplate/edit/msg_template.html +++ b/httemplate/edit/msg_template.html @@ -5,7 +5,7 @@ 'viewall_dir' => 'browse', 'agent_virt' => 1, 'agent_null' => 1, - 'agent_null_right' => 'Edit global templates', + 'agent_null_right' => ['Edit global templates', 'Configuration'], 'fields' => [ 'msgname', 'subject', -- cgit v1.2.1 From f7f5188dca2285e06f069aa20ef31fe269627a45 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 17 Aug 2010 07:07:55 +0000 Subject: better sizes and labels for message tempalte subject and addresses --- httemplate/edit/msg_template.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'httemplate/edit/msg_template.html') diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html index a0030cedd..f49a4f70a 100644 --- a/httemplate/edit/msg_template.html +++ b/httemplate/edit/msg_template.html @@ -8,16 +8,16 @@ 'agent_null_right' => ['Edit global templates', 'Configuration'], 'fields' => [ 'msgname', - 'subject', - 'from_addr', - 'bcc_addr', + { field=>'subject', size=>80, }, + { field=>'from_addr', size=>60, }, + { field=>'bcc_addr', size=>60, }, { field=>'body', type=>'htmlarea', width=>763 }, ], 'labels' => { 'msgnum' => 'Template', 'msgname' => 'Template name', - 'from_addr' => 'Return address', - 'bcc_addr' => 'Bcc address (optional)', - 'subject' => 'Message subject', + 'from_addr' => 'From: ', + 'bcc_addr' => 'Bcc: ', + 'subject' => 'Subject: ', 'body' => 'Message template', }, 'html_foot' => "$sidebar", -- cgit v1.2.1 From 13a836957b5964c4f154b0d49fba46c6c91fedec Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 17 Aug 2010 07:08:50 +0000 Subject: better sizes and labels for message tempalte subject and addresses --- httemplate/edit/msg_template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit/msg_template.html') diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html index f49a4f70a..a60f2d0c1 100644 --- a/httemplate/edit/msg_template.html +++ b/httemplate/edit/msg_template.html @@ -8,9 +8,9 @@ 'agent_null_right' => ['Edit global templates', 'Configuration'], 'fields' => [ 'msgname', - { field=>'subject', size=>80, }, { field=>'from_addr', size=>60, }, { field=>'bcc_addr', size=>60, }, + { field=>'subject', size=>80, }, { field=>'body', type=>'htmlarea', width=>763 }, ], 'labels' => { 'msgnum' => 'Template', -- cgit v1.2.1 From 523edd344793bba1c53a622dcc618e74a962bcb6 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 22 Sep 2010 23:04:32 +0000 Subject: event action to send a notice to a fixed address, RT#8209 --- httemplate/edit/msg_template.html | 1 + 1 file changed, 1 insertion(+) (limited to 'httemplate/edit/msg_template.html') diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html index a60f2d0c1..4546db98b 100644 --- a/httemplate/edit/msg_template.html +++ b/httemplate/edit/msg_template.html @@ -48,6 +48,7 @@ my %substitutions = ( '$classname' => 'Customer class', '$categoryname' => 'Customer category', '$balance' => 'Current balance', + '$credit_limit' => 'Credit limit', '$invoicing_list_emailonly' => 'Billing email address', '$cust_status' => 'Status', '$ucfirst_cust_status' => 'Status, capitalized', -- cgit v1.2.1 From 3542eb33ca09edef912885d05d1fa47181a61d51 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 18 Oct 2010 22:23:26 +0000 Subject: rt_ticket export, RT#9936 --- httemplate/edit/msg_template.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'httemplate/edit/msg_template.html') diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html index 4546db98b..f1cbc5550 100644 --- a/httemplate/edit/msg_template.html +++ b/httemplate/edit/msg_template.html @@ -96,8 +96,10 @@ my %substitutions = ( '$location_label' => 'Service location', ], 'svc_acct' => [ + '$svcnum' => 'Service#', '$username' => 'Login name', '$password' => 'Password', + '$domain' => 'Domain name', ], 'cust_pay' => [ '$paynum' => 'Payment#', -- cgit v1.2.1 From 794e709ef65adb15d75a02ca9fd53d2a2caa5f8b Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 27 Oct 2010 19:27:59 +0000 Subject: cust_pkg fields in ticket export templates, RT#9936 --- httemplate/edit/msg_template.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/edit/msg_template.html') diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html index f1cbc5550..be917d68d 100644 --- a/httemplate/edit/msg_template.html +++ b/httemplate/edit/msg_template.html @@ -80,8 +80,8 @@ my %substitutions = ( ], 'cust_pkg' => [ '$pkgnum' => 'Package#', - '$pkg_label' => 'Package label (short)', - '$pkg_label_long' => 'Package label (long)', + '$pkg' => 'Package description', + '$pkg_label' => 'Description + comment', '$status' => 'Status', '$statuscolor' => 'Status color code', '$start_ymd' => 'Start date', -- cgit v1.2.1