add usage classes to rate details

6 files changed, 69 insertions, 5 deletions

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 47b246477..3896f1712 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -3,8 +3,12 @@
 Example:
 
   include( 'elements/edit.html',  
-    'name'  =>
-    'table' =>
+    'name_singular' =>  #singular name for the record
+                        # (preferred, will be pluralized automatically)
+    'name'          =>  #name for the record
+                        # (deprecated, will be pluralized simplistically)
+    'table'         =>
+
     #? 'primary_key' => #required when the dbdef doesn't know...???
     'labels' => {
                   'column' => 'Label',
@@ -616,9 +620,9 @@ my @menubar = ();
 if ( $opt{'menubar'} ) {
   @menubar = @{ $opt{'menubar'} };
 } else {
+  my $items = $opt{'name'} ? $opt{'name'}.'s' : PL($opt{'name_singular'});
   @menubar = (
-    #eventually use Lingua::bs to pluralize
-    "View all $opt{'name'}s" => $viewall_url,
+    "View all $items" => $viewall_url,
   );
 }
 
diff --git a/httemplate/edit/process/rate_region.cgi b/httemplate/edit/process/rate_region.cgi
index d83940632..861a6dc2e 100755
--- a/httemplate/edit/process/rate_region.cgi
+++ b/httemplate/edit/process/rate_region.cgi
@@ -37,7 +37,7 @@ my @dest_detail = map {
   new FS::rate_detail {
     'ratenum'  => $ratenum,
     map { $_ => $cgi->param("$_$ratenum") }
-        qw( min_included min_charge sec_granularity )
+        qw( min_included min_charge sec_granularity classnum )
   };
 } qsearch('rate', {} );
 
diff --git a/httemplate/edit/process/usage_class.html b/httemplate/edit/process/usage_class.html
new file mode 100644
index 000000000..cf50cb762
--- /dev/null
+++ b/httemplate/edit/process/usage_class.html
@@ -0,0 +1,11 @@
+<% include( 'elements/process.html',
+               'table'       => 'usage_class',
+               'viewall_dir' => 'browse',
+           )
+%>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+</%init>
diff --git a/httemplate/edit/rate_detail.html b/httemplate/edit/rate_detail.html
index 73d2d9b41..4860593ac 100644
--- a/httemplate/edit/rate_detail.html
+++ b/httemplate/edit/rate_detail.html
@@ -8,6 +8,7 @@
                    'min_included'        => 'Included minutes',
                    'min_charge'          => 'Charge per minute',
                    'sec_granularity'     => 'Granularity',
+                   'classnum'            => 'Usage class',
                  },
      'fields' => [
                    { field=>'ratenum',             type=>'hidden', },
@@ -23,6 +24,13 @@
                      labels        => \%granularity,
                      disable_empty => 1,
                    },
+                   { field         =>'classnum',
+                     type          =>'select-table',
+                     table         =>'usage_class',
+                     name_col      =>'classname',
+                     empty_label   =>'(default)',
+                     hashref        =>{ disabled => '' },
+                   },
 
                  ],
    )
diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi
index 496e054b1..f24b9d6ef 100644
--- a/httemplate/edit/rate_region.cgi
+++ b/httemplate/edit/rate_region.cgi
@@ -57,6 +57,9 @@
     <TH CLASS="grid" BGCOLOR="#cccccc">
       <FONT SIZE=-1>Granularity</FONT>
     </TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">
+      <FONT SIZE=-1>Usage class</FONT>
+    </TH>
   </TR>
 
 % foreach my $rate ( qsearch('rate', {}) ) {
@@ -96,6 +99,19 @@
       </SELECT>
     </TD>
 
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <% include( '/elements/select-table.html',
+                  'element_name' => "classnum$n",
+                  'table'        => 'usage_class',
+                  'name_col'     => 'classname',
+                  'empty_label'  => '(default)',
+                  'hashref'      => { disabled => '' },
+                  'curr_value'   => ( $cgi->param("classnum$n") ||
+                                      $rate_detail->classnum ),
+                )
+      %>
+    </TD>
+
   </TR>
 
 % } 
diff --git a/httemplate/edit/usage_class.html b/httemplate/edit/usage_class.html
new file mode 100644
index 000000000..ef4b1fff4
--- /dev/null
+++ b/httemplate/edit/usage_class.html
@@ -0,0 +1,25 @@
+<% include( 'elements/edit.html',
+              'name_singular' => 'Usage Class',
+              'table'         => 'usage_class',
+              'fields'        => [
+                                   'classname',
+                                   { field=>'disabled',
+                                     type=>'checkbox',
+                                     value=>'Y',
+                                   },
+                                 ],
+              'labels'        => { 
+                                   'classnum'  => 'Class number',
+                                   'classname' => 'Class name',
+                                   'disabled'  => 'Disable class',
+                                 },
+              'viewall_dir'   => 'browse',
+           )
+          
+%>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+</%init>