[freeside-commits] freeside/httemplate/elements customer-table.html, 1.4.2.2, 1.4.2.3
Erik Levinson
levinse at wavetail.420.am
Tue Apr 12 22:42:41 PDT 2011
Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv27678/httemplate/elements
Modified Files:
Tag: FREESIDE_2_1_BRANCH
customer-table.html
Log Message:
quick payment tool improvements, RT8121
Index: customer-table.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/customer-table.html,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -w -d -r1.4.2.2 -r1.4.2.3
--- customer-table.html 22 Feb 2011 00:18:51 -0000 1.4.2.2
+++ customer-table.html 13 Apr 2011 05:42:39 -0000 1.4.2.3
@@ -100,7 +100,9 @@
var custnum_obj = document.getElementById('custnum'+searchrow);
var balance = document.getElementById('balance'+searchrow);
- balance.value = '';
+ var status = document.getElementById('status'+searchrow);
+ balance.innerHTML = '';
+ status.innerHTML = '';
function search_invnum_update(customers) {
@@ -121,12 +123,14 @@
customer.style.display = '';
customer_select.style.display = 'none';
- } else if ( customerArray.length == 3 ) {
+ } else if ( customerArray.length == 5 ) {
custnum_obj.value = customerArray[0];
custnum_obj.style.color = '#000000';
customer.value = customerArray[1];
- balance.value = customerArray[2];
+ balance.innerHTML = customerArray[2];
+ status.innerHTML = customerArray[3];
+ status.style.color = '#'+customerArray[4];
customer.style.display = '';
customer_select.style.display = 'none';
@@ -178,7 +182,10 @@
invnum.value = '';
var balance = document.getElementById('balance'+searchrow);
- balance.value = '';
+ balance.innerHTML = '';
+
+ var status = document.getElementById('status'+searchrow);
+ status.innerHTML = '';
function search_custnum_update(customers) {
@@ -193,12 +200,14 @@
customer.style.color = '#ff0000';
custnum_obj.style.color = '#ff0000';
- } else if ( customerArray.length == 3 ) {
+ } else if ( customerArray.length == 5 ) {
custnum_obj.value = customerArray[0];
custnum_obj.style.color = '#000000';
customer.value = customerArray[1];
- balance.value = customerArray[2];
+ balance.innerHTML = customerArray[2];
+ status.innerHTML = customerArray[3];
+ status.style.color = '#'+customerArray[4];
customer.style.display = '';
customer_select.style.display = 'none';
@@ -243,7 +252,10 @@
var customer_select = document.getElementById('cust_select'+searchrow);
var balance = document.getElementById('balance'+searchrow);
- balance.value = '';
+ balance.innerHTML = '';
+
+ var status = document.getElementById('status'+searchrow);
+ status.innerHTML = '';
function search_customer_update(customers) {
@@ -265,7 +277,9 @@
custnum_obj.value = customerArray[0][0];
customer_obj.value = customerArray[0][1];
- balance.value = customerArray[0][2];
+ balance.innerHTML = customerArray[0][2];
+ status.innerHTML = customerArray[0][3];
+ status.style.color = '#'+customerArray[0][4];
customer_obj.style.display = '';
customer_select.style.display = 'none';
@@ -287,7 +301,7 @@
//add the multiple customers
for ( var s = 0; s < customerArray.length; s++ )
- opt(customer_select, customerArray[s][0] + '_' + customerArray[s][2], customerArray[s][1], '#000000');
+ opt(customer_select, customerArray[s][0] + '_' + customerArray[s][2] + '_' + customerArray[s][3] + '_' + customerArray[s][4], customerArray[s][1], '#000000');
opt(customer_select, 'cancel', '(Edit search string)', '#000000');
@@ -305,17 +319,18 @@
function select_customer() {
- var custnum_balance = this.options[this.selectedIndex].value;
+ var custnum_balance_status = this.options[this.selectedIndex].value;
var customer = this.options[this.selectedIndex].text;
var searchrow = this.getAttribute('rownum');
var custnum_obj = document.getElementById('custnum'+searchrow);
var customer_obj = document.getElementById('customer'+searchrow);
var balance_obj = document.getElementById('balance'+searchrow);
+ var status_obj = document.getElementById('status'+searchrow);
- if ( custnum_balance == '' ) {
+ if ( custnum_balance_status == '' ) {
- } else if ( custnum_balance == 'cancel' ) {
+ } else if ( custnum_balance_status == 'cancel' ) {
custnum_obj.value = '';
custnum_obj.style.color = '#000000';
@@ -326,8 +341,13 @@
} else {
- var custnum = custnum_balance.substring(0,custnum_balance.indexOf('_'));
- var balance = custnum_balance.substring(custnum_balance.indexOf('_')+1);
+ var pos_underscore1 = custnum_balance_status.indexOf('_');
+ var pos_underscore2 = custnum_balance_status.indexOf('_',pos_underscore1+1);
+ var pos_underscore3 = custnum_balance_status.indexOf('_',pos_underscore2+1);
+ var custnum = custnum_balance_status.substring(0,pos_underscore1);
+ var balance = custnum_balance_status.substring(pos_underscore1+1,pos_underscore2);
+ var status = custnum_balance_status.substring(pos_underscore2+1,pos_underscore3);
+ var color = custnum_balance_status.substring(pos_underscore3+1);
custnum_obj.value = custnum;
custnum_obj.style.color = '#000000';
@@ -335,7 +355,10 @@
customer_obj.value = customer;
customer_obj.style.color = '#000000';
- balance_obj.value = balance;
+ balance_obj.innerHTML = balance;
+
+ status_obj.innerHTML = status;
+ status_obj.style.color = '#'+color;
this.style.display = 'none';
customer_obj.style.display = '';
@@ -362,11 +385,12 @@
<TR>
<TH>Inv #</TH>
<TH>Cust #</TH>
+ <TH>Status</TH>
<TH>Customer</TH>
+ <TH>Balance</TH>
% foreach my $header ( @{$opt{header}} ) {
<TH><% $header %></TH>
% }
- <TH>Balance</TH>
</TR>
% my $row = 0;
% for ( $row = 0; exists($param->{"custnum$row"}); $row++ ) {
@@ -407,6 +431,16 @@
</TD>
<TD>
+ <SPAN
+ NAME = "status<% $row %>"
+ ID = "status<% $row %>"
+ rownum = "<% $row %>"
+ STYLE = "text-align:center; font-weight: bold"
+ >
+ </SPAN>
+ </TD>
+
+ <TD>
<INPUT TYPE="text" NAME="customer<% $row %>" ID="customer<% $row %>" SIZE=64 VALUE="<% $param->{"customer$row"} %>" rownum="<% $row %>">
<SCRIPT TYPE="text/javascript">
var customer_input<% $row %> = document.getElementById("customer<% $row %>");
@@ -461,21 +495,19 @@
% $col++;
% }
<TD>
- <INPUT TYPE = "text"
+ <SPAN
NAME = "balance<% $row %>"
ID = "balance<% $row %>"
- SIZE = 8
- MAXLENGTH = 12
- STYLE = "text-align:right;"
- VALUE = "<% $param->{"balance$row"} %>"
rownum = "<% $row %>"
+ STYLE = "text-align:center;"
>
+ </SPAN>
</TD>
</TR>
% }
<TR>
- <TH COLSPAN=3 ID="<% $opt{'prefix'} %>_TOTAL_TOTAL">
+ <TH COLSPAN=5 ID="<% $opt{'prefix'} %>_TOTAL_TOTAL">
Total <% $row ? $row-1 : 0 %>
<% PL($opt{name_singular} || 'customer', ( $row ? $row-1 : 0 ) ) %>
</TH>
@@ -580,6 +612,18 @@
row.appendChild(custnum_cell);
+ var status_cell = document.createElement('TD');
+
+ var status_span = document.createElement('SPAN');
+ status_span.setAttribute('name', 'status'+<% $opt{prefix} %>rownum);
+ status_span.setAttribute('id', 'status'+<% $opt{prefix} %>rownum);
+ status_span.style.textAlign = 'center';
+ status_span.style.fontWeight = 'bold';
+ status_span.setAttribute('rownum', <% $opt{prefix} %>rownum);
+ status_cell.appendChild(status_span);
+
+ row.appendChild(status_cell);
+
var customer_cell = document.createElement('TD');
var customer_input = document.createElement('INPUT');
@@ -604,6 +648,17 @@
row.appendChild(customer_cell);
+ var balance_cell = document.createElement('TD');
+
+ var balance_span = document.createElement('SPAN');
+ balance_span.setAttribute('name', 'balance'+<% $opt{prefix} %>rownum);
+ balance_span.setAttribute('id', 'balance'+<% $opt{prefix} %>rownum);
+ balance_span.style.textAlign = 'center';
+ balance_span.setAttribute('rownum', <% $opt{prefix} %>rownum);
+ balance_cell.appendChild(balance_span);
+
+ row.appendChild(balance_cell);
+
% my $col = 0;
% foreach my $field ( @{$opt{fields}} ) {
@@ -640,21 +695,6 @@
% $col++;
% }
- var balance_cell = document.createElement('TD');
-
- var balance_input = document.createElement('INPUT');
- balance_input.setAttribute('name', 'balance'+<% $opt{prefix} %>rownum);
- balance_input.setAttribute('id', 'balance'+<% $opt{prefix} %>rownum);
- balance_input.style.textAlign = 'right';
- balance_input.setAttribute('size', 8);
- balance_input.setAttribute('maxlength', 12);
- balance_input.setAttribute('rownum', <% $opt{prefix} %>rownum);
- balance_input.disabled = true;
- balance_input.style.backgroundColor = '#dddddd';
- balance_cell.appendChild(balance_input);
-
- row.appendChild(balance_cell);
-
//update the total # of rows display
if ( <% $opt{prefix} %>rownum == 1 ) {
<% $opt{prefix} %>total_el.innerHTML =
More information about the freeside-commits
mailing list