projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c80c0c1
)
4.x style one-time charge
author
Ivan Kohler
<ivan@freeside.biz>
Tue, 8 Nov 2016 09:47:14 +0000
(
01:47
-0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Tue, 8 Nov 2016 09:47:14 +0000
(
01:47
-0800)
httemplate/edit/quick-charge.html
patch
|
blob
|
history
httemplate/elements/header-cust_main.html
patch
|
blob
|
history
httemplate/elements/tr-select-pkg_class.html
patch
|
blob
|
history
httemplate/elements/tr-select-taxclass.html
patch
|
blob
|
history
diff --git
a/httemplate/edit/quick-charge.html
b/httemplate/edit/quick-charge.html
index
3300815
..
51cd854
100644
(file)
--- a/
httemplate/edit/quick-charge.html
+++ b/
httemplate/edit/quick-charge.html
@@
-1,9
+1,11
@@
% if ( $quotationnum ) {
% if ( $quotationnum ) {
-<& /elements/header.html, mt('One-time charge'), '',
- ( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
-&>
+<& /elements/header.html, mt('One-time charge') &>
% } else {
% } else {
-<& /elements/header-cust_main.html, view=>'packages', cust_main=>$cust_main &>
+<& /elements/header-cust_main.html,
+ view => 'packages',
+ cust_main => $cust_main,
+ etc => $cgi->param('error') ? '' : 'onload="addRow()"',
+&>
<h2>One-time charge</h2>
% }
<h2>One-time charge</h2>
% }
@@
-113,7
+115,7
@@
function bill_now_changed (what) {
<INPUT TYPE="hidden" NAME="prospectnum" VALUE="<% $prospect_main ? $prospect_main->prospectnum : '' %>">
<INPUT TYPE="hidden" NAME="quotationnum" VALUE="<% $quotationnum %>">
<INPUT TYPE="hidden" NAME="prospectnum" VALUE="<% $prospect_main ? $prospect_main->prospectnum : '' %>">
<INPUT TYPE="hidden" NAME="quotationnum" VALUE="<% $quotationnum %>">
-<TABLE ID="QuickChargeTable"
BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 STYLE="background-color: #cccccc
">
+<TABLE ID="QuickChargeTable"
CLASS="fsinnerbox
">
% if ( $cust_pkg ) { #modify one-time charge
% if ( $cust_pkg ) { #modify one-time charge
@@
-201,7
+203,7
@@
function bill_now_changed (what) {
% } else { # new one-time charge
<TR>
% } else { # new one-time charge
<TR>
- <T
D ALIGN="right"><% mt('Amount to charge') |h %> </TD
>
+ <T
H ALIGN="right"><% mt('Amount to charge') |h %> </TH
>
<TD>
<% $money_char %><INPUT TYPE = "text"
NAME = "amount"
<TD>
<% $money_char %><INPUT TYPE = "text"
NAME = "amount"
@@
-225,7
+227,7
@@
function bill_now_changed (what) {
% if ( $conf->exists('invoice-unitprice') ) {
<TR>
% if ( $conf->exists('invoice-unitprice') ) {
<TR>
- <T
D ALIGN="right"><% mt('Quantity') |h %> </TD
>
+ <T
H ALIGN="right"><% mt('Quantity') |h %> </TH
>
<TD>
<INPUT TYPE = "text"
NAME = "quantity"
<TD>
<INPUT TYPE = "text"
NAME = "quantity"
@@
-241,7
+243,7
@@
function bill_now_changed (what) {
% unless ( $quotationnum ) {
<TR>
% unless ( $quotationnum ) {
<TR>
- <T
D ALIGN="right"><% mt('Invoice now') |h %></TD
>
+ <T
H ALIGN="right"><% mt('Invoice now') |h %></TH
>
<TD>
<INPUT TYPE = "checkbox"
NAME = "bill_now"
<TD>
<INPUT TYPE = "checkbox"
NAME = "bill_now"
@@
-261,7
+263,7
@@
function bill_now_changed (what) {
% # false laziness w/misc/order_pkg.html
<TR>
% # false laziness w/misc/order_pkg.html
<TR>
- <T
D ALIGN="right"><% mt('Charge date') |h %> </TD
>
+ <T
H ALIGN="right"><% mt('Charge date') |h %> </TH
>
<TD>
<INPUT TYPE = "text"
NAME = "start_date"
<TD>
<INPUT TYPE = "text"
NAME = "start_date"
@@
-313,7
+315,7
@@
function bill_now_changed (what) {
% }
<TR>
% }
<TR>
- <T
D ALIGN="right"><% mt('Tax exempt') |h %> </TD
>
+ <T
H ALIGN="right"><% mt('Tax exempt') |h %> </TH
>
<TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD>
</TR>
<TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD>
</TR>
@@
-331,7
+333,7
@@
function bill_now_changed (what) {
% } # if !$cust_pkg
<TR>
% } # if !$cust_pkg
<TR>
- <T
D ALIGN="right"><% mt('Description') |h %> </TD
>
+ <T
H ALIGN="right"><% mt('Description') |h %> </TH
>
<TD>
<INPUT TYPE = "text"
NAME = "pkg"
<TD>
<INPUT TYPE = "text"
NAME = "pkg"
diff --git
a/httemplate/elements/header-cust_main.html
b/httemplate/elements/header-cust_main.html
index
0c5eb87
..
c1123c3
100644
(file)
--- a/
httemplate/elements/header-cust_main.html
+++ b/
httemplate/elements/header-cust_main.html
@@
-10,9
+10,10
@@
Examples:
</%doc>
<& /elements/header.html, {
</%doc>
<& /elements/header.html, {
- 'title' => $title,
+ 'title'
=> $title,
'title_noescape' => $title_noescape,
'title_noescape' => $title_noescape,
- 'nobr' => 1,
+ 'nobr' => 1,
+ 'etc' => $opt{'etc'},
}
&>
}
&>
diff --git
a/httemplate/elements/tr-select-pkg_class.html
b/httemplate/elements/tr-select-pkg_class.html
index
28ed5d6
..
9f782e6
100644
(file)
--- a/
httemplate/elements/tr-select-pkg_class.html
+++ b/
httemplate/elements/tr-select-pkg_class.html
@@
-5,7
+5,7
@@
% } else {
<TR>
% } else {
<TR>
- <T
D ALIGN="right"><% $opt{'label'} || 'Package class' %></TD
>
+ <T
H ALIGN="right"><% $opt{'label'} || 'Package class' %></TH
>
<TD>
<% include( '/elements/select-pkg_class.html',
'curr_value' => $classnum,
<TD>
<% include( '/elements/select-pkg_class.html',
'curr_value' => $classnum,
diff --git
a/httemplate/elements/tr-select-taxclass.html
b/httemplate/elements/tr-select-taxclass.html
index
97f3cad
..
22c560e
100644
(file)
--- a/
httemplate/elements/tr-select-taxclass.html
+++ b/
httemplate/elements/tr-select-taxclass.html
@@
-7,7
+7,7
@@
% } else {
<TR>
% } else {
<TR>
- <T
D ALIGN="right"><% $opt{'label'} || 'Tax class: ' %></TD
>
+ <T
H ALIGN="right"><% $opt{'label'} || 'Tax class: ' %></TH
>
<TD>
<% include( '/elements/select-taxclass.html',
'curr_value' => $selected_taxclass,
<TD>
<% include( '/elements/select-taxclass.html',
'curr_value' => $selected_taxclass,