projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change one-time charge UI to a full page to avoid conflict with taxproducts, #71394
[freeside.git]
/
httemplate
/
edit
/
quick-charge.html
diff --git
a/httemplate/edit/quick-charge.html
b/httemplate/edit/quick-charge.html
index
1ff7000
..
2bbbe43
100644
(file)
--- a/
httemplate/edit/quick-charge.html
+++ b/
httemplate/edit/quick-charge.html
@@
-1,4
+1,4
@@
-<& /elements/header
-popup
.html, mt('One-time charge'), '',
+<& /elements/header.html, mt('One-time charge'), '',
( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
&>
( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
&>
@@
-15,9
+15,9
@@
function enable_quick_charge (e) {
if ( document.QuickChargeForm.amount.value
&& document.QuickChargeForm.pkg.value ) {
if ( document.QuickChargeForm.amount.value
&& document.QuickChargeForm.pkg.value ) {
- document.QuickChargeForm.submit
Button
.disabled = false;
+ document.QuickChargeForm.submit.disabled = false;
} else {
} else {
- document.QuickChargeForm.submit
Button
.disabled = true;
+ document.QuickChargeForm.submit.disabled = true;
}
% if ( $curuser->option('disable_enter_submit_onetimecharge') ) {
}
% if ( $curuser->option('disable_enter_submit_onetimecharge') ) {
@@
-93,11
+93,23
@@
function bill_now_changed (what) {
</SCRIPT>
</SCRIPT>
+<P>
+% if ( $cust_main ) {
+<& /elements/small_custview.html,
+ $cust_main->custnum,
+ scalar($conf->config('countrydefault')),
+ 1, #no balance
+&>
+% } else {
+<& /elements/small_prospect_view.html, $prospect_main &>
+% }
+</P>
+
<FORM ACTION = "process/quick-charge.cgi"
NAME = "QuickChargeForm"
ID = "QuickChargeForm"
METHOD = "POST"
<FORM ACTION = "process/quick-charge.cgi"
NAME = "QuickChargeForm"
ID = "QuickChargeForm"
METHOD = "POST"
- onSubmit = "document.QuickChargeForm.submit
Button
.disabled=true; return validate_quick_charge();"
+ onSubmit = "document.QuickChargeForm.submit.disabled=true; return validate_quick_charge();"
>
<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $cust_main ? $cust_main->custnum : '' %>">
>
<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $cust_main ? $cust_main->custnum : '' %>">
@@
-183,7
+195,10
@@
function bill_now_changed (what) {
<& /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'),
+ 'curr_value' => $part_pkg->get('taxproductnum')
+ &>
% }
% } else { # new one-time charge
% }
% } else { # new one-time charge
@@
-307,9
+322,14
@@
function bill_now_changed (what) {
<& /elements/tr-select-taxclass.html, 'curr_value' => $cgi->param('taxclass') &>
<& /elements/tr-select-taxclass.html, 'curr_value' => $cgi->param('taxclass') &>
-<& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $cgi->param('taxproductnum') &>
+<& /elements/tr-select-taxproduct.html,
+ 'label' => emt('Tax product'),
+ 'curr_value' => $cgi->param('taxproductnum')
+&>
-<& /elements/tr-select-taxoverride.html, 'onclick' => 'parent.taxoverridemagic(this);', 'curr_value' => $cgi->param('tax_override') &>
+<& /elements/tr-select-taxoverride.html,
+ 'curr_value' => $cgi->param('tax_override')
+&>
% } # if !$cust_pkg
% } # if !$cust_pkg
@@
-362,7
+382,7
@@
function bill_now_changed (what) {
% my $label = $cust_pkg
% ? emt('Modify one-time charge')
% : emt('Add one-time charge');
% my $label = $cust_pkg
% ? emt('Modify one-time charge')
% : emt('Add one-time charge');
-<INPUT TYPE="submit" ID="submit" NAME="submit
Button
" VALUE="<% $label %>" \
+<INPUT TYPE="submit" ID="submit" NAME="submit" VALUE="<% $label %>" \
<% ($cgi->param('error') || $cust_pkg) ? '' :' DISABLED' %>>
</FORM>
<% ($cgi->param('error') || $cust_pkg) ? '' :' DISABLED' %>>
</FORM>