diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/edit/process/quick-charge.cgi | 2 | ||||
| -rw-r--r-- | httemplate/edit/quick-charge.html | 28 | ||||
| -rw-r--r-- | httemplate/view/cust_main/packages/package.html | 2 | ||||
| -rw-r--r-- | httemplate/view/cust_main/packages/status.html | 16 |
4 files changed, 38 insertions, 10 deletions
diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi index aa6010ef9..c1e7fc159 100644 --- a/httemplate/edit/process/quick-charge.cgi +++ b/httemplate/edit/process/quick-charge.cgi @@ -93,6 +93,7 @@ if ( $param->{'pkgnum'} =~ /^(\d+)$/ ) { #modifying an existing one-time charge 'tax_override' => $override, 'quantity' => $quantity, 'start_date' => $start_date, + 'separate_bill' => scalar($cgi->param('separate_bill')), ); } else { # the usual case: new one-time charge @@ -138,6 +139,7 @@ if ( $param->{'pkgnum'} =~ /^(\d+)$/ ) { #modifying an existing one-time charge : '' ), 'no_auto' => scalar($cgi->param('no_auto')), + 'separate_bill' => scalar($cgi->param('separate_bill')), 'pkg' => scalar($cgi->param('pkg')), 'setuptax' => scalar($cgi->param('setuptax')), 'taxclass' => scalar($cgi->param('taxclass')), diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html index 58c1b0a82..78752c081 100644 --- a/httemplate/edit/quick-charge.html +++ b/httemplate/edit/quick-charge.html @@ -169,18 +169,22 @@ function bill_now_changed (what) { noinit => 1, } &> -% } -% unless ($billed) { -<TR> - <TD ALIGN="right"><% mt('Tax exempt') |h %> </TD> - <TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD> -</TR> + <& /elements/tr-checkbox.html, + label => emt('Invoice this charge separately'), + field => 'separate_bill', + value => 'Y', + curr_value => $cust_pkg->get('separate_bill'), + &> + <TR> + <TD ALIGN="right"><% mt('Tax exempt') |h %> </TD> + <TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD> + </TR> -<& /elements/tr-select-taxclass.html, 'curr_value' => $part_pkg->get('taxclass') &> + <& /elements/tr-select-taxclass.html, 'curr_value' => $part_pkg->get('taxclass') &> -<& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $part_pkg->get('taxproductnum') &> -% } + <& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $part_pkg->get('taxproductnum') &> +% } % } else { # new one-time charge @@ -280,6 +284,12 @@ function bill_now_changed (what) { }); </SCRIPT> +<& /elements/tr-checkbox.html, + label => emt('Invoice this charge separately'), + field => 'separate_bill', + value => 'Y' +&> + % } % if ( ! $quotationnum && $cust_main->payby =~ /^(CARD|CHEK)$/ ) { diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html index e47d891f5..3036f2e84 100644 --- a/httemplate/view/cust_main/packages/package.html +++ b/httemplate/view/cust_main/packages/package.html @@ -370,7 +370,7 @@ sub onetime_change_link { 'actionlabel' => emt('Modify'), 'cust_pkg' => $cust_pkg, 'width' => 690, - 'height' => 380, + 'height' => 440, ); } diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html index 36419646c..2bb4befb8 100644 --- a/httemplate/view/cust_main/packages/status.html +++ b/httemplate/view/cust_main/packages/status.html @@ -69,6 +69,8 @@ <% pkg_status_row_noauto( $cust_pkg, %opt ) %> + <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %> + <% pkg_status_row_discount( $cust_pkg, %opt ) %> % unless ( $cust_pkg->order_date eq $cust_pkg->get('susp') ) { #on hold @@ -144,6 +146,8 @@ <% pkg_status_row_noauto( $cust_pkg, %opt ) %> + <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %> + <% pkg_status_row_discount( $cust_pkg, %opt ) %> <% pkg_status_row_if( @@ -174,6 +178,8 @@ <% pkg_status_row_noauto( $cust_pkg, %opt ) %> + <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %> + <% pkg_status_row_discount( $cust_pkg, %opt ) %> <% pkg_status_row_if($cust_pkg, emt('Start billing'), 'start_date', %opt) %> @@ -191,6 +197,8 @@ <% pkg_status_row_noauto( $cust_pkg, %opt ) %> + <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %> + <% pkg_status_row_discount( $cust_pkg, %opt ) %> <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %> @@ -224,6 +232,8 @@ <% pkg_status_row_noauto( $cust_pkg, %opt ) %> + <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %> + <% pkg_status_row_discount( $cust_pkg, %opt ) %> <% pkg_status_row($cust_pkg, emt('Setup'), 'setup', %opt) %> @@ -496,6 +506,12 @@ sub pkg_status_row_noauto { pkg_status_row_colspan( $cust_pkg, emt("No automatic $what charge"), ''); } +sub pkg_status_row_separate_bill { + my $cust_pkg = shift; + return '' unless $cust_pkg->separate_bill; + pkg_status_row_colspan( $cust_pkg, emt("Invoiced separately") ); +} + sub pkg_status_row_discount { my( $cust_pkg, %opt ) = @_; |