diff options
| author | ivan <ivan> | 2003-04-01 07:59:53 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2003-04-01 07:59:53 +0000 |
| commit | d88507e5e19b45eb970e3c2edf6a430262d485be (patch) | |
| tree | 4dae498acb116bc92849ed35d06a3846a7b91b72 /httemplate | |
| parent | 33849ebe914f0cb3d80c11b039abc52a1dcf94be (diff) | |
- update qsearch for Pg 7.3
- preliminary 1.5.0 upgrade docs
- syntax error in main customer view
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/docs/index.html | 1 | ||||
| -rwxr-xr-x | httemplate/view/cust_main.cgi | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html index eaa5b9b92..de25947f3 100644 --- a/httemplate/docs/index.html +++ b/httemplate/docs/index.html @@ -12,6 +12,7 @@ <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a> <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a> <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a> + <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2?) to 1.5.0</a> <!-- <li><a href="config.html">Configuration files</a> !--> diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 1d6243e23..01ad57373 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -365,8 +365,11 @@ if ( $conf->exists('hidecancelledpackages') ) { if ( @packages ) { #formatting + + my $colspan = $packages[0]->dbdef_table->column('last_bill') ? 6 : 5; + print &table(), "\n", - qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!, + qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=$colspan>!, qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n<TR>!, qq!<TH><FONT SIZE=-1>Setup</FONT></TH>!; @@ -375,7 +378,7 @@ if ( @packages ) { print qq!<TH><FONT SIZE=-1>Next bill</FONT></TH>!, qq!<TH><FONT SIZE=-1>Susp.</FONT></TH>!, - qq!<TH><FONT SIZE=-1>Expire!</FONT></TH>!, + qq!<TH><FONT SIZE=-1>Expire</FONT></TH>!, qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!, qq!</TR>\n!; } |