X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fchange_pkg.cgi;h=9729c6b5fa5faebdbe8f19a4c8a8d02c849e2155;hb=d9880fb208858d882d02462bba4c3c57db3b377c;hp=b562d24cd9f5b60d4b749b8547904d4e74a867c7;hpb=2b2dd969f3c18751afc583ad1e836ab8e6f73b5d;p=freeside.git

diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index b562d24cd..9729c6b5f 100755
--- a/httemplate/misc/change_pkg.cgi
+++ b/httemplate/misc/change_pkg.cgi
@@ -8,7 +8,7 @@
 
 
 <FONT CLASS="fsinnerbox-title"><% mt('Package') |h %></FONT>
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
 
   <TR>
     <TH ALIGN="right"><% mt('Current package') |h %></TH>
@@ -39,14 +39,13 @@
 </TABLE>
 <BR>
 
-<% include('/misc/cust_pkg_usageprice.html',
+<& /elements/table-cust_pkg_usageprice.html,
      'pkgpart' => (scalar($cgi->param('pkgpart')) || $cust_pkg->pkgpart),
      'pkgnum'  => ($cust_pkg->change_to_pkgnum || $pkgnum),
-   ) %>
-<BR>
+&>
 
 <FONT CLASS="fsinnerbox-title"><% mt('Change') |h %></FONT>
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
 
   <SCRIPT TYPE="text/javascript">
     function delay_changed() {
@@ -85,9 +84,27 @@
 </TABLE>
 </BR>
 
+% my $discount_cust_pkg = $curuser->access_right('Discount customer package');
+% my $waive_setup_fee   = $curuser->access_right('Waive setup fee');
+%
+% if ( $discount_cust_pkg || $waive_setup_fee ) {
+  <FONT CLASS="fsinnerbox-title"><% mt('Discounting') |h %></FONT>
+  <TABLE CLASS="fsinnerbox">
+    <& /elements/tr-select-pkg-discount.html,
+      # curr_value_setup    => $discount{setup},
+      # curr_value_recur    => $discount{recur},
+      disable_setup       => 0,
+      disable_recur       => 0,
+      disable_waive_setup => 0,
+      carry_value_setup   => $discount{setup},
+      carry_value_recur   => $discount{recur},
+    &>
+  </TABLE><BR>
+
+% }
 
 <FONT CLASS="fsinnerbox-title"><% mt('Location') |h %></FONT>
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
 
   <& /elements/tr-select-cust_location.html,
                'cgi'       => $cgi,
@@ -102,9 +119,21 @@
             'form'        => "OrderPkgForm",
             'with_census' => 1,
             'with_census_functions' => 1,
-            'callback'   => 'document.OrderPkgForm.submit()',
+            'callback'    => $conf->exists('tax_district_method')
+                              ? 'wa_state_tax_district()'
+                              : 'submit_continue()',
 &>
 
+<script>
+  <& /elements/wa_state_tax_district.js &>
+
+  // wa_sate_tax_district() will call submit_continue() upon success,
+  //   or submit_abort() upon error
+  function submit_continue() {
+    document.OrderPkgForm.submit();
+  }
+</script>
+
 <INPUT NAME    = "submitButton"
        TYPE    = "button"
        VALUE   = "<% mt("Change package") |h %>"
@@ -159,4 +188,14 @@ if ( $cust_pkg->change_to_pkgnum ) {
   }
   $title = "Edit Scheduled Package Change";
 }
+
+# Get current values of discounts for selectboxes
+my %discount = (setup => undef, recur => undef);
+$discount{$_->setuprecur} = $_->discountnum
+  for qsearch('cust_pkg_discount', {
+    pkgnum   => $cust_pkg->pkgnum,
+    disabled => '',
+  });
+$discount{setup} = '-2' if $cust_pkg->waive_setup;
+
 </%init>