X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=862e98ecfbe930b22c1575bbe854c3eb879168fe;hb=c97b6a00f150f5e7a4aa58b71389d5c504817cf2;hp=e03017db49812273d2e1fbce06855ac0342f0789;hpb=a63b2729682586d8860290576e9307629424dbe0;p=freeside.git

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index e03017db4..862e98ecf 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -66,12 +66,52 @@ print '<FORM NAME="dummy">';
 #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
-print ntable("#cccccc",2), <<END;
-<TR><TD ALIGN="right">Package (customer-visable)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
-<TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
-<TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3></TD></TR>
-<TR><TD ALIGN="right">Setup fee tax exempt</TD><TD>
-END
+#false laziness w/view/cust_main.cgi
+my %freq;
+tie %freq, 'Tie::IxHash', 
+  '0'  => '(no recurring fee)',
+  '1d' => 'daily',
+  '1w' => 'weekly',
+  '2w' => 'biweekly (every 2 weeks)',
+  '1'  => 'monthly',
+  '2'  => 'bimonthly (every 2 months)',
+  '3'  => 'quarterly (every 3 months)',
+  '6'  => 'semiannually (every 6 months)',
+  '12' => 'annually',
+  '24' => 'biannually (every 2 years)',
+;
+if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) {
+  delete $freq{$_} foreach grep { ! /^\d+$/ } keys %freq;
+}
+
+%>
+<%= ntable("#cccccc",2) %>
+  <TR>
+    <TD ALIGN="right">Package (customer-visible)</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="<%= $part_pkg->pkg %>">
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Comment (customer-hidden)</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="<%=$part_pkg->comment%>">
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Recurring fee frequency </TD>
+    <TD>
+      <SELECT NAME="freq">
+        <% foreach my $freq ( keys %freq ) { %>
+          <OPTION VALUE="<%= $freq %>"<%= $freq eq $part_pkg->freq ? ' SELECTED' : '' %>><%= $freq{$freq} %>
+        <% } %>
+      </SELECT>
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Setup fee tax exempt</TD>
+    <TD>
+<%
 
 print '<INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y"';
 print ' CHECKED' if $hashref->{setuptax} eq "Y";
@@ -89,6 +129,7 @@ print '>';
 print '</TD></TR>';
 
 my $conf = new FS::Conf;
+#false laziness w/ view/cust_main.cgi quick order
 if ( $conf->exists('enable_taxclasses') ) {
   print '<TR><TD ALIGN="right">Tax class</TD><TD><SELECT NAME="taxclass">';
   my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
@@ -130,11 +171,12 @@ my $columns = 3;
 my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } );
 foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
-  my $pkg_svc = qsearchs( 'pkg_svc', {
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
+  my $pkgpart = $cgi->param('clone') || $part_pkg->pkgpart;
+  my $pkg_svc = $pkgpart && qsearchs( 'pkg_svc', {
+    'pkgpart'  => $pkgpart,
     'svcpart'  => $svcpart,
   } ) || new FS::pkg_svc ( {
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
+    'pkgpart'  => $pkgpart,
     'svcpart'  => $svcpart,
     'quantity' => 0,
   });
@@ -240,7 +282,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission_cust' => {
-    'name' => 'Flat rate with recurring comission per active customer',
+    'name' => 'Flat rate with recurring commission per active customer',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -248,7 +290,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount per month (per active customer)',
+      'comission_amount' => { 'name' => 'Commission amount per month (per active customer)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
@@ -261,7 +303,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission' => {
-    'name' => 'Flat rate with recurring comission per (any) active package',
+    'name' => 'Flat rate with recurring commission per (any) active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -269,7 +311,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount per month (per active package)',
+      'comission_amount' => { 'name' => 'Commission amount per month (per active package)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
@@ -282,7 +324,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission_pkg' => {
-    'name' => 'Flat rate with recurring comission per (selected) active package',
+    'name' => 'Flat rate with recurring commission per (selected) active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -290,7 +332,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount per month (per uncancelled package)',
+      'comission_amount' => { 'name' => 'Commission amount per month (per uncancelled package)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
@@ -354,6 +396,49 @@ tie my %plans, 'Tie::IxHash',
 
   },
 
+  'sqlradacct_hour' => {
+    'name' => 'Base charge plus charge per-hour (and for data) from an external sqlradius radacct table',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_hours' => { 'name' => 'Hours included',
+                                  'default' => 0,
+                                },
+      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
+                                 'default' => 0,
+                               },
+      'recur_included_input' => { 'name' => 'Input megabytes included',
+                                  'default' => 0,
+                                },
+      'recur_input_charge' => { 'name' =>
+                                        'Additional charge per input megabyte',
+                                'default' => 0,
+                              },
+      'recur_included_output' => { 'name' => 'Output megabytes included',
+                                   'default' => 0,
+                                },
+      'recur_output_charge' => { 'name' =>
+                                       'Additional charge per output megabyte',
+                                'default' => 0,
+                              },
+      'recur_included_total' => { 'name' =>
+                                       'Total input+output megabytes included',
+                                  'default' => 0,
+                                },
+      'recur_total_charge' => { 'name' =>
+                                 'Additional charge per input+output megabyte',
+                                'default' => 0,
+                              },
+    },
+    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); push @details, \"Last month\\\'s excess data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\", \"Last month\\\'s excess time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; \' + what.recur_flat.value + \' + $hourscharge + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + $totalcharge ;\'',
+  },
+
 ;
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
@@ -441,11 +526,11 @@ my $widget = new HTML::Widgets::SelectLayers(
              '<TR><TD>'.
              '<FONT SIZE="1">Setup expression<BR>'.
              '<INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="'.
-               $hashref->{setup}. '" onLoad="fchanged(this)">'.
+               encode_entities($hashref->{setup}). '" onLoad="fchanged(this)">'.
              '</FONT><BR>'.
              '<FONT SIZE="1">Recurring espression<BR>'.
              '<INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="'.
-               $hashref->{recur}. '" onLoad="fchanged(this)">'.
+               encode_entities($hashref->{recur}). '" onLoad="fchanged(this)">'.
              '</FONT>'.
              '</TR></TD>'.
              '</TABLE>';