projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't include stack backtrace with email errors, RT#83078, RT#83088
[freeside.git]
/
httemplate
/
misc
/
order_pkg.html
diff --git
a/httemplate/misc/order_pkg.html
b/httemplate/misc/order_pkg.html
index
39cb2f4
..
7a63b5c
100644
(file)
--- 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 ) {
<FONT CLASS="fsinnerbox-title"><% mt('Sales') |h %></FONT>
% }
% if ( $show_sales_table ) {
- <
% ntable("#cccccc") %
>
+ <
TABLE CLASS="fsinnerbox"
>
% }
<& /elements/tr-select-sales.html,
% }
<& /elements/tr-select-sales.html,
@@
-53,7
+53,7
@@
% }
<FONT CLASS="fsinnerbox-title"><% mt('Package') |h %></FONT>
% }
<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 %>">
% if ( $part_pkg ) {
<INPUT TYPE="hidden" NAME="pkgpart" VALUE="<% $part_pkg->pkgpart %>">
@@
-136,17
+136,16
@@
</TABLE><BR>
</TABLE><BR>
-<
% include('/misc/cust_pkg_usageprice.html'
,
+<
& /elements/table-cust_pkg_usageprice.html
,
'pkgpart' => $pkgpart
'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>
% 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>
<& /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>
% 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,
<& /elements/tr-select-contact.html,
'cgi' => $cgi,
@@
-189,17
+188,29
@@
<& /elements/standardize_locations.html,
'form' => "OrderPkgForm",
<& /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,
&>
'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>
% }
% 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>
<TR>
<TD></TD>
<TD>
@@
-222,7
+233,7
@@
% } else {
<BR>
<FONT CLASS="fsinnerbox-title"><% mt('Invoice details') |h %></FONT>
% } 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'},
<& /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>
<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'},
<& /edit/elements/detail-table.html,
id => 'PackageCommentTable',
details => $details->{'package_comment'},