allow Configuration right to see global message templates, avoid weird surprises...

[freeside.git] / httemplate / edit / msg_template.html

diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html
index 67eae18..a0030ce 100644 (file)
--- a/httemplate/edit/msg_template.html
+++ b/httemplate/edit/msg_template.html
@@ -5,16 +5,18 @@
               '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',
                             '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',
                           },
@@ -51,6 +53,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 +104,7 @@ my %substitutions = (
     '$payby'          => 'Payment method',
     '$date'           => 'Payment date',
     '$payinfo'        => 'Card/account# (masked)',
+    '$error'          => 'Decline reason',
   ],
 );
 my @c = @{ $substitutions{'contact'} };