X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fmsg_template.html;h=758aab6e49c4be9c91f83476bce6ab4f0442a8ad;hb=8c5a1df1a46121c75a829eb1d57956c9731940ab;hp=01d866dfbbce5106b7fbb399ae1aa865feff53eb;hpb=e574b96088606fe1624223d977e8091b9eab0600;p=freeside.git

diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html
index 01d866dfb..758aab6e4 100644
--- a/httemplate/edit/msg_template.html
+++ b/httemplate/edit/msg_template.html
@@ -5,17 +5,19 @@
               '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',
+                            { field=>'from_addr', size=>60, },
+                            { field=>'bcc_addr',  size=>60, },
+                            { field=>'subject',   size=>80, },
                             { field=>'body', type=>'htmlarea', width=>763 },
                           ],
               'labels' => { 'msgnum'    => 'Template',
                             'msgname'   => 'Template name',
-                            'from_addr' => 'Return address',
-                            'subject'   => 'Message subject',
+                            'from_addr' => 'From: ',
+                            'bcc_addr'  => 'Bcc: ',
+                            'subject'   => 'Subject: ',
                             'body'      => 'Message template',
                           },
               'html_foot' => "</TD>$sidebar</TR></TABLE>",
@@ -46,10 +48,14 @@ 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',
     '$cust_statuscolor'     => 'Status color code',
+    '$company_name'   => 'Our company name',
+    '$company_address'=> 'Our company address',
+    '$company_phonenum' => 'Our phone number',
   ],
   'contact' => [ # duplicate this for shipping
     '$name'           => 'Company and contact name',
@@ -75,8 +81,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',
@@ -91,8 +97,37 @@ my %substitutions = (
     '$location_label' => 'Service location',
   ],
   'svc_acct'  => [
+    '$svcnum'         => 'Service#',
     '$username'       => 'Login name',
-    '$password'      => 'Password',
+    '$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',
   ],
 );
 my @c = @{ $substitutions{'contact'} };
@@ -107,7 +142,11 @@ tie my %sections, 'Tie::IxHash', (
 '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(