X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fquick-charge.html;h=27841063fa9459da31504739c1d11a85827501f6;hp=8f376a54da64eecf15833b3441d30249ad241d04;hb=75e11f1d1a5ced24496b5732e290f7762403feb8;hpb=ec1f5479c8404ed7d059c309f946ed1d0b369aad diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html index 8f376a54d..27841063f 100644 --- a/httemplate/edit/quick-charge.html +++ b/httemplate/edit/quick-charge.html @@ -1,9 +1,13 @@ -<% include("/elements/header-popup.html", 'One-time charge entry', '', +<& /elements/header-popup.html, mt('One-time charge'), '', ( $cgi->param('error') ? '' : 'onload="addRow()"' ), - ) -%> +&> -<% include('/elements/error.html') %> + + + + + +<& /elements/error.html &>
@@ -62,31 +83,95 @@ function validate_quick_charge () { - + % if ( $conf->exists('invoice-unitprice') ) { - + % } -<% include('/elements/tr-select-pkg_class.html', 'curr_value' => $cgi->param('classnum') ) %> +<& /elements/tr-select-pkg_class.html, 'curr_value' => $cgi->param('classnum') &> + + + + + + +%# false laziness w/misc/order_pkg.html + + + + + + + +% if ( $cust_main->payby =~ /^(CARD|CHEK)$/ ) { +% my $what = lc(FS::payby->shortname($cust_main->payby)); + + + + +% } + + + + + -<% include('/elements/tr-select-taxclass.html', 'curr_value' => $cgi->param('taxclass') ) %> +<& /elements/tr-select-taxclass.html, 'curr_value' => $cgi->param('taxclass') &> -<% include('/elements/tr-select-taxproduct.html', 'label' => 'Tax product', 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $cgi->param('taxproductnum') ) %> +<& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $cgi->param('taxproductnum') &> -<% include('/elements/tr-select-taxoverride.html', 'onclick' => 'parent.taxoverridemagic(this);', 'curr_value' => $cgi->param('tax_override') ) %> +<& /elements/tr-select-taxoverride.html, 'onclick' => 'parent.taxoverridemagic(this);', 'curr_value' => $cgi->param('tax_override') &> - + @@ -94,7 +179,7 @@ function validate_quick_charge () { - + % my $row = 0; @@ -116,7 +201,7 @@ function validate_quick_charge () {
Amount: <% mt('Amount') |h %> - $ + <% $money_char %>
Quantity: <% mt('Quantity') |h %>
<% mt('Invoice now') |h %> + param('bill_now') ? 'CHECKED' : '' %> + onChange = "bill_now_changed(this);" + > + <% mt('with terms') |h %> + <& /elements/select-terms.html, + 'curr_value' => scalar($cgi->param('invoice_terms')), + 'empty_value' => $default_terms, + 'disabled' => ( $cgi->param('bill_now') ? 0 : 1 ), + &> +
<% mt('Charge date') |h %> + param('bill_now') ? 'STYLE = "background-color:#dddddd" DISABLED' : '' %> + > + + param('bill_now') ? '' : 'STYLE="display:none"' %> + > + (<% mt('leave blank to charge immediately') |h %>) +
<% mt("Disable automatic $what charge") |h %>
<% mt('Tax exempt') |h %> param('setuptax') ? 'CHECKED' : '' %>>
Description:<% mt('Description') |h %>
Optional additional description (also printed on invoice): <% mt('Optional additional description (also printed on invoice):') |h %>

-param('error') ? '' :' DISABLED' %>> +param('error') ? '' :' DISABLED' %>>
@@ -170,9 +255,16 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('One-time charge'); my $conf = new FS::Conf; +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; +my $money_char = $conf->config('money_char') || '$'; $cgi->param('custnum') =~ /^(\d+)$/ or die 'illegal custnum'; my $custnum = $1; +my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ); #XXX agent-virt + +my $format = "%m/%d/%Y %T %z (%Z)"; #false laziness w/REAL_cust_pkg.cgi? +my $start_date = $cust_main->next_bill_date; +$start_date = $start_date ? time2str($format, $start_date) : ''; my $amount = ''; if ( $cgi->param('amount') =~ /^\s*\$?\s*(\d+(\.\d{1,2})?)\s*$/ ) { @@ -188,4 +280,13 @@ $cgi->param('pkg') =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]*)$/ or die 'illegal description'; my $pkg = $1; +my $default_terms; +if ( $cust_main->invoice_terms ) { + $default_terms = emt("Customer default ([_1])", $cust_main->invoice_terms); +} else { + $default_terms = emt("Default ([_1])", + ($conf->config('invoice_default_terms') || emt('Payable upon receipt')) + ); +} +