X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=7a63b5c2b0ffc2b86de63f52b7ee38372accf3da;hb=9f179ee5fc7fc07a3f5e03ad1ad58cd3cadf1a56;hp=39cb2f4d6185022748872adb40474aff6301f5ea;hpb=1ce2f035cac19edbbe1b31a20e954cd97e40da20;p=freeside.git

diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 39cb2f4d6..7a63b5c2b 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -30,7 +30,7 @@
   <FONT CLASS="fsinnerbox-title"><% mt('Sales') |h %></FONT>
 % }
 % if ( $show_sales_table ) {
-  <% ntable("#cccccc") %>
+  <TABLE CLASS="fsinnerbox">
 % }
 
 <& /elements/tr-select-sales.html,
@@ -53,7 +53,7 @@
 % }
 
 <FONT CLASS="fsinnerbox-title"><% mt('Package') |h %></FONT>
-<% ntable("#cccccc") %>
+<TABLE CLASS="fsinnerbox">
 
 % if ( $part_pkg ) {
     <INPUT TYPE="hidden" NAME="pkgpart" VALUE="<% $part_pkg->pkgpart %>">
@@ -136,17 +136,16 @@
 
 </TABLE><BR>
 
-<% include('/misc/cust_pkg_usageprice.html',
+<& /elements/table-cust_pkg_usageprice.html,
      'pkgpart' => $pkgpart
-   ) %>
-<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>
-  <% ntable("#cccccc") %>
+  <TABLE CLASS="fsinnerbox">
     <& /elements/tr-select-pkg-discount.html &>
   </TABLE><BR>
 
@@ -157,7 +156,7 @@
 % my $contact_title = $lock_locationnum ? 'Contact'
 %                                       : 'Contact and Location';
 <FONT CLASS="fsinnerbox-title"><% mt($contact_title) |h %></FONT>
-<% ntable("#cccccc") %>
+<TABLE CLASS="fsinnerbox">
 
 <& /elements/tr-select-contact.html,
              'cgi'           => $cgi,
@@ -189,17 +188,29 @@
 
   <& /elements/standardize_locations.html,
                 'form'        => "OrderPkgForm",
-                'callback'    => 'document.OrderPkgForm.submit()',
+                'callback'    => $conf->exists('tax_district_method')
+                                 ? 'wa_state_tax_district()'
+                                 : 'submit_continue()',
                 'with_census' => 1,
                 'with_census_functions' => 1,
   &>
 
+  <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>
+
 % }
 
 % if ($quotationnum) {
 <BR>
 <FONT CLASS="fsinnerbox-title"><% mt('Quotation details') |h %></FONT>
-<TABLE ID="QuotationDetailTable" BORDER="0" BGCOLOR="#cccccc">
+<TABLE ID="QuotationDetailTable" CLASS="fsinnerbox">
   <TR>
     <TD></TD>
     <TD>
@@ -222,7 +233,7 @@
 % } else {
 <BR>
 <FONT CLASS="fsinnerbox-title"><% mt('Invoice details') |h %></FONT>
-<TABLE ID="InvoiceDetailTable" BORDER="0" BGCOLOR="#cccccc">
+<TABLE ID="InvoiceDetailTable" CLASS="fsinnerbox">
 <& /edit/elements/detail-table.html, 
      id      => 'InvoiceDetailTable',
      details => $details->{'invoice_detail'},
@@ -232,7 +243,7 @@
 
 <BR>
 <FONT CLASS="fsinnerbox-title"><% mt('Package comments') |h %></FONT>
-<TABLE ID="PackageCommentTable" BORDER="0" BGCOLOR="#cccccc">
+<TABLE ID="PackageCommentTable" CLASS="fsinnerbox">
 <& /edit/elements/detail-table.html, 
      id      => 'PackageCommentTable',
      details => $details->{'package_comment'},